5.3

28 files changed, 6148 insertions, 3639 deletions

diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index fd5cbaf8..e40d8afc 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>浏览目录</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>取消请求: 正在等待当前操作完成...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>实时同步 - 自动同步</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux错误代码 %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>解决符号链接出错:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>无法解决 %x 的符号连接.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -135,35 +138,41 @@
 <pluralform>%x 字节</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>从同步数据库中读取时出错:</target>
+<source>Cannot read file %x.</source>
+<target>无法读取文件 %x .</target>
 
-<source>Error writing to synchronization database:</source>
-<target>向同步数据库中写入时出错:</target>
+<source>Cannot write file %x.</source>
+<target>无法写入文件 %x .</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>不兼容的同步数据库格式:</target>
+<source>Database file %x is incompatible.</source>
+<target>数据库文件 %x 不兼容.</target>
 
 <source>Initial synchronization:</source>
 <target>初始化同步:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>FreeFileSync数据库文件其中一个不存在:</target>
+<source>Database file %x does not yet exist.</source>
+<target>数据库文件 %x 还未存在.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>数据库文件没不共享一个公共的同步段</target>
+<source>Out of memory!</source>
+<target>内存不足!</target>
+
+<source>Database files do not share a common session.</source>
+<target>数据库文件并未共享一个公共会话.</target>
 
 <source>An exception occurred!</source>
 <target>发生异常!</target>
 
-<source>Error reading file attributes:</source>
-<target>读取文件属性出错:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>无法读取 %x 的文件属性.</target>
+
+<source>Cannot get process information.</source>
+<target>无法取得进程信息.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>由于目录已锁定而正在等待(%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>设置目录锁定时出错:</target>
+<source>Cannot set directory lock %x.</source>
+<target>无法设置目录锁定 %x .</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -173,8 +182,8 @@
 <pluralform>%x 秒</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>读取文件出错:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>当分析文件 %x , 行 %y, 列 %z 时出错.</target>
 
 <source>Scanning:</source>
 <target>扫描中:</target>
@@ -190,38 +199,32 @@
 <pluralform>[%x 线程]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>无效的 FreeFileSync 配置文件!</target>
+<source>/sec</source>
+<target>/秒</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>文件 %x 并未包含合法的配置.</target>
 
-<source>Error parsing configuration file:</source>
-<target>分析配置文件出错:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>配置文件 %x 只是部分载入.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>只部分载入配置文件:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>无法访问卷影复制服务.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>无法移动 %x 到回收站!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>请使用 FreeFileSync 64位版本来在这个系统上创建卷影复制.</target>
 
 <source>Cannot load file %x.</source>
 <target>不能载入文件 %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>使用卷影复制服务时出错!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>不支持在WOW64上使用卷影复制. 请使用 FreeFileSync 64位版本.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>不能确定文件的卷名:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>路径 %x 并未包含一个卷名.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>卷名 %x 并非文件名 %y 的一部分!</target>
 
-<source>/sec</source>
-<target>/秒</target>
-
-<source>File does not exist:</source>
-<target>文件不存在:</target>
+<source>Cannot find file %x.</source>
+<target>无法找到文件 %x .</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>无法读取如下XML元素:</target>
@@ -300,9 +303,6 @@ The command line is executed each time:
 <source>RealtimeSync configuration</source>
 <target>实时同步配置</target>
 
-<source>File already exists. Overwrite?</source>
-<target>文件已经存在.覆盖?</target>
-
 <source>&Restore</source>
 <target>恢复(&R)</target>
 
@@ -345,35 +345,38 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync 配置</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync 批处理作业</target>
-
-<source>Unable to create log file!</source>
-<target>无法创建日志!</target>
-
 <source>Batch execution</source>
 <target>批处理执行</target>
 
-<source>Stop</source>
-<target>停止</target>
+<source>Items processed:</source>
+<target>已处理的项目:</target>
+
+<source>Items remaining:</source>
+<target>剩余的项目:</target>
 
 <source>Total time:</source>
 <target>总共时间:</target>
 
+<source>Stop</source>
+<target>停止</target>
+
 <source>Synchronization aborted!</source>
 <target>同步已放弃!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>同步已完成但有错误.</target>
 
+<source>Nothing to synchronize!</source>
+<target>没有什么可同步!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>同步成功完成!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>按"切换"可打开FreeFileSync图形用户界面模块.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>请按下"切换"来解决 FreeFileSync主对话框上的问题.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>切换至FreeFileSync图形用户界面模块...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>正在切换到 FreeFileSync 主对话框...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>无法链接到 Sourceforge.net!</target>
@@ -531,9 +534,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>已找到的项目:</target>
 
-<source>Items remaining:</source>
-<target>剩余的项目:</target>
-
 <source>Speed:</source>
 <target>速度:</target>
 
@@ -561,9 +561,6 @@ The command line is executed each time:
 <source>Right</source>
 <target>右侧</target>
 
-<source>Sync setttings</source>
-<target>同步设置</target>
-
 <source>Status feedback</source>
 <target>状况反馈</target>
 
@@ -588,8 +585,8 @@ The command line is executed each time:
 <source>&Load</source>
 <target>加载(&L)</target>
 
-<source>&Cancel</source>
-<target>取消(&C)</target>
+<source>Cancel</source>
+<target>取消</target>
 
 <source>Select variant:</source>
 <target>选择变化的:</target>
@@ -639,8 +636,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>冲突/文件不能被分类</target>
 
-<source>&OK</source>
-<target>确定(&O)</target>
+<source>OK</source>
+<target>确定</target>
 
 <source>Compare by...</source>
 <target>比较选项...</target>
@@ -675,9 +672,6 @@ is the same
 <source>Synchronizing...</source>
 <target>同步中...</target>
 
-<source>Items processed:</source>
-<target>已处理的项目:</target>
-
 <source>&Pause</source>
 <target>暂停(&P)</target>
 
@@ -1017,9 +1011,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>文件清单已经导出!</target>
 
-<source>Error writing file:</source>
-<target>写入文件出错:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1061,21 +1052,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>已暂停</target>
 
+<source>Initializing...</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>Continue</source>
-<target>继续</target>
-
 <source>Cannot find %x</source>
 <target>找不到 %x</target>
 
@@ -1209,68 +1200,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x 天</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>不能初始化目录监视:</target>
-
-<source>Error when monitoring directories.</source>
-<target>监视目录时出错.</target>
+<source>Cannot monitor directory %x.</source>
+<target>无法监视目录 %x.</target>
 
 <source>Conversion error:</source>
 <target>转换错误:</target>
 
-<source>Error deleting file:</source>
-<target>删除文件出错:</target>
+<source>Cannot delete file %x.</source>
+<target>无法删除文件 %x.</target>
 
-<source>Error moving file:</source>
-<target>移动文件时出错:</target>
+<source>The file is locked by another process:</source>
+<target>此文件被另一进程锁定:</target>
 
-<source>Target file already existing!</source>
-<target>目标文件已经存在!</target>
+<source>Cannot move file %x to %y.</source>
+<target>无法移动文件 %x 到 %y.</target>
 
-<source>Error moving directory:</source>
-<target>移动目录时出错:</target>
+<source>Cannot delete directory %x.</source>
+<target>无法删除目录 %x.</target>
 
-<source>Target directory already existing!</source>
-<target>目标目录已经存在!</target>
+<source>Cannot write modification time of %x.</source>
+<target>无法写入 %x 的最后修改时间.</target>
 
-<source>Error deleting directory:</source>
-<target>删除目录出错:</target>
+<source>Cannot find system function %x.</source>
+<target>无法找到系统功能 %x.</target>
 
-<source>Error changing modification time:</source>
-<target>改变修改时间时出错:</target>
+<source>Cannot read security context of %x.</source>
+<target>无法读取 %x 的安全上下文.</target>
 
-<source>Error loading library function:</source>
-<target>加载库函数出错:</target>
+<source>Cannot write security context of %x.</source>
+<target>无法写入 %x 的安全上下文.</target>
 
-<source>Error reading security context:</source>
-<target>读取安全上下文时出错:</target>
+<source>Cannot read permissions of %x.</source>
+<target>无法读取 %x 的权限.</target>
 
-<source>Error writing security context:</source>
-<target>写入安全上下文时出错:</target>
+<source>Cannot write permissions of %x.</source>
+<target>无法写入 %x 的权限.</target>
 
-<source>Error copying file permissions:</source>
-<target>复制文件权限时出错:</target>
+<source>Cannot create directory %x.</source>
+<target>无法创建目录 %x.</target>
 
-<source>Error creating directory:</source>
-<target>创建目录出错:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>无法复制符号连接 %x 到 %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>复制符号链接时出错:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>无法写入 %x 的文件属性.</target>
 
-<source>Error copying file:</source>
-<target>复制文件出错:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>无法复制文件 %x 到 %y.</target>
 
-<source>Error opening file:</source>
-<target>打开文件出错:</target>
+<source>Cannot read directory %x.</source>
+<target>无法读取目录 %x.</target>
 
-<source>Error traversing directory:</source>
-<target>遍历目录出错:</target>
+<source>Endless loop.</source>
+<target>无限循环.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>遍历目录时出现无限循环:</target>
+<source>Cannot set privilege %x.</source>
+<target>无法设置 %x 的特权.</target>
 
-<source>Error setting privilege:</source>
-<target>设置权限时出错:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>无法移动 %x 到回收站!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>在最后的同步之后两边均已改变!</target>
@@ -1296,8 +1284,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>你可以忽略这个错误而认为目录是空的.</target>
 
-<source>Directory does not exist:</source>
-<target>目录不存在:</target>
+<source>Cannot find directory %x.</source>
+<target>无法找到目录 %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目录有依赖性！在设立同步规则时请小心:</target>
@@ -1305,20 +1293,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>正在准备同步...</target>
 
-<source>Out of memory!</source>
-<target>内存不足!</target>
+<source>Conflict detected:</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>Symbolic links %x have the same date but a different target.</source>
+<target>符号连接 %x 有相同的日期但目标不同.</target>
 
 <source>Comparing content of files %x</source>
 <target>正在比较文件 %x 的内容</target>
@@ -1401,12 +1386,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>正在创建文件 %x</target>
 
-<source>Creating folder %x</source>
-<target>正创建文件夹 %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>正在创建符号连接 %x</target>
 
+<source>Creating folder %x</source>
+<target>正创建文件夹 %x</target>
+
 <source>Overwriting file %x</source>
 <target>正在覆盖文件 %x</target>
 
@@ -1425,8 +1410,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>用于保存文件历史版本的目录没有提供!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>源目录已经不存在:</target>
+<source>Source directory %x not found.</source>
+<target>来源目录 %x 无法找到.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>存在不可解决的冲突!</target>
@@ -1461,12 +1446,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>正在生成数据库...</target>
 
-<source>Nothing to synchronize!</source>
-<target>没有什么可同步!</target>
-
-<source>Unable to copy 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/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index c222463d..69414e19 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -19,9 +19,15 @@
 <source>Browse directory</source>
 <target>瀏覽目錄</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>中止請求：正在等待目前操作完成...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>即時同步 - 自動同步</target>
 
+<source>Error</source>
+<target>錯誤</target>
+
 <source>Select alternate comparison settings</source>
 <target>選擇替代的比對設定</target>
 
@@ -52,9 +58,6 @@
 <source>About</source>
 <target>關於</target>
 
-<source>Error</source>
-<target>錯誤</target>
-
 <source>Warning</source>
 <target>警告</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux錯誤代碼 %x：</target>
 
-<source>Error resolving symbolic link:</source>
-<target>解析錯誤的符號連結：</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>無法解析符號連結 %X。</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -135,35 +138,41 @@
 <pluralform>%x 位元組</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>讀取同步資料庫錯誤：</target>
+<source>Cannot read file %x.</source>
+<target>無法讀取檔案 %X。</target>
 
-<source>Error writing to synchronization database:</source>
-<target>寫入同步資料庫錯誤：</target>
+<source>Cannot write file %x.</source>
+<target>無法寫入檔案 %X。</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>同步資料庫格式不相容：</target>
+<source>Database file %x is incompatible.</source>
+<target>資料庫檔案 %x 是不相容的。</target>
 
 <source>Initial synchronization:</source>
 <target>初始化同步：</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>其中一個FreeFileSync資料庫檔案不存在：</target>
+<source>Database file %x does not yet exist.</source>
+<target>資料庫檔案 %x 並不存在。</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>資料庫檔案不要共享一個共同的同步連線：</target>
+<source>Out of memory!</source>
+<target>記憶體不足！</target>
+
+<source>Database files do not share a common session.</source>
+<target>資料庫檔案不會共享一個共同的連線。</target>
 
 <source>An exception occurred!</source>
 <target>發生異常！</target>
 
-<source>Error reading file attributes:</source>
-<target>讀取檔案屬性錯誤：</target>
+<source>Cannot read file attributes of %x.</source>
+<target>無法讀取 %x 的檔案屬性。</target>
+
+<source>Cannot get process information.</source>
+<target>無法得到進程資訊。</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>等待同時目錄被鎖定(%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>設定目錄鎖錯誤：</target>
+<source>Cannot set directory lock %x.</source>
+<target>無法設定目錄鎖 %x。</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -173,8 +182,8 @@
 <pluralform>%x 秒</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>讀取檔案錯誤：</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>解析檔案 %x、行 %y、列 %z 時出現錯誤。</target>
 
 <source>Scanning:</source>
 <target>正在掃瞄：</target>
@@ -190,38 +199,32 @@
 <pluralform>[%x 個執行緒]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>無效的FreeFileSync配置檔案！</target>
+<source>/sec</source>
+<target>/秒</target>
 
-<source>Error parsing configuration file:</source>
-<target>分析配置檔案錯誤：</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>檔案 %x 不包含一個有效的配置。</target>
 
-<source>Configuration loaded partially only:</source>
-<target>只載入部分配置：</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>只載入設定檔 %x 的一部份。</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>無法將 %x 移動到資源回收筒！</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>無法讀取卷影複製服務。</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>請在此系統上使用FreeFileSync 64位元版本來新建卷影副本。</target>
 
 <source>Cannot load file %x.</source>
 <target>無法載入檔案 %x。</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>讀取卷影複製服務時錯誤！</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>不支援WOW64製作卷影副本。請使用FreeFileSync 64位元版本。</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>無法判斷檔案卷名：</target>
+<source>Path %x does not contain a volume name.</source>
+<target>路徑 %x 不包含卷名。</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>卷名 %x 並非檔名 %y 的一部份！</target>
 
-<source>/sec</source>
-<target>/秒</target>
-
-<source>File does not exist:</source>
-<target>檔案不存在：</target>
+<source>Cannot find file %x.</source>
+<target>找不到檔案 %x。</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>無法讀取下列XML元素：</target>
@@ -294,15 +297,18 @@ The command line is executed each time:
 <source>Start</source>
 <target>開始</target>
 
+<source>&Retry</source>
+<target>重試(&R)</target>
+
+<source>Cancel</source>
+<target>取消</target>
+
 <source>(Build: %x)</source>
 <target>(建立：%x)</target>
 
 <source>RealtimeSync configuration</source>
 <target>即時同步配置</target>
 
-<source>File already exists. Overwrite?</source>
-<target>檔案已存在，要覆蓋嗎？</target>
-
 <source>&Restore</source>
 <target>還原(&R)</target>
 
@@ -345,35 +351,38 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync配置</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync批次處理作業</target>
-
-<source>Unable to create log file!</source>
-<target>無法新建日誌檔！</target>
-
 <source>Batch execution</source>
 <target>批次處理執行</target>
 
-<source>Stop</source>
-<target>停止</target>
+<source>Items processed:</source>
+<target>已處理項目：</target>
+
+<source>Items remaining:</source>
+<target>剩餘項目：</target>
 
 <source>Total time:</source>
 <target>全部時間：</target>
 
+<source>Stop</source>
+<target>停止</target>
+
 <source>Synchronization aborted!</source>
 <target>同步已中止！</target>
 
 <source>Synchronization completed with errors!</source>
 <target>同步完成但有錯誤！</target>
 
+<source>Nothing to synchronize!</source>
+<target>沒有什麼東西可同步！</target>
+
 <source>Synchronization completed successfully!</source>
 <target>已成功的完成同步！</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>按下 "切換" 開啟FreeFileSync圖形介面操作方式。</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>在FreeFileSync主對話框，按下"切換"來解決問題。</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>切換FreeFileSync圖形介面操作方式...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>切換到FreeFileSync主對話框...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>無法連接到sourceforge.net！</target>
@@ -531,9 +540,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>尋找項目：</target>
 
-<source>Items remaining:</source>
-<target>剩餘項目：</target>
-
 <source>Speed:</source>
 <target>速度：</target>
 
@@ -561,9 +567,6 @@ The command line is executed each time:
 <source>Right</source>
 <target>右邊</target>
 
-<source>Sync setttings</source>
-<target>同步設定</target>
-
 <source>Status feedback</source>
 <target>狀態回報</target>
 
@@ -588,9 +591,6 @@ The command line is executed each time:
 <source>&Load</source>
 <target>載入(&L)</target>
 
-<source>&Cancel</source>
-<target>取消(&C)</target>
-
 <source>Select variant:</source>
 <target>選擇變數：</target>
 
@@ -639,8 +639,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>衝突/檔案無法分類</target>
 
-<source>&OK</source>
-<target>確定(&O)</target>
+<source>OK</source>
+<target>確定</target>
 
 <source>Compare by...</source>
 <target>比對選項...</target>
@@ -666,9 +666,6 @@ is the same
 <source>Synchronizing...</source>
 <target>正在同步...</target>
 
-<source>Items processed:</source>
-<target>已處理項目：</target>
-
 <source>&Pause</source>
 <target>暫停(&P)</target>
 
@@ -708,9 +705,6 @@ is the same
 <source>&Ignore</source>
 <target>忽略(&I)</target>
 
-<source>&Retry</source>
-<target>重試(&R)</target>
-
 <source>Do not show this dialog again</source>
 <target>不要再顯示此對話框</target>
 
@@ -1008,9 +1002,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>檔案清單已匯出！</target>
 
-<source>Error writing file:</source>
-<target>寫入檔案錯誤：</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1052,21 +1043,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>已暫停</target>
 
+<source>Initializing...</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>Continue</source>
-<target>繼續</target>
-
 <source>Cannot find %x</source>
 <target>找不到 %x</target>
 
@@ -1200,68 +1191,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x 天</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>無法初始化目錄監測：</target>
-
-<source>Error when monitoring directories.</source>
-<target>監測目錄錯誤。</target>
+<source>Cannot monitor directory %x.</source>
+<target>無法監測目錄 %x。</target>
 
 <source>Conversion error:</source>
 <target>轉換錯誤：</target>
 
-<source>Error deleting file:</source>
-<target>刪除檔案錯誤：</target>
+<source>Cannot delete file %x.</source>
+<target>無法刪除目錄 %x。</target>
 
-<source>Error moving file:</source>
-<target>移動檔案錯誤：</target>
+<source>The file is locked by another process:</source>
+<target>檔案被另一個進程鎖定：</target>
 
-<source>Target file already existing!</source>
-<target>目標檔案已存在！</target>
+<source>Cannot move file %x to %y.</source>
+<target>無法移動檔案 %x 到 %y。</target>
 
-<source>Error moving directory:</source>
-<target>移動目錄錯誤：</target>
+<source>Cannot delete directory %x.</source>
+<target>無法刪除目錄 %x。</target>
 
-<source>Target directory already existing!</source>
-<target>目標目錄已存在！</target>
+<source>Cannot write modification time of %x.</source>
+<target>無法寫入 %x 的修改時間。</target>
 
-<source>Error deleting directory:</source>
-<target>刪除目錄錯誤：</target>
+<source>Cannot find system function %x.</source>
+<target>找不到系統函數 %x。</target>
 
-<source>Error changing modification time:</source>
-<target>變更修改時間錯誤：</target>
+<source>Cannot read security context of %x.</source>
+<target>無法讀取 %x 的安全上下文。</target>
 
-<source>Error loading library function:</source>
-<target>載入函數庫錯誤：</target>
+<source>Cannot write security context of %x.</source>
+<target>無法寫入 %x 的安全上下文。</target>
 
-<source>Error reading security context:</source>
-<target>讀取安全性內容錯誤：</target>
+<source>Cannot read permissions of %x.</source>
+<target>無法讀取 %x 的權限。</target>
 
-<source>Error writing security context:</source>
-<target>寫入安全性內容錯誤：</target>
+<source>Cannot write permissions of %x.</source>
+<target>無法寫入 %x 的權限。</target>
 
-<source>Error copying file permissions:</source>
-<target>複製檔案權限錯誤：</target>
+<source>Cannot create directory %x.</source>
+<target>無法新建目錄 %x。</target>
 
-<source>Error creating directory:</source>
-<target>新建目錄錯誤：</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>無法複製符號連結 %x 到 %y。</target>
 
-<source>Error copying symbolic link:</source>
-<target>複製符號連結錯誤：</target>
+<source>Cannot write file attributes of %x.</source>
+<target>無法寫入 %x 的檔案屬性。</target>
 
-<source>Error copying file:</source>
-<target>複製檔案錯誤：</target>
+<source>Cannot copy file %x to %y.</source>
+<target>無法複製檔案 %x 到 %y。</target>
 
-<source>Error opening file:</source>
-<target>開啟檔案錯誤：</target>
+<source>Cannot read directory %x.</source>
+<target>無法讀取目錄 %x。</target>
 
-<source>Error traversing directory:</source>
-<target>遍歷目錄錯誤：</target>
+<source>Endless loop.</source>
+<target>無限迴圈。</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>當遍歷目錄時無限循環：</target>
+<source>Cannot set privilege %x.</source>
+<target>無法設定權限 %x。</target>
 
-<source>Error setting privilege:</source>
-<target>設定權限錯誤：</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>無法將 %x 移動到資源回收筒！</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>自上次同步後，兩邊均已更改過！</target>
@@ -1287,8 +1275,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>您可以忽略此錯誤，考慮該目錄為空。</target>
 
-<source>Directory does not exist:</source>
-<target>目錄不存在：</target>
+<source>Cannot find directory %x.</source>
+<target>找不到目錄 %x。</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目錄有依靠性！請小心設定同步規則：</target>
@@ -1296,20 +1284,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>正在準備同步...</target>
 
-<source>Out of memory!</source>
-<target>記憶體不足！</target>
+<source>Conflict detected:</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>Symbolic links %x have the same date but a different target.</source>
+<target>%x 的符號連結具有相同的日期，但不同的目標。</target>
 
 <source>Comparing content of files %x</source>
 <target>正在比對檔案内容 %x</target>
@@ -1392,12 +1377,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>正在新建檔案 %x</target>
 
-<source>Creating folder %x</source>
-<target>正在新建資料夾 %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>正在新建符號連結 %x</target>
 
+<source>Creating folder %x</source>
+<target>正在新建資料夾 %x</target>
+
 <source>Overwriting file %x</source>
 <target>正在覆蓋檔案 %x</target>
 
@@ -1416,8 +1401,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>版本控制檔的目錄不提供！</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>來源目錄不存在：</target>
+<source>Source directory %x not found.</source>
+<target>來源目錄 %x 找不到。</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>存在未解決的衝突！</target>
@@ -1452,12 +1437,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>正在產生資料庫...</target>
 
-<source>Nothing to synchronize!</source>
-<target>沒有什麼東西可同步！</target>
-
-<source>Unable to copy 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/croatian.lng b/BUILD/Languages/croatian.lng
index 708eda95..ff56257e 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Odaberi direktorij</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Prekid zahtjevan: čekam da se trenutna akcija završi...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatska Sinkronizacija</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux greška %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Pogreška pri otvaranju poveznice simbola:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Ne mogu riješiti simboličnu poveznicu</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -137,35 +140,41 @@
 <pluralform>%x Bajtova</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Greška pri čitanju iz sinkronizacijske baze:</target>
+<source>Cannot read file %x.</source>
+<target>Ne mogu čitati datoteku</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Greška pri pisanju u sinkronizacijsku bazu:</target>
+<source>Cannot write file %x.</source>
+<target>Ne mogu zapisati datoteku</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Nekompatibilan format sinkronizacijske podatkovne baze:</target>
+<source>Database file %x is incompatible.</source>
+<target>Datoteka baze %x je nekompatibilna</target>
 
 <source>Initial synchronization:</source>
 <target>Početna sinkronizacija:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Jedna od FreeFileSync datoteka podatkovne baze još ne postoji:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Datoteka baze %x još ne postoji</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Datoteke podatkovne baze ne dijele zajedničke sinkronizacijske sesije:</target>
+<source>Out of memory!</source>
+<target>Nedostatak memorije</target>
+
+<source>Database files do not share a common session.</source>
+<target>Datoteke baze ne dijele zajednički protokol</target>
 
 <source>An exception occurred!</source>
 <target>Dogodilo se izuzeće!</target>
 
-<source>Error reading file attributes:</source>
-<target>Greška pri čitanju atributa datoteke:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Ne mogu pročitati osobine od %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Ne mogu dobit iniformacije o procesu</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čekam dok se direktorij zaključava (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Greška pri postavljanju zaključenja direktorija:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Ne mogu zaključati direktorij %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -177,8 +186,8 @@
 <pluralform>%x sek</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Greška pri čitanju datoteke:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Greška u analizi datoteke %x, red %y, stupac %z.</target>
 
 <source>Scanning:</source>
 <target>Pretražujem:</target>
@@ -196,38 +205,32 @@
 <pluralform>% Stavki</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Nevaljana FreeFileSync konfiguracijska datoteka!</target>
+<source>/sec</source>
+<target>/sek</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Datoteka %x ne sadrži valjanu konfiguraciju</target>
 
-<source>Error parsing configuration file:</source>
-<target>Greška pri raščlanjivanju datoteke postavki:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Datoteka postavki %x učitana samo djelomično</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Konfiguracija učitala samo djelomično:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Ne mogu pristupiti Volume Shadow Copy Servisu</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Nije moguće prebaciti u Koš za smeće</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Molimo koristite FreeFileSync 64-bitnu verziju za izradu shadow kopija na ovom sustavu</target>
 
 <source>Cannot load file %x.</source>
 <target>Ne mogu učitati datoteku %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Greška pri pristupu servisu particijskog kopiranja!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Stvaranje sjeničnih kopija na WOW63 nije podržano. Molimo koristite 64-bitnu FreeFileSync inačnicu.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Nemože se ustanoviti naziv datoteke</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Putanja %x ne sadrži naziv particije</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Naziv particije %x dio naziva datoteke %y!</target>
 
-<source>/sec</source>
-<target>/sek</target>
-
-<source>File does not exist:</source>
-<target>Datoteka ne postoji:</target>
+<source>Cannot find file %x.</source>
+<target>Ne mogu pronaći datoteku %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Ne mogu čitati slijedeće XML elemente</target>
@@ -306,9 +309,6 @@ Naredba će biti izvršena kada:
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync postavke</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Datoteka već postoji. Prepisati?</target>
-
 <source>&Restore</source>
 <target>&Vrati</target>
 
@@ -351,35 +351,38 @@ Naredba će biti izvršena kada:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync postavke</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Slijedni zadatak</target>
-
-<source>Unable to create log file!</source>
-<target>Nemogu napraviti zapisnik!</target>
-
 <source>Batch execution</source>
 <target>Slijedno izvršavanje</target>
 
-<source>Stop</source>
-<target>Zaustavi</target>
+<source>Items processed:</source>
+<target>Obrađeni elementi:</target>
+
+<source>Items remaining:</source>
+<target>Preostale stavke:</target>
 
 <source>Total time:</source>
 <target>Ukupno vrijeme:</target>
 
+<source>Stop</source>
+<target>Zaustavi</target>
+
 <source>Synchronization aborted!</source>
 <target>Sinkronizacija prekinuta!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sinkronizacija završena s greškama!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Ništa za sinkronizirati!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Sinkronizacija uspješno završena!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Pretisnite "Zamjena", da otvorite FreeFileSync GUI način.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Preisni "Zamjeni" za riješavanje problema u FreeFileSync glavnom dijaloškom okviru</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Prelazim na FreeFileSync GUI način...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Prebacujem u FreeFileSync glavni dijaloški okvir</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Ne mogu se povezati na sourceforge.net!</target>
@@ -537,9 +540,6 @@ Naredba će biti izvršena kada:
 <source>Items found:</source>
 <target>Pronađene stavke:</target>
 
-<source>Items remaining:</source>
-<target>Preostale stavke:</target>
-
 <source>Speed:</source>
 <target>Brzina:</target>
 
@@ -591,8 +591,8 @@ Naredba će biti izvršena kada:
 <source>&Load</source>
 <target>&Uvezi</target>
 
-<source>&Cancel</source>
-<target>&Odustani</target>
+<source>Cancel</source>
+<target>Odustani</target>
 
 <source>Select variant:</source>
 <target>Izaberite varijantu:</target>
@@ -642,8 +642,8 @@ Naredba će biti izvršena kada:
 <source>Conflict/file cannot be categorized</source>
 <target>Konflikt/datoteka ne more biti kategorizirana</target>
 
-<source>&OK</source>
-<target>&U redu</target>
+<source>OK</source>
+<target>U redu</target>
 
 <source>Compare by...</source>
 <target>Usporedi prema...</target>
@@ -678,9 +678,6 @@ jednak
 <source>Synchronizing...</source>
 <target>Sinkroniziram...</target>
 
-<source>Items processed:</source>
-<target>Obrađeni elementi:</target>
-
 <source>&Pause</source>
 <target>&Pauziraj</target>
 
@@ -1020,9 +1017,6 @@ Isključi: \stuff\temp\*
 <source>File list exported!</source>
 <target>Datotečna lista izvezena!</target>
 
-<source>Error writing file:</source>
-<target>Napaka pri pisanju datoteke:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1072,21 +1066,21 @@ Isključi: \stuff\temp\*
 <source>Paused</source>
 <target>Pauzirano</target>
 
+<source>Initializing...</source>
+<target>Učitavam</target>
+
 <source>Aborted</source>
 <target>Prekinuto</target>
 
 <source>Completed</source>
 <target>Završeno</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Prekid zahtjevan: čekam da se trenutna akcija završi...</target>
+<source>Continue</source>
+<target>Nastavi</target>
 
 <source>Pause</source>
 <target>Pauziraj</target>
 
-<source>Continue</source>
-<target>Nastavi</target>
-
 <source>Cannot find %x</source>
 <target>Nemogu pronać %x</target>
 
@@ -1230,65 +1224,65 @@ Isključi: \stuff\temp\*
 <pluralform>%x dana</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Ne mogu započeti nadziranje direktorija:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Greška pri nadziranju direktorija.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Ne mogu posmatrati direktorij %x.</target>
 
 <source>Conversion error:</source>
 <target>Greška pri pretvorbi:</target>
 
-<source>Error deleting file:</source>
-<target>Greška pri brisanju datoteke:</target>
+<source>Cannot delete file %x.</source>
+<target>Ne mogu izbrisati datoteku %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Datoteka je blokirana drugim procesom:</target>
 
-<source>Error moving file:</source>
-<target>Greška pri premještanju datoteke:</target>
+<source>Cannot move file %x to %y.</source>
+<target>Ne mogu premjestiti datoteku %x u %y.</target>
 
-<source>Target file already existing!</source>
-<target>Ciljna datoteka već postoji!</target>
+<source>Cannot delete directory %x.</source>
+<target>Ne mogu izbrisati mapu %x.</target>
 
-<source>Error moving directory:</source>
-<target>Greška pri premještanju direktorija:</target>
+<source>Cannot write modification time of %x.</source>
+<target>Ne mogu zapisati vrijeme izmjene %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Ciljni direktorij već postoji!</target>
+<source>Cannot find system function %x.</source>
+<target>Ne mogu pronaći sistemsku funkciju %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Greška pri brisanju direktorija:</target>
+<source>Cannot read security context of %x.</source>
+<target>Ne mogu čitati zaštićeni sadržaj %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Greška pri promjeni vremena izmjene:</target>
+<source>Cannot write security context of %x.</source>
+<target>Ne mogu zapisati zaštićeni sadržaj %x.</target>
 
-<source>Error loading library function:</source>
-<target>Greška pri zadavanju funkcije iz knjižnice:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Ne mogu čitati dopuštenja od %x.</target>
 
-<source>Error reading security context:</source>
-<target>Greška pri čitanju zaštićenog sadržaja:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Ne mogu zapisati dopuštenja za %x.</target>
 
-<source>Error writing security context:</source>
-<target>Greška pri pisanju zaštićenog sadržaja:</target>
+<source>Cannot create directory %x.</source>
+<target>Ne mogu izraditi mapu %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Greška pri kopiranju datotečnih dopuštenja:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Ne mogu kopirati simboličnu poveznicu %x na %y.</target>
 
-<source>Error creating directory:</source>
-<target>Greška pri izradi direktorija:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Ne mogu zapisati svojstva od %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Greška pri kopiranju poveznice simbola:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Ne mogu kopirati datoteku %x na %y.</target>
 
-<source>Error copying file:</source>
-<target>Greška pri kopiranju datoteke:</target>
+<source>Cannot read directory %x.</source>
+<target>Ne mogu čitati mapu %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Greška pri prelasku direktorija:</target>
+<source>Endless loop.</source>
+<target>Beskrajna petlja</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Beskonačna petlja pri prelasku direktorija:</target>
+<source>Cannot set privilege %x.</source>
+<target>Ne mogu postaviti prava za %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Greška pri postavljanju dopuštenja:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Nije moguće prebaciti u Koš za smeće</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Obje su strane promjenjene od posljednje sinkronizacije!</target>
@@ -1314,8 +1308,8 @@ Isključi: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Možete ignorirati ovu grešku uzimajući datoteku kao praznu .</target>
 
-<source>Directory does not exist:</source>
-<target>Direktorij ne postoji:</target>
+<source>Cannot find directory %x.</source>
+<target>Ne mogu pronaći mapu %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Direktoriji su u ovisnosti! Budite oprezni pri postavljanju sinkronizacijskih pravila:</target>
@@ -1323,20 +1317,17 @@ Isključi: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Pripremam sinkronizaciju</target>
 
-<source>Out of memory!</source>
-<target>Nedostatak memorije</target>
+<source>Conflict detected:</source>
+<target>Sukob pronađen:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Datoteka %x ima nevaljan datum!</target>
 
-<source>Conflict detected:</source>
-<target>Sukob pronađen:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Datoteke %x imaju isti datum ali drugačiju veličinu!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Simbolične poveznice %x imaju isti datum ali drugačiji cilj!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Simbolične poveznice %x imaju isti datum ali drugačiji cilj</target>
 
 <source>Comparing content of files %x</source>
 <target>Uspoređujem sadržaj datoteka %x</target>
@@ -1419,12 +1410,12 @@ Isključi: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Izrađujem datoteku %x</target>
 
-<source>Creating folder %x</source>
-<target>Izrađujem mapu %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Izrađujem simboličnu poveznicu %x</target>
 
+<source>Creating folder %x</source>
+<target>Izrađujem mapu %x</target>
+
 <source>Overwriting file %x</source>
 <target>Prepisujem datoteku %x</target>
 
@@ -1443,8 +1434,8 @@ Isključi: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Mapa za ovakvu datoteku nije isporučena</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Izvorni direktorij više ne postoji:</target>
+<source>Source directory %x not found.</source>
+<target>Izvorna mapa %x nije pronađena</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Nerješivi sukob postoji!</target>
@@ -1479,12 +1470,6 @@ Isključi: \stuff\temp\*
 <source>Generating database...</source>
 <target>Izrađujem bazu podataka...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Ništa za sinkronizirati!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Nemoguće kopirati blokiranu datoteku %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Greška pri provjeravanju podataka: Izvorna i ciljna datoteka imaju različit sadržaj!</target>
 
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index cd0aa8f0..3230b30b 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Procházet adresář</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Požadavek na přerušení: Čekání na ukončení aktuální operace...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatická synchronizace</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Chybový kód Linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Nelze najít odkaz zástupce:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nelze najít odkaz zástupce %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -137,35 +140,41 @@
 <pluralform>%x B</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Nelze číst ze synchronizační databáze:</target>
+<source>Cannot read file %x.</source>
+<target>Nelze číst soubor %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Nelze zapsat do synchronizační databáze:</target>
+<source>Cannot write file %x.</source>
+<target>Nelze zapsat soubor %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Chybný formát synchronizační databáze:</target>
+<source>Database file %x is incompatible.</source>
+<target>Chybný formát databáze %x.</target>
 
 <source>Initial synchronization:</source>
 <target>Prvotní synchronizace:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Některý z databázových souborů FreeFileSync neexistuje:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Databázový soubor %x neexistuje.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Databázové soubory nejsou navzájem komplementární</target>
+<source>Out of memory!</source>
+<target>Nedostatek pracovní paměti!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Databázové soubory nejsou navzájem komplementární.</target>
 
 <source>An exception occurred!</source>
 <target>Vyskytla se chyba!</target>
 
-<source>Error reading file attributes:</source>
-<target>Nelze číst atributy souboru:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Nelze číst atributy souboru %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Nelze získat informace procesu.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čekání na uzamčení adresáře (%x)</target>
 
-<source>Error setting directory lock:</source>
-<target>Nelze nastavit zámek adresáře:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Nelze nastavit zámek adresáře %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -177,8 +186,8 @@
 <pluralform>%x sekund</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Nelze číst soubor:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Chyba zpracování souboru %x: na řádku %y ve sloupci %z</target>
 
 <source>Scanning:</source>
 <target>Zpracováváno:</target>
@@ -196,38 +205,32 @@
 <pluralform>[%x procesů]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Chybný konfigurační soubor FreeFileSync!</target>
+<source>/sec</source>
+<target>/s</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Soubor %x neobsahuje platnou konfiguraci.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Nelze zpracovat konfigurační soubor:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Konfigurace ze souboru %x byla načtena jen částečně.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Konfigurace byla načtena jen částečně:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Nepodařil se přístup ke službě Volume Shadow Copy Service.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Není možné přesunout %x do Koše!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Prosím použijte FreeFileSync 64-bitovou verzi pro použití služby Volume Shadow Copy.</target>
 
 <source>Cannot load file %x.</source>
 <target>Nelze načíst soubor %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Nepodařil se přístup ke službě Volume Shadow Copy Service!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Vytváření stínových kopií na WOW64 není podporováno. Prosím použijte 64 bitovou verzi FreeFileSync.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Nelze zjistit jméno jednotky souboru:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>>Nelze zjistit jméno jednotky souboru %x.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Disk %x není součástí jména souboru %y!</target>
 
-<source>/sec</source>
-<target>/s</target>
-
-<source>File does not exist:</source>
-<target>Soubor neexistuje:</target>
+<source>Cannot find file %x.</source>
+<target>Nalze najít soubor %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Nelze načíst následující XML elementy:</target>
@@ -306,9 +309,6 @@ Příkazová řádka je spuštěna pokaždé když:
 <source>RealtimeSync configuration</source>
 <target>Konfigurace RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Soubor již existuje. Přepsat?</target>
-
 <source>&Restore</source>
 <target>&Obnovit</target>
 
@@ -351,35 +351,38 @@ Příkazová řádka je spuštěna pokaždé když:
 <source>FreeFileSync configuration</source>
 <target>Konfigurace FreeFileSync</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Dávkové zpracování</target>
-
-<source>Unable to create log file!</source>
-<target>Není možné vytvořit záznamový soubor!</target>
-
 <source>Batch execution</source>
 <target>Spuštění dávky</target>
 
-<source>Stop</source>
-<target>Stop</target>
+<source>Items processed:</source>
+<target>Zpracováno položek:</target>
+
+<source>Items remaining:</source>
+<target>Zbývá položek:</target>
 
 <source>Total time:</source>
 <target>Celkový čas:</target>
 
+<source>Stop</source>
+<target>Stop</target>
+
 <source>Synchronization aborted!</source>
 <target>Synchronizace zrušena!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronizace dokončena s chybami.</target>
 
+<source>Nothing to synchronize!</source>
+<target>Není co synchronizovat!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Synchronizace dokončena úspěšně!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Talčítkem "Přepnout" otevřete okno FreeFileSync.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Použijte tlačítko "Přepnout" k vyřešení problému pomocí hlavního okna FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Otevírání okna FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Přepínání do hlavního okna FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Není možné se připojit k sourceforge.net!</target>
@@ -537,9 +540,6 @@ Příkazová řádka je spuštěna pokaždé když:
 <source>Items found:</source>
 <target>Nalezeno položek:</target>
 
-<source>Items remaining:</source>
-<target>Zbývá položek:</target>
-
 <source>Speed:</source>
 <target>Rychlost:</target>
 
@@ -591,8 +591,8 @@ Příkazová řádka je spuštěna pokaždé když:
 <source>&Load</source>
 <target>&Načíst</target>
 
-<source>&Cancel</source>
-<target>&Zrušit</target>
+<source>Cancel</source>
+<target>Zrušit</target>
 
 <source>Select variant:</source>
 <target>Vyberte variantu:</target>
@@ -642,8 +642,8 @@ Příkazová řádka je spuštěna pokaždé když:
 <source>Conflict/file cannot be categorized</source>
 <target>Konflikty/soubory které nelze zařadit</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Porovnat ...</target>
@@ -678,9 +678,6 @@ je stejný
 <source>Synchronizing...</source>
 <target>Synchronizuji...</target>
 
-<source>Items processed:</source>
-<target>Zpracováno položek:</target>
-
 <source>&Pause</source>
 <target>&Pauza</target>
 
@@ -1020,9 +1017,6 @@ Vynechat: \někde\něco\*
 <source>File list exported!</source>
 <target>Seznam souborů exportován!</target>
 
-<source>Error writing file:</source>
-<target>Nelze zapsat souboru:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1072,21 +1066,21 @@ Vynechat: \někde\něco\*
 <source>Paused</source>
 <target>Pauza</target>
 
+<source>Initializing...</source>
+<target>Inicializace...</target>
+
 <source>Aborted</source>
 <target>Přerušeno</target>
 
 <source>Completed</source>
 <target>Hotovo</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Požadavek na přerušení: Čekání na ukončení aktuální operace...</target>
+<source>Continue</source>
+<target>Pokračovat</target>
 
 <source>Pause</source>
 <target>Pauza</target>
 
-<source>Continue</source>
-<target>Pokračovat</target>
-
 <source>Cannot find %x</source>
 <target>Nelze najít %x</target>
 
@@ -1230,65 +1224,65 @@ Vynechat: \někde\něco\*
 <pluralform>%x dnů</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Nelze nastavit monitorování adresáře:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Nelze pokračovat ve sledování adresářů.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Nelze nastavit monitorování adresáře %x.</target>
 
 <source>Conversion error:</source>
 <target>Chyba konverze:</target>
 
-<source>Error deleting file:</source>
-<target>Nelze smazat soubor:</target>
+<source>Cannot delete file %x.</source>
+<target>Nelze smazat soubor %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Soubor je uzamčen jiným procesem:</target>
 
-<source>Error moving file:</source>
-<target>Nelze přesunout soubor:</target>
+<source>Cannot move file %x to %y.</source>
+<target>Nelze přesunout soubor %x do %y.</target>
 
-<source>Target file already existing!</source>
-<target>Cílový soubor již existuje!</target>
+<source>Cannot delete directory %x.</source>
+<target>Nelze smazat adresář %x.</target>
 
-<source>Error moving directory:</source>
-<target>Nelze přesunout adresář:</target>
+<source>Cannot write modification time of %x.</source>
+<target>Nelze nastavit atribut času změny pro %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Cílový adresář již existuje!</target>
+<source>Cannot find system function %x.</source>
+<target>Nelze najít systémovou funkci %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Nelze smazat adresář:</target>
+<source>Cannot read security context of %x.</source>
+<target>Nelze číst přístupová práva pro %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Nelze nastavit atribut času změny:</target>
+<source>Cannot write security context of %x.</source>
+<target>Nelze zapsat přístupová práva pro %x.</target>
 
-<source>Error loading library function:</source>
-<target>Nepodařilo se načíst funkci z knihovny:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Nelze číst oprávnění pro %x.</target>
 
-<source>Error reading security context:</source>
-<target>Nelze číst přístupová práva:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Nelze zapsat oprávnění pro %x.</target>
 
-<source>Error writing security context:</source>
-<target>Nelze zapsat přístupová práva:</target>
+<source>Cannot create directory %x.</source>
+<target>Nelze vytvořit adresář %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Nelze kopírovat oprávnění souboru:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Nelze kopítovat zástupce %x do %y.</target>
 
-<source>Error creating directory:</source>
-<target>Nelze vytvořit adresář:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Nelze zapsat atributy souboru %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Nelze kopírovat zástupce:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Nelze kopírovat soubor %x do %y.</target>
 
-<source>Error copying file:</source>
-<target>Nelze kopírovat souboru:</target>
+<source>Cannot read directory %x.</source>
+<target>Nelze číst adresář %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Nelze procházet adresář:</target>
+<source>Endless loop.</source>
+<target>Nekonečná smyčka.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Zacyklení při procházení adresáře:</target>
+<source>Cannot set privilege %x.</source>
+<target>Nelze nastavit práva pro %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Nelze nastavit práva:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Není možné přesunout %x do Koše!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Došlo ke změně obou stran od poslední synchronizace!</target>
@@ -1314,8 +1308,8 @@ Vynechat: \někde\něco\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Tuto chybu můžete přeskočit a považovat neexistující adresář jako prázdný.</target>
 
-<source>Directory does not exist:</source>
-<target>Adresář neexistuje:</target>
+<source>Cannot find directory %x.</source>
+<target>Nelze najít adresář %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Adresáře jsou závislé! Buďte opatrní s definicí synchronizačních pravidel:</target>
@@ -1323,20 +1317,17 @@ Vynechat: \někde\něco\*
 <source>Preparing synchronization...</source>
 <target>Příprava synchronizace...</target>
 
-<source>Out of memory!</source>
-<target>Nedostatek pracovní paměti!</target>
+<source>Conflict detected:</source>
+<target>Zaznamenán konflikt:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Soubor %x má chybné datum!</target>
 
-<source>Conflict detected:</source>
-<target>Zaznamenán konflikt:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Soubory %x mají stejné datum a čas ale rozdílnou velikost!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Symbolický odkaz %x má stejné datum ale jiný cíl!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Symbolický odkaz %x má stejné datum ale jiný cíl.</target>
 
 <source>Comparing content of files %x</source>
 <target>Porovnávání obsahu souborů %x</target>
@@ -1419,12 +1410,12 @@ Vynechat: \někde\něco\*
 <source>Creating file %x</source>
 <target>Vytváření souboru %x</target>
 
-<source>Creating folder %x</source>
-<target>Vytváření adresáře %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Vytváření symbolického odkazu %x</target>
 
+<source>Creating folder %x</source>
+<target>Vytváření adresáře %x</target>
+
 <source>Overwriting file %x</source>
 <target>Přepisování souboru %x</target>
 
@@ -1443,8 +1434,8 @@ Vynechat: \někde\něco\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Nebyl zadán adresář pro verzování souborů!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Zdrojový adresář již neexistuje:</target>
+<source>Source directory %x not found.</source>
+<target>Zdrojový adresář %x nelze najít.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Nevyřešené konflikty!</target>
@@ -1479,12 +1470,6 @@ Vynechat: \někde\něco\*
 <source>Generating database...</source>
 <target>Vytváření databáze...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Není co synchronizovat!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Nelze kopírovat zamčený souboru %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Nezdařila se verifikace dat: Zdrojový a cílový soubor mají rozdílný obsah!</target>
 
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index 08634a4f..d524b0bd 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Gennemse Bibliotek</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Afbrydelse: Venter på nuværende opgave afsluttes...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSynk - Automatisk Synkronisering</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux Fejl kode %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Fejl i at finde link:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Kan ikke følge linket %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Fejl i læsning fra synkroniserings databasen:</target>
+<source>Cannot read file %x.</source>
+<target>Kan ikke læse filen %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Fejl i skrivning til synkroniserings databasen:</target>
+<source>Cannot write file %x.</source>
+<target>Kan ikke skrive filen %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Ukompatibelt synkroniserings database format:</target>
+<source>Database file %x is incompatible.</source>
+<target>Database filen %x er ikke kompatibel.</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>Database file %x does not yet exist.</source>
+<target>Database filen %x findes ikke.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Database filer deler ikke en fælles synkroniserings session</target>
+<source>Out of memory!</source>
+<target>Ude af hukommelse!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Database filen kan ikke deles.</target>
 
 <source>An exception occurred!</source>
 <target>En undtagelse er opstået!</target>
 
-<source>Error reading file attributes:</source>
-<target>Fejl i læsning af atributter:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Kan ikke læse fil attributterne på %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Kan ikke lave informationer over processen.</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>Cannot set directory lock %x.</source>
+<target>Kan ikke låse biblioteket %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x sek</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Fejl i læsning af fil:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Fejl i videregivelse af filen %x, række %y, kolonne %z.</target>
 
 <source>Scanning:</source>
 <target>Skanner:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Tråde]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Ugyldig FreeFileSync config fil!</target>
+<source>/sec</source>
+<target>/sek</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>%x indeholder ikke en gyldig konfiguration.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Fejl i at lave konfigurations filen:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Konfigurationsfilen %x er kun delvist hentet.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Konfiguration kun delvist hentet:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Kan ikke få adgang til Drev Kopi Servicen.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Ude af stand til at flytte %x til skraldespanden!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Brug venligst FreeFileSync 64-bit version for at lave en drev kopi på dette system.</target>
 
 <source>Cannot load file %x.</source>
 <target>Kan ikke læse filen %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Fejl i adgang til Enhedens Kopi Service</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>At lave spejl kopier af WOW64 er ikke understøttet. Brug venligst FreeFileSync 64-bit version.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Kan ikke bestemme drev navn for filen:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Stien %x indeholder ikke et drev navn.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Drev navn %x ikke en del af filnavn %y!</target>
 
-<source>/sec</source>
-<target>/sek</target>
-
-<source>File does not exist:</source>
-<target>Filen findes ikke:</target>
+<source>Cannot find file %x.</source>
+<target>Kan ikke finde filen %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Kan ikke læse følgende XML emner:</target>
@@ -303,9 +306,6 @@ Kommando linjen bliver afviklet hver gang:
 <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>
 
@@ -348,35 +348,38 @@ Kommando linjen bliver afviklet hver gang:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync konfiguration</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Batch Job</target>
-
-<source>Unable to create log file!</source>
-<target>Kan ikke oprette logfil!</target>
-
 <source>Batch execution</source>
 <target>Batch afvikling</target>
 
-<source>Stop</source>
-<target>Stop</target>
+<source>Items processed:</source>
+<target>Enheder behandlet:</target>
+
+<source>Items remaining:</source>
+<target>Enheder tilbage:</target>
 
 <source>Total time:</source>
 <target>Samlet tid:</target>
 
+<source>Stop</source>
+<target>Stop</target>
+
 <source>Synchronization aborted!</source>
 <target>Synkronisering afbrudt!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synkronisering afsluttet med fejl!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Intet at synkronisere!</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>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Tryk "Skift" for at løse problemer i hoved vinduet.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Skifter til FreeFileSync GUI mode...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Skift til hoved vinduet...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Kan ikke forbinde til sourceforge.net!</target>
@@ -534,9 +537,6 @@ Kommando linjen bliver afviklet hver gang:
 <source>Items found:</source>
 <target>Enheder fundet:</target>
 
-<source>Items remaining:</source>
-<target>Enheder tilbage:</target>
-
 <source>Speed:</source>
 <target>Hastighed:</target>
 
@@ -564,9 +564,6 @@ Kommando linjen bliver afviklet hver gang:
 <source>Right</source>
 <target>Højre</target>
 
-<source>Sync setttings</source>
-<target>Synkroniser indstillinger</target>
-
 <source>Status feedback</source>
 <target>Status feedback</target>
 
@@ -591,8 +588,8 @@ Kommando linjen bliver afviklet hver gang:
 <source>&Load</source>
 <target>&Hent</target>
 
-<source>&Cancel</source>
-<target>&Anuller</target>
+<source>Cancel</source>
+<target>Anuller</target>
 
 <source>Select variant:</source>
 <target>Vælg variant:</target>
@@ -642,8 +639,8 @@ Kommando linjen bliver afviklet hver gang:
 <source>Conflict/file cannot be categorized</source>
 <target>Konflikt/filen kan ikke kategoriseres</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Sammenlign ved...</target>
@@ -678,9 +675,6 @@ er det samme
 <source>Synchronizing...</source>
 <target>Synkroniserer...</target>
 
-<source>Items processed:</source>
-<target>Enheder behandlet:</target>
-
 <source>&Pause</source>
 <target>&Pause</target>
 
@@ -1020,9 +1014,6 @@ Udeluk: \ting\temp\*
 <source>File list exported!</source>
 <target>Fil listen er eksporteret!</target>
 
-<source>Error writing file:</source>
-<target>Fejl i at skrive fil:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1068,21 +1059,21 @@ Udeluk: \ting\temp\*
 <source>Paused</source>
 <target>Pauset</target>
 
+<source>Initializing...</source>
+<target>Initialiserer...</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>Continue</source>
-<target>Fortsæt</target>
-
 <source>Cannot find %x</source>
 <target>Kan ikke finde %x</target>
 
@@ -1221,68 +1212,65 @@ Udeluk: \ting\temp\*
 <pluralform>%x dage</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Kunne ikke initialiserer biblioteks overvågningen:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Fejl i overvågning af biblioteker.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Kan ikke overvåge biblioteket %x.</target>
 
 <source>Conversion error:</source>
 <target>Konverterings fejl:</target>
 
-<source>Error deleting file:</source>
-<target>Fejl i sletning af fil:</target>
+<source>Cannot delete file %x.</source>
+<target>Kan ikke slette filen %x.</target>
 
-<source>Error moving file:</source>
-<target>Fejl i flytning af fil:</target>
+<source>The file is locked by another process:</source>
+<target>Filen er låst af en anden process:</target>
 
-<source>Target file already existing!</source>
-<target>Filen findes i forvejen!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Kan ikke flytte filen %x til %y.</target>
 
-<source>Error moving directory:</source>
-<target>Fejl i flytning af bibliotek:</target>
+<source>Cannot delete directory %x.</source>
+<target>Kan ikke slette biblioteket %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Bibliotek findes i forvejen!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Kan ikke opdatere ændringstiden på %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Fejl i sletning af bibliotek:</target>
+<source>Cannot find system function %x.</source>
+<target>Kan ikke finde systemfunktionen %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Fejl i ændring af modificerings tiden:</target>
+<source>Cannot read security context of %x.</source>
+<target>Kan ikke læse sikkerhedsindstillingerne på %x.</target>
 
-<source>Error loading library function:</source>
-<target>Fejl i biblioteks funktionen:</target>
+<source>Cannot write security context of %x.</source>
+<target>Kan ikke skrive sikkerhedsindstillingerne på %x.</target>
 
-<source>Error reading security context:</source>
-<target>Fejl i læsning af sikkerhedstilladelser:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Kan ikke læse tilladelserne på %x.</target>
 
-<source>Error writing security context:</source>
-<target>Fejl i skrivning af sikkerhedstilladelser:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Kan ikke skrive tilladelserne til %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Fejl i kopiering af filtilladelser:</target>
+<source>Cannot create directory %x.</source>
+<target>Kan ikke oprette biblioteket %x.</target>
 
-<source>Error creating directory:</source>
-<target>Fejl i oprettelse af bibliotek:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Kan ikke kopiere linket %x til %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Fejl i kopiering af link:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Kan ikke skrive fil attributter til %x.</target>
 
-<source>Error copying file:</source>
-<target>Fejl i kopiering af fil:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Kan ikke kopiere filen %x til %y.</target>
 
-<source>Error opening file:</source>
-<target>Fejl i åbning af fil:</target>
+<source>Cannot read directory %x.</source>
+<target>Kan ikke læse biblioteket %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Fejl i gennemgang af bibliotek:</target>
+<source>Endless loop.</source>
+<target>Uendelig løkke.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Uendelig løkke ved gennemgang af bibliotek:</target>
+<source>Cannot set privilege %x.</source>
+<target>Kan ikke sætte privilegier til %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Fejl i at sætte privilegier:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Ude af stand til at flytte %x til skraldespanden!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Begge sider er ændret siden sidste synkronisering!</target>
@@ -1308,8 +1296,8 @@ Udeluk: \ting\temp\*
 <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>Cannot find directory %x.</source>
+<target>Kan ikke finde biblioteket %x.</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>
@@ -1317,20 +1305,17 @@ Udeluk: \ting\temp\*
 <source>Preparing synchronization...</source>
 <target>Forbereder synkronisering...</target>
 
-<source>Out of memory!</source>
-<target>Ude af hukommelse!</target>
+<source>Conflict detected:</source>
+<target>Konflik fundet:</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>Symbolic links %x have the same date but a different target.</source>
+<target>Linksene %x har samme dato men forskellige mål.</target>
 
 <source>Comparing content of files %x</source>
 <target>Sammenligner indhold af filer %x</target>
@@ -1413,12 +1398,12 @@ Udeluk: \ting\temp\*
 <source>Creating file %x</source>
 <target>Opretter filen %x</target>
 
-<source>Creating folder %x</source>
-<target>Opretter mappe %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Opretter linket %x</target>
 
+<source>Creating folder %x</source>
+<target>Opretter mappe %x</target>
+
 <source>Overwriting file %x</source>
 <target>Overskriver filen %x</target>
 
@@ -1437,8 +1422,8 @@ Udeluk: \ting\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Fil versions biblioteket blev ikke angivet!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Kilde biblioteket findes ikke mere:</target>
+<source>Source directory %x not found.</source>
+<target>Kildebiblioteket %x blev ikke fundet.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Er er uløste konflikter!</target>
@@ -1473,12 +1458,6 @@ Udeluk: \ting\temp\*
 <source>Generating database...</source>
 <target>Opretter database...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Intet at synkronisere!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Ude af stand til at kopiere 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 9a2ac4f7..0e7c3cb9 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -19,9 +19,15 @@
 <source>Browse directory</source>
 <target>Verken map</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Bezig met afbreken: Wacht op beëindiging huidige bewerking...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Geautomatiseerde Synchronisatie</target>
 
+<source>Error</source>
+<target>Fout</target>
+
 <source>Select alternate comparison settings</source>
 <target>Selecteer alternatieve vergelijkings instellingen</target>
 
@@ -52,9 +58,6 @@
 <source>About</source>
 <target>Informatie</target>
 
-<source>Error</source>
-<target>Fout</target>
-
 <source>Warning</source>
 <target>Waarschuwing</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux Fout Code %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Fout tijdens opzoeken van snelkoppeling:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Kan snelkoppeling %x niet vinden.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Fout tijdens uitlezen van synchronisatie-database:</target>
+<source>Cannot read file %x.</source>
+<target>Kan bestand %x niet vinden.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Fout tijdens schrijven naar synchronisatie-database:</target>
+<source>Cannot write file %x.</source>
+<target>Kan bestand %x niet schrijven.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Opmaak van synchronisatie-database komt niet overeen:</target>
+<source>Database file %x is incompatible.</source>
+<target>Database bestand %x is niet compatibel.</target>
 
 <source>Initial synchronization:</source>
 <target>Initiële  synchronisatie:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Eén van de FreeFileSync database bestanden bestaat nog niet:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Database bestand %x bestaat nog niet.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Database bestanden delen geen gezamelijke synchronisatie sessie:</target>
+<source>Out of memory!</source>
+<target>Onvoldoende geheugen!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Database bestanden delen geen gezamelijke sessie.</target>
 
 <source>An exception occurred!</source>
 <target>Er heeft een uitzondering plaatsgevonden!</target>
 
-<source>Error reading file attributes:</source>
-<target>Fout tijdens lezen van bestandsattributen</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Kan bestandskenmerken van %x niet uitlezen.</target>
+
+<source>Cannot get process information.</source>
+<target>Kan geen procesinformatie verkrijgen.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Wacht totdat map is vergrendeld (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Fout tijdens mapvergrendeling:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Kan directory %x niet sluiten.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x sec</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Fout tijdens lezen van bestand:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Fout bij het parsen van bestand %x, rij %y, kolom %z.</target>
 
 <source>Scanning:</source>
 <target>Doorzoekt:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Foutief FreeFileSync configuratiebestand!</target>
+<source>/sec</source>
+<target>/sec</target>
 
-<source>Error parsing configuration file:</source>
-<target>Fout tijdens verwerking configuratiebestand:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>Bestand %x bevat geen valide configuratie.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Configuratie alleen gedeeltelijk geladen:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Configuratie bestand %x alleen deels geladen.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Niet mogelijk om %x naar de Prullenbak te verplaatsen!</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Kan de Volume Schaduwkopie Service niet benaderen.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Gebruik alstublieft de FreeFileSync 64-bit versie om schaduwkopieën te maken op dit systeem.</target>
 
 <source>Cannot load file %x.</source>
 <target>Kan bestand %x niet laden.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Fout bij toegang tot Volume Schaduwkopie Service!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Het aanmaken van schaduwkopieën op WOW64 wordt niet ondersteund. Gebruik alstublieft de 64-bit versie van FreeFileSync.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Kan volumenaam niet bepalen voor bestand:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Het pad %x bevat geen schijfnaam.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Schijfnaam %x maakt geen deel uit van bestandsnaam %y!</target>
 
-<source>/sec</source>
-<target>/sec</target>
-
-<source>File does not exist:</source>
-<target>Bestand bestaat niet:</target>
+<source>Cannot find file %x.</source>
+<target>Kan bestand %x niet vinden.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Kan de volgende XML elementen niet lezen:</target>
@@ -297,15 +300,18 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>Start</source>
 <target>Start</target>
 
+<source>&Retry</source>
+<target>&Opnieuw proberen</target>
+
+<source>Cancel</source>
+<target>Annuleren</target>
+
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync configuratie</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Bestand bestaat al. Overschrijven?</target>
-
 <source>&Restore</source>
 <target>&Herstellen</target>
 
@@ -348,35 +354,38 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync configuratie</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Taaklijst</target>
-
-<source>Unable to create log file!</source>
-<target>Niet in staat om een logbestand aan te maken!</target>
-
 <source>Batch execution</source>
 <target>Taak uitvoeren</target>
 
-<source>Stop</source>
-<target>Stop</target>
+<source>Items processed:</source>
+<target>Onderdelen verwerkt:</target>
+
+<source>Items remaining:</source>
+<target>Onderdelen te gaan:</target>
 
 <source>Total time:</source>
 <target>Totale tijd:</target>
 
+<source>Stop</source>
+<target>Stop</target>
+
 <source>Synchronization aborted!</source>
 <target>Synchronisatie afgebroken!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronisatie is met fouten afgerond!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Niks om te synchroniseren!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Synchronisatie succesvol afgerond!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Toets "Switch" om FreeFileSync GUI mode te openen.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Druk op "Omschakelen" om problemen op te lossen in het hoofdscherm van FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Schakelt over naar FreeFileSync GUI mode...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Bezig met omschakelen naar het FreeFileSync hoofdscherm.</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Niet in staat verbinding te maken met sourceforge.net!</target>
@@ -534,9 +543,6 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>Items found:</source>
 <target>Onderdelen gevonden:</target>
 
-<source>Items remaining:</source>
-<target>Onderdelen te gaan:</target>
-
 <source>Speed:</source>
 <target>Snelheid:</target>
 
@@ -588,9 +594,6 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>&Load</source>
 <target>&Laden</target>
 
-<source>&Cancel</source>
-<target>&Annuleren</target>
-
 <source>Select variant:</source>
 <target>Selecteer een variant:</target>
 
@@ -639,8 +642,8 @@ De opdrachtregel wordt telkens uitgevoerd indien:
 <source>Conflict/file cannot be categorized</source>
 <target>Conflict/Bestand kan niet worden gecategoriseerd</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Vergelijk met...</target>
@@ -675,9 +678,6 @@ overeenkomt
 <source>Synchronizing...</source>
 <target>Synchroniseert...</target>
 
-<source>Items processed:</source>
-<target>Onderdelen verwerkt:</target>
-
 <source>&Pause</source>
 <target>&Pauze</target>
 
@@ -717,14 +717,11 @@ overeenkomt
 <source>&Ignore</source>
 <target>&Negeren</target>
 
-<source>&Retry</source>
-<target>&Opnieuw proberen</target>
-
 <source>Do not show this dialog again</source>
 <target>Toon deze melding niet meer</target>
 
 <source>&Switch</source>
-<target>&Verander</target>
+<target>&Omschakelen</target>
 
 <source>&Yes</source>
 <target>&Ja</target>
@@ -1017,9 +1014,6 @@ Uitsluiten: \stuff\temp\*
 <source>File list exported!</source>
 <target>Bestandslijst geëxporteerd!</target>
 
-<source>Error writing file:</source>
-<target>Fout tijdens schrijven van bestand:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1065,21 +1059,21 @@ Uitsluiten: \stuff\temp\*
 <source>Paused</source>
 <target>Gepauzeerd</target>
 
+<source>Initializing...</source>
+<target>Initialiseren...</target>
+
 <source>Aborted</source>
 <target>Afgebroken</target>
 
 <source>Completed</source>
 <target>Volbracht</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Bezig met afbreken: Wacht op beëindiging huidige bewerking...</target>
+<source>Continue</source>
+<target>Doorgaan</target>
 
 <source>Pause</source>
 <target>Pauze</target>
 
-<source>Continue</source>
-<target>Doorgaan</target>
-
 <source>Cannot find %x</source>
 <target>Kan %x niet vinden</target>
 
@@ -1218,65 +1212,65 @@ Uitsluiten: \stuff\temp\*
 <pluralform>%x dagen</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Initaliseren van map-observatie niet mogelijk:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Fout tijdens observeren van mappen.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Kan locatie %x niet controleren.</target>
 
 <source>Conversion error:</source>
 <target>Converteer fout:</target>
 
-<source>Error deleting file:</source>
-<target>Fout tijdens verwijderen van bestand:</target>
+<source>Cannot delete file %x.</source>
+<target>Kan bestand %x niet verwijderen.</target>
 
-<source>Error moving file:</source>
-<target>Fout tijdens verplaatsen van bestand:</target>
+<source>The file is locked by another process:</source>
+<target>Het bestand is op afgesloten door een ander proces:</target>
 
-<source>Target file already existing!</source>
-<target>Doelbestand bestaat al!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Kan bestand %x niet verplaatsen naar %y.</target>
 
-<source>Error moving directory:</source>
-<target>Fout tijdens verplaatsen van map:</target>
+<source>Cannot delete directory %x.</source>
+<target>Kan bestand %x niet verwijderen.</target>
 
-<source>Target directory already existing!</source>
-<target>Doelmap bestaat al!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Kan wijzigings tijd van %x niet toevoegen.</target>
 
-<source>Error deleting directory:</source>
-<target>Fout tijdens het verwijderen van map:</target>
+<source>Cannot find system function %x.</source>
+<target>Kan systeemfunctie %x niet vinden.</target>
 
-<source>Error changing modification time:</source>
-<target>Fout tijdens aanpassing van de wijzigingstijd:</target>
+<source>Cannot read security context of %x.</source>
+<target>Kan de beveiligingscontext van %x niet lezen.</target>
 
-<source>Error loading library function:</source>
-<target>Fout tijdens laden van bibliotheek functie:</target>
+<source>Cannot write security context of %x.</source>
+<target>Kan de beveiligingscontext van %x niet schrijven.</target>
 
-<source>Error reading security context:</source>
-<target>Fout tijdens lezen van beveiligingscontext:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Kan de bevoegdheden van %x niet lezen.</target>
 
-<source>Error writing security context:</source>
-<target>Fout tijdens schrijven van beveiligingscontext:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Kan de bevoegdheden van %x niet schrijven.</target>
 
-<source>Error copying file permissions:</source>
-<target>Fout tijdens kopiëren van bestandspermissies:</target>
+<source>Cannot create directory %x.</source>
+<target>Kan map %x niet aanmaken.</target>
 
-<source>Error creating directory:</source>
-<target>Fout tijdens het aanmaken van map:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Kan snelkoppeling %x niet kopiëren naar %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Fout tijdens kopiëren van snelkoppeling:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Kan bestandskenmerken van %x niet schrijven.</target>
 
-<source>Error copying file:</source>
-<target>Fout tijdens kopiëren van bestand:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Kan bestand %x niet kopiëren naar %y.</target>
 
-<source>Error traversing directory:</source>
-<target>Fout tijdens doorzoeken van map:</target>
+<source>Cannot read directory %x.</source>
+<target>Kan map %x niet lezen.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Oneindige lus bij het doorlopen van map:</target>
+<source>Endless loop.</source>
+<target>Oneindige loop.</target>
 
-<source>Error setting privilege:</source>
-<target>Fout tijdens instellen van privileges:</target>
+<source>Cannot set privilege %x.</source>
+<target>Kan privilege %x niet instellen.</target>
+
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Niet mogelijk om %x naar de Prullenbak te verplaatsen!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Beide zijdes zijn veranderd sinds de laatste synchronisatie!</target>
@@ -1302,8 +1296,8 @@ Uitsluiten: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Je kan deze error negeren als de map leeg is.</target>
 
-<source>Directory does not exist:</source>
-<target>Map bestaat niet:</target>
+<source>Cannot find directory %x.</source>
+<target>Kan map %x niet vinden.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Mappen zijn afhankelijk van elkaar! Wees voorzichtig met het maken van synchronisatieregels:</target>
@@ -1311,20 +1305,17 @@ Uitsluiten: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Synchronisatie voorbereiden</target>
 
-<source>Out of memory!</source>
-<target>Onvoldoende geheugen!</target>
+<source>Conflict detected:</source>
+<target>Conflict gedetecteerd:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Bestand %x heeft een ongeldige datum!</target>
 
-<source>Conflict detected:</source>
-<target>Conflict gedetecteerd:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Bestanden %x hebben dezelfde datums maar een afwijkende grootte!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Snelkoppeling %x heeft dezelfde datum maar een ander doel!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Snelkoppelingen %x hebben dezelfde datum maar een verschillend doel.</target>
 
 <source>Comparing content of files %x</source>
 <target>De inhoud van %x bestanden wordt vergeleken</target>
@@ -1407,12 +1398,12 @@ Uitsluiten: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Bestand %x wordt aangemaakt</target>
 
-<source>Creating folder %x</source>
-<target>Map %x wordt aangemaakt</target>
-
 <source>Creating symbolic link %x</source>
 <target>Snelkoppeling %x wordt aangemaakt</target>
 
+<source>Creating folder %x</source>
+<target>Map %x wordt aangemaakt</target>
+
 <source>Overwriting file %x</source>
 <target>Bezig met overschrijven van bestand %x</target>
 
@@ -1431,8 +1422,8 @@ Uitsluiten: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Map voor bestands versiebeheer is niet ingegeven!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Bronmap bestaat niet meer:</target>
+<source>Source directory %x not found.</source>
+<target>Bronmap %x niet gevonden.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Er bestaan onopgeloste conflicten!</target>
@@ -1467,12 +1458,6 @@ Uitsluiten: \stuff\temp\*
 <source>Generating database...</source>
 <target>Genereren van database...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Niks om te synchroniseren!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Niet in staat om vergrendeld bestand %x te synchroniseren!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Dataverificatie-fout: Bron en doelbestand hebben verschillende inhoud!</target>
 
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 000b07d0..abed9c59 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Browse directory</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Abort requested: Waiting for current operation to finish...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automated Synchronisation</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux Error Code %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Error resolving symbolic link:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Cannot resolve symbolic link %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Error reading from synchronisation database:</target>
+<source>Cannot read file %x.</source>
+<target>Cannot read file %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Error writing to synchronisation database:</target>
+<source>Cannot write file %x.</source>
+<target>Cannot write file %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Incompatible synchronisation database format:</target>
+<source>Database file %x is incompatible.</source>
+<target>Database file %x is incompatible.</target>
 
 <source>Initial synchronization:</source>
 <target>Initial synchronisation:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>One of the FreeFileSync database files is not yet existing:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Database file %x does not yet exist.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Database files do not share a common synchronisation session:</target>
+<source>Out of memory!</source>
+<target>Out of memory!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Database files do not share a common session.</target>
 
 <source>An exception occurred!</source>
 <target>An exception occurred!</target>
 
-<source>Error reading file attributes:</source>
-<target>Error reading file attributes:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Cannot read file attributes of %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Cannot get process information.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Waiting while directory is locked (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Error setting directory lock:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Cannot set directory lock %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x sec</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Error reading file:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Error parsing file %x, row %y, column %z.</target>
 
 <source>Scanning:</source>
 <target>Scanning:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Invalid FreeFileSync config file!</target>
+<source>/sec</source>
+<target>/sec</target>
 
-<source>Error parsing configuration file:</source>
-<target>Error parsing configuration file:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>File %x does not contain a valid configuration.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Configuration loaded partially only:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Configuration file %x loaded partially only.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Unable to move %x to the Recycle Bin!</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Cannot access Volume Shadow Copy Service.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Please use FreeFileSync 64-bit version to create shadow copies on this system.</target>
 
 <source>Cannot load file %x.</source>
 <target>Cannot load file %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Error accessing Volume Shadow Copy Service!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Cannot determine volume name for file:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Path %x does not contain a volume name.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Volume name %x not part of file name %y!</target>
 
-<source>/sec</source>
-<target>/sec</target>
-
-<source>File does not exist:</source>
-<target>File does not exist:</target>
+<source>Cannot find file %x.</source>
+<target>Cannot find file %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Cannot read the following XML elements:</target>
@@ -303,9 +306,6 @@ The command line is executed each time:
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync configuration</target>
 
-<source>File already exists. Overwrite?</source>
-<target>File already exists. Overwrite?</target>
-
 <source>&Restore</source>
 <target>&Restore</target>
 
@@ -351,32 +351,38 @@ The command line is executed each time:
 <source>FreeFileSync Batch Job</source>
 <target>FreeFileSync Batch Job</target>
 
-<source>Unable to create log file!</source>
-<target>Unable to create log file!</target>
-
 <source>Batch execution</source>
 <target>Batch execution</target>
 
-<source>Stop</source>
-<target>Stop</target>
+<source>Items processed:</source>
+<target>Elements processed:</target>
+
+<source>Items remaining:</source>
+<target>Elements remaining:</target>
 
 <source>Total time:</source>
 <target>Total time:</target>
 
+<source>Stop</source>
+<target>Stop</target>
+
 <source>Synchronization aborted!</source>
 <target>Synchronisation aborted!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronisation completed with errors!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Nothing to synchronise!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Synchronisation completed successfully!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Press "Switch" to open FreeFileSync GUI mode.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Press "Switch" to resolve issues in FreeFileSync main dialog.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Switching to FreeFileSync GUI mode...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Switching to FreeFileSync main dialog...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Unable to connect to sourceforge.net!</target>
@@ -534,9 +540,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>Elements found:</target>
 
-<source>Items remaining:</source>
-<target>Elements remaining:</target>
-
 <source>Speed:</source>
 <target>Speed:</target>
 
@@ -564,9 +567,6 @@ The command line is executed each time:
 <source>Right</source>
 <target>Right</target>
 
-<source>Sync setttings</source>
-<target>Sync setttings</target>
-
 <source>Status feedback</source>
 <target>Status feedback</target>
 
@@ -591,8 +591,8 @@ The command line is executed each time:
 <source>&Load</source>
 <target>&Load</target>
 
-<source>&Cancel</source>
-<target>&Cancel</target>
+<source>Cancel</source>
+<target>Cancel</target>
 
 <source>Select variant:</source>
 <target>Select variant:</target>
@@ -642,8 +642,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>Conflict/file cannot be categorised</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Compare by...</target>
@@ -678,9 +678,6 @@ is the same
 <source>Synchronizing...</source>
 <target>Synchronising...</target>
 
-<source>Items processed:</source>
-<target>Elements processed:</target>
-
 <source>&Pause</source>
 <target>&Pause</target>
 
@@ -1020,9 +1017,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>File list exported!</target>
 
-<source>Error writing file:</source>
-<target>Error writing file:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1068,21 +1062,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>Paused</target>
 
+<source>Initializing...</source>
+<target>Initialising...</target>
+
 <source>Aborted</source>
 <target>Aborted</target>
 
 <source>Completed</source>
 <target>Completed</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abort requested: Waiting for current operation to finish...</target>
+<source>Continue</source>
+<target>Continue</target>
 
 <source>Pause</source>
 <target>Pause</target>
 
-<source>Continue</source>
-<target>Continue</target>
-
 <source>Cannot find %x</source>
 <target>Cannot find %x</target>
 
@@ -1221,68 +1215,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x days</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Could not initialise directory monitoring:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Error when monitoring directories.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Cannot monitor directory %x.</target>
 
 <source>Conversion error:</source>
 <target>Conversion error:</target>
 
-<source>Error deleting file:</source>
-<target>Error deleting file:</target>
+<source>Cannot delete file %x.</source>
+<target>Cannot delete file %x.</target>
 
-<source>Error moving file:</source>
-<target>Error moving file:</target>
+<source>The file is locked by another process:</source>
+<target>The file is locked by another process:</target>
 
-<source>Target file already existing!</source>
-<target>Target file already existing!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Cannot move file %x to %y.</target>
 
-<source>Error moving directory:</source>
-<target>Error moving directory:</target>
+<source>Cannot delete directory %x.</source>
+<target>Cannot delete directory %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Target directory already existing!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Cannot write modification time of %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Error deleting directory:</target>
+<source>Cannot find system function %x.</source>
+<target>Cannot find system function %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Error changing modification time:</target>
+<source>Cannot read security context of %x.</source>
+<target>Cannot read security context of %x.</target>
 
-<source>Error loading library function:</source>
-<target>Error loading library function:</target>
+<source>Cannot write security context of %x.</source>
+<target>Cannot write security context of %x.</target>
 
-<source>Error reading security context:</source>
-<target>Error reading security context:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Cannot read permissions of %x.</target>
 
-<source>Error writing security context:</source>
-<target>Error writing security context:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Cannot write permissions of %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Error copying file permissions:</target>
+<source>Cannot create directory %x.</source>
+<target>Cannot create directory %x.</target>
 
-<source>Error creating directory:</source>
-<target>Error creating directory:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Cannot copy symbolic link %x to %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Error copying symbolic link:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Cannot write file attributes of %x.</target>
 
-<source>Error copying file:</source>
-<target>Error copying file:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Cannot copy file %x to %y.</target>
 
-<source>Error opening file:</source>
-<target>Error opening file:</target>
+<source>Cannot read directory %x.</source>
+<target>Cannot read directory %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Error traversing directory:</target>
+<source>Endless loop.</source>
+<target>Endless loop.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Endless loop when traversing directory:</target>
+<source>Cannot set privilege %x.</source>
+<target>Cannot set privilege %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Error setting privilege:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Unable to move %x to the Recycle Bin!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Both sides have changed since last synchronisation!</target>
@@ -1308,8 +1299,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>You can ignore this error to consider the directory as empty.</target>
 
-<source>Directory does not exist:</source>
-<target>Directory does not exist:</target>
+<source>Cannot find directory %x.</source>
+<target>Cannot find directory %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Directories are dependent! Be careful when setting up synchronisation rules:</target>
@@ -1317,20 +1308,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Preparing synchronisation...</target>
 
-<source>Out of memory!</source>
-<target>Out of memory!</target>
+<source>Conflict detected:</source>
+<target>Conflict detected:</target>
 
 <source>File %x has an invalid date!</source>
 <target>File %x has an invalid date!</target>
 
-<source>Conflict detected:</source>
-<target>Conflict detected:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Files %x have the same date but a different size!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Symlinks %x have the same date but a different target!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Symbolic links %x have the same date but a different target.</target>
 
 <source>Comparing content of files %x</source>
 <target>Comparing content of files %x</target>
@@ -1413,12 +1401,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Creating file %x</target>
 
-<source>Creating folder %x</source>
-<target>Creating folder %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Creating symbolic link %x</target>
 
+<source>Creating folder %x</source>
+<target>Creating folder %x</target>
+
 <source>Overwriting file %x</source>
 <target>Overwriting file %x</target>
 
@@ -1437,8 +1425,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Directory for file versioning was not supplied!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Source directory does not exist anymore:</target>
+<source>Source directory %x not found.</source>
+<target>Source directory %x not found.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Unresolved conflicts existing!</target>
@@ -1473,12 +1461,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>Generating database...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nothing to synchronise!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Unable to copy locked file %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Data verification error: Source and target file have different content!</target>
 
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index aaaf3d35..48cfc636 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -19,11 +19,14 @@
 <source>Browse directory</source>
 <target>Selaa hakemistoa</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Keskeytys pyydetty: Odotetaan toiminnon loppumista...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Automaattinen täsmäytys</target>
+<target>RealtimeSync - Automaattisoitu täsmäytys</target>
 
 <source>Select alternate comparison settings</source>
-<target>Valitse vaihtoehtoinen vertailuasetus</target>
+<target>Valitse toinen asetus vertailulle</target>
 
 <source>Select alternate synchronization settings</source>
 <target>Valitse täsmäykselle toinen asetus</target>
@@ -83,7 +86,7 @@
 <target>Näytä Pop-Up</target>
 
 <source>Show pop-up on errors or warnings</source>
-<target>Näytä Pop-Up (virheet, varoitukset)</target>
+<target>Näytä Pop-Up (virheet/varoitukset)</target>
 
 <source>Ignore errors</source>
 <target>Älä huomioi virheitä</target>
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux virhekoodi %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Virhe selvittäessä pikakuvaketta:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Tämä linkki on virheellinen %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x tavua</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Virhe lukiessa täsmäyksen tietokantaa:</target>
+<source>Cannot read file %x.</source>
+<target>Lukeminen ei onnistu %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Virhe kirjottaessa täsmäyksen tietokantaa:</target>
+<source>Cannot write file %x.</source>
+<target>Kirjoittaminen ei onnistu %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Täsmäytyksen tietokannan muoto on virheellinen:</target>
+<source>Database file %x is incompatible.</source>
+<target>Tietokanta %x vierasta muotoa.</target>
 
 <source>Initial synchronization:</source>
 <target>Ensi täsmäytys:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Jokin FreeFileSynk tietokannan tiedostoista puuttuu vielä:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Tietokanta %x on vielä luomatta.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Kannan tiedostot ovat eri sessioista:</target>
+<source>Out of memory!</source>
+<target>Muisti loppui!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Tietokannan tiedostot eri sessioista.</target>
 
 <source>An exception occurred!</source>
 <target>Virhe havaittu!</target>
 
-<source>Error reading file attributes:</source>
-<target>Virhe lukiessa tiedoston ominaisuuksia:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>x% -ominaisuudet ei tunnisteta.</target>
+
+<source>Cannot get process information.</source>
+<target>Prosessin tietoja ei saada.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Odotan hakemiston lukitusta (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Virhe asettaessa hakemiston lukkoa:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Hakemistoa %x ei saada lukittua.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,11 +184,11 @@
 <pluralform>%x s</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Virhe lukiessa tiedostoa:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Virhe jäsennys tiedo %x, rivi %y, sarake %z.</target>
 
 <source>Scanning:</source>
-<target>Haen:</target>
+<target>Skannaus:</target>
 
 <source>Encoding extended time information: %x</source>
 <target>Tulkitaan laajennettua aikatietoa: %x</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x säikeitä]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Virheellinen FreeFileSync asetustiedosto!</target>
+<source>/sec</source>
+<target>/s</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Tiedosto %x ei sisällä kelvollista kokoonpanoa.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Virhe jäsentäessä asetustiedostoa:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Kokoonpanotiedosto %x ladattu vain osittain.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Asetukset ladattiin vain osittain:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Ei voi käyttää Volume Shadow Copy Service.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Ei voitu siirtää %x Roskakoriin!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Tilannevedoksia varten käytä tässä järjestelmässä FreeFileSync 64-bittinen versio.</target>
 
 <source>Cannot load file %x.</source>
 <target>Tiedostoa %x ei voida ladata.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Virhe kutsuttaessa Volume Shadow Services!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>WOW64 varjokopiointia ei tueta. Käytä FreeFileSync 64-bittistä versiota.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Asemaa ei tunnisteta tiedostolle:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Polku %x ei sisällä taltion nimeä.</target>
 
 <source>Volume name %x not part of file name %y!</source>
-<target>Osan nimi %x ei esiinny tiedostonimessä %y!</target>
+<target>Taltion nimi %x ei esiinny tiedostonimessä %y!</target>
 
-<source>/sec</source>
-<target>/s</target>
-
-<source>File does not exist:</source>
-<target>Tiedosto puuttuu:</target>
+<source>Cannot find file %x.</source>
+<target>Tiedosto %x ei löydy.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>XML elementit lukukelvottimia:</target>
@@ -268,9 +271,9 @@ The command line is executed each time:
 - files within these directories or subdirectories are modified
 </source>
 <target>
-Komento suoritetaan kun:
-- nämä hakemistot ovat saatavilla (esim. USB tikku asennetaan)
-- tiedostot näissä hakemistoissa tai alihakemistoissa muutetaan
+Komentokehoite suoritetaan kun:
+- Kaikki hakemistot ovat saatavilla (esim. USB tikku asennetaan)
+- Tiedostot näissä hakemistoissa tai alihakemistoissa muutetaan
 </target>
 
 <source>Directories to watch</source>
@@ -289,7 +292,7 @@ Komento suoritetaan kun:
 <target>Komentokehote</target>
 
 <source>Minimum Idle Time [seconds]</source>
-<target>Minimi joutoaika [sekuntia]</target>
+<target>Minimi joutoaika [sekunttia]</target>
 
 <source>Idle time between detection of last change and execution of command line in seconds</source>
 <target>Joutoaika viimeisen muutos havainnon ja käskyn suorittamisen välillä, sekunneissa</target>
@@ -303,9 +306,6 @@ Komento suoritetaan kun:
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync Asetukset</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Tiedosto on jo olemassa. Ylikirjoitetaanko?</target>
-
 <source>&Restore</source>
 <target>&Palauta</target>
 
@@ -348,38 +348,41 @@ Komento suoritetaan kun:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync asetukset</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Eräajo</target>
-
-<source>Unable to create log file!</source>
-<target>Lokitiedostoa ei pystytä luomaan!</target>
-
 <source>Batch execution</source>
 <target>Eräajon suoritus</target>
 
-<source>Stop</source>
-<target>Seis</target>
+<source>Items processed:</source>
+<target>Osia käsitelty:</target>
+
+<source>Items remaining:</source>
+<target>Osia jäljellä:</target>
 
 <source>Total time:</source>
 <target>Kokonaisaika:</target>
 
+<source>Stop</source>
+<target>Seis</target>
+
 <source>Synchronization aborted!</source>
 <target>Täsmäytys lopetettiin!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Täsmäytys päättyi virheisiin!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Ei mitään täsmäytettävää!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Täsmäytys suoritettu onnistuneesti!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Paina "Vaihda" Avaa FreeFileSync GUI toimintoa.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Paina "Vaihda" ja korjaa virheet FreeFileSync päävalintaikkunassa</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Siirtyminen FreeFileSync GUI toimintoon...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Siiry FreeFileSync päävalintaikkunaan ...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
-<target>Kytkeytyminen ei onnistu kohteeseen sourceforge.net!</target>
+<target>Yhteys sourceforge.net:n ei onnistu!</target>
 
 <source>A newer version of FreeFileSync is available:</source>
 <target>FreeFileSync:n uusi versio on saatavilla:</target>
@@ -445,7 +448,7 @@ Komento suoritetaan kun:
 <target>Lepotila</target>
 
 <source>Hibernate</source>
-<target>Hybernaatiotila</target>
+<target>Horrostila</target>
 
 <source>1. &Compare</source>
 <target>1. &Vertaa</target>
@@ -481,7 +484,7 @@ Komento suoritetaan kun:
 <target>Vertaile</target>
 
 <source>Compare both sides</source>
-<target>Vertaile puolet keskenään</target>
+<target>Vertaile molemmat puolet</target>
 
 <source>&Abort</source>
 <target>&Lopeta</target>
@@ -534,9 +537,6 @@ Komento suoritetaan kun:
 <source>Items found:</source>
 <target>Osia löytyi:</target>
 
-<source>Items remaining:</source>
-<target>Osia jäljellä:</target>
-
 <source>Speed:</source>
 <target>Nopeus:</target>
 
@@ -550,7 +550,7 @@ Komento suoritetaan kun:
 <target>Eräajo</target>
 
 <source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target>Luo eräajotiedosto automatisoidaksesi täsmäytyksen. Käynnistä tupla-klikkaamalla tai suorita komento: FreeFileSync.exe SyncJob.ffs_batch. Voit ajastaa eräajo Tehtävien ajoitus -toiminnolla.</target>
+<target>Luo eräajotiedosto automatisoidaksesi täsmäytyksen. Käynnistä tuplaklikkaamalla tai suorita komento: FreeFileSync.exe SyncJob.ffs_batch. Voit ajastaa eräajo Tehtävien ajoitus -toiminnolla.</target>
 
 <source>Help</source>
 <target>Ohje</target>
@@ -568,16 +568,16 @@ Komento suoritetaan kun:
 <target>Tilan palaute</target>
 
 <source>Show progress dialog</source>
-<target>Näytä etenemisen asetukset</target>
+<target>Näytä etenemä ikkuna</target>
 
 <source>Error handling</source>
-<target>Virhe käsitellessä</target>
+<target>Virheiden käsittely</target>
 
 <source>Maximum number of log files:</source>
 <target>Lokitiedostojen enimmäismäärä:</target>
 
 <source>Select log file directory:</source>
-<target>Hakemisto lokitiedostoille:</target>
+<target>Lokitiedoston hakemisto:</target>
 
 <source>Batch settings</source>
 <target>Eräajo asetukset</target>
@@ -588,23 +588,23 @@ Komento suoritetaan kun:
 <source>&Load</source>
 <target>&Lataa</target>
 
-<source>&Cancel</source>
-<target>&Lopeta</target>
+<source>Cancel</source>
+<target>Lopeta</target>
 
 <source>Select variant:</source>
 <target>Valitse vaihtoehto:</target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Tunnista ja monista muutokset tietokannalla molemmille puolille. Poisto/Poikkeama/Uudelleen nimeäminan tunnistetaan automaattisesti.</target>
+<target>Tunnista ja monista muutokset tietokannalla molemmille puolille. Poistot, uudelleennimeäminen ja ristiriidat havaitaan automaattisesti.</target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Peilaava varmuuskopio. Oikeanpuoleinen hakemisto muutetaan täsmäytyksessä vastaamaan tarkasti vasenta.</target>
+<target>Vasemman peilaava varmuuskopio. Oikeanpuoleinen hakemisto muutetaan täsmäytyksessä vastaamaan tarkasti vasenta.</target>
 
 <source>Copy new or updated files to right folder.</source>
-<target>Kopioidaan uudet tai muuttuneet tiedostot oikeaan hakemistoon.</target>
+<target>Kopioi uudet tai päivitetyt tiedostot oikeaan kansioon.</target>
 
 <source>Configure your own synchronization rules.</source>
-<target>Määrittele oma täsmäyssääntö.</target>
+<target>Määritä omat täsmäyssäännöt.</target>
 
 <source>Deletion handling</source>
 <target>Poistotapa</target>
@@ -625,22 +625,22 @@ Komento suoritetaan kun:
 <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>
+<target>Tiedosto/hakemisto löytyy vain oiealta</target>
 
 <source>Left file is newer</source>
-<target>Tiedosto vasemmalla on uudempi</target>
+<target>Vasen tiedosto uudempi</target>
 
 <source>Right file is newer</source>
-<target>Tiedosto oikealla on uudempi</target>
+<target>Oikea tiedosto uudempi</target>
 
 <source>Files have different content</source>
-<target>Tiedostojen sisältö on eri</target>
+<target>Tiedostojen sisältö on erilaisia</target>
 
 <source>Conflict/file cannot be categorized</source>
 <target>Poikkeaman/tiedoston luokittelu ei onnistu</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Vertaile...</target>
@@ -675,9 +675,6 @@ on sama
 <source>Synchronizing...</source>
 <target>Täsmäytetään...</target>
 
-<source>Items processed:</source>
-<target>Osia käsitelty:</target>
-
 <source>&Pause</source>
 <target>&Keskeytä</target>
 
@@ -685,7 +682,7 @@ on sama
 <target>Koodikieli on C++ käyttäen:</target>
 
 <source>Feedback and suggestions are welcome</source>
-<target>Palaute ja uudet ideat ovat mieluisia</target>
+<target>Palaute ja uudet ideat ovat tervetulleita</target>
 
 <source>Homepage</source>
 <target>Kotisivu</target>
@@ -697,7 +694,7 @@ on sama
 <target>S-posti</target>
 
 <source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>Suuret kiitokset FreeFileSync:n kääntämisestä:</target>
+<target>Suuret kiitokset FreeFileSync:n paikallistamisesta:</target>
 
 <source>If you like FreeFileSync</source>
 <target>Jos pidät FreeFileSync:tä</target>
@@ -721,7 +718,7 @@ on sama
 <target>&Uudestaan</target>
 
 <source>Do not show this dialog again</source>
-<target>Älä näytä tätä jatkossa</target>
+<target>Älä enää näytä valintaikkunaa</target>
 
 <source>&Switch</source>
 <target>&Vaihda</target>
@@ -739,15 +736,15 @@ on sama
 <target>Poista molemmilta puolilta</target>
 
 <source>Delete on both sides even if the file is selected on one side only</source>
-<target>Poista molemmilta puolilta vaikka tiedosto valittu vain toisella puolella</target>
+<target>Poista molemmin puolin, vaikka tiedosto on valittu vain toisella puolella</target>
 
 <source>
 Only files that match all filter settings will be synchronized.
 Note: File names must be relative to base directories!
 </source>
 <target>
-Vain ne tiedostot jotka täyttää kaikkia suotimia täsmennetään. 
-HUOM: Tiedostonimet oltava suhteellisia hakemistoon!
+Vain tiedostot, jotka vastaavat kaikkia suodattimen asetuksia synkronoidaan.
+Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 </target>
 
 <source>Hints:</source>
@@ -775,7 +772,7 @@ Sulje pois: \stuff\temp\*
 </target>
 
 <source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
-<target>Täsmäytä kaikki .doc, .zip und .exe tiedostot paitsi hakemistossa "temp" olevat.</target>
+<target>Täsmäytä kaikki .doc, .zip und .exe tiedostot paitsi kaikki hakemistossa "temp" olevat.</target>
 
 <source>Include</source>
 <target>Sisällytä</target>
@@ -802,7 +799,7 @@ Sulje pois: \stuff\temp\*
 <target>Transaktio pohjainen kopiointi</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>Kirjoittaa ensin tilapäistiedostoon (*.ffs_tmp) ja nimeä sen uudestaan. Varmistaa eheyden myös Fataali Virheen tapahtuessa.</target>
+<target>Kirjoittaa ensin tilapäistiedostoon (*.ffs_tmp) ja nimeä sen uudestaan. Varmistaa eheyden myös Vakavan Virheen tapahtuessa.</target>
 
 <source>Copy locked files</source>
 <target>Kopioi lukitut tiedostot</target>
@@ -817,7 +814,7 @@ Sulje pois: \stuff\temp\*
 <target>Siirrä tiedosto- ja hakemisto-oikeuksia (Vaatii Järjestelmävalvojan oikeuksia)</target>
 
 <source>Restore hidden dialogs</source>
-<target>Palauta piilotetut käskyt</target>
+<target>Palauta piilotetut ikkunat</target>
 
 <source>External applications</source>
 <target>Ulkopuolinen sovellus</target>
@@ -844,7 +841,7 @@ Sulje pois: \stuff\temp\*
 <target>Toiminto lopetettiin!</target>
 
 <source>Main bar</source>
-<target>Päävalikko</target>
+<target>Pääpalkki</target>
 
 <source>Folder pairs</source>
 <target>Hakemistoparit</target>
@@ -862,7 +859,7 @@ Sulje pois: \stuff\temp\*
 <target>Sulje pois, tilapäisesti</target>
 
 <source>Include temporarily</source>
-<target>Sisällytä tilapäisesti</target>
+<target>Sisällytä, tilapäisesti</target>
 
 <source>Exclude via filter:</source>
 <target>Sulje pois suotimella:</target>
@@ -907,7 +904,7 @@ Sulje pois: \stuff\temp\*
 <target>Asetukset tallennettu!</target>
 
 <source>Never save changes</source>
-<target>Muutoksia hylätään aina</target>
+<target>Älä tallenna muutoksia</target>
 
 <source>Save changes to current configuration?</source>
 <target>Tallenna asetuksiin tehdyt muutokset?</target>
@@ -919,13 +916,13 @@ Sulje pois: \stuff\temp\*
 <target>Hakemistojen vertailu ja täsmäytys</target>
 
 <source>Hide files that exist on left side only</source>
-<target>Piilota vain vasemmalla olevat tiedostot</target>
+<target>Piilota vain vasemmalla esiintyvät 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 vain oikealla olevat tiedostot</target>
+<target>Piilota vain oikealla esiintyvät tiedostot</target>
 
 <source>Show files that exist on right side only</source>
 <target>Näytä vain oikealla esiintyvät tiedostot</target>
@@ -946,13 +943,13 @@ Sulje pois: \stuff\temp\*
 <target>Piilota yhteneväiset tiedostot</target>
 
 <source>Show files that are equal</source>
-<target>Näytä yhtenevät tiedostot</target>
+<target>Näytä yhteneväiset tiedostot</target>
 
 <source>Hide files that are different</source>
 <target>Piilota erilaiset tiedostot</target>
 
 <source>Show files that are different</source>
-<target>Näytä poikkeavat tiedostot</target>
+<target>Näytä erilaiset tiedostot</target>
 
 <source>Hide conflicts</source>
 <target>Piilota ristiriidat</target>
@@ -1006,7 +1003,7 @@ Sulje pois: \stuff\temp\*
 <target>Kaikki hakemistot täsmäävät!</target>
 
 <source>Please run a Compare first before synchronizing!</source>
-<target>Aja Tarkistus ennen täsmäystä.</target>
+<target>Suorita Vertaile ennen täsmäystä.</target>
 
 <source>Comma separated list</source>
 <target>CSV-muotoinen lista</target>
@@ -1015,10 +1012,7 @@ Sulje pois: \stuff\temp\*
 <target>Selite</target>
 
 <source>File list exported!</source>
-<target>Tiedosto lista viety!</target>
-
-<source>Error writing file:</source>
-<target>Virhe kirjottaessa tiedostoa:</target>
+<target>Tiedostolista viety!</target>
 
 <source>
 <pluralform>Object deleted successfully!</pluralform>
@@ -1057,29 +1051,29 @@ Sulje pois: \stuff\temp\*
 </target>
 
 <source>Scanning...</source>
-<target>Haen tiedostoja...</target>
+<target>Tiedostoja haetaan...</target>
 
 <source>Comparing content...</source>
-<target>Tietosisällön vertailu...</target>
+<target>Sisällön vertailu...</target>
 
 <source>Paused</source>
 <target>Pysäytetty</target>
 
+<source>Initializing...</source>
+<target>Alustus...</target>
+
 <source>Aborted</source>
-<target>Lopetettu</target>
+<target>Keskeytetty</target>
 
 <source>Completed</source>
 <target>Valmis</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Keskeytys pyydetty: Odotetaan toiminnon loppumista...</target>
+<source>Continue</source>
+<target>Jatka</target>
 
 <source>Pause</source>
 <target>Tauko</target>
 
-<source>Continue</source>
-<target>Jatka</target>
-
 <source>Cannot find %x</source>
 <target>En löydä %x</target>
 
@@ -1218,65 +1212,65 @@ Sulje pois: \stuff\temp\*
 <pluralform>%x päivää</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Hakemiston tarkkailua ei voitu käynnistää:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Virhe seuratessa hakemistoa.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Hakemistoa %x ei voida tarkkaila.</target>
 
 <source>Conversion error:</source>
-<target>Konversio virhe:</target>
+<target>Muunnosvirhe:</target>
+
+<source>Cannot delete file %x.</source>
+<target>Ei voi poistaa tiedostoa %x.</target>
 
-<source>Error deleting file:</source>
-<target>Virhe poistettaessa tiedostoa:</target>
+<source>The file is locked by another process:</source>
+<target>Tiedosto on toisen prosessin lukitsema:</target>
 
-<source>Error moving file:</source>
-<target>Virhe siirtäessä tiedostoa:</target>
+<source>Cannot move file %x to %y.</source>
+<target>Tiedostoa %x ei voida siirtää kohtaan %y.</target>
 
-<source>Target file already existing!</source>
-<target>Kohde tiedosto on jo olemassa!</target>
+<source>Cannot delete directory %x.</source>
+<target>Hakemistoa %x ei voida poistaa.</target>
 
-<source>Error moving directory:</source>
-<target>Virhe siirtäessä hakemistoa:</target>
+<source>Cannot write modification time of %x.</source>
+<target>Tiedoston %x muutosaikaa ei voida kirjoittaa.</target>
 
-<source>Target directory already existing!</source>
-<target>Haluttu tiedosto on jo olemassa!</target>
+<source>Cannot find system function %x.</source>
+<target>Järjestelmäfunktio ei löydy, %x</target>
 
-<source>Error deleting directory:</source>
-<target>Virhe poistettaessa hakemistoa:</target>
+<source>Cannot read security context of %x.</source>
+<target>Ei voi lukea %x -suojauskontekstia.</target>
 
-<source>Error changing modification time:</source>
-<target>Virhe muuttaessa tiedoston aikaa:</target>
+<source>Cannot write security context of %x.</source>
+<target>Ei voi tallentaa %x -suojauskontekstia.</target>
 
-<source>Error loading library function:</source>
-<target>Virhe ladattaessa kirjastotoimintoa:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Ei voi lukea %x -oikeuksia.</target>
 
-<source>Error reading security context:</source>
-<target>Virhe lukiessa turvatietoja:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Ei voi tallentaa %x -oikeuksia.</target>
 
-<source>Error writing security context:</source>
-<target>Virhe kirjottaessa turvatietoja:</target>
+<source>Cannot create directory %x.</source>
+<target>Hakemistoa %x ei voitu luoda.</target>
 
-<source>Error copying file permissions:</source>
-<target>Virhe kopioitaessa tiedoston oikeuksia:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Pikakuviketta %x ei voida kopioida kohtaan %y.</target>
 
-<source>Error creating directory:</source>
-<target>Virhe hakemistoa luotassa:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Tiedoston %x ominaisuuksia ei voitu tallentaa.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Symbolisen linkin kopiointi epäonnistui:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Tiedostoa %x ei voida kopioida kohtaan %y.</target>
 
-<source>Error copying file:</source>
-<target>Virhe kopioitaessa tiedostoa:</target>
+<source>Cannot read directory %x.</source>
+<target>Hakemisto %x ei voida lukea.</target>
 
-<source>Error traversing directory:</source>
-<target>Virhe hakemistoa läpikäydessä:</target>
+<source>Endless loop.</source>
+<target>Ääretön silmukka.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Suorita hakemiston läpikulku jatkuvana:</target>
+<source>Cannot set privilege %x.</source>
+<target>Oikeuksia %x ei voitu asettaa.</target>
 
-<source>Error setting privilege:</source>
-<target>Virhe, asettaessa oikeuksia:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Ei voitu siirtää %x Roskakoriin!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Molemmat puolet muuttuneet edellisestä täsmäyksestä!</target>
@@ -1302,8 +1296,8 @@ Sulje pois: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Jätää virhe huomiotta ja tulkitse hakemisto tyhjäksi.</target>
 
-<source>Directory does not exist:</source>
-<target>Puuttuva hakemisto:</target>
+<source>Cannot find directory %x.</source>
+<target>Hakemisto %x ei löydy.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Hakemistot riippuvuussuhteessa! Aseta täsmäyssääntöjä varovasti:</target>
@@ -1311,20 +1305,17 @@ Sulje pois: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Täsmäytys alustetaan...</target>
 
-<source>Out of memory!</source>
-<target>Muisti loppui!</target>
+<source>Conflict detected:</source>
+<target>Ristiriita todettu:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Tiedostolla %x on virheellinen päiväys!</target>
 
-<source>Conflict detected:</source>
-<target>Ristiriita todettu:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Tiedostoilla %x on sama päiväys mutta eri koko!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Pikakuvakkeilla %x on sama päiväys mutta kohde on toinen!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Pikakuvikeilla %x on sama päiväys mutta osoittavat eri kohtiin.</target>
 
 <source>Comparing content of files %x</source>
 <target>Vertaa tiedostojen %x tietosisältöä</target>
@@ -1336,10 +1327,10 @@ Sulje pois: \stuff\temp\*
 <target>Luodaan tiedostolista...</target>
 
 <source>Both sides are equal</source>
-<target>Puolet ovat denttiset</target>
+<target>Puolet ovat identtiset</target>
 
 <source>Files/folders differ in attributes only</source>
-<target>Tiedostot/hakemistot eroavat vain ominaisuuksissa</target>
+<target>Tiedostot/hakemistot eroavat vain ominaisuuksiltaan</target>
 
 <source>Copy new file/folder to left</source>
 <target>Kopioi uusi tiedosto/hakemisto vasemmalle</target>
@@ -1360,10 +1351,10 @@ Sulje pois: \stuff\temp\*
 <target>Siirrä oikea tiedosto</target>
 
 <source>Overwrite left file/folder with right one</source>
-<target>Ylikirjoita oikea tiedosto/hakemista vasemanpuolisella</target>
+<target>Ylikirjoita vasen tiedosto/hakemista oikealla olevalla</target>
 
 <source>Overwrite right file/folder with left one</source>
-<target>Ylikirjoita oikea tiedosto/hakemista oikeannpuolisella</target>
+<target>Ylikirjoita oikea tiedosto/hakemista vasemmalla olevalla</target>
 
 <source>Do nothing</source>
 <target>Älä tee mitään</target>
@@ -1407,12 +1398,12 @@ Sulje pois: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Luodaan tiedosto %x</target>
 
-<source>Creating folder %x</source>
-<target>Luo hakemisto %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Luodaan pikakuvake %x</target>
 
+<source>Creating folder %x</source>
+<target>LuoDAAN hakemisto %x</target>
+
 <source>Overwriting file %x</source>
 <target>Korvaa tiedosto %x</target>
 
@@ -1426,13 +1417,13 @@ Sulje pois: \stuff\temp\*
 <target>Päivitän %x:n ominaisuudet</target>
 
 <source>Target directory name must not be empty!</source>
-<target>Kohdehakemisto ei saa olla tyhjä!</target>
+<target>Kohdehakemiston nimi ei saa olla tyhjä!</target>
 
 <source>Directory for file versioning was not supplied!</source>
-<target>Versioinnin hakemisto antamatta!</target>
+<target>Tiedostoversioinnin hakemisto on antamatta!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Lähdehakemisto puuttuu:</target>
+<source>Source directory %x not found.</source>
+<target>Lähdehakemisto %x ei löydy.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Ratkaisemattomia ristiriitoja!</target>
@@ -1447,7 +1438,7 @@ Sulje pois: \stuff\temp\*
 <target>Yli 50% tiedostoista kopioidaan tai poistetaan!</target>
 
 <source>Not enough free disk space available in:</source>
-<target>Levytila ei riitä:</target>
+<target>Vapaa levytila ei riitä:</target>
 
 <source>Free disk space required:</source>
 <target>Tarvittava vapaa levytila:</target>
@@ -1456,10 +1447,10 @@ Sulje pois: \stuff\temp\*
 <target>Levytilaa jäljellä:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Roskakori puuttuu tässä polussa! Tiedostot poistetaan pysyvästi:</target>
+<target>Roskakori puuttuu näistä polusta! Tiedostot poistetaan pysyvästi:</target>
 
 <source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<target>Moniosaisen hakemistoparin hakemisto muutetaan! Tarkista täsmäysasetuksia!</target>
+<target>Yksi moniosaisen hakemistoparin hakemisto muutetaan! Tarkista täsmäysasetuksia!</target>
 
 <source>Processing folder pair:</source>
 <target>Käsitellään hakemistoparia:</target>
@@ -1467,12 +1458,6 @@ Sulje pois: \stuff\temp\*
 <source>Generating database...</source>
 <target>Luodaan tietokantaa...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Ei mitään täsmäytettävää!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Kopioimatta, lukittu tiedosto %x</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Tiedon varmennusvirhe: Lähteellä ja kohteella on eri sisältö!</target>
 
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index cd613d6b..2fca8158 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Parcourir le répertoire</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Abandon demandé : En attente de la fin de l'opération en cours...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Synchronisation Automatisée</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Code erreur Linux %x :</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Erreur lors de la résolution du lien symbolique :</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Impossible de résoudre le lien symbolique %x.</target>
 
 <source>%x MB</source>
 <target>%x Mo</target>
@@ -136,35 +139,41 @@
 <pluralform>%x octets</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Erreur lors de la lecture de la base de données de synchro :</target>
+<source>Cannot read file %x.</source>
+<target>Impossible de lire le fichier %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Erreur lors de l'écriture de la base de données de synchro :</target>
+<source>Cannot write file %x.</source>
+<target>Impossible d'écrire le fichier %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Format de la base de données de synchro incompatible :</target>
+<source>Database file %x is incompatible.</source>
+<target>La base de données %x n'est pas compatible.</target>
 
 <source>Initial synchronization:</source>
 <target>Première synchronisation :</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>L'un des fichiers de la base de données FreeFileSync n'existe plus :</target>
+<source>Database file %x does not yet exist.</source>
+<target>La base de données %x n'existe plus.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Les fichiers de la base de données ne font pas partie de la même session de synchronisation</target>
+<source>Out of memory!</source>
+<target>Mémoire insuffisante !</target>
+
+<source>Database files do not share a common session.</source>
+<target>Les fichiers de la base de données ne font pas partie de la même session.</target>
 
 <source>An exception occurred!</source>
 <target>Une erreur s'est produite !</target>
 
-<source>Error reading file attributes:</source>
-<target>Erreur lors de la lecture des attributs du fichier :</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Impossible de lire les attributs du fichier %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Impossible d'obtenir les informations du traitement.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>En attente tant que le répertoire est verrouillé (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Erreur lors du verrouillage du répertoire :</target>
+<source>Cannot set directory lock %x.</source>
+<target>Impossible de verrouiller le répertoire %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x sec</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Erreur lors de la lecture du fichier :</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Erreur lors de l'analyse du fichier %x, ligne %y, colonne %z.</target>
 
 <source>Scanning:</source>
 <target>Lecture en cours :</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Tâches]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Fichier de configuration FreeFileSync invalide !</target>
+<source>/sec</source>
+<target>/sec</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Le fichier %x ne contient pas une configuration valide.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Erreur lors de l'analyse du fichier de configuration :</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Le fichier de configuration %x a été chargé seulement partiellement.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Seule une partie de la configuration a été chargée :</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Impossible d'accéder au service Volume Shadow Copy</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Impossible de déplacer %x dans la Corbeille !</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Utilisez la version FreeFileSync 64-bit pour créer des "shadow copies" sur ce système.</target>
 
 <source>Cannot load file %x.</source>
 <target>Impossible de charger le fichier %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Erreur lors de l'accès au Volume Shadow Copy Service !</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>La copie en tâche de fond sur WOW64 n'est pas possible. Utilisez pour cela la version 64 bits de FreeFileSync.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Impossible de trouver le nom du volume du fichier :</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Le chemin %x ne contient pas de nom de volume.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Le nom de volume %x ne fait pas partie du nom de fichier %y !</target>
 
-<source>/sec</source>
-<target>/sec</target>
-
-<source>File does not exist:</source>
-<target>Le fichier n'existe pas :</target>
+<source>Cannot find file %x.</source>
+<target>Impossible de trouver le fichier %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Impossible de lire les données XML suivantes :</target>
@@ -303,9 +306,6 @@ La ligne de commande est exécutée chaque fois que :
 <source>RealtimeSync configuration</source>
 <target>Configuration RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Le fichier existe déjà. Voulez-vous le remplacer ?</target>
-
 <source>&Restore</source>
 <target>&Restaurer</target>
 
@@ -325,7 +325,7 @@ La ligne de commande est exécutée chaque fois que :
 <target>Connexion</target>
 
 <source>File time and size</source>
-<target>Date et heure de modification du fichier</target>
+<target>Heure et taille du fichier</target>
 
 <source>File content</source>
 <target>Contenu du fichier</target>
@@ -348,35 +348,38 @@ La ligne de commande est exécutée chaque fois que :
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync configuration</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>Traitement batch FreeFileSync</target>
-
-<source>Unable to create log file!</source>
-<target>Impossible de créer un fichier log !</target>
-
 <source>Batch execution</source>
 <target>Exécution du traitement batch</target>
 
-<source>Stop</source>
-<target>Arrêt</target>
+<source>Items processed:</source>
+<target>Elements traités :</target>
+
+<source>Items remaining:</source>
+<target>Elements restants :</target>
 
 <source>Total time:</source>
 <target>Durée totale :</target>
 
+<source>Stop</source>
+<target>Arrêt</target>
+
 <source>Synchronization aborted!</source>
 <target>Synchronisation abandonnée !</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronisation terminée avec des erreurs !</target>
 
+<source>Nothing to synchronize!</source>
+<target>Rien à synchroniser !</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Synchronisation terminée avec succès !</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Appuyer sur "Changer " pour ouvrir le mode FreeFileSync GUI</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Cliquez sur "Permuter" pour résoudre les problèmes dans l'écran principal de FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Changement en mode FreeFileSync GUI...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Passage à l'écran principal de FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Impossible de se connecter à sourceforge.net !</target>
@@ -534,9 +537,6 @@ La ligne de commande est exécutée chaque fois que :
 <source>Items found:</source>
 <target>Elements trouvés :</target>
 
-<source>Items remaining:</source>
-<target>Elements restants :</target>
-
 <source>Speed:</source>
 <target>Vitesse :</target>
 
@@ -588,8 +588,8 @@ La ligne de commande est exécutée chaque fois que :
 <source>&Load</source>
 <target>&Charger</target>
 
-<source>&Cancel</source>
-<target>&Annuler</target>
+<source>Cancel</source>
+<target>Annuler</target>
 
 <source>Select variant:</source>
 <target>Choisissez une variante :</target>
@@ -639,8 +639,8 @@ La ligne de commande est exécutée chaque fois que :
 <source>Conflict/file cannot be categorized</source>
 <target>Conflit ou fichier indéterminé</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Comparaison par...</target>
@@ -675,9 +675,6 @@ est identique
 <source>Synchronizing...</source>
 <target>Synchronisation en cours...</target>
 
-<source>Items processed:</source>
-<target>Elements traités :</target>
-
 <source>&Pause</source>
 <target>&Pause</target>
 
@@ -1017,9 +1014,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>Liste des fichiers exportée !</target>
 
-<source>Error writing file:</source>
-<target>Erreur lors de l'écriture du fichier :</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1065,21 +1059,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>En pause</target>
 
+<source>Initializing...</source>
+<target>Initialisation...</target>
+
 <source>Aborted</source>
 <target>Abandonné</target>
 
 <source>Completed</source>
 <target>Terminé</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abandon demandé : En attente de la fin de l'opération en cours...</target>
+<source>Continue</source>
+<target>Continuer</target>
 
 <source>Pause</source>
 <target>Pause</target>
 
-<source>Continue</source>
-<target>Continuer</target>
-
 <source>Cannot find %x</source>
 <target>Impossible de trouver %x</target>
 
@@ -1218,65 +1212,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x jours</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Impossible d'initialiser la surveillance des dossiers :</target>
-
-<source>Error when monitoring directories.</source>
-<target>Erreur lors de la surveillance des répertoires.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Impossible de gérer le répertoire %x.</target>
 
 <source>Conversion error:</source>
 <target>Erreur de conversion :</target>
 
-<source>Error deleting file:</source>
-<target>Erreur lors de la suppression d'un fichier :</target>
+<source>Cannot delete file %x.</source>
+<target>Impossible de supprimer le fichier %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Le fichier est verrouillé par un autre process :</target>
 
-<source>Error moving file:</source>
-<target>Erreur lors du déplacement du fichier :</target>
+<source>Cannot move file %x to %y.</source>
+<target>Impossible de déplacer le fichier %x vers %y.</target>
 
-<source>Target file already existing!</source>
-<target>Le fichier de destination existe déjà !</target>
+<source>Cannot delete directory %x.</source>
+<target>Impossible de supprimer le répertoire %x.</target>
 
-<source>Error moving directory:</source>
-<target>Erreur lors du déplacement du répertoire :</target>
+<source>Cannot write modification time of %x.</source>
+<target>Impossible d'écrire la date de modification de %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Le répertoire de destination existe déjà !</target>
+<source>Cannot find system function %x.</source>
+<target>Impossible de trouver la fonction système %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Erreur lors de la suppression d'un répertoire :</target>
+<source>Cannot read security context of %x.</source>
+<target>Impossible de lire les paramètres de sécurité de %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Erreur lors du changement de la date de modification :</target>
+<source>Cannot write security context of %x.</source>
+<target>Impossible d'écrire les paramètres de sécurité de %x.</target>
 
-<source>Error loading library function:</source>
-<target>Erreur lors du chargement de la bibliothèque de fonctions :</target>
+<source>Cannot read permissions of %x.</source>
+<target>Impossible de lire les permissions de %x.</target>
 
-<source>Error reading security context:</source>
-<target>Erreur de lecture du contexte de sécurité:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Impossible d'écrire les permissions de %x.</target>
 
-<source>Error writing security context:</source>
-<target>Erreur d'écriture du contexte de sécurité:</target>
+<source>Cannot create directory %x.</source>
+<target>Impossible de créer le répertoire %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Erreur lors de la copie des attributs système</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Impossible de copier le lien symbolique %x vers %y.</target>
 
-<source>Error creating directory:</source>
-<target>Erreur lors de la création d'un répertoire :</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Impossible d'écrire les attributs de fichier de %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Erreur lors de la copie du lien symbolique :</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Impossible de copier le fichier %X vers %y.</target>
 
-<source>Error copying file:</source>
-<target>Erreur lors de la copie du fichier :</target>
+<source>Cannot read directory %x.</source>
+<target>Impossible de lire le répertoire %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Erreur lors du parcours du répertoire :</target>
+<source>Endless loop.</source>
+<target>Boucle infinie.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Boucle sans fin lors du parcours du répertoire :</target>
+<source>Cannot set privilege %x.</source>
+<target>Impossible de fixer le privilège %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Erreur de paramétrage de privilège</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Impossible de déplacer %x dans la Corbeille !</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Les deux côtés ont changé depuis la dernière synchronisation !</target>
@@ -1302,8 +1296,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Vous pouvez ignorer cette erreur en considérant le répertoire comme vide.</target>
 
-<source>Directory does not exist:</source>
-<target>Le répertoire n'existe pas :</target>
+<source>Cannot find directory %x.</source>
+<target>Impossible de trouver le répertoire %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Les répertoires sont imbriqués ! Attention à la mise à jour des règles de synchronisation :</target>
@@ -1311,20 +1305,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Synchronisation en cours de préparation ...</target>
 
-<source>Out of memory!</source>
-<target>Mémoire insuffisante !</target>
+<source>Conflict detected:</source>
+<target>Conflit détecté :</target>
 
 <source>File %x has an invalid date!</source>
 <target>Le fichier %x a une date invalide !</target>
 
-<source>Conflict detected:</source>
-<target>Conflit détecté :</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Les fichiers %x ont la même date mais une taille différente !</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Le lien symbolique %x a la même date mais une destination différente !</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Le lien symbolique %x a la même date mais pas la même cible.</target>
 
 <source>Comparing content of files %x</source>
 <target>Comparaison du contenu des fichiers %x</target>
@@ -1407,12 +1398,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Création du fichier %x</target>
 
-<source>Creating folder %x</source>
-<target>Création du dossier %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Création du lien symbolique %x</target>
 
+<source>Creating folder %x</source>
+<target>Création du dossier %x</target>
+
 <source>Overwriting file %x</source>
 <target>Remplacement du fichier %x</target>
 
@@ -1431,8 +1422,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Le répertoire des versions de fichiers n'a pas été indiqué !</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Le répertoire source n'existe plus :</target>
+<source>Source directory %x not found.</source>
+<target>Impossible de trouver le répertoire source %x.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Il y a des conflits non résolus !</target>
@@ -1467,12 +1458,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>Génération de la base de données...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Rien à synchroniser !</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Impossible de copier le fichier verrouillé %x !</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Erreur lors du contrôle des données : Les fichiers source et destination ont des contenus différents !</target>
 
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index b671f599..96ebaf75 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Verzeichnis öffnen</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Abbruch initiiert: Warte, bis aktuelle Operation beendet ist...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatisierte Synchronisation</target>
 
@@ -29,7 +32,7 @@
 <target>Alternative Synchronisationseinstellungen auswählen</target>
 
 <source>No filter selected</source>
-<target>Kein Filter ausgewählt</target>
+<target>Kein Filter gesetzt</target>
 
 <source>Filter is active</source>
 <target>Filter ist aktiv</target>
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux Fehlercode %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Fehler beim Auflösen des Symbolischen Links:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Der Symbolische Link %x kann nicht aufgelöst werden.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Fehler beim Lesen der Synchronisationsdatenbank:</target>
+<source>Cannot read file %x.</source>
+<target>Die Datei %x kann nicht gelesen werden.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Fehler beim Schreiben der Synchronisationsdatenbank:</target>
+<source>Cannot write file %x.</source>
+<target>Die Datei %x kann nicht geschrieben werden.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Inkompatibles Datenbankformat:</target>
+<source>Database file %x is incompatible.</source>
+<target>Die Datenbankdatei %x ist nicht kompatibel.</target>
 
 <source>Initial synchronization:</source>
 <target>Erstmalige Synchronisation:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Eine der FreeFileSync Datenbankdateien existiert noch nicht:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Die Datenbankdatei %x existiert noch nicht.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Die Datenbankdateien enthalten keine gemeinsame Synchronisationssitzung:</target>
+<source>Out of memory!</source>
+<target>Nicht genügend Arbeitsspeicher!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Die Datenbankdateien teilen keine gemeinsame Sitzung.</target>
 
 <source>An exception occurred!</source>
 <target>Eine Ausnahme ist aufgetreten!</target>
 
-<source>Error reading file attributes:</source>
-<target>Fehler beim Lesen der Dateiattribute:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Die Dateiattribute von %x können nicht gelesen werden.</target>
+
+<source>Cannot get process information.</source>
+<target>Prozessinformationen können nicht gelesen werden.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Warte während Verzeichnis gesperrt ist (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Fehler beim Setzen der Verzeichnissperre:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Die Verzeichnissperre %x kann nicht gesetzt werden.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x Sek.</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Fehler beim Lesen der Datei:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Fehler beim Auswerten der Datei %x, Zeile %y, Spalte %z.</target>
 
 <source>Scanning:</source>
 <target>Suche Dateien:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Ungültige FreeFileSync Konfigurationsdatei!</target>
+<source>/sec</source>
+<target>/s</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Die Datei %x enthält keine gültige Konfiguration.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Fehler beim Auswerten der Konfigurationsdatei:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Die Konfigurationsdatei %x wurde nur teilweise geladen.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Die Konfiguration wurde nur teilweise geladen:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Auf den Volumenschattenkopiedienst kann nicht zugegriffen werden.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>%x kann nicht in den Papierkorb verschoben werden!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Bitte benutzen Sie die FreeFileSync 64-Bit Version, um Schattenkopien auf diesem System zu erstellen.</target>
 
 <source>Cannot load file %x.</source>
 <target>Die Datei %x kann nicht geladen werden.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Fehler beim Zugriff auf den Volumenschattenkopiedienst!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Das Erstellen von Schattenkopien unter WOW64 wird nicht unterstützt. Bitte benutzen Sie die FreeFileSync 64-Bit Version.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Laufwerksname der Datei kann nicht ermittelt werden:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Der Pfad %x enthält keinen Laufwerksnamen.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Laufwerksname %x ist kein Teil des Dateinamens %y!</target>
 
-<source>/sec</source>
-<target>/s</target>
-
-<source>File does not exist:</source>
-<target>Die Datei existiert nicht:</target>
+<source>Cannot find file %x.</source>
+<target>Die Datei %x wurde nicht gefunden.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Die folgenden XML-Elemente können nicht gelesen werden:</target>
@@ -303,9 +306,6 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync Konfiguration</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Die Datei existiert bereits. Überschreiben?</target>
-
 <source>&Restore</source>
 <target>&Wiederherstellen</target>
 
@@ -348,35 +348,38 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync Konfiguration</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Batch-Job</target>
-
-<source>Unable to create log file!</source>
-<target>Die Protokolldatei konnte nicht erstellt werden!</target>
-
 <source>Batch execution</source>
 <target>Batchlauf</target>
 
-<source>Stop</source>
-<target>Stop</target>
+<source>Items processed:</source>
+<target>Verarbeitete Elemente:</target>
+
+<source>Items remaining:</source>
+<target>Verbleibende Elemente:</target>
 
 <source>Total time:</source>
 <target>Gesamtzeit:</target>
 
+<source>Stop</source>
+<target>Stop</target>
+
 <source>Synchronization aborted!</source>
 <target>Synchronisation abgebrochen!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronisation mit Fehlern abgeschlossen!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Nichts zu synchronisieren!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Synchronisation erfolgreich abgeschlossen!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>"Wechseln" öffnet FreeFileSync in der graphischen Ansicht.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Drücken Sie "Wechseln", um die Probleme in FreeFileSyncs Hauptdialog zu bearbeiten.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Wechsle in die graphische Ansicht...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Wechsle in FreeFileSyncs Hauptdialog...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Es konnte keine Verbindung zu Sourceforge.net aufgebaut werden!</target>
@@ -534,9 +537,6 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>Items found:</source>
 <target>Gefundene Elemente:</target>
 
-<source>Items remaining:</source>
-<target>Verbleibende Elemente:</target>
-
 <source>Speed:</source>
 <target>Geschwindigkeit:</target>
 
@@ -564,9 +564,6 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>Right</source>
 <target>Rechts</target>
 
-<source>Sync setttings</source>
-<target>Synchronisationseinstellungen</target>
-
 <source>Status feedback</source>
 <target>Statusrückmeldung</target>
 
@@ -591,8 +588,8 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>&Load</source>
 <target>&Laden</target>
 
-<source>&Cancel</source>
-<target>&Abbrechen</target>
+<source>Cancel</source>
+<target>Abbrechen</target>
 
 <source>Select variant:</source>
 <target>Variante auswählen:</target>
@@ -642,8 +639,8 @@ Die Befehlszeile wird ausgeführt wenn:
 <source>Conflict/file cannot be categorized</source>
 <target>Konflikt/Datei, die nicht eingeordnet werden kann</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Vergleichen nach...</target>
@@ -678,9 +675,6 @@ gleich ist
 <source>Synchronizing...</source>
 <target>Synchronisiere...</target>
 
-<source>Items processed:</source>
-<target>Verarbeitete Elemente:</target>
-
 <source>&Pause</source>
 <target>&Pause</target>
 
@@ -1020,9 +1014,6 @@ Ausschließen: \stuff\temp\*
 <source>File list exported!</source>
 <target>Dateiliste exportiert!</target>
 
-<source>Error writing file:</source>
-<target>Fehler beim Schreiben der Datei:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1068,21 +1059,21 @@ Ausschließen: \stuff\temp\*
 <source>Paused</source>
 <target>Angehalten</target>
 
+<source>Initializing...</source>
+<target>Initialisiere...</target>
+
 <source>Aborted</source>
 <target>Abgebrochen</target>
 
 <source>Completed</source>
 <target>Fertig</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abbruch initiiert: Warte, bis aktuelle Operation beendet ist...</target>
+<source>Continue</source>
+<target>Fortfahren</target>
 
 <source>Pause</source>
 <target>Pause</target>
 
-<source>Continue</source>
-<target>Fortfahren</target>
-
 <source>Cannot find %x</source>
 <target>%x wurde nicht gefunden.</target>
 
@@ -1221,68 +1212,65 @@ Ausschließen: \stuff\temp\*
 <pluralform>%x Tage</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Die Verzeichnisüberwachung konnte nicht gestartet werden:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Fehler beim Überwachen der Verzeichnisse.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Das Verzeichnis %x kann nicht überwacht werden.</target>
 
 <source>Conversion error:</source>
 <target>Fehler bei Konvertierung:</target>
 
-<source>Error deleting file:</source>
-<target>Fehler beim Löschen der Datei:</target>
+<source>Cannot delete file %x.</source>
+<target>Die Datei %x kann nicht gelöscht werden.</target>
 
-<source>Error moving file:</source>
-<target>Fehler beim Verschieben der Datei:</target>
+<source>The file is locked by another process:</source>
+<target>Die Datei wird von einem anderen Prozess gesperrt:</target>
 
-<source>Target file already existing!</source>
-<target>Die Zieldatei existiert bereits!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Die Datei %x kann nicht nach %y verschoben werden.</target>
 
-<source>Error moving directory:</source>
-<target>Fehler beim Verschieben des Verzeichnisses:</target>
+<source>Cannot delete directory %x.</source>
+<target>Das Verzeichnis %x kann nicht gelöscht werden.</target>
 
-<source>Target directory already existing!</source>
-<target>Zielverzeichnis existiert bereits!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Die Änderungszeit von %x kann nicht geschrieben werden.</target>
 
-<source>Error deleting directory:</source>
-<target>Fehler beim Löschen des Verzeichnisses:</target>
+<source>Cannot find system function %x.</source>
+<target>Die Systemfunktion %x wurde nicht gefunden.</target>
 
-<source>Error changing modification time:</source>
-<target>Fehler beim Setzen der Dateiänderungszeit:</target>
+<source>Cannot read security context of %x.</source>
+<target>Der Sicherheitskontext von %x kann nicht gelesen werden.</target>
 
-<source>Error loading library function:</source>
-<target>Fehler beim Laden der Bibliotheksfunktion:</target>
+<source>Cannot write security context of %x.</source>
+<target>Der Sicherheitskontext von %x kann nicht geschrieben werden.</target>
 
-<source>Error reading security context:</source>
-<target>Fehler beim Lesen des Sicherheitskontextes:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Die Berechtigungen von %x können nicht gelesen werden.</target>
 
-<source>Error writing security context:</source>
-<target>Fehler beim Schreiben des Sicherheitskontextes:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Die Berechtigungen von %x können nicht geschrieben werden.</target>
 
-<source>Error copying file permissions:</source>
-<target>Fehler beim Kopieren der Dateiberechtigungen:</target>
+<source>Cannot create directory %x.</source>
+<target>Das Verzeichnis %x kann nicht erstellt werden.</target>
 
-<source>Error creating directory:</source>
-<target>Fehler beim Erstellen des Verzeichnisses:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Der Symbolische Link %x kann nicht nach %y kopiert werden.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Fehler beim Kopieren des Symbolischen Links:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Die Dateiattribute von %x können nicht geschrieben werden.</target>
 
-<source>Error copying file:</source>
-<target>Fehler beim Kopieren der Datei:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Die Datei %x kann nicht nach %y kopiert werden.</target>
 
-<source>Error opening file:</source>
-<target>Fehler beim Öffnen der Datei:</target>
+<source>Cannot read directory %x.</source>
+<target>Das Verzeichnis %x kann nicht gelesen werden.</target>
 
-<source>Error traversing directory:</source>
-<target>Fehler beim Durchsuchen des Verzeichnisses:</target>
+<source>Endless loop.</source>
+<target>Endlosschleife.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Endlosschleife beim Lesen des Verzeichnisses:</target>
+<source>Cannot set privilege %x.</source>
+<target>Das Privileg %x kann nicht gesetzt werden.</target>
 
-<source>Error setting privilege:</source>
-<target>Fehler beim Setzen des Privilegs:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>%x kann nicht in den Papierkorb verschoben werden!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Beide Seiten wurden seit der letzten Synchronisation verändert!</target>
@@ -1308,8 +1296,8 @@ Ausschließen: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Dieser Fehler kann ignoriert werden, um das Verzeichnis als leer anzusehen.</target>
 
-<source>Directory does not exist:</source>
-<target>Das Verzeichnis existiert nicht:</target>
+<source>Cannot find directory %x.</source>
+<target>Das Verzeichnis %x wurde nicht gefunden.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Die Verzeichnisse sind voneinander abhängig! Achtung beim Festlegen der Synchronisationsregeln:</target>
@@ -1317,20 +1305,17 @@ Ausschließen: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Bereite Synchronisation vor...</target>
 
-<source>Out of memory!</source>
-<target>Nicht genügend Arbeitsspeicher!</target>
+<source>Conflict detected:</source>
+<target>Ein Konflikt wurde erkannt:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Die Datei %x hat ein ungültiges Datum!</target>
 
-<source>Conflict detected:</source>
-<target>Ein Konflikt wurde erkannt:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Die Dateien %x haben dasselbe Datum, aber unterschiedliche Größen!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Die Symbolischen Links %x haben dasselbe Datum, aber ein unterschiedliches Ziel!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Die Symbolischen Links %x haben dasselbe Datum, aber ein unterschiedliches Ziel.</target>
 
 <source>Comparing content of files %x</source>
 <target>Vergleiche Inhalt der Dateien %x</target>
@@ -1413,12 +1398,12 @@ Ausschließen: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Erstelle Datei %x</target>
 
-<source>Creating folder %x</source>
-<target>Erstelle Verzeichnis %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Erstelle Symbolischen Link %x</target>
 
+<source>Creating folder %x</source>
+<target>Erstelle Verzeichnis %x</target>
+
 <source>Overwriting file %x</source>
 <target>Überschreibe Datei %x</target>
 
@@ -1437,8 +1422,8 @@ Ausschließen: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Das Verzeichnis für die Versionierung wurde nicht angegeben!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Quellverzeichnis existiert nicht mehr:</target>
+<source>Source directory %x not found.</source>
+<target>Das Quellverzeichnis %x wurde nicht gefunden.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Es existieren ungelöste Konflikte!</target>
@@ -1473,12 +1458,6 @@ Ausschließen: \stuff\temp\*
 <source>Generating database...</source>
 <target>Erzeuge Synchronisationsdatenbank...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nichts zu synchronisieren!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Die gesperrte Datei %x kann nicht kopiert werden!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Verifizierungsfehler: Quell- und Zieldatei haben unterschiedlichen Inhalt!</target>
 
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index f2bc3878..5d1dfa8a 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Αναζήτηση υποκαταλόγου</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Ζητήθηκε ματαίωση: Αναμονή για την λήξη της τρέχουσας εργασίας...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Αυτοματοποιημένος Συγχρονισμός</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Κωδικός Σφάλματος του Linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Σφάλμα κατά την επίλυση του συμβολικού δεσμού:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Ο συμβολικός δεσμός %x δεν μπορεί να επιλυθεί</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Σφάλμα κατά την ανάγνωση από τη βάση δεδομένων συγχρονισμού:</target>
+<source>Cannot read file %x.</source>
+<target>Δεν μπορεί να γίνει ανάγνωση του αρχείου %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Σφάλμα κατά την εγγραφή στη βάση δεδομένων συγχρονισμού:</target>
+<source>Cannot write file %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή του αρχείου %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Η μορφή της βάσης δεδομένων συγχρονισμού δεν είναι συμβατή:</target>
+<source>Database file %x is incompatible.</source>
+<target>Το αρχείο βάσης δεδομένων %x δεν είναι συμβατό</target>
 
 <source>Initial synchronization:</source>
 <target>Αρχικός συγχρονισμός:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Μια από τις βάσεις δεδομένων του FreeFileSync δεν υπάρχει ακόμα:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Το αρχείο βάσης δεδομένων %x δεν υπάρχει ακόμα.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Οι βάσεις δεδομένων δεν έχουν δημιουργηθεί από τον ίδιο συγχρονισμό:</target>
+<source>Out of memory!</source>
+<target>Ανεπαρκής μνήμη!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Τα αρχεία βάσης δεδομένων δεν έχουν χρησιμοποιηθεί από κοινού σε συγχρονισμό.</target>
 
 <source>An exception occurred!</source>
 <target>Παρουσιάστηκε σφάλμα!</target>
 
-<source>Error reading file attributes:</source>
-<target>Σφάλμα κατά την ανάγνωση των χαρακτηριστικών του αρχείου:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Δεν μπορεί να γίνει ανάγνωση των χαρακτηριστικών του αρχείου %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Δεν μπορούν να ληφθούν πληροφορίες για τις τρέχουσες διαδικασίες.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Αναμονή μέχρι να κλειδωθεί ο υποκατάλογος (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Σφάλμα κατά το κλείδωμα του υποκαταλόγου:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Δεν μπορεί να κλειδωθεί ο υπολατάλογος %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x δ/λεπτα</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Σφάλμα κατά την ανάγνωση του αρχείου:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Σφάλμα κατά την ανάλυση του αρχείου %x, γραμμή %y, στήλη %z.</target>
 
 <source>Scanning:</source>
 <target>Ανίχνευση:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Νήματα]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Το αρχείο διάταξης του FreeFileSync δεν είναι έγκυρο!</target>
+<source>/sec</source>
+<target>/δευτερόλεπτο</target>
 
-<source>Error parsing configuration file:</source>
-<target>Σφάλμα κατά την ανάλυση του αρχείου διάταξης:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>Το αρχείο %x δεν περιέχει μια έγκυρη διάταξη.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Μόνο ένα τμήμα του αρχείου διάταξης φορτώθηκε:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Το αρχείο διάταξης %x έχει φορτωθεί μόνο κατά ένα μέρος.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Δεν ήταν δυνατό να μεταφερθεί το %x στον Κάδο Ανακύκλωσης!</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Δεν πέτυχε η πρόσφαση στην Υπηρεσεία Σκιώδους Αντίγραφου Τόμου.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Χρησιμοποιήστε την 64-μπιτη έκδοση του FreeFileSync για να δημιουργήσετε σκιώδη αντίγραφα σε αυτόν τον υπολογιστή.</target>
 
 <source>Cannot load file %x.</source>
 <target>Το αρχείο %x δεν ήταν δυνατόν να φορτωθεί.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Σφάλμα κατά την πρόσβαση στην υπηρεσία Volume Shadow Copy!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Δεν είναι δυνατή η δημιουργία σκιώδους αντίγραφου σε WOW64. Χρησιμοποιείστε την 64-bit έκδοση του FreeFileSync.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Δεν ήταν δυνατό να βρεθεί το όνομα τόμου για το αρχείο:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Η διαδρομή %x δεν περιέχει ένα όνομα τόμου.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Το όνομα τόμου %x δεν είναι μέρος του ονόματος του αρχείου %y!</target>
 
-<source>/sec</source>
-<target>/δευτερόλεπτο</target>
-
-<source>File does not exist:</source>
-<target>Το αρχείο δεν υπάρχει:</target>
+<source>Cannot find file %x.</source>
+<target>Το αρχείο %x δε βρέθηκε.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Δεν ήταν δυνατό να αναγνωσθούν τα ακόλουθα στοιχεία XML:</target>
@@ -303,9 +306,6 @@ The command line is executed each time:
 <source>RealtimeSync configuration</source>
 <target>Διαμόρφωση του RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Το αρχείο υπάρχει ήδη. Να αντικατασταθεί;</target>
-
 <source>&Restore</source>
 <target>&Επαναφορά</target>
 
@@ -348,35 +348,38 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>Αρχείο διάταξης FreeFileSync</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Δέσμη Ενεργειών</target>
-
-<source>Unable to create log file!</source>
-<target>Δεν είναι δυνατή η δημιουργία ενός αρχείου καταγραφής!</target>
-
 <source>Batch execution</source>
 <target>Εκτέλεση δέσμης ενεργειών</target>
 
-<source>Stop</source>
-<target>Λήξη</target>
+<source>Items processed:</source>
+<target>Επεξεργάστηκαν στοιχεία:</target>
+
+<source>Items remaining:</source>
+<target>Περισσεύουν στοιχεία:</target>
 
 <source>Total time:</source>
 <target>Συνολική διάρκεια:</target>
 
+<source>Stop</source>
+<target>Λήξη</target>
+
 <source>Synchronization aborted!</source>
 <target>Ο συγχρονισμός ματαιώθηκε!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Ο συγχρονισμός ολοκληρώθηκε με σφάλματα!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Δεν υπάρχει τίποτα προς συγχρονισμό!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Ο συγχρονισμός ολοκληρώθηκε επιτυχώς!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Πατήστε "Εναλλαγή" για να ανοίξετε το γραφικό περιβάλλον του FreeFileSync</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Πατήστε "Εναλλαγή" για να επιλύσετε τα θέματα στο κεντρικό παράθυρο του FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Εναλλαγή στο γραφικό περιβάλλον του FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Επιστρέφοντας στο κεντρικό παράθυρο του FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Δεν είναι δυνατή η σύνδεση με το sourceforge.net!</target>
@@ -534,9 +537,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>Βρέθηκαν στοιχεία:</target>
 
-<source>Items remaining:</source>
-<target>Περισσεύουν στοιχεία:</target>
-
 <source>Speed:</source>
 <target>Ταχύτητα:</target>
 
@@ -588,8 +588,8 @@ The command line is executed each time:
 <source>&Load</source>
 <target>&Άνοιγμα</target>
 
-<source>&Cancel</source>
-<target>&Άκυρο</target>
+<source>Cancel</source>
+<target>Άκυρο</target>
 
 <source>Select variant:</source>
 <target>Επιλέξτε μια μέθοδο:</target>
@@ -639,8 +639,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>Η διένεξη / το αρχείο δεν μπορεί να κατηγοριοποιηθεί</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Σύγκριση με βάση το...</target>
@@ -675,9 +675,6 @@ is the same
 <source>Synchronizing...</source>
 <target>Γίνεται συγχρονισμός...</target>
 
-<source>Items processed:</source>
-<target>Επεξεργάστηκαν στοιχεία:</target>
-
 <source>&Pause</source>
 <target>&Παύση</target>
 
@@ -808,7 +805,7 @@ Exclude: \stuff\temp\*
 <target>Αντιγραφή κλειδωμένων αρχείων</target>
 
 <source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Αντιγραφή κλειδωμένων ή διαμοιρασμένων αρχείων με την υπηρεσία Volume Shadow Copy (απαιτεί δικαιώματα Administrator)</target>
+<target>Αντιγραφή κλειδωμένων ή διαμοιρασμένων αρχείων με την Yπηρεσία Σκιώδους Αντίγραφου Τόμου (απαιτεί δικαιώματα Administrator)</target>
 
 <source>Copy file access permissions</source>
 <target>Αντιγραφή των αδειών προσπέλασης των αρχείων</target>
@@ -1017,9 +1014,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>Ο κατάλογος των αρχείων έχει εξαχθεί!</target>
 
-<source>Error writing file:</source>
-<target>Σφάλμα κατά την εγγραφή του αρχείου:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1065,21 +1059,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>Σε παύση</target>
 
+<source>Initializing...</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>Continue</source>
-<target>Συνέχεια</target>
-
 <source>Cannot find %x</source>
 <target>Δεν μπορεί να βρεθεί το %x</target>
 
@@ -1218,65 +1212,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x μέρες</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Δεν ήταν δυνατό να γίνει έναρξη παρακολούθησης του υποκαταλόγου:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Σφάλμα κατά την παρακολούθηση υποκαταλόγων.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Δεν είναι δυνατή η παρακολύθηση του υποκαταλόγου %x.</target>
 
 <source>Conversion error:</source>
 <target>Σφάλμα μετατροπής:</target>
 
-<source>Error deleting file:</source>
-<target>Σφάλμα κατά τη διαγραφή του αρχείου:</target>
+<source>Cannot delete file %x.</source>
+<target>Δεν μπορεί να διαγραφεί το αρχείο %x.</target>
 
-<source>Error moving file:</source>
-<target>Σφάλμα κατά τη μεταφορά του αρχείου:</target>
+<source>The file is locked by another process:</source>
+<target>Το αρχείο είναι κλειδωμένο από μια άλλη διαδικασία:</target>
 
-<source>Target file already existing!</source>
-<target>Το αρχείο προορισμού υπάρχει ήδη!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Δεν μπορεί το αρχείο %x να μεταφερθεί στο %y.</target>
 
-<source>Error moving directory:</source>
-<target>Σφάλμα κατά τη μεταφορά του υποκαταλόγου:</target>
+<source>Cannot delete directory %x.</source>
+<target>Δεν μπορεί να διαγραφεί ο υποκατάλογος %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Ο υποκατάλογος προορισμού υπάρχει ήδη!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή της ώρας τροποποίησης του %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Σφάλμα κατά τη διαγραφή του υποκαταλόγου:</target>
+<source>Cannot find system function %x.</source>
+<target>Δεν ανευρίσκεται η λειτουργία συστήματος %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Σφάλμα κατά την αλλαγή της ώρας τροποποίησης:</target>
+<source>Cannot read security context of %x.</source>
+<target>Δεν μπορεί να αναγνωσθεί το περιβάλλον ασφαλείας του x%.</target>
 
-<source>Error loading library function:</source>
-<target>Σφάλμα κατά τη φόρτωση της συνάρτησης βιβλιοθήκης:</target>
+<source>Cannot write security context of %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή του περιβάλλοντος ασφαλείας του x%.</target>
 
-<source>Error reading security context:</source>
-<target>Σφάλμα κατά την ανάγνωση του πλαισίου ασφαλείας:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Δεν μπορούν να αναγνωσθούν οι άδειες προσπέλασης του %x.</target>
 
-<source>Error writing security context:</source>
-<target>Σφάλμα κατά την εγγραφή του πλαισίου ασφάλειας:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή των αδειών προσπέλασης του %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Σφάλμα κατά την αντιγραφή των αδειών των αρχείων:</target>
+<source>Cannot create directory %x.</source>
+<target>Δεν μπορεί να δημιουργηθεί ο υποκατάλογος %x.</target>
 
-<source>Error creating directory:</source>
-<target>Σφάλμα κατά τη δημιουργία του υποκαταλόγου:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Δεν μπορεί να αντιγραφεί ο συμβολικός δεσμός %x στο %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Σφάλμα κατά την αντιγραφή του συμβολικού δεσμού:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Δεν μπορεί να γίνει εγγραφή των χαρακτηριστικών αρχείου του %x.</target>
 
-<source>Error copying file:</source>
-<target>Σφάλμα κατά την αντιγραφή του αρχείου:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Δεν μπορεί να αντιγραφεί το αρχείο %x στο %y.</target>
 
-<source>Error traversing directory:</source>
-<target>Σφάλμα κατά την ανάλυση του υποκαταλόγου:</target>
+<source>Cannot read directory %x.</source>
+<target>Δεν μπορεί να αναγνωσθεί ο υποκατάλογος %x.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Ατέρμονος βρόχος κατά την την ανάλυση του υποκαταλόγου:</target>
+<source>Endless loop.</source>
+<target>Ατέρμων βρόχος.</target>
 
-<source>Error setting privilege:</source>
-<target>Σφάλμα κατά τον ορισμό δικαιωμάτων:</target>
+<source>Cannot set privilege %x.</source>
+<target>Τα δικαιώματα %x δεν μπορούν να οριστούν.</target>
+
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Το αρχείο %x δεν μπόρεσε να μεταφερθεί στον Κάδο Ανακύκλωσης!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Και οι δυο πλευρές έχουν αλλάξει από τον τελευταίο συγχρονισμό!</target>
@@ -1302,8 +1296,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Μπορείτε να αγνοήσετε αυτό το σφάλμα και να θεωρήσετε τον υποκατάλογο κενό.</target>
 
-<source>Directory does not exist:</source>
-<target>Ο υποκατάλογος δεν υπάρχει:</target>
+<source>Cannot find directory %x.</source>
+<target>Ο υποκατάλογος %x δεν μπορεί να βρεθεί.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Οι υποκατάλογοι είναι εξαρτώμενοι. Προσοχή κατά την εισαγωγή των κανόνων συγχρονισμού:</target>
@@ -1311,20 +1305,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Προετοιμασία του συγχρονισμού...</target>
 
-<source>Out of memory!</source>
-<target>Ανεπαρκής μνήμη!</target>
+<source>Conflict detected:</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>Symbolic links %x have the same date but a different target.</source>
+<target>Οι συμβολικοί δεσμοί %x έχουν την ίδια ημερομηνία αλλά διαφορετικό προορισμό.</target>
 
 <source>Comparing content of files %x</source>
 <target>Σύγκριση του περιεχομένου των αρχείων %x</target>
@@ -1407,12 +1398,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Δημιουργία του αρχείου %x</target>
 
-<source>Creating folder %x</source>
-<target>Δημιουργία του υποκαταλόγου %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Δημιουργία του συμβολικού δεσμού %x</target>
 
+<source>Creating folder %x</source>
+<target>Δημιουργία του υποκαταλόγου %x</target>
+
 <source>Overwriting file %x</source>
 <target>Αντικατάσταση του αρχείου %x</target>
 
@@ -1431,8 +1422,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Δεν έχει οριστεί υποκατάλογος για τη διατήρηση παλιών εκδόσεων!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Ο υποκατάλογος προέλευσης δεν υπάρχει πλέον:</target>
+<source>Source directory %x not found.</source>
+<target>Ο υποκατάλογος πηγής %x δεν βρέθηκε.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Υπάρχουν ανεπίλυτες διενέξεις!</target>
@@ -1467,12 +1458,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>Δημιουργία βάσης δεδομένων...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Δεν υπάρχει τίποτα προς συγχρονισμό!</target>
-
-<source>Unable to copy 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/hebrew.lng b/BUILD/Languages/hebrew.lng
index a55fd05f..7c2bb384 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -19,9 +19,15 @@
 <source>Browse directory</source>
 <target>עיין במחיצה</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>התקבלה בקשת ביטול: מחכה לפעולה הנוכחית להסתיים...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - סינכרון  אוטומטי</target>
 
+<source>Error</source>
+<target>שגיאה</target>
+
 <source>Select alternate comparison settings</source>
 <target>בחר הגדרות השוואה חליפיות</target>
 
@@ -52,9 +58,6 @@
 <source>About</source>
 <target>אודות</target>
 
-<source>Error</source>
-<target>שגיאה</target>
-
 <source>Warning</source>
 <target>אזהרה</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>קוד שגיאת לינוקס %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>שגיאה בפענוח קישור סימבולי (Symbolic Link)</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>לא יכול לפענח את הקישור הסימבולי %x.</target>
 
 <source>%x MB</source>
 <target>%x מגה בייט</target>
@@ -136,35 +139,41 @@
 <pluralform>%x בייט</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>שגיאה בקריאה מבסיס הנתונים של הסנכרון:</target>
+<source>Cannot read file %x.</source>
+<target>לא יכול לקרוא קובץ %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>שגיאה ברישום לבסיס נתוני סנכרון:</target>
+<source>Cannot write file %x.</source>
+<target>לא יכול לכתוב קובץ %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>מסד נתונים של הסנכרון לא תואם:</target>
+<source>Database file %x is incompatible.</source>
+<target>קובץ בסיס נתונים %x אינו במבנה מתאים.</target>
 
 <source>Initial synchronization:</source>
 <target>סנכרון ראשוני:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>אחד מקובצי בסיס הנתונים הבא עדיין לא קיים</target>
+<source>Database file %x does not yet exist.</source>
+<target>קובץ בסיס נתונים %x אינו קיים עדיין.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>קבצי בסיס הנתונים אינם חולקים ארוע סנכרון משותף:</target>
+<source>Out of memory!</source>
+<target>תם הזכרון!</target>
+
+<source>Database files do not share a common session.</source>
+<target>קבצי הנתונים אינם כוללים מופע פעילות משותף.</target>
 
 <source>An exception occurred!</source>
 <target>אירוע חריג!</target>
 
-<source>Error reading file attributes:</source>
-<target>שגיאה בקריאת תכונות קובץ:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>לא יכול לקרוא תכונות של קובץ %x.</target>
+
+<source>Cannot get process information.</source>
+<target>לא יכול לקבל את נתוני התהליך.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>ממתין כאשר  מחיצה נעולה (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>שגיאה בנעילת מחיצה:</target>
+<source>Cannot set directory lock %x.</source>
+<target>לא יכול להגדיר את נעילת מחיצה %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x שניות</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>שגיאה בקריאת קובץ:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>שגיאה בפענוח קובץ %x, שורה %y, טור %z.</target>
 
 <source>Scanning:</source>
 <target>סורק:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x תהליכונים]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>קובץ תצורה בלתי חוקי!</target>
+<source>/sec</source>
+<target>/שנ</target>
 
-<source>Error parsing configuration file:</source>
-<target>שגיאה בניתוח קובץ תצורה:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>קובץ %x אינו כולל תצורה תקינה.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>תצורה נטענה חלקית בלבד:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>קובץ תצורה %x נטען חלקית בלבד.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>לא יכול להעביר את %x לסל המיחזור!</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>לא יכול לגשת אל volume shadow copy service.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>אנא השתמש בגירסת 64-bit של FreeFileSync על מנת ליצר shadow copies במערכת הפעלה זו.</target>
 
 <source>Cannot load file %x.</source>
 <target>לא יכול לטעון קובץ %x!</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>שגיאה בגישה לשרות Volume Shadow Copy Service</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>לא נתמכת בגרסה זאת אנא התקן גרסה 64 WOW64 העתקת צל ב</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>לא יכול לקבוע שם כונן עבור קובץ:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>נתיב %x אינו כולל שם כרך.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>ככונן %x לא בנתיב של קובץ %y!</target>
 
-<source>/sec</source>
-<target>/שנ</target>
-
-<source>File does not exist:</source>
-<target>קובץ לא קיים:</target>
+<source>Cannot find file %x.</source>
+<target>לא יכול למצוא קובץ %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>לא יכול לקרוא את שמות צמתי XML:</target>
@@ -297,15 +300,18 @@ The command line is executed each time:
 <source>Start</source>
 <target>התחל</target>
 
+<source>&Retry</source>
+<target>&נסה שנית</target>
+
+<source>Cancel</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>
 
@@ -348,35 +354,38 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync הגדרות</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync עבודת אצווה</target>
-
-<source>Unable to create log file!</source>
-<target>לא מסוגל ליצור קובץ יומן!</target>
-
 <source>Batch execution</source>
 <target>פעולת אצווה</target>
 
-<source>Stop</source>
-<target>עצור</target>
+<source>Items processed:</source>
+<target>אלמנטים עובדו:</target>
+
+<source>Items remaining:</source>
+<target>אלמנתים נותרו:</target>
 
 <source>Total time:</source>
 <target>זמן כולל:</target>
 
+<source>Stop</source>
+<target>עצור</target>
+
 <source>Synchronization aborted!</source>
 <target>סינכרון בוטל!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>סנכרון הושלם עם שגיאות!</target>
 
+<source>Nothing to synchronize!</source>
+<target>אין מה לסנכרן!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>סינכרון הושלם בהצלחה!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>"לחץ" לפתיחת FreeFileSync בממשק גרפי.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>לחץ על "החלפה" בכדי לפתור בעיות בדיאלוג הראשי.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>החלף לתצורת ממשק חזותי...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>עובר לדיאלוג הראשי של FreeFileSync</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>אין תקשורת ל sourceforge.net!</target>
@@ -534,9 +543,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>אלמנטים נמצאו:</target>
 
-<source>Items remaining:</source>
-<target>אלמנתים נותרו:</target>
-
 <source>Speed:</source>
 <target>מהירות:</target>
 
@@ -588,9 +594,6 @@ The command line is executed each time:
 <source>&Load</source>
 <target>&טען</target>
 
-<source>&Cancel</source>
-<target>&בטל</target>
-
 <source>Select variant:</source>
 <target>בחר משתנה:</target>
 
@@ -639,8 +642,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>קונפליקט\קובץ אינו יכול לקבל סיווג</target>
 
-<source>&OK</source>
-<target>&אשר</target>
+<source>OK</source>
+<target>אשר</target>
 
 <source>Compare by...</source>
 <target>השווה ע"י...</target>
@@ -675,9 +678,6 @@ is the same
 <source>Synchronizing...</source>
 <target>מסנכרן...</target>
 
-<source>Items processed:</source>
-<target>אלמנטים עובדו:</target>
-
 <source>&Pause</source>
 <target>&עצור</target>
 
@@ -717,9 +717,6 @@ is the same
 <source>&Ignore</source>
 <target>&התעלם</target>
 
-<source>&Retry</source>
-<target>&נסה שנית</target>
-
 <source>Do not show this dialog again</source>
 <target>אל תראה מסך זה שנית</target>
 
@@ -1017,9 +1014,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>רשימת קבצים יוצאה!</target>
 
-<source>Error writing file:</source>
-<target>שגיאה בכתיבת קובץ:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1065,21 +1059,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>עצור</target>
 
+<source>Initializing...</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>Continue</source>
-<target>המשך</target>
-
 <source>Cannot find %x</source>
 <target>לא מוצא %x</target>
 
@@ -1218,65 +1212,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x ימים</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>לא יכול לאתחל ניטור מחיצה:</target>
-
-<source>Error when monitoring directories.</source>
-<target>שגיאה בזמן ניטור מחיצות.</target>
+<source>Cannot monitor directory %x.</source>
+<target>לא יכול לנטר מחיצה %x.</target>
 
 <source>Conversion error:</source>
 <target>שגיאה בהסבה:</target>
 
-<source>Error deleting file:</source>
-<target>שגיאה במחיקת קובץ:</target>
+<source>Cannot delete file %x.</source>
+<target>לא יכול למחוק קובץ %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>הקובץ נעול ע"י תהליך:</target>
 
-<source>Error moving file:</source>
-<target>שגיאה בהעברת קובץ:</target>
+<source>Cannot move file %x to %y.</source>
+<target>לא יכול להעביר קובץ %x אל %y.</target>
 
-<source>Target file already existing!</source>
-<target>קובץ מטרה כבר קיים!</target>
+<source>Cannot delete directory %x.</source>
+<target>לא יכול למחוק מחיצה %x.</target>
 
-<source>Error moving directory:</source>
-<target>שגיאה בהעברת מחיצה:</target>
+<source>Cannot write modification time of %x.</source>
+<target>לא יכול לרשום זמן שינוי של %x.</target>
 
-<source>Target directory already existing!</source>
-<target>מחיצת מטרה כבר קיימת!</target>
+<source>Cannot find system function %x.</source>
+<target>לא יכול למצוא פונקצית מערכת %x.</target>
 
-<source>Error deleting directory:</source>
-<target>שגיאה במחיקת מחיצה:</target>
+<source>Cannot read security context of %x.</source>
+<target>לא יכול לקרוא הקשר בטיחות של %x.</target>
 
-<source>Error changing modification time:</source>
-<target>שגיאה בשינוי זמן:</target>
+<source>Cannot write security context of %x.</source>
+<target>לא יכול לכתוב הקשר בטיחות של %x.</target>
 
-<source>Error loading library function:</source>
-<target>שגיאה בטעינת ספרית פונקציות:</target>
+<source>Cannot read permissions of %x.</source>
+<target>לא יכול לקרוא הרשאות של %x.</target>
 
-<source>Error reading security context:</source>
-<target>שגיאה בכתיבת הקשר בטיחות:</target>
+<source>Cannot write permissions of %x.</source>
+<target>לא יכול לכתוב הרשאות של %x.</target>
 
-<source>Error writing security context:</source>
-<target>שגיאה בכתיבת הקשר בטיחות:</target>
+<source>Cannot create directory %x.</source>
+<target>לא יכול ליצור מחיצה %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>שגיאה בהעתקת הרשאות קובץ:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>לא יכול להעתיק קישור סימבולי %x אל %y.</target>
 
-<source>Error creating directory:</source>
-<target>שגיאה ביצירת מחיצה:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>לא יכול לכתוב תכונות קובץ של %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>שגיאה בהעתקת קישור :</target>
+<source>Cannot copy file %x to %y.</source>
+<target>לא יכול להעתיק קובץ %x  אל %y.</target>
 
-<source>Error copying file:</source>
-<target>שגיאה בהעתקת קובץ:</target>
+<source>Cannot read directory %x.</source>
+<target>לא יכול לקרוא מחיצה %x.</target>
 
-<source>Error traversing directory:</source>
-<target>שגיאה בהצלבת מחיצות</target>
+<source>Endless loop.</source>
+<target>לולאה אינסופית.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>נוצרת לולאה אינסופית בחצית מחיצות</target>
+<source>Cannot set privilege %x.</source>
+<target>לא יכול להגדיר זבות %x.</target>
 
-<source>Error setting privilege:</source>
-<target>שגיאה בהשמת פריווילגיה</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>לא יכול להעביר את %x לסל המיחזור!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>שני הצדדים שונו מאז הסנכרון האחרון!</target>
@@ -1302,8 +1296,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>אפשר להתעלם משגיאה זו ולהניח כי המחיצה ריקה.</target>
 
-<source>Directory does not exist:</source>
-<target>מחיצה לא קיימת:</target>
+<source>Cannot find directory %x.</source>
+<target>לא יכול למצוא מחיצה %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>מחיצות תלויות! זהירות בהגדרת כללי סנכרון:</target>
@@ -1311,20 +1305,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>מכין סינכרון...</target>
 
-<source>Out of memory!</source>
-<target>תם הזכרון!</target>
+<source>Conflict detected:</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>Symbolic links %x have the same date but a different target.</source>
+<target>לקישורים סימבוליים %x יש תאריך זהה אבל יעד שונה.</target>
 
 <source>Comparing content of files %x</source>
 <target>השווה תכולה של קבצים %x</target>
@@ -1407,12 +1398,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>יוצר קובץ %x</target>
 
-<source>Creating folder %x</source>
-<target>יוצר מחיצה %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>יוצר קישור סימבולי %x</target>
 
+<source>Creating folder %x</source>
+<target>יוצר מחיצה %x</target>
+
 <source>Overwriting file %x</source>
 <target>דורס קובץ %x</target>
 
@@ -1431,8 +1422,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>לא סופקה מחיצה לרישום גרסאות קבצים</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>מחיצת המקור לא נמצאת:</target>
+<source>Source directory %x not found.</source>
+<target>מחיצת מקור %x לא נמצאה.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>קיים קונפליקט לא פתור!</target>
@@ -1467,12 +1458,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>מיצר בסיס נתונים...</target>
 
-<source>Nothing to synchronize!</source>
-<target>אין מה לסנכרן!</target>
-
-<source>Unable to copy 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 12c7ffb7..67b2ac34 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -19,9 +19,15 @@
 <source>Browse directory</source>
 <target>Mappa tallózása</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Megszakítási kérelem: Várakozás a folyamatban lévő művelet befejezésére...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatikus szinkronizálás</target>
 
+<source>Error</source>
+<target>Hiba</target>
+
 <source>Select alternate comparison settings</source>
 <target>Alternatív összehasonlítás beállításai</target>
 
@@ -52,9 +58,6 @@
 <source>About</source>
 <target>A programról</target>
 
-<source>Error</source>
-<target>Hiba</target>
-
 <source>Warning</source>
 <target>Figyelem</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux hibakód %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>A szimbolikus link feloldása sikertelen:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Sikertelen a következő symlink feloldása: %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bájt</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Hiba történt a szinkronizációs adatbázis olvasása közben:</target>
+<source>Cannot read file %x.</source>
+<target>A következő fájl olvasása sikertelen: %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Hiba történt a szinkronizációs adatbázis írása közben:</target>
+<source>Cannot write file %x.</source>
+<target>A következő fájl írása sikertelen: %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Inkompatibilis szinkronizációs adatbázis formátum:</target>
+<source>Database file %x is incompatible.</source>
+<target>Inkompatibilis adatbázisfájl: %x.</target>
 
 <source>Initial synchronization:</source>
 <target>Első szinkronizáció:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>A FreeFileSync egyik adatbázisfájlja nem létezik:</target>
+<source>Database file %x does not yet exist.</source>
+<target>A következő adatbázisfájl nem létezik: %x.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Az adatbázisfájlok nem osztoznak egy közös szinkronizációs munkameneten:</target>
+<source>Out of memory!</source>
+<target>Elfogyott a szabad memória!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Az adatbázisfájlok nem osztanak meg közös munkamenetet.</target>
 
 <source>An exception occurred!</source>
 <target>Kivétel keletkezett!</target>
 
-<source>Error reading file attributes:</source>
-<target>A fájl attribútumainak olvasása sikertelen:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>A következő fájl attribútumainak olvasása sikertelen: %x.</target>
+
+<source>Cannot get process information.</source>
+<target>A processzinformációk lekérdezése sikertelen.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Várakozás a mappa zárolásának a feloldására (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Hiba történt a mappa zárolása közben:</target>
+<source>Cannot set directory lock %x.</source>
+<target>A következő mappa zárolása sikertelen: %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x másodperc</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>A fájl olvasása sikertelen:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Hiba történt a fájl feldolgozása közben: %x fájl, %y sor, %z oszlop.</target>
 
 <source>Scanning:</source>
 <target>Vizsgálat:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x szál]</pluralform>
 </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>Error parsing configuration file:</source>
-<target>A beállításokat tartalmazó fájl feldolgozása sikertelen:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>A következő fájl nem tartalmaz érvényes beállításokat: %x.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>A beállításokat csak részben sikerült betölteni:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Csak részlegesen töltődött be a következő beállításokat tartalmazó fájl: %x.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>%x Lomtárba helyezése sikertelen!</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>A Volume Shadow Copy szolgáltatás elérése sikertelen.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Kérjük, használd a FreeFileSync 64 bites verzióját a shadow másolatok készítéséhez ezen a rendszeren.</target>
 
 <source>Cannot load file %x.</source>
 <target>%x fájl betöltése sikertelen.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Hiba történt a Volume Shadow Copy szolgáltatás elérése közben!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>A Shadow Copy a WOW64-en nem támogatott. Kérjük, használja a 64-bites FreeFileSync-et.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Nem lehet meghatározni a kötetnevet a következő fájlhoz:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>A következő útvonal nem tartalmaz kötetnevet: %x.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>A(z) %x kötetnevet nem tartalmazza a(z) %y fájlnév!</target>
 
-<source>/sec</source>
-<target>/másodperc</target>
-
-<source>File does not exist:</source>
-<target>A következő fájl nem létezik:</target>
+<source>Cannot find file %x.</source>
+<target>Nem található a következő fájl: %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>A következő XML elemek olvasása sikertelen:</target>
@@ -297,15 +300,18 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <source>Start</source>
 <target>Indítás</target>
 
+<source>&Retry</source>
+<target>&Ismét</target>
+
+<source>Cancel</source>
+<target>Mégsem</target>
+
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync beállítások</target>
 
-<source>File already exists. Overwrite?</source>
-<target>A fájl már létezik. Felülírjuk?</target>
-
 <source>&Restore</source>
 <target>&Visszaállítás</target>
 
@@ -348,35 +354,38 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync beállítások</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync kötegelt feladat</target>
-
-<source>Unable to create log file!</source>
-<target>Nem lehet létrehozni a naplófájlt!</target>
-
 <source>Batch execution</source>
 <target>Kötegelt végrehajtás</target>
 
-<source>Stop</source>
-<target>Megállítás</target>
+<source>Items processed:</source>
+<target>Feldolgozott elemek száma:</target>
+
+<source>Items remaining:</source>
+<target>Hátralévő elemek száma:</target>
 
 <source>Total time:</source>
 <target>Becsült idő:</target>
 
+<source>Stop</source>
+<target>Megállítás</target>
+
 <source>Synchronization aborted!</source>
 <target>A szinkronizáció megszakítva!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>A szinkronizáció befejeződött, de akadtak hibák!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Nincs mit szinkronizálni!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>A szinkronizáció sikeresen befejeződött!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Kérjük, nyomja meg a "Váltás" gombot a GUI mód megnyitásához.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Nyomg meg a "Váltás" gombot az események kezeléséhez a FreeFileSync fő párbeszédablakában.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Váltás a FreeFileSync GUI módjára...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Váltás a FreeFileSync fő párbeszédablakára...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>A csatlakozás a sourceforge.net-hez sikertelen!</target>
@@ -534,9 +543,6 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <source>Items found:</source>
 <target>Talált elemek száma:</target>
 
-<source>Items remaining:</source>
-<target>Hátralévő elemek száma:</target>
-
 <source>Speed:</source>
 <target>Sebesség:</target>
 
@@ -588,9 +594,6 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <source>&Load</source>
 <target>&Betöltés</target>
 
-<source>&Cancel</source>
-<target>&Mégsem</target>
-
 <source>Select variant:</source>
 <target>Változat kiválasztása:</target>
 
@@ -639,8 +642,8 @@ A parancssor végrehajtódik minden alkalommal, ha:
 <source>Conflict/file cannot be categorized</source>
 <target>Kategorizálhatatlan ütközések/fájlok</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Összehasonlítás</target>
@@ -673,9 +676,6 @@ A fájlok megegyeznek, ha megegyezik
 <source>Synchronizing...</source>
 <target>Szinkronizálás folyamatban...</target>
 
-<source>Items processed:</source>
-<target>Feldolgozott elemek száma:</target>
-
 <source>&Pause</source>
 <target>&Szünet</target>
 
@@ -718,9 +718,6 @@ a következő személyeknek:
 <source>&Ignore</source>
 <target>&Kihagy</target>
 
-<source>&Retry</source>
-<target>&Ismét</target>
-
 <source>Do not show this dialog again</source>
 <target>Ne mutasd újra ezt a párbeszédablakot</target>
 
@@ -1018,9 +1015,6 @@ Kizárni: \stuff\temp\*
 <source>File list exported!</source>
 <target>A fájllista exportálása befejeződött!</target>
 
-<source>Error writing file:</source>
-<target>A fájl írása sikertelen:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1066,21 +1060,21 @@ Kizárni: \stuff\temp\*
 <source>Paused</source>
 <target>Szüneteltetve</target>
 
+<source>Initializing...</source>
+<target>Inicializálás...</target>
+
 <source>Aborted</source>
 <target>Megszakítva</target>
 
 <source>Completed</source>
 <target>Befejezve</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Megszakítási kérelem: Várakozás a folyamatban lévő művelet befejezésére...</target>
+<source>Continue</source>
+<target>Folytatás</target>
 
 <source>Pause</source>
 <target>Szünet</target>
 
-<source>Continue</source>
-<target>Folytatás</target>
-
 <source>Cannot find %x</source>
 <target>Nem található: %x</target>
 
@@ -1219,65 +1213,65 @@ Kizárni: \stuff\temp\*
 <pluralform>%x nap</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>A mappafigyelés inicializálása sikertelen:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Hiba történt a mappák figyelése közben.</target>
+<source>Cannot monitor directory %x.</source>
+<target>A következő mappa monitorozása sikertelen: %x.</target>
 
 <source>Conversion error:</source>
 <target>Konverziós hiba:</target>
 
-<source>Error deleting file:</source>
-<target>A fájl törlése sikertelen:</target>
+<source>Cannot delete file %x.</source>
+<target>A következő fájl törlése sikertelen: %x.</target>
 
-<source>Error moving file:</source>
-<target>Hiba a fájl mozgatásakor:</target>
+<source>The file is locked by another process:</source>
+<target>A fájl zárolva van egy másik processz által:</target>
 
-<source>Target file already existing!</source>
-<target>A célként megadott fájl már létezik!</target>
+<source>Cannot move file %x to %y.</source>
+<target>%x fájl mozgatása %y fájlba sikertelen.</target>
 
-<source>Error moving directory:</source>
-<target>Hiba a mappa mozgatásakor:</target>
+<source>Cannot delete directory %x.</source>
+<target>A következő mappa törlése sikertelen: %x.</target>
 
-<source>Target directory already existing!</source>
-<target>A célmappa már létezik!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Az utolsó módosítás dátumának a beállítása sikertelen a következő fájlnál: %x.</target>
 
-<source>Error deleting directory:</source>
-<target>A mappa törlése sikertelen:</target>
+<source>Cannot find system function %x.</source>
+<target>Nem található a következő rendszerfunkció: %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Az utolsó változtatás dátumának módosítása sikertelen:</target>
+<source>Cannot read security context of %x.</source>
+<target>A következő fájl biztonsági tulajdonságainak olvasása sikertelen: %x.</target>
 
-<source>Error loading library function:</source>
-<target>A könyvtári funkció betöltése sikertelen:</target>
+<source>Cannot write security context of %x.</source>
+<target>A következő fájl biztonsági tulajdonságainak írása sikertelen: %x.</target>
 
-<source>Error reading security context:</source>
-<target>A biztonsági címke olvasása sikertelen:</target>
+<source>Cannot read permissions of %x.</source>
+<target>A következő fájl jogosultságainak az olvasása sikertelen: %x.</target>
 
-<source>Error writing security context:</source>
-<target>A biztonsági címke írása sikertelen:</target>
+<source>Cannot write permissions of %x.</source>
+<target>A következő fájl jogosultságainak az írása sikertelen: %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Hiba történt a fájl jogosultságainak másolása közben:</target>
+<source>Cannot create directory %x.</source>
+<target>A következő mappa létrehozása sikertelen: %x.</target>
 
-<source>Error creating directory:</source>
-<target>A mappa létrehozása sikertelen:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>%x symlink másolása a(z) %y symlinkbe sikertelen.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Hiba történt a szimbolikus link másolása közben:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>A következő fájl attribútumainak írása sikertelen: %x.</target>
 
-<source>Error copying file:</source>
-<target>A fájl másolása sikertelen:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>%x fájl másolása a(z) %y fájlba sikertelen.</target>
 
-<source>Error traversing directory:</source>
-<target>A mappa átnézése sikertelen:</target>
+<source>Cannot read directory %x.</source>
+<target>A következő mappa olvasása sikertelen: %x.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Végtelen hurok a mappák bejárásakor:</target>
+<source>Endless loop.</source>
+<target>Végtelen hurok.</target>
 
-<source>Error setting privilege:</source>
-<target>Hiba történt a jogok beállítása közben:</target>
+<source>Cannot set privilege %x.</source>
+<target>A következő privilégium beállítása sikertelen: %x.</target>
+
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>%x Lomtárba helyezése sikertelen!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Mindkét oldal megváltozott az utolsó szikronizálás óta!</target>
@@ -1303,8 +1297,8 @@ Kizárni: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Figyelmen kívül hagyhatod ezt a hibát, üresnek tekintve a mappát.</target>
 
-<source>Directory does not exist:</source>
-<target>A mappa nem létezik:</target>
+<source>Cannot find directory %x.</source>
+<target>Nem található a következő mappa: %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>A mappák függenek egymástól! Legyen óvatos, amikor megadja a szinkronizálási szabályokat:</target>
@@ -1312,20 +1306,17 @@ Kizárni: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Szinkronizálás előkészítése...</target>
 
-<source>Out of memory!</source>
-<target>Elfogyott a szabad memória!</target>
+<source>Conflict detected:</source>
+<target>Ütközés történt:</target>
 
 <source>File %x has an invalid date!</source>
 <target>A(z) %x fájlnak érvénytelen a dátuma!</target>
 
-<source>Conflict detected:</source>
-<target>Ütközés történt:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>A(z) %x fájlok dátuma megegyezik, de a mérete nem!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>A(z) %x symlinknek megegyezik a dátuma, de a célpontja nem!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>A következő symlinkeknek megegyezik a dátuma, de a célpontjuk különböző: %x.</target>
 
 <source>Comparing content of files %x</source>
 <target>%x fájlok tartalmának összehasonlítása</target>
@@ -1408,12 +1399,12 @@ Kizárni: \stuff\temp\*
 <source>Creating file %x</source>
 <target>%x fájl létrehozása</target>
 
-<source>Creating folder %x</source>
-<target>%x mappa létrehozása</target>
-
 <source>Creating symbolic link %x</source>
 <target>%x symlink létrehozása</target>
 
+<source>Creating folder %x</source>
+<target>%x mappa létrehozása</target>
+
 <source>Overwriting file %x</source>
 <target>%x fájl felülírása</target>
 
@@ -1432,8 +1423,8 @@ Kizárni: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Nem lett megadva mappa a fájlok verziókezeléséhez!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>A forrásként megadott mappa többé nem létezik:</target>
+<source>Source directory %x not found.</source>
+<target>Nem található a következő forrásmappa: %x.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Feloldatlan ütközések vannak!</target>
@@ -1468,12 +1459,6 @@ Kizárni: \stuff\temp\*
 <source>Generating database...</source>
 <target>Adatbázis generálása...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nincs mit szinkronizálni!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>A zárolt %x fájl másolása sikertelen!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Adatellenőrzési hiba: A forrás és cél fájl tartalma különbözik!</target>
 
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 1ba11fea..27523f4d 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -19,9 +19,15 @@
 <source>Browse directory</source>
 <target>Sfoglia cartelle</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Selezionata interruazione: conclusione dell'operazione...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronizzazione automatizzata</target>
 
+<source>Error</source>
+<target>Errore</target>
+
 <source>Select alternate comparison settings</source>
 <target>Seleziona impostazioni di comparazione alternative</target>
 
@@ -52,9 +58,6 @@
 <source>About</source>
 <target>Info su</target>
 
-<source>Error</source>
-<target>Errore</target>
-
 <source>Warning</source>
 <target>Attenzione</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux - Errore codice %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Errore nella risoluzione di collegamento simbolico:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target></target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Byte</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Errore in lettura dal database di sincronizzione:</target>
+<source>Cannot read file %x.</source>
+<target>Impossibile leggere il file %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Errore in scrittura sul database di sincronizzazione:</target>
+<source>Cannot write file %x.</source>
+<target>Impossibile scrivere il file %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Formato database di sincronizzazione incompatibile:</target>
+<source>Database file %x is incompatible.</source>
+<target>Il file database %x non è compatibile.</target>
 
 <source>Initial synchronization:</source>
 <target>Prima sincronizzazione:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Un file database di FreeFileSync non è ancora stato creato:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Il file database %x non è ancora stato creato.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>I file database non condividono una comune sessione di sincronizzazione:</target>
+<source>Out of memory!</source>
+<target>Memoria insufficiente!</target>
+
+<source>Database files do not share a common session.</source>
+<target>I file database non condividono una sessione comune.</target>
 
 <source>An exception occurred!</source>
-<target>Si è verificato una ececzione!</target>
+<target>Si è verificata una eccezione!</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Impossibile leggere gli attributi del file %x.</target>
 
-<source>Error reading file attributes:</source>
-<target>Errore di lettura degli attributi file:</target>
+<source>Cannot get process information.</source>
+<target>Impossibile ottenere informazioni sul processo.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Attendi mentre la cartella è bloccata (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Errore nell'impostazione del blocco cartella:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Impossibile impostare il blocco cartella %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x sec</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Errore durante la lettura del file:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Errore nel parsing del file %x, riga %y, colonna %z.</target>
 
 <source>Scanning:</source>
 <target>Analisi di:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x threads]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>File di configurazione FreeFileSync non valido!</target>
+<source>/sec</source>
+<target>/sec</target>
 
-<source>Error parsing configuration file:</source>
-<target>Errore nell'analisi del file di configurazione:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>Il file %x non contiene una configurazione valida.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Configurazione caricata solo parzialmente:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>File di configurazione %x caricato solo parzialmente.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Impossibile spostare %x nel Cestino!</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Impossibile accedere al servizio Volume Shadow Copy.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>E' necessario utilizzare FreeFileSync versione 64-bit per creare copie shadow su questo sistema.</target>
 
 <source>Cannot load file %x.</source>
 <target>Impossibile caricare il file %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Errore in accesso al servizio Volume Shadow Copy</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>La creazione di copie shadow su WOW64 non e' supportata. Utilizzare FreeFileSync in versione 64 bit.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Impossibile determinare il nome volume per il il file:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Il percorso %x non contiene un nome di volume.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Il nome volume %x non è parte del nome file %y!</target>
 
-<source>/sec</source>
-<target>/sec</target>
-
-<source>File does not exist:</source>
-<target>Il file non esiste:</target>
+<source>Cannot find file %x.</source>
+<target>Impossibile trovare il file %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Impossibile leggere i seguenti elementi XML:</target>
@@ -297,15 +300,18 @@ La linea di comando è eseguita ogni volta che:
 <source>Start</source>
 <target>Avvia</target>
 
+<source>&Retry</source>
+<target>&Riprova</target>
+
+<source>Cancel</source>
+<target>Annulla</target>
+
 <source>(Build: %x)</source>
 <target>(Versione: %x)</target>
 
 <source>RealtimeSync configuration</source>
 <target>Configurazione di RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Il file esiste già. Lo vuoi sovrascrivere?</target>
-
 <source>&Restore</source>
 <target>&Ripristina</target>
 
@@ -348,35 +354,38 @@ La linea di comando è eseguita ogni volta che:
 <source>FreeFileSync configuration</source>
 <target>Configurazione di FreeFileSync</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync job attività</target>
-
-<source>Unable to create log file!</source>
-<target>Impossibile creare il file del registro attività!</target>
-
 <source>Batch execution</source>
 <target>Esecuzione in batch</target>
 
-<source>Stop</source>
-<target>Stop</target>
+<source>Items processed:</source>
+<target>Elementi processati:</target>
+
+<source>Items remaining:</source>
+<target>Elementi rimanenti:</target>
 
 <source>Total time:</source>
 <target>Tempo totale:</target>
 
+<source>Stop</source>
+<target>Stop</target>
+
 <source>Synchronization aborted!</source>
 <target>Sincronizzazione abortita!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sincronizzazione completata con errori!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Non c'è nulla da sincronizzare!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Sincronizzazione completata con successo!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Premi "Switch" per aprire modalità GUI di FreeFileSync</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Premere "Passa" per risolvere i problemi nella finestra principale di FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Switch alla modalità GUI di FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Sto passando alla finestra principale di FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Impossibile collegarsi a sourceforge.net!</target>
@@ -534,9 +543,6 @@ La linea di comando è eseguita ogni volta che:
 <source>Items found:</source>
 <target>Elementi trovati:</target>
 
-<source>Items remaining:</source>
-<target>Elementi rimanenti:</target>
-
 <source>Speed:</source>
 <target>Velocita':</target>
 
@@ -588,9 +594,6 @@ La linea di comando è eseguita ogni volta che:
 <source>&Load</source>
 <target>&Carica</target>
 
-<source>&Cancel</source>
-<target>&Annulla</target>
-
 <source>Select variant:</source>
 <target>Seleziona una variante:</target>
 
@@ -639,8 +642,8 @@ La linea di comando è eseguita ogni volta che:
 <source>Conflict/file cannot be categorized</source>
 <target>I conflitti/file non possono essere categorizzati</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Compara per...</target>
@@ -675,9 +678,6 @@ I file sono considerati identici se
 <source>Synchronizing...</source>
 <target>Sincronizzazione...</target>
 
-<source>Items processed:</source>
-<target>Elementi processati:</target>
-
 <source>&Pause</source>
 <target>&Pausa</target>
 
@@ -717,14 +717,11 @@ I file sono considerati identici se
 <source>&Ignore</source>
 <target>&Ignora</target>
 
-<source>&Retry</source>
-<target>&Riprova</target>
-
 <source>Do not show this dialog again</source>
 <target>Non visualizzare più questo messaggio</target>
 
 <source>&Switch</source>
-<target>&Switch</target>
+<target>&Passa</target>
 
 <source>&Yes</source>
 <target>&Si</target>
@@ -1017,9 +1014,6 @@ Escludi: \stuff\temp\*
 <source>File list exported!</source>
 <target>Elenco file esportato!</target>
 
-<source>Error writing file:</source>
-<target>Errore durante la scrittura del file:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1065,21 +1059,21 @@ Escludi: \stuff\temp\*
 <source>Paused</source>
 <target>In pausa</target>
 
+<source>Initializing...</source>
+<target>Inizializzazione...</target>
+
 <source>Aborted</source>
 <target>Interrotto</target>
 
 <source>Completed</source>
 <target>Completato</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Selezionata interruazione: conclusione dell'operazione...</target>
+<source>Continue</source>
+<target>Continua</target>
 
 <source>Pause</source>
 <target>Pausa</target>
 
-<source>Continue</source>
-<target>Continua</target>
-
 <source>Cannot find %x</source>
 <target>Impossibile trovare %x</target>
 
@@ -1218,65 +1212,65 @@ Escludi: \stuff\temp\*
 <pluralform>%x giorni</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Monitoraggio cartella non inizializzabile:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Errore durante il monitoraggio cartella.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Impossibile monitorare la cartella %x.</target>
 
 <source>Conversion error:</source>
 <target>Errore di conversione:</target>
 
-<source>Error deleting file:</source>
-<target>Errore durante l'eliminazione del file:</target>
+<source>Cannot delete file %x.</source>
+<target>Impossibile eliminare il file %x.</target>
 
-<source>Error moving file:</source>
-<target>Errore nello spostamento file:</target>
+<source>The file is locked by another process:</source>
+<target>Il file è bloccato da un altro processo:</target>
 
-<source>Target file already existing!</source>
-<target>File destinazione già esistente!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Impossibile spostare il file %x in %y.</target>
 
-<source>Error moving directory:</source>
-<target>Errore nello spostamento directory:</target>
+<source>Cannot delete directory %x.</source>
+<target>Impossibile eliminare la cartella %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Cartella di destinazione già esistente!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Impossibile scrivere data e ora di modifica di %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Errore durante l'eliminazione delle cartella:</target>
+<source>Cannot find system function %x.</source>
+<target>Impossibile trovare funzione di sistema %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Errore durante la modifica della data:</target>
+<source>Cannot read security context of %x.</source>
+<target>Impossibile leggere il contesto di protezione di %x.</target>
 
-<source>Error loading library function:</source>
-<target>Errore nel caricamento della funzione libreria:</target>
+<source>Cannot write security context of %x.</source>
+<target>Impossibile scrivere il contesto di protezione di %x.</target>
 
-<source>Error reading security context:</source>
-<target>Errore in lettura del contesto di sicurezza:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Impossibile leggere i permessi di %x.</target>
 
-<source>Error writing security context:</source>
-<target>Errore in scrittura del contesto di sicurezza:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Impossibile scrivere i permessi di %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Errore durante la copia dei permessi su file:</target>
+<source>Cannot create directory %x.</source>
+<target>Impossibile creare cartella %x.</target>
 
-<source>Error creating directory:</source>
-<target>Errore durante la creazione della cartella:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Impossibile copiare collegamento simbolico %x su %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Errore durante la copia del link simbolico:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Impossibile scrivere attributi file di %x.</target>
 
-<source>Error copying file:</source>
-<target>Errore durante la copia del file:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Impossibile copiare file %x in %y.</target>
 
-<source>Error traversing directory:</source>
-<target>Errore nello spostamento cartella:</target>
+<source>Cannot read directory %x.</source>
+<target>Impossibile leggere cartella %x.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Loop senza fine nello spostamento cartella:</target>
+<source>Endless loop.</source>
+<target>Loop senza fine.</target>
 
-<source>Error setting privilege:</source>
-<target>Errore nell'impostazione dei privilegi:</target>
+<source>Cannot set privilege %x.</source>
+<target>Impossibile impostare privilegi %x.</target>
+
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Impossibile spostare %x nel Cestino!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Entrambi i lati sono cambiati dall'ultima sincronizzazione!</target>
@@ -1302,8 +1296,8 @@ Escludi: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Puoi ignorare questo errore per considerare la cartella come vuota.</target>
 
-<source>Directory does not exist:</source>
-<target>La cartella non esiste:</target>
+<source>Cannot find directory %x.</source>
+<target>Impossibile trovare cartella %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Le cartelle sono dipendenti! Fai attenzione quando configuri le regole di sincronizzazione:</target>
@@ -1311,20 +1305,17 @@ Escludi: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Preparazione sincronizzazione...</target>
 
-<source>Out of memory!</source>
-<target>Memoria insufficiente!</target>
+<source>Conflict detected:</source>
+<target>Rilevato conflitto:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Il file %x ha una data non valida!</target>
 
-<source>Conflict detected:</source>
-<target>Rilevato conflitto:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>I file %x hanno la stessa data ma dimensione diversa!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>I link simbolici %x hanno stessa data ma differente target!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Collegamento simbolico %x ha stessa data ma un diverso puntamento.</target>
 
 <source>Comparing content of files %x</source>
 <target>Comparazione contenuto del file %x</target>
@@ -1407,12 +1398,12 @@ Escludi: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Creazione file %x</target>
 
-<source>Creating folder %x</source>
-<target>Creazione cartella %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Creazione link simbolico %x</target>
 
+<source>Creating folder %x</source>
+<target>Creazione cartella %x</target>
+
 <source>Overwriting file %x</source>
 <target>Sovrascrittura file %x</target>
 
@@ -1431,8 +1422,8 @@ Escludi: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Non è stata indicata una cartella per il file delle versioni!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>La cartella sorgente non esiste più:</target>
+<source>Source directory %x not found.</source>
+<target>Cartella sorgente %x non trovata.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Sono presenti conflitti irrisolti!</target>
@@ -1467,12 +1458,6 @@ Escludi: \stuff\temp\*
 <source>Generating database...</source>
 <target>Generazione database...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Non c'è nulla da sincronizzare!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Impossibile copiare il file bloccato %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Errore nella verifica data: i file sorgente e destinazione hanno differente contenuto!</target>
 
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 9f04e478..1d7b1b65 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>ディレクトリを参照</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>ユーザによる中断: 現在の処理を終了しています.. お待ちください...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>リアルタイム同期 - 自動同期</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux エラーコード %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>シンボリックリンクの解決に失敗:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>シンボリックリンク %x を解決できません.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -135,35 +138,41 @@
 <pluralform>%x バイト</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>同期データベースからの読み込みエラー:</target>
+<source>Cannot read file %x.</source>
+<target>ファイル %x を読み込めません.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>同期データベースへの書き込みエラー:</target>
+<source>Cannot write file %x.</source>
+<target>ファイル %x に書き込めません.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>同期データベースの書式に互換性がありません:</target>
+<source>Database file %x is incompatible.</source>
+<target>データベース %x とは互換性がありません.</target>
 
 <source>Initial synchronization:</source>
 <target>同期処理の初期化:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>FreeFileSync データベースファイルが存在しません:</target>
+<source>Database file %x does not yet exist.</source>
+<target>データベース %x は存在しません.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>データベースファイルは一般的な同期セッションを共有しません:</target>
+<source>Out of memory!</source>
+<target>メモリが足りません!</target>
+
+<source>Database files do not share a common session.</source>
+<target>データベースは一般セッションで共有できません.</target>
 
 <source>An exception occurred!</source>
 <target>例外が発生しました!</target>
 
-<source>Error reading file attributes:</source>
-<target>ファイル属性の取得に失敗:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>%x のファイル属性を読み込めません.</target>
+
+<source>Cannot get process information.</source>
+<target>プロセス情報を取得できません.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>待機時間中ディレクトリはロックされます(%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>ディレクトリ設定に失敗(ロック):</target>
+<source>Cannot set directory lock %x.</source>
+<target>%x のロックをセットできません.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -173,8 +182,8 @@
 <pluralform>%x 秒.</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>ファイル読み込みエラー:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>ファイル %x の構文解析エラー, 行 %y, 列 %z.</target>
 
 <source>Scanning:</source>
 <target>スキャン:</target>
@@ -190,38 +199,32 @@
 <pluralform>[%x スレッド]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>無効な FreeFileSync 構成ファイルです!</target>
+<source>/sec</source>
+<target>/秒</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>ファイル %x には有効な構成が含まれていません.</target>
 
-<source>Error parsing configuration file:</source>
-<target>構成ファイルの構文に誤りがあります:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>構成ファイル %x は部分的のみ読み込まれます.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>部分的のみ読み込まれた構成:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>ﾎﾞﾘｭｰﾑｼｬﾄﾞｳｺﾋﾟｰｻｰﾋﾞｽにアクセス出来ません.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>%x をゴミ箱に移動できません!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>FreeFileSync 64-bit 版を使用してこのシステムにシャドウコピーを作成してください.</target>
 
 <source>Cannot load file %x.</source>
 <target>ファイル %x を読み込めません.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>ボリュームシャドウ・コピーサービスにアクセス出来ません!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>WOW64 では、ボリュームシャドウコピーに対応していません、FreeFileSync 64-bit 版をお試しください。</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>ファイルのボリューム名を解決出来ません:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>パス %x にはボリューム名が含まれていません.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>ボリューム名 %x にファイル名 %y はありません!</target>
 
-<source>/sec</source>
-<target>/秒</target>
-
-<source>File does not exist:</source>
-<target>ファイルが存在しません:</target>
+<source>Cannot find file %x.</source>
+<target>ファイル %x がみつかりません.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>次の XML要素を読み込めません:</target>
@@ -300,9 +303,6 @@ The command line is executed each time:
 <source>RealtimeSync configuration</source>
 <target>リアルタイム同期の構成設定</target>
 
-<source>File already exists. Overwrite?</source>
-<target>ファイルは存在します、上書きしますか?</target>
-
 <source>&Restore</source>
 <target>修復(&R)</target>
 
@@ -345,35 +345,38 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync 構成設定</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync 一括ジョブ</target>
-
-<source>Unable to create log file!</source>
-<target>ログファイルを作成出来ません!</target>
-
 <source>Batch execution</source>
 <target>一括処理を実行</target>
 
-<source>Stop</source>
-<target>停止</target>
+<source>Items processed:</source>
+<target>処理された要素:</target>
+
+<source>Items remaining:</source>
+<target>残りの要素:</target>
 
 <source>Total time:</source>
 <target>合計時間:</target>
 
+<source>Stop</source>
+<target>停止</target>
+
 <source>Synchronization aborted!</source>
 <target>同期処理を中断!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>同期処理は、エラーで終了しています!</target>
 
+<source>Nothing to synchronize!</source>
+<target>同期対象がありません!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>同期処理はすべて正常に完了しました!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>"切り替え" を押すと FreeFileSync GUI モードで開きます</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>"切り替え"を押すと FreeFileSync ダイアログの問題を解決します.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>FreeFileSync GUI モードの切り替え中...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>FreeFileSync メインダイアログを切替中...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Sourceforge.net に接続できません!</target>
@@ -531,9 +534,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>見つかった要素:</target>
 
-<source>Items remaining:</source>
-<target>残りの要素:</target>
-
 <source>Speed:</source>
 <target>速度:</target>
 
@@ -561,9 +561,6 @@ The command line is executed each time:
 <source>Right</source>
 <target>右側</target>
 
-<source>Sync setttings</source>
-<target>同期設定</target>
-
 <source>Status feedback</source>
 <target>状態 フィードバック</target>
 
@@ -588,8 +585,8 @@ The command line is executed each time:
 <source>&Load</source>
 <target>読み込み(&L)</target>
 
-<source>&Cancel</source>
-<target>キャンセル(&C)</target>
+<source>Cancel</source>
+<target>キャンセル</target>
 
 <source>Select variant:</source>
 <target>変数を選択:</target>
@@ -639,8 +636,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>競合があるため分類できません</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>比較対象...</target>
@@ -675,9 +672,6 @@ is the same
 <source>Synchronizing...</source>
 <target>同期処理中...</target>
 
-<source>Items processed:</source>
-<target>処理された要素:</target>
-
 <source>&Pause</source>
 <target>一時停止(&P)</target>
 
@@ -1017,9 +1011,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>ファイル一覧のエクスポートが完了!</target>
 
-<source>Error writing file:</source>
-<target>ファイル書き込みエラー:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1061,21 +1052,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>一時停止中</target>
 
+<source>Initializing...</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>Continue</source>
-<target>続行</target>
-
 <source>Cannot find %x</source>
 <target>%x は見つかりません</target>
 
@@ -1209,68 +1200,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x 日</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>監視するディレクトリを初期化できません:</target>
-
-<source>Error when monitoring directories.</source>
-<target>ディレクトリの監視エラー</target>
+<source>Cannot monitor directory %x.</source>
+<target>ディレクトリ %x を監視できません.</target>
 
 <source>Conversion error:</source>
 <target>変換エラー:</target>
 
-<source>Error deleting file:</source>
-<target>ファイルの削除エラー:</target>
+<source>Cannot delete file %x.</source>
+<target>ファイル %x を削除出来ません.</target>
 
-<source>Error moving file:</source>
-<target>ファイルの移動に失敗:</target>
+<source>The file is locked by another process:</source>
+<target>次のファイルは別のプロセスで使用中です:</target>
 
-<source>Target file already existing!</source>
-<target>対象ファイルは既に存在します!</target>
+<source>Cannot move file %x to %y.</source>
+<target>ファイル %x を %y に移動できません.</target>
 
-<source>Error moving directory:</source>
-<target>ディレクトリ移動に失敗:</target>
+<source>Cannot delete directory %x.</source>
+<target>ディレクトリ %x を削除できません.</target>
 
-<source>Target directory already existing!</source>
-<target>対象ディレクトリはすでに存在します!</target>
+<source>Cannot write modification time of %x.</source>
+<target>%x の更新時刻を書き込めませんでした.</target>
 
-<source>Error deleting directory:</source>
-<target>ディレクトリの削除エラー:</target>
+<source>Cannot find system function %x.</source>
+<target>システム関数 %x がみつかりません.</target>
 
-<source>Error changing modification time:</source>
-<target>時間の修正中のエラー:</target>
+<source>Cannot read security context of %x.</source>
+<target>%x のｾｷｭﾘﾃｨｺﾝﾃｷｽﾄを読み込めません.</target>
 
-<source>Error loading library function:</source>
-<target>ライブラリ読み込みエラー:</target>
+<source>Cannot write security context of %x.</source>
+<target>>%x のｾｷｭﾘﾃｨｺﾝﾃｷｽﾄを書き込めません.</target>
 
-<source>Error reading security context:</source>
-<target>セキュリティ・コンテキストの読み取りエラー:</target>
+<source>Cannot read permissions of %x.</source>
+<target>>%x のﾊﾟｰﾐｯｼｮﾝを読み込めません.</target>
 
-<source>Error writing security context:</source>
-<target>セキュリティ・コンテキストの書き込みエラー:</target>
+<source>Cannot write permissions of %x.</source>
+<target>%x のﾊﾟｰﾐｯｼｮﾝを書き込めません.</target>
 
-<source>Error copying file permissions:</source>
-<target>パーミッションコピー中のエラー</target>
+<source>Cannot create directory %x.</source>
+<target>ディレクトリ %x を作成出来ません.</target>
 
-<source>Error creating directory:</source>
-<target>ディレクトリ作成エラー:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>S リンクを %x から %y にコピーできません.</target>
 
-<source>Error copying symbolic link:</source>
-<target>シンボリックリンクのコピーに失敗:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>%x のファイル属性を書き込めません.</target>
 
-<source>Error copying file:</source>
-<target>ファイルのコピーに失敗:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>%x から %y にコピーできません.</target>
 
-<source>Error opening file:</source>
-<target>ファイルのオープンに失敗:</target>
+<source>Cannot read directory %x.</source>
+<target>ディレクトリ %x を読み込めません.</target>
 
-<source>Error traversing directory:</source>
-<target>ディレクトリの移動エラー:</target>
+<source>Endless loop.</source>
+<target>エンドレスループ</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>ディレクトリ移動中に無限ループが発生:</target>
+<source>Cannot set privilege %x.</source>
+<target>%x の特権をセットできません.</target>
 
-<source>Error setting privilege:</source>
-<target>特権の設定エラー:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>%x をゴミ箱に移動できません!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>前回最後の同期処理以降、両側とも変更があります!</target>
@@ -1296,8 +1284,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>ディレクトリが空と考慮する場合、このエラーは無視できます。</target>
 
-<source>Directory does not exist:</source>
-<target>ディレクトリが存在しません:</target>
+<source>Cannot find directory %x.</source>
+<target>ディレクトリ %x がみつかりません.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:</target>
@@ -1305,20 +1293,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>同期処理の準備中...</target>
 
-<source>Out of memory!</source>
-<target>メモリが足りません!</target>
+<source>Conflict detected:</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>Symbolic links %x have the same date but a different target.</source>
+<target>シンボリックリンク %x の日付は同じですが、対象が異なっています.</target>
 
 <source>Comparing content of files %x</source>
 <target>ファイル %x の内容を比較中</target>
@@ -1401,12 +1386,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>ファイル %x を作成中</target>
 
-<source>Creating folder %x</source>
-<target>フォルダ %x を作成中</target>
-
 <source>Creating symbolic link %x</source>
 <target>シンボリックリンク %x を作成中</target>
 
+<source>Creating folder %x</source>
+<target>フォルダ %x を作成中</target>
+
 <source>Overwriting file %x</source>
 <target>ファイル %x を上書き中</target>
 
@@ -1425,8 +1410,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>ファイルバージョンが利用できないディレクトリです!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>ソースディレクトリが存在しません:</target>
+<source>Source directory %x not found.</source>
+<target>ソースディレクトリ %x がみつかりません.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>未解決の不一致があります!</target>
@@ -1461,12 +1446,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>データベースを作成中...</target>
 
-<source>Nothing to synchronize!</source>
-<target>同期対象がありません!</target>
-
-<source>Unable to copy 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/korean.lng b/BUILD/Languages/korean.lng
index 36a10add..b7952f45 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>디렉토리 찾아보기</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>사용자에 의한 작업 중단 : 현재 작업 종료 대기 중...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>실시간 동기화 - 자동 동기화</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>리눅스 에러 코드 %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>심볼릭 링크를 해결하던 중 발생한 오류 :</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>심볼릭 링크 %x 을(를) 해결할 수 없습니다.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -135,35 +138,41 @@
 <pluralform>%x 바이트</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>동기화 데이터베이스로부터 읽어 들이던 중 발생한 오류 :</target>
+<source>Cannot read file %x.</source>
+<target>파일 %x 을(를) 읽을 수 없습니다.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>동기화 데이터베이스에 쓰던 중 발생한 오류 :</target>
+<source>Cannot write file %x.</source>
+<target>파일 %x 을(를) 쓸 수 없습니다.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>호환되지 않는 동기화 데이터베이스 형식 :</target>
+<source>Database file %x is incompatible.</source>
+<target>데이터베이스 파일 %x 은(는) 호환 불가능합니다.</target>
 
 <source>Initial synchronization:</source>
 <target>초기 동기화 :</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>FreeFileSync 데이터베이스 파일 중 하나가 아직 존재하지 않습니다 :</target>
+<source>Database file %x does not yet exist.</source>
+<target>데이터베이스 파일 %x 은(는) 아직 존재하지 않습니다.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>데이터베이스 파일이 공통 동기화 세션을 공유하지 않습니다 :</target>
+<source>Out of memory!</source>
+<target>메모리 부족!</target>
+
+<source>Database files do not share a common session.</source>
+<target>데이터베이스 파일이 일반/공동 세션을 공유하지 않습니다.</target>
 
 <source>An exception occurred!</source>
 <target>예외 발생!</target>
 
-<source>Error reading file attributes:</source>
-<target>파일 속성을 읽던 중 발생한 오류 :</target>
+<source>Cannot read file attributes of %x.</source>
+<target>%x의 파일 속성을 읽을 수 없습니다.</target>
+
+<source>Cannot get process information.</source>
+<target>프로세스 정보를 얻을 수 없습니다.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>디렉토리 잠금 대기 중 (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>디렉토리 잠금 설정 중 발생한 오류 :</target>
+<source>Cannot set directory lock %x.</source>
+<target>디렉토리 잠금 %x 을(를) 설정할 수 없습니다.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -173,8 +182,8 @@
 <pluralform>%x초</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>파일을 읽던 중 발생한 오류 :</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>분석 오류 - 파일: %x, 행: %y, 열: %z</target>
 
 <source>Scanning:</source>
 <target>스캔 :</target>
@@ -190,38 +199,32 @@
 <pluralform>[%x 스레드]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>잘못된 FreeFileSync 설정 파일!</target>
+<source>/sec</source>
+<target>/초</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>파일 %x 의 구성이 유효하지 않습니다.</target>
 
-<source>Error parsing configuration file:</source>
-<target>설정파일 분석 중 발생한 오류 :</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>구성 파일 %x 이(가) 부분적으로만 로드 되었음.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>구성이 부분적으로만 로드 됐습니다 :</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Volume Shadow Copy Service 접근 불가</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>%x 을(를) 휴지통으로 이동할 수 없습니다!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>본 운영체제에서의 Shadow Copy 생성은 FreeFileSync 64-비트 버전을 사용하세요.</target>
 
 <source>Cannot load file %x.</source>
 <target>파일 %x 을(를) 로드할 수 없습니다.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>볼륨 섀도 복사본 서비스에 액세스하던 중 오류 발생!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>WOW64 에서의 Shadow Copy 는 지원하지 않습니다. FreeFileSync 64-bit 버전을 사용하세요.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>파일의 볼륨 이름을 결정할 수 없습니다 :</target>
+<source>Path %x does not contain a volume name.</source>
+<target>경로 %x에 볼륨 이름이 없습니다.</target>
 
 <source>Volume name %x not part of file name %y!</source>
-<target>볼륨 이름 %x 이(가) 파일 이름 %y 의 일부가 아닙니다!</target>
+<target>볼륨 이름 %x 은(는) 파일 이름 %y 의 일부가 아님!</target>
 
-<source>/sec</source>
-<target>/초</target>
-
-<source>File does not exist:</source>
-<target>파일이 존재하지 않습니다 :</target>
+<source>Cannot find file %x.</source>
+<target>파일 %x 을(를) 찾을 수 없습니다.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>다음 XML 요소를 읽을 수 없습니다 :</target>
@@ -300,9 +303,6 @@ The command line is executed each time:
 <source>RealtimeSync configuration</source>
 <target>실시간 동기화 설정</target>
 
-<source>File already exists. Overwrite?</source>
-<target>파일이 이미 존재합니다. 덮어 쓰시겠습니까?</target>
-
 <source>&Restore</source>
 <target>복원(&R)</target>
 
@@ -345,35 +345,38 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync 구성 설정</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync 일괄 작업</target>
-
-<source>Unable to create log file!</source>
-<target>로그파일 생성을 할 수 없습니다!</target>
-
 <source>Batch execution</source>
 <target>일괄 실행</target>
 
-<source>Stop</source>
-<target>정지</target>
+<source>Items processed:</source>
+<target>처리된 항목 :</target>
+
+<source>Items remaining:</source>
+<target>남은 항목 :</target>
 
 <source>Total time:</source>
 <target>전체 시간 :</target>
 
+<source>Stop</source>
+<target>정지</target>
+
 <source>Synchronization aborted!</source>
 <target>동기화 중단!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>동기화가 완료되긴 했으나, 오류가 있습니다!</target>
 
+<source>Nothing to synchronize!</source>
+<target>동기화 할 항목이 없습니다!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>동기화가 성공적으로 완료 됐습니다!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>FreeFileSync GUI 모드는 "전환" 을 누르면 열립니다.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>FreeFileSync 메인 다이얼로그에서 문제 해결을 하려면 "Switch" [전환]을 누르십시오.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>FreeFileSync GUI 모드로 전환 중...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>FreeFileSync 메인 다이얼로그로 전환 중...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Sourceforge.net에 접속할 수 없습니다!</target>
@@ -531,9 +534,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>발견된 항목 :</target>
 
-<source>Items remaining:</source>
-<target>남은 항목 :</target>
-
 <source>Speed:</source>
 <target>속도 :</target>
 
@@ -561,9 +561,6 @@ The command line is executed each time:
 <source>Right</source>
 <target>우측</target>
 
-<source>Sync setttings</source>
-<target>싱크(동기화) 설정</target>
-
 <source>Status feedback</source>
 <target>상태 피드백</target>
 
@@ -588,8 +585,8 @@ The command line is executed each time:
 <source>&Load</source>
 <target>로드(&L)</target>
 
-<source>&Cancel</source>
-<target>취소(&C)</target>
+<source>Cancel</source>
+<target>취소</target>
 
 <source>Select variant:</source>
 <target>옵션 선택 :</target>
@@ -639,8 +636,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>충돌/파일 분류 불가능</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>대상 별 비교...</target>
@@ -675,9 +672,6 @@ is the same
 <source>Synchronizing...</source>
 <target>동기화 작업 중...</target>
 
-<source>Items processed:</source>
-<target>처리된 항목 :</target>
-
 <source>&Pause</source>
 <target>일시정지(&P)</target>
 
@@ -808,7 +802,7 @@ Exclude: \stuff\temp\*
 <target>락 걸린 파일 복사</target>
 
 <source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Volume Shadow Copy를 사용하여 공유 또는 락 걸린 파일을 복사 (관리자 권한 필요)</target>
+<target>Volume Shadow Copy Service를 사용하여 공유 또는 락 걸린 파일을 복사 (관리자 권한 필요)</target>
 
 <source>Copy file access permissions</source>
 <target>파일 접근 권한 복사</target>
@@ -1017,9 +1011,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>파일 리스트 내보내기 완료!</target>
 
-<source>Error writing file:</source>
-<target>파일을 쓰던 중 발생한 오류 :</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1061,21 +1052,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>일시정지 중</target>
 
+<source>Initializing...</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>Continue</source>
-<target>계속</target>
-
 <source>Cannot find %x</source>
 <target>%x 을(를) 찾을 수 없습니다.</target>
 
@@ -1174,7 +1165,7 @@ Exclude: \stuff\temp\*
 <target>파일</target>
 
 <source>Percentage</source>
-<target>퍼센티지(백분율)</target>
+<target>백분율(%)</target>
 
 <source>%x TB</source>
 <target>%x TB</target>
@@ -1209,68 +1200,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x일</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>디렉토리 모니터링을 초기화 할 수 없습니다 :</target>
-
-<source>Error when monitoring directories.</source>
-<target>디렉토리 모니터링 중 발생한 오류 :</target>
+<source>Cannot monitor directory %x.</source>
+<target>디렉토리 %x 을(를) 모니터링 할 수 없습니다.</target>
 
 <source>Conversion error:</source>
 <target>변환 오류 :</target>
 
-<source>Error deleting file:</source>
-<target>파일 삭제 중 발생한 오류 :</target>
+<source>Cannot delete file %x.</source>
+<target>파일 %x 을(를) 삭제할 수 없습니다.</target>
 
-<source>Error moving file:</source>
-<target>파일 이동 중 발생한 오류 :</target>
+<source>The file is locked by another process:</source>
+<target>파일이 다른 프로세스에 의해 잠겨 있습니다 :</target>
 
-<source>Target file already existing!</source>
-<target>대상 파일이 이미 존재합니다!</target>
+<source>Cannot move file %x to %y.</source>
+<target>파일 %x 을(를) %y (으)로 이동할 수 없습니다.</target>
 
-<source>Error moving directory:</source>
-<target>디렉토리 이동 중 발생한 오류 :</target>
+<source>Cannot delete directory %x.</source>
+<target>디렉토리 %x 을(를) 삭제할 수 없습니다.</target>
 
-<source>Target directory already existing!</source>
-<target>대상 디렉토리가 이미 존재합니다!</target>
+<source>Cannot write modification time of %x.</source>
+<target>%x의 수정 시간을 쓸 수 없습니다.</target>
 
-<source>Error deleting directory:</source>
-<target>디렉토리 삭제 중 발생한 오류 :</target>
+<source>Cannot find system function %x.</source>
+<target>시스템 함수 %x 을(를) 찾을 수 없습니다.</target>
 
-<source>Error changing modification time:</source>
-<target>시간 수정 중 발생한 오류 :</target>
+<source>Cannot read security context of %x.</source>
+<target>%x의 보안 컨텍스트를 읽을 수 없습니다.</target>
 
-<source>Error loading library function:</source>
-<target>라이브러리 기능 로드 중 발생한 오류 :</target>
+<source>Cannot write security context of %x.</source>
+<target>%x의 보안 컨텍스트를 쓸 수 없습니다.</target>
 
-<source>Error reading security context:</source>
-<target>보안 컨텍스트를 읽던 중 발생한 오류 :</target>
+<source>Cannot read permissions of %x.</source>
+<target>%x의 권한을 읽을 수 없습니다.</target>
 
-<source>Error writing security context:</source>
-<target>보안 컨텍스트를 쓰던 중 발생한 오류 :</target>
+<source>Cannot write permissions of %x.</source>
+<target>%x의 권한을 쓸 수 없습니다.</target>
 
-<source>Error copying file permissions:</source>
-<target>파일 권한 복사 중 발생한 오류 :</target>
+<source>Cannot create directory %x.</source>
+<target>디렉토리 %x 을(를) 생성할 수 없습니다.</target>
 
-<source>Error creating directory:</source>
-<target>디렉토리 생성 중 발생한 오류 :</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>심볼릭 링크 %x 을(를) %y (으)로 복사할 수 없습니다.</target>
 
-<source>Error copying symbolic link:</source>
-<target>심볼릭 링크 복사 중 발생한 오류 :</target>
+<source>Cannot write file attributes of %x.</source>
+<target>%x의 파일 속성을 쓸 수 없습니다.</target>
 
-<source>Error copying file:</source>
-<target>파일 복사 중 발생한 오류 :</target>
+<source>Cannot copy file %x to %y.</source>
+<target>파일 %x 을(를) %y (으)로 복사할 수 없습니다.</target>
 
-<source>Error opening file:</source>
-<target>파일을 열던 중 발생한 오류 :</target>
+<source>Cannot read directory %x.</source>
+<target>디렉토리 %x 을(를) 읽을 수 없습니다.</target>
 
-<source>Error traversing directory:</source>
-<target>디렉토리 이동 중 발생한 오류 :</target>
+<source>Endless loop.</source>
+<target>무한 루프</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>디렉토리 이동 중 무한 루프 발생 :</target>
+<source>Cannot set privilege %x.</source>
+<target>권한 %x 을(를) 설정할 수 없습니다.</target>
 
-<source>Error setting privilege:</source>
-<target>권한 설정 중 발생한 오류 :</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>%x 을(를) 휴지통으로 이동할 수 없습니다!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>마지막 동기화 작업 이후, 양측 모두 변경 되었습니다!</target>
@@ -1296,8 +1284,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>디렉토리가 비었다는 오류는 무시 가능합니다.</target>
 
-<source>Directory does not exist:</source>
-<target>디렉토리가 존재하지 않습니다 :</target>
+<source>Cannot find directory %x.</source>
+<target>디렉토리 %x 을(를) 찾을 수 없습니다.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>디렉토리가 의존 관계에 있습니다. 동기화 규칙 설정시 주의하십시오.</target>
@@ -1305,20 +1293,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>동기화 준비 중...</target>
 
-<source>Out of memory!</source>
-<target>메모리 부족!</target>
+<source>Conflict detected:</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>Symbolic links %x have the same date but a different target.</source>
+<target>심볼릭 링크 %x 의 날짜는 같으나, 타겟이 다릅니다.</target>
 
 <source>Comparing content of files %x</source>
 <target>파일 %x 내용 별 비교 중</target>
@@ -1381,32 +1366,32 @@ Exclude: \stuff\temp\*
 <target>심볼릭 링크 %x 삭제 중</target>
 
 <source>Moving file %x to recycle bin</source>
-<target>파일 %x를(을) 휴지통으로 이동 중</target>
+<target>파일 %x을(를) 휴지통으로 이동 중</target>
 
 <source>Moving folder %x to recycle bin</source>
-<target>폴더 %x를(을) 휴지통으로 이동 중</target>
+<target>폴더 %x을(를) 휴지통으로 이동 중</target>
 
 <source>Moving symbolic link %x to recycle bin</source>
-<target>심볼릭 링크 %x를(을) 휴지통으로 이동 중</target>
+<target>심볼릭 링크 %x을(를) 휴지통으로 이동 중</target>
 
 <source>Moving file %x to %y</source>
-<target>파일 %x를(을) %y(으)로 이동 중</target>
+<target>파일 %x을(를) %y(으)로 이동 중</target>
 
 <source>Moving folder %x to %y</source>
-<target>폴더 %x를(을) %y(으)로 이동 중</target>
+<target>폴더 %x을(를) %y(으)로 이동 중</target>
 
 <source>Moving symbolic link %x to %y</source>
-<target>심볼릭 링크 %x를(을) %y(으)로 이동 중</target>
+<target>심볼릭 링크 %x을(를) %y(으)로 이동 중</target>
 
 <source>Creating file %x</source>
 <target>파일 %x 생성 중</target>
 
-<source>Creating folder %x</source>
-<target>폴더 %x 생성 중</target>
-
 <source>Creating symbolic link %x</source>
 <target>심볼릭 링크 %x 생성 중</target>
 
+<source>Creating folder %x</source>
+<target>폴더 %x 생성 중</target>
+
 <source>Overwriting file %x</source>
 <target>파일 %x 덮어쓰는 중</target>
 
@@ -1425,8 +1410,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>파일 버저닝을 위한 디렉토리가 제공되지 않았습니다!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>소스 디렉토리가 더 이상 존재하지 않습니다 :</target>
+<source>Source directory %x not found.</source>
+<target>소스 디렉토리 %x 을(를) 찾을 수 없습니다.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>해결되지 않은 충돌이 있습니다!</target>
@@ -1461,12 +1446,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>데이터베이스 생성 중...</target>
 
-<source>Nothing to synchronize!</source>
-<target>동기화 할 항목이 없습니다!</target>
-
-<source>Unable to copy 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/lithuanian.lng b/BUILD/Languages/lithuanian.lng
new file mode 100644
index 00000000..9506c48c
--- /dev/null
+++ b/BUILD/Languages/lithuanian.lng
@@ -0,0 +1,1487 @@
+<header>
+	<language name>Lietuvių</language name>
+	<translator>Liudas Ališauskas</translator>
+	<locale>lt_LT</locale>
+	<flag file>lithuania.png</flag file>
+	<plural forms>4</plural forms>
+	<plural definition>n==1 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3</plural definition>
+</header>
+
+<source>Searching for directory %x...</source>
+<target>Iškoma aplanko %x...</target>
+
+<source>Show in Explorer</source>
+<target>Rodyti naršyklėje</target>
+
+<source>Open with default application</source>
+<target>Atverti su numatyta programa</target>
+
+<source>Browse directory</source>
+<target>Naršyti aplanką</target>
+
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Nutraukti: laukiama kol baigsis esama operacija...</target>
+
+<source>RealtimeSync - Automated Synchronization</source>
+<target>RealtimeSync - Automatizuotas sinchronizavimas</target>
+
+<source>Error</source>
+<target>Klaida</target>
+
+<source>Select alternate comparison settings</source>
+<target>Pasirinkite alternatyvius sulyginimo nustatymus</target>
+
+<source>Select alternate synchronization settings</source>
+<target>Pasirinkite alternatyvius sinchronizavimo nustatymus</target>
+
+<source>No filter selected</source>
+<target>Nepažymėti jokie filtrai</target>
+
+<source>Filter is active</source>
+<target>Filtas yra aktyvus</target>
+
+<source>Remove alternate settings</source>
+<target>Pašalinti alternatyvius nustatymus</target>
+
+<source>Clear filter settings</source>
+<target>Išvalyti filtro nustatymus</target>
+
+<source>Create a batch job</source>
+<target>Sukurti paketinę užduotį</target>
+
+<source>Synchronization settings</source>
+<target>Sinchronizavimo nustatymai</target>
+
+<source>Comparison settings</source>
+<target>Sulyginimo nustatymai</target>
+
+<source>About</source>
+<target>Apie</target>
+
+<source>Warning</source>
+<target>Perspėjimas</target>
+
+<source>Question</source>
+<target>Klausimas</target>
+
+<source>Confirm</source>
+<target>Patvirtinti</target>
+
+<source>Configure filter</source>
+<target>Nustatyti filtrą</target>
+
+<source>Global settings</source>
+<target>Bendri nustatymai</target>
+
+<source>Synchronization Preview</source>
+<target>Sinchronizavimo peržiūra</target>
+
+<source>Find</source>
+<target>Rasti</target>
+
+<source>Select time span</source>
+<target>Pažymėti laiko trukmę</target>
+
+<source>Show pop-up</source>
+<target>Rodyti pranešimą</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Rodyti pranešimą esant klaidoms ar perspėjimams</target>
+
+<source>Ignore errors</source>
+<target>Ignoruoti klaidas</target>
+
+<source>Hide all error and warning messages</source>
+<target>Slėpti visus klaidų ir perspėjimų pranešimus</target>
+
+<source>Exit instantly</source>
+<target>Išeiti iškart</target>
+
+<source>Abort synchronization immediately</source>
+<target>Atšaukti sinchronizavimą dabar</target>
+
+<source>Browse</source>
+<target>Naršyti</target>
+
+<source>Invalid command line: %x</source>
+<target>Netinkama komandinė eilutė: %x</target>
+
+<source>Info</source>
+<target>Informacija</target>
+
+<source>Fatal Error</source>
+<target>Kritinė klaida</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows klaidos kodas %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux klaidos kodas %x:</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nepavyksta išspręsti simbolinės nuorodos.</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 Baitas</pluralform>
+<pluralform>%x Baitai</pluralform>
+<pluralform>%x Baitų</pluralform>
+<pluralform>%x Baitai</pluralform>
+</target>
+
+<source>Cannot read file %x.</source>
+<target>Nepavyksta nuskaityti failo %x.</target>
+
+<source>Cannot write file %x.</source>
+<target>Nepavyksta įrašyti failo %x.</target>
+
+<source>Database file %x is incompatible.</source>
+<target>Duomenų bazė %x yra netinkama.</target>
+
+<source>Initial synchronization:</source>
+<target>Pirminis sinchronizavimas:</target>
+
+<source>Database file %x does not yet exist.</source>
+<target>Duomenų bazės failo %x dar nėra.</target>
+
+<source>Out of memory!</source>
+<target>Trūksta atminties!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Duomenų bazės failai nesidalina bendros sesijos.</target>
+
+<source>An exception occurred!</source>
+<target>Atsirado išimtis!</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Nepavyksta nuskaityti failo atributų</target>
+
+<source>Cannot get process information.</source>
+<target>Nepavyksta gauti eigos informacijos.</target>
+
+<source>Waiting while directory is locked (%x)...</source>
+<target>Laikiama kol aplankas bus užrakintas (%x)...</target>
+
+<source>Cannot set directory lock %x.</source>
+<target>Nepavyksta nustatyti aplanko užrakto %x.</target>
+
+<source>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
+</source>
+<target>
+<pluralform>1 sek</pluralform>
+<pluralform>%x sek</pluralform>
+<pluralform>%x sek</pluralform>
+<pluralform>%x sek</pluralform>
+</target>
+
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Klaida trinant failą %x, eilė %y, stulpelis %z.</target>
+
+<source>Scanning:</source>
+<target>Skenuojama:</target>
+
+<source>Encoding extended time information: %x</source>
+<target>Koduojama išplėstinė laiko informacija: %x</target>
+
+<source>
+<pluralform>[1 Thread]</pluralform>
+<pluralform>[%x Threads]</pluralform>
+</source>
+<target>
+<pluralform>[1 Grėsmė]</pluralform>
+<pluralform>[%x Grėsmės]</pluralform>
+<pluralform>[%x Grėsmių]</pluralform>
+<pluralform>[%x Grėsmės]</pluralform>
+</target>
+
+<source>/sec</source>
+<target>/sek.</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Failas %x neturi tinkamų nustatymų.</target>
+
+<source>Configuration file %x loaded partially only.</source>
+<target>Nustatymų failas %x įkeltas tik dalinai.</target>
+
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Nepavyksta apsiekti tomo šėšėlinio kopijavimo tarnybos.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Prašome naudoti 64-bit FreeFileSync versiją, kad sukurti šėšėlines kopijas šioje sistemoje.</target>
+
+<source>Cannot load file %x.</source>
+<target>Nepavyksta įkelti failo %x.</target>
+
+<source>Path %x does not contain a volume name.</source>
+<target>Kelias %x neturi tomo pavadinimo.</target>
+
+<source>Volume name %x not part of file name %y!</source>
+<target>Tomo pavadinimas %x nėra dalis failo pavadinimo %y!</target>
+
+<source>Cannot find file %x.</source>
+<target>Nepavyksta rasti failo %x.</target>
+
+<source>Cannot read the following XML elements:</source>
+<target>Nepavyksta perskaityti sekančių XML elementų:</target>
+
+<source>S&ave configuration...</source>
+<target>Išs&augoti nustatymus...</target>
+
+<source>&Load configuration...</source>
+<target>Įke&lti nustatymus...</target>
+
+<source>&Quit</source>
+<target>&Išeiti</target>
+
+<source>&File</source>
+<target>&Failas</target>
+
+<source>&Content</source>
+<target>&Turinys</target>
+
+<source>&About...</source>
+<target>&Apie...</target>
+
+<source>&Help</source>
+<target>&Pagalba</target>
+
+<source>Usage:</source>
+<target>Naudojimas:</target>
+
+<source>1. Select directories to monitor.</source>
+<target>1. Pažymėti aplankus stebėjimui.</target>
+
+<source>2. Enter a command line.</source>
+<target>2. Įvesti komandinę eilutę.</target>
+
+<source>3. Press 'Start'.</source>
+<target>3. Spauskite „Pradėti“'.</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>
+Komandinė eilutė yra įvykdoma kas kart:
+- visi aplankai tampa pasiekiamais (pvz. USB atmintukas įkišamas)
+- failai šiuose aplankuose ar poaplankiuose yra pakeisti
+</target>
+
+<source>Directories to watch</source>
+<target>Aplankai stebėjimui</target>
+
+<source>Add folder</source>
+<target>Pridėti aplanką</target>
+
+<source>Remove folder</source>
+<target>Pašalinti aplanką</target>
+
+<source>Select a folder</source>
+<target>Pažymėti aplanką</target>
+
+<source>Command line</source>
+<target>Komandinė eilutė</target>
+
+<source>Minimum Idle Time [seconds]</source>
+<target>Mažiausias neveikimo laikas [sekundės]</target>
+
+<source>Idle time between detection of last change and execution of command line in seconds</source>
+<target>Neveikimo laikas tarp paskutinio pakeitimo nustatymo ir komandinės eilutės įvykdymo sekundėmis</target>
+
+<source>Start</source>
+<target>Pradėti</target>
+
+<source>&Retry</source>
+<target>&Bandyti vėl</target>
+
+<source>Cancel</source>
+<target>Atšaukti</target>
+
+<source>(Build: %x)</source>
+<target>(Komponavimo versija: %x)</target>
+
+<source>RealtimeSync configuration</source>
+<target>RealtimeSync nustatymai</target>
+
+<source>&Restore</source>
+<target>&Atstatyti</target>
+
+<source>&Exit</source>
+<target>&Išeiti</target>
+
+<source>Monitoring active...</source>
+<target>Stebėjimas aktyvus...</target>
+
+<source>Waiting for missing directories...</source>
+<target>Laikiama trūkstamų aplankų...</target>
+
+<source>A directory input field is empty.</source>
+<target>Aplanko įvedimo laukelis yra tuščias.</target>
+
+<source>Logging</source>
+<target>Užduoties duomenys</target>
+
+<source>File time and size</source>
+<target>Failo laiką ir dydį</target>
+
+<source>File content</source>
+<target>Failo turinį</target>
+
+<source><Automatic></source>
+<target><Automatiškai></target>
+
+<source>Mirror ->></source>
+<target>Veidrodis ->></target>
+
+<source>Update -></source>
+<target>Atnaujinti -></target>
+
+<source>Custom</source>
+<target>Savitas</target>
+
+<source>FreeFileSync batch file</source>
+<target>FreeFileSync paketinės užduoties failas</target>
+
+<source>FreeFileSync configuration</source>
+<target>FreeFileSync nustatymai</target>
+
+<source>Batch execution</source>
+<target>Paketinės užduoties vykdymas</target>
+
+<source>Items processed:</source>
+<target>Elementų apdorota:</target>
+
+<source>Items remaining:</source>
+<target>Likę elementai:</target>
+
+<source>Total time:</source>
+<target>Visas laikas:</target>
+
+<source>Stop</source>
+<target>Stabdyti</target>
+
+<source>Synchronization aborted!</source>
+<target>Synchronizavimas nutrauktas!</target>
+
+<source>Synchronization completed with errors!</source>
+<target>Synchronizavimas baigtas su klaidomis!</target>
+
+<source>Nothing to synchronize!</source>
+<target>Nėra ko sinchronizuoti!</target>
+
+<source>Synchronization completed successfully!</source>
+<target>Synchronizavimas baigtas sėkmingai!</target>
+
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Spauskite „Perjungti“, kad išspręsti problemas pagrindiniame FreeFileSync lange.</target>
+
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Perjungiama į pagrindinį FreeFileSync langą...</target>
+
+<source>Unable to connect to sourceforge.net!</source>
+<target>Nepavyksta prisijungti prie sourceforge.net!</target>
+
+<source>A newer version of FreeFileSync is available:</source>
+<target>Naujesnė FreeFileSync versija yra pasiekiama:</target>
+
+<source>Download now?</source>
+<target>Atsiųsti dabar?</target>
+
+<source>Information</source>
+<target>Informacija</target>
+
+<source>FreeFileSync is up to date!</source>
+<target>FreeFileSync yra naujausia!</target>
+
+<source>Do you want FreeFileSync to automatically check for updates every week?</source>
+<target>Ar tikrai norite, kad FreeFileSync automatiškai ieškoti atnaujinimų kiekvieną savaitę?</target>
+
+<source>(Requires an Internet connection!)</source>
+<target>(Reikalingas interneto ryšys!)</target>
+
+<source><Symlink></source>
+<target><Simbolinė nuoroda></target>
+
+<source><Directory></source>
+<target><Aplankas></target>
+
+<source>Full path</source>
+<target>Pilnas kelias</target>
+
+<source>Name</source>
+<target>Pavadinimas</target>
+
+<source>Relative path</source>
+<target>Atitinkamas kelias</target>
+
+<source>Directory</source>
+<target>Aplankas</target>
+
+<source>Size</source>
+<target>Dydis</target>
+
+<source>Date</source>
+<target>Data</target>
+
+<source>Extension</source>
+<target>Plėtinys</target>
+
+<source>Comparison Result</source>
+<target>Sulyginimo rezultatas</target>
+
+<source>Drag && drop</source>
+<target>Vilkti ir numesti</target>
+
+<source>Close progress dialog</source>
+<target>Uždaryti eigos langą</target>
+
+<source>Shut down</source>
+<target>Išjungti kompiuterį</target>
+
+<source>Log off</source>
+<target>Atsijungti</target>
+
+<source>Standby</source>
+<target>Stabdyti į diską</target>
+
+<source>Hibernate</source>
+<target>Stabdyti į operatyviąją atmintį</target>
+
+<source>1. &Compare</source>
+<target>1. &Sulyginti</target>
+
+<source>2. &Synchronize...</source>
+<target>2. &Sinchronizuoti...</target>
+
+<source>&New</source>
+<target>&Naujas</target>
+
+<source>&Program</source>
+<target>&Programa</target>
+
+<source>&Language</source>
+<target>&Kalba</target>
+
+<source>&Global settings...</source>
+<target>&Bendri nustatymai...</target>
+
+<source>&Create batch job...</source>
+<target>&Sukurti paketinę užduotį...</target>
+
+<source>&Export file list...</source>
+<target>&Eksportuoti failų sąrašą...</target>
+
+<source>&Advanced</source>
+<target>&Išsamiau</target>
+
+<source>&Check for new version</source>
+<target>&Tikrinti dėl atnaujinimų</target>
+
+<source>Compare</source>
+<target>Sulyginti</target>
+
+<source>Compare both sides</source>
+<target>Sulyginti abi puses</target>
+
+<source>&Abort</source>
+<target>&Nutraukti</target>
+
+<source>Synchronize...</source>
+<target>Sinchronizuoti...</target>
+
+<source>Start synchronization</source>
+<target>Pradėti sinchronizavimą</target>
+
+<source>Add folder pair</source>
+<target>Pridėti aplankų porą</target>
+
+<source>Remove folder pair</source>
+<target>Pašalinti aplankų porą</target>
+
+<source>Swap sides</source>
+<target>Sukeisti puses</target>
+
+<source>Save current configuration to file</source>
+<target>Išsaugoti esamus nustatymus į failą</target>
+
+<source>Load configuration from file</source>
+<target>Įkelti nustatymus iš failo</target>
+
+<source>Last used configurations (press DEL to remove from list)</source>
+<target>Paskiausiai naudoti nustatymai (spauskite DEL, kad pašalinti iš sąrašo)</target>
+
+<source>Hide excluded items</source>
+<target>Slėpti neįtrauktus elementus</target>
+
+<source>Hide filtered or temporarily excluded files</source>
+<target>Slėpti išfiltruotus ar laikinai neįtrauktus failus</target>
+
+<source>Number of files and directories that will be created</source>
+<target>Skaičius failų ir aplankų, kurie bus sukurti</target>
+
+<source>Number of files that will be overwritten</source>
+<target>Skaičius failų, kurie bus perrašyti</target>
+
+<source>Number of files and directories that will be deleted</source>
+<target>Skaičius failų ir aplankų, kurie bus ištrinti</target>
+
+<source>Total amount of data that will be transferred</source>
+<target>Visas duomenų kiekis, kuris bus perduotas</target>
+
+<source>Operation:</source>
+<target>Operacija:</target>
+
+<source>Items found:</source>
+<target>Rasta elementų:</target>
+
+<source>Speed:</source>
+<target>Greitis:</target>
+
+<source>Remaining time:</source>
+<target>Likęs laikas:</target>
+
+<source>Elapsed time:</source>
+<target>Praėjęs laikas:</target>
+
+<source>Batch job</source>
+<target>Paketinė užduotis</target>
+
+<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
+<target>Sukurti paketinės užduoties failą ir automatizuoti sinchronizavimą. Kad paleisti paketinės užduoties veiksenoje tiesiog du kartus spustelėkite ant šio failo arba paleiskite komandą: FreeFileSync.exe SyncJob.ffs_batch. Tai taip pat gali būti įtraukta į Jūsų sistemos užduočių tvarkyklės planą.</target>
+
+<source>Help</source>
+<target>Pagalba</target>
+
+<source>Filter files</source>
+<target>Filtruoti failus</target>
+
+<source>Left</source>
+<target>Kairė</target>
+
+<source>Right</source>
+<target>Dešinė</target>
+
+<source>Status feedback</source>
+<target>Būsenos grįžtamasis ryšys</target>
+
+<source>Show progress dialog</source>
+<target>Rodyti eigos langą</target>
+
+<source>Error handling</source>
+<target>Klaidų valdymas</target>
+
+<source>Maximum number of log files:</source>
+<target>Didžiausias ataskaitų failų skaičius:</target>
+
+<source>Select log file directory:</source>
+<target>Pažymėti ataskaitos failų aplanką:</target>
+
+<source>Batch settings</source>
+<target>Paketinės užduoties nustatymai</target>
+
+<source>&Save</source>
+<target>&Išsaugoti</target>
+
+<source>&Load</source>
+<target>Į&kelti</target>
+
+<source>Select variant:</source>
+<target>Pažymėkite variantą:</target>
+
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Nustatyti ir siūlyti pokeitimus abiejose pusėse naudojant duomenų bazę. Trinimai, pervardinimas ir konfliktai yra nustatomi automatiškai.</target>
+
+<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
+<target>Veidrodinė kairiojo aplanko kopija. Dešinysis aplankas yra pakeičiamas taip, kad po sinchronizavimo tiksliai atitiktų kairyjį aplanką.</target>
+
+<source>Copy new or updated files to right folder.</source>
+<target>Kopijuoti naujus ar atnaujintus failus į dešinyjį aplanką.</target>
+
+<source>Configure your own synchronization rules.</source>
+<target>Nustatyti Jūsų pačių sinchronizavimo taisykles.</target>
+
+<source>Deletion handling</source>
+<target>Trinimo valdymas</target>
+
+<source>On completion:</source>
+<target>Baigus:</target>
+
+<source>Configuration</source>
+<target>Nustatymai</target>
+
+<source>Category</source>
+<target>Kategorija</target>
+
+<source>Action</source>
+<target>Veiksmas</target>
+
+<source>File/folder exists on left side only</source>
+<target>Failas/aplankas egzistuoja tik kairiame aplanke</target>
+
+<source>File/folder exists on right side only</source>
+<target>Failas/aplankas egzistuoja tik dešiniame aplanke</target>
+
+<source>Left file is newer</source>
+<target>Kairysis failas yra naujesnis</target>
+
+<source>Right file is newer</source>
+<target>Dešinysis failas yra naujesnis</target>
+
+<source>Files have different content</source>
+<target>Failai turi skirtingą turinį</target>
+
+<source>Conflict/file cannot be categorized</source>
+<target>Konfliktas/failo negalima kategorizuoti</target>
+
+<source>OK</source>
+<target>Gerai</target>
+
+<source>Compare by...</source>
+<target>Sulyginti pagal...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Failai laikomi lygiais jei
+     - paskutinis rašymo laikas ir data
+     - failo dydis
+yra tokie patys
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Failai laikomi lygiais jei
+     - failo turinys
+yra toks pats
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Simbolinių nuorodų valdymas</target>
+
+<source>Synchronizing...</source>
+<target>Sinchronizuojama...</target>
+
+<source>&Pause</source>
+<target>&Pauzė</target>
+
+<source>Source code written in C++ utilizing:</source>
+<target>Šaltinio kodas parašytas su C++ naudojant:</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Nuomonė ir patarimai laukiami</target>
+
+<source>Homepage</source>
+<target>Namų puslapis</target>
+
+<source>FreeFileSync at Sourceforge</source>
+<target>FreeFileSync svetainėje Sourceforge</target>
+
+<source>Email</source>
+<target>El. paštas</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Didelė padėka už FreeFileSync vertimą reiškiama:</target>
+
+<source>If you like FreeFileSync</source>
+<target>Jei Jums patinka FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Paremkite per PayPal</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Platinama su GNU General Public licenzija</target>
+
+<source>Ignore further errors</source>
+<target>Ignoruoti tolimesnes klaidas</target>
+
+<source>Hide further error messages during the current process</source>
+<target>Slėpti tolimesnius klaidų pranešimus per esamą procesą</target>
+
+<source>&Ignore</source>
+<target>&Ignoruoti</target>
+
+<source>Do not show this dialog again</source>
+<target>Nerodyti šio lango daugiau</target>
+
+<source>&Switch</source>
+<target>&Perjungti</target>
+
+<source>&Yes</source>
+<target>&Taip</target>
+
+<source>&No</source>
+<target>&Ne</target>
+
+<source>Use Recycle Bin</source>
+<target>Naudoti šiukšliadėžę</target>
+
+<source>Delete on both sides</source>
+<target>Ištrinti abiejose pusėse</target>
+
+<source>Delete on both sides even if the file is selected on one side only</source>
+<target>Ištrinti abiejose pusėse net jei failas yra pažymėtas tik vienoje pusėje</target>
+
+<source>
+Only files that match all filter settings will be synchronized.
+Note: File names must be relative to base directories!
+</source>
+<target>
+Tik failai, kurie atitinka visus filtro nustatymus bus sinchronizuoti.
+Pastaba: Failų pavadinimai privalo atitikti bazinius aplankus!
+</target>
+
+<source>Hints:</source>
+<target>Patarimai:</target>
+
+<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
+<target>1. Įveskite atitinkamus failo ar aplanko pavadinimus atskirtus su ';' ar naujoje eilutėje.</target>
+
+<source>2. Use wildcard characters '*' and '?'.</source>
+<target>2. Naudokite pakaitos simbolius '*' ir '?'.</target>
+
+<source>3. Exclude files directly on main grid via context menu.</source>
+<target>3. Išskirkite failus tiesiogiai pagrindiniame tinklelyje per kontekstinį meniu.</target>
+
+<source>Example</source>
+<target>Pavyzdys</target>
+
+<source>
+Include: *.doc;*.zip;*.exe
+Exclude: \stuff\temp\*
+</source>
+<target>
+Įtraukti: *.doc;*.zip;*.exe
+Išsirti: \stuff\temp\*
+</target>
+
+<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
+<target>Sinchronizuoti visus .doc, .zip ir .exe failus iškyrus viską poaplankyje „temp“.</target>
+
+<source>Include</source>
+<target>Įtraukti</target>
+
+<source>Exclude</source>
+<target>Neįtraukti</target>
+
+<source>Time span</source>
+<target>Laiko tarpas</target>
+
+<source>File size</source>
+<target>Failo dydis</target>
+
+<source>Minimum</source>
+<target>Mažiausiai</target>
+
+<source>Maximum</source>
+<target>Daugiausiai</target>
+
+<source>&Default</source>
+<target>&Numatyta</target>
+
+<source>Transactional file copy</source>
+<target>Suderintas failų kopijavimas</target>
+
+<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
+<target>Pirmiausiai rašyti į laikinąjį failą (*.ffs_tmp), tada pervardinti jį. Tai garantuoja pastovumą net ir kritinės klaidos atveju.</target>
+
+<source>Copy locked files</source>
+<target>Kopijuoti užrakintus failus</target>
+
+<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
+<target>Kopijuoti viešinamus ar užrakintus failus naudojant tomo šėšėlinio kopijavimo tarnybą (Reikalingos administratoriaus teisės)</target>
+
+<source>Copy file access permissions</source>
+<target>Kopijuoti failo leidimus</target>
+
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Perkelti failo ir aplanko leidimus (Reikalingos administratoriaus teisės)</target>
+
+<source>Restore hidden dialogs</source>
+<target>Atstatyti paslėptus langus</target>
+
+<source>External applications</source>
+<target>Išorinės programos</target>
+
+<source>Description</source>
+<target>Apibūdinimas</target>
+
+<source>Variant</source>
+<target>Variantas</target>
+
+<source>Statistics</source>
+<target>Statistika</target>
+
+<source>Find what:</source>
+<target>Rasti kas:</target>
+
+<source>Match case</source>
+<target>Atitikti atveją</target>
+
+<source>&Find next</source>
+<target>&Rasti kitą</target>
+
+<source>Operation aborted!</source>
+<target>Operacija nutraukta!</target>
+
+<source>Main bar</source>
+<target>Pagrindinė juosta</target>
+
+<source>Folder pairs</source>
+<target>Aplankų poros</target>
+
+<source>Overview</source>
+<target>Apžvalga</target>
+
+<source>Select view</source>
+<target>Pasirinkti rodomus</target>
+
+<source>Set direction:</source>
+<target>Nustatyti kryptį:</target>
+
+<source>Exclude temporarily</source>
+<target>Neįtraukti laikinai</target>
+
+<source>Include temporarily</source>
+<target>Įtraukti laikinai</target>
+
+<source>Exclude via filter:</source>
+<target>Neįtraukti per filtrą:</target>
+
+<source><multiple selection></source>
+<target><keletos pažymėjimas></target>
+
+<source>Delete</source>
+<target>Trinti</target>
+
+<source>Include all</source>
+<target>Įtraukti visus</target>
+
+<source>Exclude all</source>
+<target>Neįtraukti visų</target>
+
+<source>Show icons:</source>
+<target>Rodyti ženkliukus:</target>
+
+<source>Small</source>
+<target>Maži</target>
+
+<source>Medium</source>
+<target>Vidutiniai</target>
+
+<source>Large</source>
+<target>Dideli</target>
+
+<source>Select time span...</source>
+<target>Pasirinkti laiko tarpą...</target>
+
+<source>Default view</source>
+<target>Numatytas rodmuo</target>
+
+<source>Show "%x"</source>
+<target>Rodyti "%x"</target>
+
+<source><Last session></source>
+<target><Paskutinė sesija></target>
+
+<source>Configuration saved!</source>
+<target>Nustatymai išsaugoti!</target>
+
+<source>Never save changes</source>
+<target>Niekada nesaugoti pakeitimų</target>
+
+<source>Save changes to current configuration?</source>
+<target>Išsaugoti pakeitimus į esamus nustatymus?</target>
+
+<source>Configuration loaded!</source>
+<target>Nustatymai įkelti!</target>
+
+<source>Folder Comparison and Synchronization</source>
+<target>Aplankų sulyginimas ir sinchronizavimas</target>
+
+<source>Hide files that exist on left side only</source>
+<target>Slėpti failus, kurie egzistuoja tik kairėje pusėje</target>
+
+<source>Show files that exist on left side only</source>
+<target>Rodyti failus, kurie egzistuoja tik kairėje pusėje</target>
+
+<source>Hide files that exist on right side only</source>
+<target>Slėpti failus, kurie egzistuoja tik dešinėje pusėje</target>
+
+<source>Show files that exist on right side only</source>
+<target>Rodyti failus, kurie egzistuoja tik dešinėje pusėje</target>
+
+<source>Hide files that are newer on left</source>
+<target>Slėpti failus, kurie yra naujesni kairėje</target>
+
+<source>Show files that are newer on left</source>
+<target>Rodyti failus, kurie yra naujesni kairėje</target>
+
+<source>Hide files that are newer on right</source>
+<target>Slėpti failus, kurie yra naujesni dešinėje</target>
+
+<source>Show files that are newer on right</source>
+<target>Rodyti failus, kurie yra naujesni dešinėje</target>
+
+<source>Hide files that are equal</source>
+<target>Slėpti failus, kurie yra lygūs</target>
+
+<source>Show files that are equal</source>
+<target>Rodyti failus, kurie yra lygūs</target>
+
+<source>Hide files that are different</source>
+<target>Slėpti failus, kurie yra skirtingi</target>
+
+<source>Show files that are different</source>
+<target>Rodyti failus, kurie yra skirtingi</target>
+
+<source>Hide conflicts</source>
+<target>Slėpti konfliktus</target>
+
+<source>Show conflicts</source>
+<target>Rodyti konfliktus</target>
+
+<source>Hide files that will be created on the left side</source>
+<target>Slėpti failus, kurie bus sukurti kairėje pusėje</target>
+
+<source>Show files that will be created on the left side</source>
+<target>Rodyti failus, kurie bus sukurti kairėje pusėje</target>
+
+<source>Hide files that will be created on the right side</source>
+<target>Slėpti failus, kurie bus sukurti dešinėje pusėje</target>
+
+<source>Show files that will be created on the right side</source>
+<target>Rodyti failus, kurie bus sukurti dešinėje pusėje</target>
+
+<source>Hide files that will be deleted on the left side</source>
+<target>Slėpti failus, kurie bus ištrinti kairėje pusėje</target>
+
+<source>Show files that will be deleted on the left side</source>
+<target>Rodyti failus, kurie bus ištrinti kairėje pusėje</target>
+
+<source>Hide files that will be deleted on the right side</source>
+<target>Slėpti failus, kurie bus ištrinti dešinėje pusėje</target>
+
+<source>Show files that will be deleted on the right side</source>
+<target>Rodyti failus, kurie bus ištrinti dešinėje pusėje</target>
+
+<source>Hide files that will be overwritten on left side</source>
+<target>Slėpti failus, kurie bus perrašyti kairėje pusėje</target>
+
+<source>Show files that will be overwritten on left side</source>
+<target>Rodyti failus, kurie bus perrašyti kairėje pusėje</target>
+
+<source>Hide files that will be overwritten on right side</source>
+<target>Slėpti failus, kurie bus perrašyti dešinėje pusėje</target>
+
+<source>Show files that will be overwritten on right side</source>
+<target>Rodyti failus, kurie bus perrašyti dešinėje pusėje</target>
+
+<source>Hide files that won't be copied</source>
+<target>Slėpti failus, kurie ne bus kopijuojami</target>
+
+<source>Show files that won't be copied</source>
+<target>Rodyti failus, kurie ne bus kopijuojami</target>
+
+<source>All directories in sync!</source>
+<target>Visi aplankai sinchronizavime!</target>
+
+<source>Please run a Compare first before synchronizing!</source>
+<target>Prašome paleisti sulyginimą prieš sinchronizavimą!</target>
+
+<source>Comma separated list</source>
+<target>Kableliais atksirtas sąrašas</target>
+
+<source>Legend</source>
+<target>Legenda</target>
+
+<source>File list exported!</source>
+<target>Failų sąrašas eksportuotas!</target>
+
+<source>
+<pluralform>Object deleted successfully!</pluralform>
+<pluralform>%x objects deleted successfully!</pluralform>
+</source>
+<target>
+<pluralform>Objektas sėkmingai ištrintas!</pluralform>
+<pluralform>%x objektai sėkmingai ištrinti!</pluralform>
+<pluralform>%x objektų sėkmingai ištrinti!</pluralform>
+<pluralform>%x objektai sėkmingai ištrinti!</pluralform>
+</target>
+
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 aplankas</pluralform>
+<pluralform>%x aplankai</pluralform>
+<pluralform>%x aplankų</pluralform>
+<pluralform>%x aplankai</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 failas</pluralform>
+<pluralform>%x failai</pluralform>
+<pluralform>%x failų</pluralform>
+<pluralform>%x failai</pluralform>
+</target>
+
+<source>
+<pluralform>%x of 1 row in view</pluralform>
+<pluralform>%x of %y rows in view</pluralform>
+</source>
+<target>
+<pluralform>%x iš 1 eilės rodmenyje</pluralform>
+<pluralform>%x iš %y eilių rodmenyje</pluralform>
+<pluralform>%x iš %y eilių rodmenyje</pluralform>
+<pluralform>%x iš %y eilių rodmenyje</pluralform>
+</target>
+
+<source>Scanning...</source>
+<target>Skenuojama...</target>
+
+<source>Comparing content...</source>
+<target>Sulyginamas turinys...</target>
+
+<source>Paused</source>
+<target>Pristabdyta</target>
+
+<source>Initializing...</source>
+<target>Pradedama...</target>
+
+<source>Aborted</source>
+<target>Nutraukta</target>
+
+<source>Completed</source>
+<target>Baigta</target>
+
+<source>Continue</source>
+<target>Tęsti</target>
+
+<source>Pause</source>
+<target>Pristabdyti</target>
+
+<source>Cannot find %x</source>
+<target>Nepavyksta rasti %x</target>
+
+<source>Inactive</source>
+<target>Neaktyvus</target>
+
+<source>Today</source>
+<target>Šiandien</target>
+
+<source>This week</source>
+<target>Ši savaitė</target>
+
+<source>This month</source>
+<target>Šis mėnuo</target>
+
+<source>This year</source>
+<target>Šie metai</target>
+
+<source>Last x days</source>
+<target>Paskutinės x dienos</target>
+
+<source>Byte</source>
+<target>Baitai</target>
+
+<source>KB</source>
+<target>KB</target>
+
+<source>MB</source>
+<target>MB</target>
+
+<source>Filter</source>
+<target>Filtras</target>
+
+<source>Direct</source>
+<target>Tiesiogiai</target>
+
+<source>Follow</source>
+<target>Sekti</target>
+
+<source>Copy NTFS permissions</source>
+<target>Kopijuoti NTFS leidimus</target>
+
+<source>Integrate external applications into context menu. The following macros are available:</source>
+<target>Integruoti išorines programas į kontekstinį meniu. Sekantys makro galimi:</target>
+
+<source>- full file or directory name</source>
+<target>- pilnas failo ar aplanko pavadinimas</target>
+
+<source>- directory part only</source>
+<target>- tik aplanko dalis</target>
+
+<source>- Other side's counterpart to %name</source>
+<target>- Kitos pusės atitikmuo %name</target>
+
+<source>- Other side's counterpart to %dir</source>
+<target>- Kitos pusės atitikmuo %dir</target>
+
+<source>Make hidden dialogs and warning messages visible again?</source>
+<target>Padaryti paslėptus langus ir perpėjimo žinutes matomas vėl?</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>Ar tikrai norite perkelti sekantį objektą į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti sekančius %x objektus į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti sekančius %x objektų į šiukšliadėžę?</pluralform>
+<pluralform>Ar tikrai norite perkelti sekančius %x objektus į šiukšliadėžę?</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>Ar tikrai norite ištrinti sekantį objektą?</pluralform>
+<pluralform>Ar tikrai norite ištrinti sekantčius %x objektus?</pluralform>
+<pluralform>Ar tikrai norite ištrinti sekantčius %x objektų?</pluralform>
+<pluralform>Ar tikrai norite ištrinti sekantčius %x objektus?</pluralform>
+</target>
+
+<source>Leave as unresolved conflict</source>
+<target>Palikti kaip neišpręstą konfliktą</target>
+
+<source>Delete permanently</source>
+<target>Ištrinti visam laikui</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Trinti ar perrašyti failus visam laikui</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Naudoti šiukšliadėžę kaii trinami ar perrašomi failai</target>
+
+<source>Versioning</source>
+<target>Versijavimas</target>
+
+<source>Move files into a time-stamped subdirectory</source>
+<target>Perkelti failus į laiku pažymėtą poaplankį</target>
+
+<source>Files</source>
+<target>Failai</target>
+
+<source>Percentage</source>
+<target>Procentai</target>
+
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 valanda</pluralform>
+<pluralform>%x valandos</pluralform>
+<pluralform>%x valandų</pluralform>
+<pluralform>%x valandos</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 diena</pluralform>
+<pluralform>%x dienos</pluralform>
+<pluralform>%x dienų</pluralform>
+<pluralform>%x dienos</pluralform>
+</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Nepavyko stebėti aplanko %x.</target>
+
+<source>Conversion error:</source>
+<target>Konvertavimo klaida:</target>
+
+<source>Cannot delete file %x.</source>
+<target>Nepavyksta ištrinti failo %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Failas yra užrakintas kito procceso:</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Nepavyksta perkelti failo %x į %y.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Nepavyksta ištrinti aplanko %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Nepavyksta šrašyti pakeitimo datos %x.</target>
+
+<source>Cannot find system function %x.</source>
+<target>Nepavyksta rasti sistemos funkcijos %x.</target>
+
+<source>Cannot read security context of %x.</source>
+<target>Nepavyksta perskaityti %x saugumo konteksto.</target>
+
+<source>Cannot write security context of %x.</source>
+<target>Nepavyksta įrašyti %x saugumo konteksto.</target>
+
+<source>Cannot read permissions of %x.</source>
+<target>Nepavyksta perskaityti %x leidimų.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Nepavyksta įrašyti leidimų %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Nepavyksta sukurti aplanko %x.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Nepavyksta nukopijuoti simbolinės nuorodos %x į %y.</target>
+
+<source>Cannot write file attributes of %x.</source>
+<target>Nepavyksta įrašyti atributų failui %x.</target>
+
+<source>Cannot copy file %x to %y.</source>
+<target>Nepavyksta nukopijuoti failo %x į %y.</target>
+
+<source>Cannot read directory %x.</source>
+<target>Nepavyksta nuskaityti aplanko %x.</target>
+
+<source>Endless loop.</source>
+<target>Nesibaigiantis ciklas</target>
+
+<source>Cannot set privilege %x.</source>
+<target>Nepavyksta nustatyti privilegijos %x.</target>
+
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Nepavyksta perkelti %x į šiukšliadėžę!</target>
+
+<source>Both sides have changed since last synchronization!</source>
+<target>Abi pusės buvo pakeistos nuo paskutinio sinchronizavimo!</target>
+
+<source>Cannot determine sync-direction:</source>
+<target>Nepavyksta nustatyti sinchronizavimo krypties:</target>
+
+<source>No change since last synchronization!</source>
+<target>Nėra pakitimo nuo pakutinio sinchronizavimo!</target>
+
+<source>Filter settings have changed!</source>
+<target>Filtro nustatymai buvo pakeisti!</target>
+
+<source>The file was not processed by last synchronization!</source>
+<target>Failas nebuvo apdirbtas paskutinio sinchronizavimo!</target>
+
+<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
+<target>Nustatomos numatytos sinchronizavimo kryptys: Seni failai bus perrašyti naujesniais failais.</target>
+
+<source>The file does not contain a valid configuration:</source>
+<target>Failas neturi tinkamų nustatymų:</target>
+
+<source>You can ignore this error to consider the directory as empty.</source>
+<target>Jūs galite ignoruoti šią klaidą, kad laikyti aplanką tuščiu.</target>
+
+<source>Cannot find directory %x.</source>
+<target>Nepavyksta rasti aplanko %x</target>
+
+<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
+<target>Aplankai yra priklausomi! Būkite atsargūs nustatydami sinchronizavimo taisykles:</target>
+
+<source>Preparing synchronization...</source>
+<target>Ruošiamas sinchronizavimas...</target>
+
+<source>Conflict detected:</source>
+<target>Aptiktas konfliktas:</target>
+
+<source>File %x has an invalid date!</source>
+<target>Failas %x turi netinkamą datą!</target>
+
+<source>Files %x have the same date but a different size!</source>
+<target>Failai %x turi tokią pačią datą bet skirtingą dydį!</target>
+
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Simbolinės nuorodos %x turi tokią pačią datą bet skirtingus tikslus</target>
+
+<source>Comparing content of files %x</source>
+<target>Sulyginamas failų turinys %x</target>
+
+<source>Comparing files by content failed.</source>
+<target>Nepavyko failų sulyginimas pagal turinį.</target>
+
+<source>Generating file list...</source>
+<target>Generuojamas failų sąrašas...</target>
+
+<source>Both sides are equal</source>
+<target>Abi pusės yra lygios</target>
+
+<source>Files/folders differ in attributes only</source>
+<target>Failai/aplankai skiriasi tik pagal atributus</target>
+
+<source>Copy new file/folder to left</source>
+<target>Kopijuoti naują failą/aplanką į kairę</target>
+
+<source>Copy new file/folder to right</source>
+<target>Kopijuoti naują failą/aplanką į dešinę</target>
+
+<source>Delete left file/folder</source>
+<target>Trinti kairį failą/aplanką</target>
+
+<source>Delete right file/folder</source>
+<target>Trinti dešinį failą/aplanką</target>
+
+<source>Move file on left</source>
+<target>Perkelti failą į kairę</target>
+
+<source>Move file on right</source>
+<target>Perkelti failą į dešinę</target>
+
+<source>Overwrite left file/folder with right one</source>
+<target>Perrašyti kairį failą/aplanką su dešiniuoju</target>
+
+<source>Overwrite right file/folder with left one</source>
+<target>Perrašyti dešinįjį failą/aplanką su kairiuoju</target>
+
+<source>Do nothing</source>
+<target>Nieko nedaryti</target>
+
+<source>Copy file attributes only to left</source>
+<target>Kopijuoti failo atributus tik į kairę</target>
+
+<source>Copy file attributes only to right</source>
+<target>Kopijuoti failo atributus tik į dešinę</target>
+
+<source>Multiple...</source>
+<target>Keletas...</target>
+
+<source>Deleting file %x</source>
+<target>Trinamas failas %x</target>
+
+<source>Deleting folder %x</source>
+<target>Trinamas aplankas %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Tinama simbolinė nuoroda %x</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Perkeliamas failas %x į šiukšliadėžę</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Perkeliamas aplankas %x į šiukšliadėžę</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Perkeliama simbolinė nuoroda %x į šiukšliadėžę</target>
+
+<source>Moving file %x to %y</source>
+<target>Perkeliamas failas %x į %y</target>
+
+<source>Moving folder %x to %y</source>
+<target>Perkeliamas aplankas %x į %y</target>
+
+<source>Moving symbolic link %x to %y</source>
+<target>Perkeliama simbolinė nuoroda %x į %y</target>
+
+<source>Creating file %x</source>
+<target>Kuriamas failas %x</target>
+
+<source>Creating symbolic link %x</source>
+<target>Kuriama simbolinė nuoroda %x</target>
+
+<source>Creating folder %x</source>
+<target>Kuriamas aplankas %x</target>
+
+<source>Overwriting file %x</source>
+<target>Perrašomas failas %x</target>
+
+<source>Overwriting symbolic link %x</source>
+<target>Perrašoma simbolinė nuoroda %x</target>
+
+<source>Verifying file %x</source>
+<target>Tikrinamas failas %x</target>
+
+<source>Updating attributes of %x</source>
+<target>Atnaujinami atributai %x</target>
+
+<source>Target directory name must not be empty!</source>
+<target>Tikslo aplankas privalo būti ne tuščias!</target>
+
+<source>Directory for file versioning was not supplied!</source>
+<target>Aplankas failo versijavimui nebuvo pateiktas!</target>
+
+<source>Source directory %x not found.</source>
+<target>Šaltinio aplankas %x nerastas.</target>
+
+<source>Unresolved conflicts existing!</source>
+<target>Yra neišspręstų konfliktų!</target>
+
+<source>You can ignore conflicts and continue synchronization.</source>
+<target>Jūs galite ignoruoti konfliktus ir tęsti sinchronizavimą.</target>
+
+<source>Significant difference detected:</source>
+<target>Žymus skirtumas nustatytas:</target>
+
+<source>More than 50% of the total number of files will be copied or deleted!</source>
+<target>Daugiau nei 50% failų bus nukopijuota arba ištrinta!</target>
+
+<source>Not enough free disk space available in:</source>
+<target>Nepakanka laisvos disko vietos:</target>
+
+<source>Free disk space required:</source>
+<target>Laisva disko vieta reikalinga:</target>
+
+<source>Free disk space available:</source>
+<target>Laisva disko vieta prieinama:</target>
+
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Šiukšliadėžė nepasiekiama sekantiems keliams! Failai bus ištrinti visam laikui išskyrus:</target>
+
+<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
+<target>Aplankas, kuris bus keičiamas yra dalis keletos aplankų porų! Prašome peržiūrėti sinchronizavimo nustatymus!</target>
+
+<source>Processing folder pair:</source>
+<target>Apdorojama aplankų pora:</target>
+
+<source>Generating database...</source>
+<target>Generuojama duomenų bazė...</target>
+
+<source>Data verification error: Source and target file have different content!</source>
+<target>Duomenų patikrinimo klaida: Šaltinio ir tikslo failas turi skirtingus turinius!</target>
+
diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
new file mode 100644
index 00000000..31474eb8
--- /dev/null
+++ b/BUILD/Languages/norwegian.lng
@@ -0,0 +1,1463 @@
+<header>
+	<language name>Norsk</language name>
+	<translator>FreewareTips</translator>
+	<locale>nb_NO</locale>
+	<flag file>norway.png</flag file>
+	<plural forms>2</plural forms>
+	<plural definition>n == 1 ? 0 : 1</plural definition>
+</header>
+
+<source>Searching for directory %x...</source>
+<target>Søker etter mappe %x...</target>
+
+<source>Show in Explorer</source>
+<target>Vis i Utforsker</target>
+
+<source>Open with default application</source>
+<target>Åpne med standardprogram</target>
+
+<source>Browse directory</source>
+<target>Bla gjennom mappe</target>
+
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Avbrytelse forespurt: Venter på at gjeldende handling avsluttes...</target>
+
+<source>RealtimeSync - Automated Synchronization</source>
+<target>RealtimeSync - Automatisk synkronisering</target>
+
+<source>Error</source>
+<target>Feil</target>
+
+<source>Select alternate comparison settings</source>
+<target>Velg alternative sammenligningsinnstillinger</target>
+
+<source>Select alternate synchronization settings</source>
+<target>Velg alternative synkroniseringsinnstillinger</target>
+
+<source>No filter selected</source>
+<target>Ingen filter valgt</target>
+
+<source>Filter is active</source>
+<target>Filter er aktivt</target>
+
+<source>Remove alternate settings</source>
+<target>Fjern alternative innstillinger</target>
+
+<source>Clear filter settings</source>
+<target>Fjern filterinnstillinger</target>
+
+<source>Create a batch job</source>
+<target>Opprett en batch-jobb</target>
+
+<source>Synchronization settings</source>
+<target>Synkroniseringsinnstillinger</target>
+
+<source>Comparison settings</source>
+<target>Sammenligningsinnstillinger</target>
+
+<source>About</source>
+<target>Om</target>
+
+<source>Warning</source>
+<target>Advarsel</target>
+
+<source>Question</source>
+<target>Spørsmål</target>
+
+<source>Confirm</source>
+<target>Bekreft</target>
+
+<source>Configure filter</source>
+<target>Still inn filter</target>
+
+<source>Global settings</source>
+<target>Felles innstillinger</target>
+
+<source>Synchronization Preview</source>
+<target>Forhåndsvisning for synkronisering</target>
+
+<source>Find</source>
+<target>Søk</target>
+
+<source>Select time span</source>
+<target>Velg tidsområde</target>
+
+<source>Show pop-up</source>
+<target>Vis oppsprettsvindu</target>
+
+<source>Show pop-up on errors or warnings</source>
+<target>Vis oppsprettsvindu ved feil eller advarsler</target>
+
+<source>Ignore errors</source>
+<target>Ignorer feil</target>
+
+<source>Hide all error and warning messages</source>
+<target>Skjul meldinger om feil og advarsler</target>
+
+<source>Exit instantly</source>
+<target>Avslutt med en gang</target>
+
+<source>Abort synchronization immediately</source>
+<target>Avbryt synkronisering umiddelbart</target>
+
+<source>Browse</source>
+<target>Bla gjennom</target>
+
+<source>Invalid command line: %x</source>
+<target>Ugyldig kommando: %x</target>
+
+<source>Info</source>
+<target>Info</target>
+
+<source>Fatal Error</source>
+<target>Fatal feil</target>
+
+<source>Windows Error Code %x:</source>
+<target>Windows feilkode %x:</target>
+
+<source>Linux Error Code %x:</source>
+<target>Linux feilkode %x:</target>
+
+<source>Cannot resolve symbolic link %x.</source>
+<target>Kan ikke bestemme symbolsk lenke %x.</target>
+
+<source>%x MB</source>
+<target>%x MB</target>
+
+<source>%x KB</source>
+<target>%x KB</target>
+
+<source>%x GB</source>
+<target>%x GB</target>
+
+<source>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</source>
+<target>
+<pluralform>1 Byte</pluralform>
+<pluralform>%x Bytes</pluralform>
+</target>
+
+<source>Cannot read file %x.</source>
+<target>Kan ikke lese fil %x.</target>
+
+<source>Cannot write file %x.</source>
+<target>Kan ikke skrive fil %x.</target>
+
+<source>Database file %x is incompatible.</source>
+<target>Databasefil %x er inkompatibel.</target>
+
+<source>Initial synchronization:</source>
+<target>Innledende synkronisering:</target>
+
+<source>Database file %x does not yet exist.</source>
+<target>Databasefil %x finnes ikke ennå.</target>
+
+<source>Out of memory!</source>
+<target>For lite minne!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Databasefiler deler ikke en felles synkroniseringsøkt.</target>
+
+<source>An exception occurred!</source>
+<target>En unntagelse skjedde!</target>
+
+<source>Cannot read file attributes of %x.</source>
+<target>Kan ikke lese filattributter til %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Kan ikke hente prosessinformasjon.</target>
+
+<source>Waiting while directory is locked (%x)...</source>
+<target>Venter mens mappe er låst (%x)...</target>
+
+<source>Cannot set directory lock %x.</source>
+<target>Kan ikke sette mappelås %x.</target>
+
+<source>
+<pluralform>1 sec</pluralform>
+<pluralform>%x sec</pluralform>
+</source>
+<target>
+<pluralform>1 sek</pluralform>
+<pluralform>%x sek</pluralform>
+</target>
+
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Feil ved analysering av fil %x, rekke %y, kolonne %z.</target>
+
+<source>Scanning:</source>
+<target>Skanner:</target>
+
+<source>Encoding extended time information: %x</source>
+<target>Koder utvided tidsinformasjon: %x</target>
+
+<source>
+<pluralform>[1 Thread]</pluralform>
+<pluralform>[%x Threads]</pluralform>
+</source>
+<target>
+<pluralform>[1 Tråd]</pluralform>
+<pluralform>[%x Tråder]</pluralform>
+</target>
+
+<source>/sec</source>
+<target>/sek</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Filen %x inneholder ikke en gyldig innstilling.</target>
+
+<source>Configuration file %x loaded partially only.</source>
+<target>Innstillingsfilen %x bare delvis lastet.</target>
+
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Kan ikke få adgang til Volume Shadow Copy Service.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Bruk FreeFileSync 64-bit-versjon til å opprette skyggekopier på dette systemet.</target>
+
+<source>Cannot load file %x.</source>
+<target>Kan ikke laste filen %x.</target>
+
+<source>Path %x does not contain a volume name.</source>
+<target>Banen %x inneholder ikke et volumnavn.</target>
+
+<source>Volume name %x not part of file name %y!</source>
+<target>Volumnavn %x ikke del av filnavn %y!</target>
+
+<source>Cannot find file %x.</source>
+<target>Kan ikke finne filen %x.</target>
+
+<source>Cannot read the following XML elements:</source>
+<target>Kan ikke lese følgende XML-elementer:</target>
+
+<source>S&ave configuration...</source>
+<target>L&agre innstilling...</target>
+
+<source>&Load configuration...</source>
+<target>&Last innstilling...</target>
+
+<source>&Quit</source>
+<target>&Avslutt</target>
+
+<source>&File</source>
+<target>&Fil</target>
+
+<source>&Content</source>
+<target>&Innhold</target>
+
+<source>&About...</source>
+<target>&Om programmet...</target>
+
+<source>&Help</source>
+<target>&Hjelp</target>
+
+<source>Usage:</source>
+<target>Bruk:</target>
+
+<source>1. Select directories to monitor.</source>
+<target>1. Velg mapper å overvåke.</target>
+
+<source>2. Enter a command line.</source>
+<target>2. Oppfør en kommandolinje.</target>
+
+<source>3. Press 'Start'.</source>
+<target>3. Trykk '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>
+Kommandolinjen kjøres hver gang:
+- Alle mapper blir tilgjengelige (f.eks. ved innsetting av USB-minnepinne)
+- Filer i disse mapper eller undermapper endres
+</target>
+
+<source>Directories to watch</source>
+<target>Mapper å overvåke</target>
+
+<source>Add folder</source>
+<target>Legg til mappe</target>
+
+<source>Remove folder</source>
+<target>Fjern mappe</target>
+
+<source>Select a folder</source>
+<target>Velg en mappe</target>
+
+<source>Command line</source>
+<target>Kommandolinje</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>Uvirksom tid mellom oppdaging av siste endring og kjøring av kommandolinje i sekunder</target>
+
+<source>Start</source>
+<target>Start</target>
+
+<source>&Retry</source>
+<target>&Prøv igjen</target>
+
+<source>Cancel</source>
+<target>Avbryt</target>
+
+<source>(Build: %x)</source>
+<target>(Build: %x)</target>
+
+<source>RealtimeSync configuration</source>
+<target>RealtimeSync-innstilling</target>
+
+<source>&Restore</source>
+<target>&Gjenopprett</target>
+
+<source>&Exit</source>
+<target>&Avslutt</target>
+
+<source>Monitoring active...</source>
+<target>Overvåkning aktiv...</target>
+
+<source>Waiting for missing directories...</source>
+<target>Venter på manglende mapper...</target>
+
+<source>A directory input field is empty.</source>
+<target>Et inndatafelt for mappe er tomt.</target>
+
+<source>Logging</source>
+<target>Logging</target>
+
+<source>File time and size</source>
+<target>Fildato og størrelse</target>
+
+<source>File content</source>
+<target>Filinnhold</target>
+
+<source><Automatic></source>
+<target><Automatisk></target>
+
+<source>Mirror ->></source>
+<target>Speile ->></target>
+
+<source>Update -></source>
+<target>Oppdatere -></target>
+
+<source>Custom</source>
+<target>Brukerdefinert</target>
+
+<source>FreeFileSync batch file</source>
+<target>FreeFileSync batch-fil</target>
+
+<source>FreeFileSync configuration</source>
+<target>FreeFileSync-innstilling</target>
+
+<source>Batch execution</source>
+<target>Batch-kjøring</target>
+
+<source>Items processed:</source>
+<target>Elementer behandlet:</target>
+
+<source>Items remaining:</source>
+<target>Elementer igjen:</target>
+
+<source>Total time:</source>
+<target>Total tid:</target>
+
+<source>Stop</source>
+<target>Stopp</target>
+
+<source>Synchronization aborted!</source>
+<target>Synkronisering avbrutt!</target>
+
+<source>Synchronization completed with errors!</source>
+<target>Synkronisering fullført med feil!</target>
+
+<source>Nothing to synchronize!</source>
+<target>Ikke noe å synkronisere!</target>
+
+<source>Synchronization completed successfully!</source>
+<target>Synkronisering vellykket fullført!</target>
+
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Trykk "Skift" for å løse problemer i FreeFileSync hovedvindu.</target>
+
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Skifter til FreeFileSync hovedvindu...</target>
+
+<source>Unable to connect to sourceforge.net!</source>
+<target>Ikke i stand til å koble til sourceforge.net!</target>
+
+<source>A newer version of FreeFileSync is available:</source>
+<target>En nyere versjon av FreeFileSync er tilgjengelig:</target>
+
+<source>Download now?</source>
+<target>Laste ned nå?</target>
+
+<source>Information</source>
+<target>Informasjon</target>
+
+<source>FreeFileSync is up to date!</source>
+<target>FreeFileSync er oppdatert!</target>
+
+<source>Do you want FreeFileSync to automatically check for updates every week?</source>
+<target>Skal FreeFileSync automatisk se etter oppdateringer hver uke?</target>
+
+<source>(Requires an Internet connection!)</source>
+<target>(Krever en internettforbindelse!)</target>
+
+<source><Symlink></source>
+<target><Symbolsk lenke></target>
+
+<source><Directory></source>
+<target><Mappe></target>
+
+<source>Full path</source>
+<target>Full bane</target>
+
+<source>Name</source>
+<target>Navn</target>
+
+<source>Relative path</source>
+<target>Relativ bane</target>
+
+<source>Directory</source>
+<target>Mappe</target>
+
+<source>Size</source>
+<target>Størrelse</target>
+
+<source>Date</source>
+<target>Dato</target>
+
+<source>Extension</source>
+<target>Filendelse</target>
+
+<source>Comparison Result</source>
+<target>Sammenligningsresultat</target>
+
+<source>Drag && drop</source>
+<target>Dra && slipp</target>
+
+<source>Close progress dialog</source>
+<target>Lukk framdriftsvindu</target>
+
+<source>Shut down</source>
+<target>Slå av maskinen</target>
+
+<source>Log off</source>
+<target>Logg av</target>
+
+<source>Standby</source>
+<target>Standby</target>
+
+<source>Hibernate</source>
+<target>Sett i dvalemodus</target>
+
+<source>1. &Compare</source>
+<target>1. Sammen&lign</target>
+
+<source>2. &Synchronize...</source>
+<target>2. &Synkroniser...</target>
+
+<source>&New</source>
+<target>&Ny</target>
+
+<source>&Program</source>
+<target>&Program</target>
+
+<source>&Language</source>
+<target>&Språk</target>
+
+<source>&Global settings...</source>
+<target>&Felles innstillinger...</target>
+
+<source>&Create batch job...</source>
+<target>&Opprett batch-jobb...</target>
+
+<source>&Export file list...</source>
+<target>&Eksporter filliste...</target>
+
+<source>&Advanced</source>
+<target>&Avansert</target>
+
+<source>&Check for new version</source>
+<target>&Se etter ny versjon</target>
+
+<source>Compare</source>
+<target>Sammenlign</target>
+
+<source>Compare both sides</source>
+<target>Sammenlign begge sider</target>
+
+<source>&Abort</source>
+<target>&Avbryt</target>
+
+<source>Synchronize...</source>
+<target>Synkroniser...</target>
+
+<source>Start synchronization</source>
+<target>Start synkronisering</target>
+
+<source>Add folder pair</source>
+<target>Legg til mappepar</target>
+
+<source>Remove folder pair</source>
+<target>Fjern mappepar</target>
+
+<source>Swap sides</source>
+<target>Bytt sider</target>
+
+<source>Save current configuration to file</source>
+<target>Lagre gjeldende innstilling til fil</target>
+
+<source>Load configuration from file</source>
+<target>Last innstilling fra fil</target>
+
+<source>Last used configurations (press DEL to remove from list)</source>
+<target>Sist brukte innstillinger (trykk DEL for å fjerne fra liste)</target>
+
+<source>Hide excluded items</source>
+<target>Skjul ekskluderte elementer</target>
+
+<source>Hide filtered or temporarily excluded files</source>
+<target>Skjul filtrerte eller midlertidig ekskluderte filer</target>
+
+<source>Number of files and directories that will be created</source>
+<target>Antall filer og mapper som blir opprettet</target>
+
+<source>Number of files that will be overwritten</source>
+<target>Antall filer som blir overskrevet</target>
+
+<source>Number of files and directories that will be deleted</source>
+<target>Antal filer og mapper som blir slettet</target>
+
+<source>Total amount of data that will be transferred</source>
+<target>Totale antall data som blir overført</target>
+
+<source>Operation:</source>
+<target>Handling:</target>
+
+<source>Items found:</source>
+<target>Elementer funnet:</target>
+
+<source>Speed:</source>
+<target>Hastighet:</target>
+
+<source>Remaining time:</source>
+<target>Gjenstående tid:</target>
+
+<source>Elapsed time:</source>
+<target>Tid gått:</target>
+
+<source>Batch job</source>
+<target>Batch-jobb</target>
+
+<source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
+<target>Opprett en batch-fil og automatiser synkronisering. For å starte i batch-modus dobbeltklikk denne filen eller kjør kommandoen: FreeFileSync.exe SyncJob.ffs_batch. Dette kan også planlegges i ditt systems oppgaveplanlegger.</target>
+
+<source>Help</source>
+<target>Hjelp</target>
+
+<source>Filter files</source>
+<target>Filtrer filer</target>
+
+<source>Left</source>
+<target>Venstre</target>
+
+<source>Right</source>
+<target>Høyre</target>
+
+<source>Status feedback</source>
+<target>Status-tilbakemelding</target>
+
+<source>Show progress dialog</source>
+<target>Vis dialogboks</target>
+
+<source>Error handling</source>
+<target>Feilhåndtering</target>
+
+<source>Maximum number of log files:</source>
+<target>Maksimale antall loggfiler:</target>
+
+<source>Select log file directory:</source>
+<target>Velg loggfilmappe:</target>
+
+<source>Batch settings</source>
+<target>Batch-innstillinger</target>
+
+<source>&Save</source>
+<target>La&gre</target>
+
+<source>&Load</source>
+<target>&Last</target>
+
+<source>Select variant:</source>
+<target>Velg variant:</target>
+
+<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
+<target>Identifiser og spre endringer på begge sider ved å bruke en database. Slettinger, navneendringer og konflikter blir automatisk oppdaget.</target>
+
+<source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
+<target>Speilings-sikkerhetskopi av venstre mappe. Høyre mappe endres slik at den blir helt lik venstre mappe etter synkronisering.</target>
+
+<source>Copy new or updated files to right folder.</source>
+<target>Kopier nye og endrede filer til høyre mappe.</target>
+
+<source>Configure your own synchronization rules.</source>
+<target>Still inn dine egne synkroniseringsregler.</target>
+
+<source>Deletion handling</source>
+<target>Slette-håndtering</target>
+
+<source>On completion:</source>
+<target>Ved fullføring:</target>
+
+<source>Configuration</source>
+<target>Innstilling</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 finnes bare på venstre side</target>
+
+<source>File/folder exists on right side only</source>
+<target>Fil/mappe finnes bare på høyre side</target>
+
+<source>Left file is newer</source>
+<target>Fil til venstre er nyere</target>
+
+<source>Right file is newer</source>
+<target>Fil til høyre er nyere</target>
+
+<source>Files have different content</source>
+<target>Filer har forskjellig innhold</target>
+
+<source>Conflict/file cannot be categorized</source>
+<target>Konflikt/filen kan ikke kategoriseres</target>
+
+<source>OK</source>
+<target>OK</target>
+
+<source>Compare by...</source>
+<target>Sammenlign etter...</target>
+
+<source>
+Files are found equal if
+     - last write time and date
+     - file size
+are the same
+</source>
+<target>
+Filer blir funnet like hvis
+     - sist skrevne tid og dato
+     - filstørrelse
+er den samme
+</target>
+
+<source>
+Files are found equal if
+     - file content
+is the same
+</source>
+<target>
+Filer blir funnet like hvis
+     - filinnhold
+er det samme
+</target>
+
+<source>Symbolic Link handling</source>
+<target>Symbolsk lenkehåndtering</target>
+
+<source>Synchronizing...</source>
+<target>Synkroniserer...</target>
+
+<source>&Pause</source>
+<target>&Pause</target>
+
+<source>Source code written in C++ utilizing:</source>
+<target>Kildekode skrevet i C++ med hjelp fra:</target>
+
+<source>Feedback and suggestions are welcome</source>
+<target>Tilbakemelding og forslag er velkomne</target>
+
+<source>Homepage</source>
+<target>Hjemmeside</target>
+
+<source>FreeFileSync at Sourceforge</source>
+<target>FreeFileSync på Sourceforge</target>
+
+<source>Email</source>
+<target>E-post</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>Stor takk for oversettelse av FreeFileSync går til:</target>
+
+<source>If you like FreeFileSync</source>
+<target>Hvis du liker FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>Doner med PayPal</target>
+
+<source>Published under the GNU General Public License</source>
+<target>Utgitt under GNU General Public Licence</target>
+
+<source>Ignore further errors</source>
+<target>Ignorer ytterligere feil</target>
+
+<source>Hide further error messages during the current process</source>
+<target>Skjul ytterligere feilmeldinger under den gjeldende prosessen</target>
+
+<source>&Ignore</source>
+<target>&Ignorer</target>
+
+<source>Do not show this dialog again</source>
+<target>Ikke vis denne dialog igjen</target>
+
+<source>&Switch</source>
+<target>&Skift</target>
+
+<source>&Yes</source>
+<target>&Ja</target>
+
+<source>&No</source>
+<target>&Nei</target>
+
+<source>Use Recycle Bin</source>
+<target>Bruk papirkurv</target>
+
+<source>Delete on both sides</source>
+<target>Slett på begge sider</target>
+
+<source>Delete on both sides even if the file is selected on one side only</source>
+<target>Slett på begge sider selv om filen bare er valgt på en side</target>
+
+<source>
+Only files that match all filter settings will be synchronized.
+Note: File names must be relative to base directories!
+</source>
+<target>
+Synkroniserer kun filer som passer til alle filterinnstillinger.
+Merk: Filnavn må være relative til basismapper!
+</target>
+
+<source>Hints:</source>
+<target>Veiledninger:</target>
+
+<source>1. Enter relative file or directory names separated by ';' or a new line.</source>
+<target>1. Oppfør relative fil- eller mappenavn adskilt med ';' eller en ny linje.</target>
+
+<source>2. Use wildcard characters '*' and '?'.</source>
+<target>2. Bruk jokertegn '*' og '?'.</target>
+
+<source>3. Exclude files directly on main grid via context menu.</source>
+<target>3. Ekskluder filer direkte i hovedvindu via høyreklikkmeny.</target>
+
+<source>Example</source>
+<target>Eksempel</target>
+
+<source>
+Include: *.doc;*.zip;*.exe
+Exclude: \stuff\temp\*
+</source>
+<target>
+Inkluder: *.doc;*.zip;*.exe
+Ekskluder: \ting\temp\*
+</target>
+
+<source>Synchronize all .doc, .zip and .exe files except everything in subfolder "temp".</source>
+<target>Synkroniserer alle .doc, .zip og .exe-filer unntatt alt i undermappen "temp".</target>
+
+<source>Include</source>
+<target>Inkluder</target>
+
+<source>Exclude</source>
+<target>Ekskluder</target>
+
+<source>Time span</source>
+<target>Tidsrom</target>
+
+<source>File size</source>
+<target>Filstørrelse</target>
+
+<source>Minimum</source>
+<target>Minimum</target>
+
+<source>Maximum</source>
+<target>Maksimum</target>
+
+<source>&Default</source>
+<target>&Standard</target>
+
+<source>Transactional file copy</source>
+<target>Transaksjonell filkopiering</target>
+
+<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
+<target>Skriv til en midlertidig fil (*.ffs_tmp) først så endre navn på den. Dette garanterer en konsistent tilstand selv ved alvorlige feil.</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 å bruke Volume Shadow Copy Service (Krever administratorrettigheter)</target>
+
+<source>Copy file access permissions</source>
+<target>Kopier filadgangstillatelser</target>
+
+<source>Transfer file and directory permissions (Requires Administrator rights)</source>
+<target>Overfør fil- og mappetillatelser (Krever administratorrettigheter)</target>
+
+<source>Restore hidden dialogs</source>
+<target>Gjenopprett skjulte dialoger</target>
+
+<source>External applications</source>
+<target>Eksterne programmer</target>
+
+<source>Description</source>
+<target>Beskrivelse</target>
+
+<source>Variant</source>
+<target>Variant</target>
+
+<source>Statistics</source>
+<target>Statistikk</target>
+
+<source>Find what:</source>
+<target>Søk hva:</target>
+
+<source>Match case</source>
+<target>Skill mellom store og små bokstaver</target>
+
+<source>&Find next</source>
+<target>&Søk neste</target>
+
+<source>Operation aborted!</source>
+<target>Handling avbrutt!</target>
+
+<source>Main bar</source>
+<target>Hovedverktøylinje</target>
+
+<source>Folder pairs</source>
+<target>Mappepar</target>
+
+<source>Overview</source>
+<target>Oversikt</target>
+
+<source>Select view</source>
+<target>Velg visning</target>
+
+<source>Set direction:</source>
+<target>Still inn retningen:</target>
+
+<source>Exclude temporarily</source>
+<target>Ekskluder midlertidig</target>
+
+<source>Include temporarily</source>
+<target>Inkluder midlertidig</target>
+
+<source>Exclude via filter:</source>
+<target>Ekskluder via filter:</target>
+
+<source><multiple selection></source>
+<target><flervalg></target>
+
+<source>Delete</source>
+<target>Slett</target>
+
+<source>Include all</source>
+<target>Inkluder alle</target>
+
+<source>Exclude all</source>
+<target>Ekskluder alle</target>
+
+<source>Show icons:</source>
+<target>Vis ikoner:</target>
+
+<source>Small</source>
+<target>Små</target>
+
+<source>Medium</source>
+<target>Middels</target>
+
+<source>Large</source>
+<target>Store</target>
+
+<source>Select time span...</source>
+<target>Velg tidsområde...</target>
+
+<source>Default view</source>
+<target>Standardvisning</target>
+
+<source>Show "%x"</source>
+<target>Vis "%x"</target>
+
+<source><Last session></source>
+<target><Siste økt></target>
+
+<source>Configuration saved!</source>
+<target>Innstilling lagret!</target>
+
+<source>Never save changes</source>
+<target>Aldri lagre endringer</target>
+
+<source>Save changes to current configuration?</source>
+<target>Lagre endringer til gjeldende innstilling?</target>
+
+<source>Configuration loaded!</source>
+<target>Innstilling lastet!</target>
+
+<source>Folder Comparison and Synchronization</source>
+<target>Mappesammenligning og synkronisering</target>
+
+<source>Hide files that exist on left side only</source>
+<target>Skjul filer som bare finnes på venstre side</target>
+
+<source>Show files that exist on left side only</source>
+<target>Vis filer som bare finnes på venstre side</target>
+
+<source>Hide files that exist on right side only</source>
+<target>Skjul filer som bare finnes på høyre side</target>
+
+<source>Show files that exist on right side only</source>
+<target>Vis filer som bare finnes på høyre side</target>
+
+<source>Hide files that are newer on left</source>
+<target>Skjul filer som er nyere til venstre</target>
+
+<source>Show files that are newer on left</source>
+<target>Vis filer som er nyere til venstre</target>
+
+<source>Hide files that are newer on right</source>
+<target>Skjul filer som er nyere til høyre</target>
+
+<source>Show files that are newer on right</source>
+<target>Vis filer som er nyere til høyre</target>
+
+<source>Hide files that are equal</source>
+<target>Skjul filer som er like</target>
+
+<source>Show files that are equal</source>
+<target>Vis filer som er like</target>
+
+<source>Hide files that are different</source>
+<target>Skjul filer som er forskjellige</target>
+
+<source>Show files that are different</source>
+<target>Vis filer som er forskjellige</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 som blir opprettet på venstre side</target>
+
+<source>Show files that will be created on the left side</source>
+<target>Vis filer som blir opprettet på venstre side</target>
+
+<source>Hide files that will be created on the right side</source>
+<target>Skjul filer som blir opprettet på høyre side</target>
+
+<source>Show files that will be created on the right side</source>
+<target>Vis filer som blir opprettet på høyre side</target>
+
+<source>Hide files that will be deleted on the left side</source>
+<target>Skjul filer som blir slettet på venstre side</target>
+
+<source>Show files that will be deleted on the left side</source>
+<target>Vis filer som blir slettet på venstre side</target>
+
+<source>Hide files that will be deleted on the right side</source>
+<target>Skjul filer som blir slettet på høyre side</target>
+
+<source>Show files that will be deleted on the right side</source>
+<target>Vis filer som blir slettet på høyre side</target>
+
+<source>Hide files that will be overwritten on left side</source>
+<target>Skjul filer som blir overskrevet på venstre side</target>
+
+<source>Show files that will be overwritten on left side</source>
+<target>Vis filer som blir overskrevet på venstre side</target>
+
+<source>Hide files that will be overwritten on right side</source>
+<target>Skjul filer som blir overskrevet på høyre side</target>
+
+<source>Show files that will be overwritten on right side</source>
+<target>Vis filer som blir overskrevet på høyre side</target>
+
+<source>Hide files that won't be copied</source>
+<target>Skjul filer som ikke blir kopiert</target>
+
+<source>Show files that won't be copied</source>
+<target>Vis filer som ikke blir kopiert</target>
+
+<source>All directories in sync!</source>
+<target>Alle mapper er synkronisert!</target>
+
+<source>Please run a Compare first before synchronizing!</source>
+<target>Kjør en sammenligning før synkronisering!</target>
+
+<source>Comma separated list</source>
+<target>Komma-separert liste</target>
+
+<source>Legend</source>
+<target>Forklaring</target>
+
+<source>File list exported!</source>
+<target>Filliste eksportert!</target>
+
+<source>
+<pluralform>Object deleted successfully!</pluralform>
+<pluralform>%x objects deleted successfully!</pluralform>
+</source>
+<target>
+<pluralform>Objekt vellykket slettet!</pluralform>
+<pluralform>%x objekter vellykket slettet!</pluralform>
+</target>
+
+<source>
+<pluralform>1 directory</pluralform>
+<pluralform>%x directories</pluralform>
+</source>
+<target>
+<pluralform>1 mappe</pluralform>
+<pluralform>%x mapper</pluralform>
+</target>
+
+<source>
+<pluralform>1 file</pluralform>
+<pluralform>%x files</pluralform>
+</source>
+<target>
+<pluralform>1 fil</pluralform>
+<pluralform>%x filer</pluralform>
+</target>
+
+<source>
+<pluralform>%x of 1 row in view</pluralform>
+<pluralform>%x of %y rows in view</pluralform>
+</source>
+<target>
+<pluralform>%x av 1 rekke</pluralform>
+<pluralform>%x av %y rekker</pluralform>
+</target>
+
+<source>Scanning...</source>
+<target>Skanner...</target>
+
+<source>Comparing content...</source>
+<target>Sammenligner innhold...</target>
+
+<source>Paused</source>
+<target>Pauset</target>
+
+<source>Initializing...</source>
+<target>Initialiserer...</target>
+
+<source>Aborted</source>
+<target>Avbrutt</target>
+
+<source>Completed</source>
+<target>Fullført</target>
+
+<source>Continue</source>
+<target>Fortsett</target>
+
+<source>Pause</source>
+<target>Pause</target>
+
+<source>Cannot find %x</source>
+<target>Kan ikke finne %x</target>
+
+<source>Inactive</source>
+<target>Inaktiv</target>
+
+<source>Today</source>
+<target>Idag</target>
+
+<source>This week</source>
+<target>Denne uke</target>
+
+<source>This month</source>
+<target>Denne måned</target>
+
+<source>This year</source>
+<target>Dette år</target>
+
+<source>Last x days</source>
+<target>Siste x dager</target>
+
+<source>Byte</source>
+<target>Byte</target>
+
+<source>KB</source>
+<target>KB</target>
+
+<source>MB</source>
+<target>MB</target>
+
+<source>Filter</source>
+<target>Filter</target>
+
+<source>Direct</source>
+<target>Direkte</target>
+
+<source>Follow</source>
+<target>Følg</target>
+
+<source>Copy NTFS permissions</source>
+<target>Kopier NTFS-tillatelser</target>
+
+<source>Integrate external applications into context menu. The following macros are available:</source>
+<target>Integrer eksterne programmer i høyreklikkmeny. Følgende makroer er tilgjengelige:</target>
+
+<source>- full file or directory name</source>
+<target>- fullt fil- eller mappenavn</target>
+
+<source>- directory part only</source>
+<target>- bare mappedel</target>
+
+<source>- Other side's counterpart to %name</source>
+<target>- Andre sides motstykke til %name</target>
+
+<source>- Other side's counterpart to %dir</source>
+<target>- Andre sides motstykke til %dir</target>
+
+<source>Make hidden dialogs and warning messages visible again?</source>
+<target>Gjøre skjulte dialoger og advarselsmeldinger synlige igjen?</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 det følgende objektet til papirkurven?</pluralform>
+<pluralform>Vil du flytte de følgende %x objekter til papirkurven?</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 det følgende objektet?</pluralform>
+<pluralform>Vil du slette de følgende %x objekter?</pluralform>
+</target>
+
+<source>Leave as unresolved conflict</source>
+<target>Etterlat som uløste konflikter</target>
+
+<source>Delete permanently</source>
+<target>Slett permanent</target>
+
+<source>Delete or overwrite files permanently</source>
+<target>Slett eller overskriv filer permanent</target>
+
+<source>Use Recycle Bin when deleting or overwriting files</source>
+<target>Bruk papirkurv ved sletting eller filoverskrivning</target>
+
+<source>Versioning</source>
+<target>Versjonshåndtering</target>
+
+<source>Move files into a time-stamped subdirectory</source>
+<target>Flytt filer til en datomerket undermappe</target>
+
+<source>Files</source>
+<target>Filer</target>
+
+<source>Percentage</source>
+<target>Prosent</target>
+
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 time</pluralform>
+<pluralform>%x timer</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dag</pluralform>
+<pluralform>%x dager</pluralform>
+</target>
+
+<source>Cannot monitor directory %x.</source>
+<target>Kan ikke overvåke mappen %x.</target>
+
+<source>Conversion error:</source>
+<target>Konverteringsfeil:</target>
+
+<source>Cannot delete file %x.</source>
+<target>Kan ikke slette filen %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Filen er låst av en annen prosess:</target>
+
+<source>Cannot move file %x to %y.</source>
+<target>Kan ikke flytte filen %x til %y.</target>
+
+<source>Cannot delete directory %x.</source>
+<target>Kan ikke slette mappen %x.</target>
+
+<source>Cannot write modification time of %x.</source>
+<target>Kan ikke skrive endringstid til %x.</target>
+
+<source>Cannot find system function %x.</source>
+<target>Kan ikke finne systemfunksjonen %x.</target>
+
+<source>Cannot read security context of %x.</source>
+<target>Kan ikke lese sikkerhetskontekst til %x.</target>
+
+<source>Cannot write security context of %x.</source>
+<target>Kan ikke skrive sikkerhetskontekst til %x.</target>
+
+<source>Cannot read permissions of %x.</source>
+<target>Kan ikke lese tillatelser til %x.</target>
+
+<source>Cannot write permissions of %x.</source>
+<target>Kan ikke skrive tillatelser til %x.</target>
+
+<source>Cannot create directory %x.</source>
+<target>Kan ikke opprette mappen %x.</target>
+
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Kan ikke kopiere symbolsk lenke %x til %y.</target>
+
+<source>Cannot write file attributes of %x.</source>
+<target>Kan ikke skrive filattributter til %x.</target>
+
+<source>Cannot copy file %x to %y.</source>
+<target>Kan ikke kopiere filen %x til %y.</target>
+
+<source>Cannot read directory %x.</source>
+<target>Kan ikke lese mappen %x.</target>
+
+<source>Endless loop.</source>
+<target>Endeløs sløyfe.</target>
+
+<source>Cannot set privilege %x.</source>
+<target>Kan ikke sette privilegie %x.</target>
+
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Ikke i stand til å flytte %x til papirkurven!</target>
+
+<source>Both sides have changed since last synchronization!</source>
+<target>Begge sider er endret siden siste synkronisering!</target>
+
+<source>Cannot determine sync-direction:</source>
+<target>Kan ikke bestemme synkroniseringsretning:</target>
+
+<source>No change since last synchronization!</source>
+<target>Ingen endringer siden siste synkronisering!</target>
+
+<source>Filter settings have changed!</source>
+<target>Filterinnstillinger er endret!</target>
+
+<source>The file was not processed by last synchronization!</source>
+<target>Filen ble ikke behandlet ved siste synkronisering!</target>
+
+<source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
+<target>Stiller inn standard synkroniseringsretning: Gamle filer blir overskrevet med nyere filer.</target>
+
+<source>The file does not contain a valid configuration:</source>
+<target>Filen inneholder ingen gyldig innstilling:</target>
+
+<source>You can ignore this error to consider the directory as empty.</source>
+<target>Du kan ignorere denne feil og anse mappen som tom.</target>
+
+<source>Cannot find directory %x.</source>
+<target>Kan ikke finne mappen %x.</target>
+
+<source>Directories are dependent! Be careful when setting up synchronization rules:</source>
+<target>Mapper er avhengige av hverandre! Vær forsiktig når du setter opp synkroniseringsregler:</target>
+
+<source>Preparing synchronization...</source>
+<target>Forbereder synkronisering...</target>
+
+<source>Conflict detected:</source>
+<target>Konflikt oppdaget:</target>
+
+<source>File %x has an invalid date!</source>
+<target>Filen %x har en ugyldig dato!</target>
+
+<source>Files %x have the same date but a different size!</source>
+<target>Filer %x har den samme datoen, men forskjellig størrelse!</target>
+
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Symbolske lenker %x har den samme datoen, men forskjellige mål.</target>
+
+<source>Comparing content of files %x</source>
+<target>Sammenligner innhold til filer %x</target>
+
+<source>Comparing files by content failed.</source>
+<target>Sammenligning av filer etter innhold feilet.</target>
+
+<source>Generating file list...</source>
+<target>Lager filliste...</target>
+
+<source>Both sides are equal</source>
+<target>Begge sider er like</target>
+
+<source>Files/folders differ in attributes only</source>
+<target>Filer/mapper skiller bare i attributter</target>
+
+<source>Copy new file/folder to left</source>
+<target>Kopier ny fil/mappe til venstre</target>
+
+<source>Copy new file/folder to right</source>
+<target>Kopier ny fil/mappe til høyre</target>
+
+<source>Delete left file/folder</source>
+<target>Slett venstre fil/mappe</target>
+
+<source>Delete right file/folder</source>
+<target>Slett høyre fil/mappe</target>
+
+<source>Move file on left</source>
+<target>Flytt venstre fil</target>
+
+<source>Move file on right</source>
+<target>Flytt høyre fil</target>
+
+<source>Overwrite left file/folder with right one</source>
+<target>Overskriv venstre fil/mappe med den til høyre</target>
+
+<source>Overwrite right file/folder with left one</source>
+<target>Overskriv høyre fil/mappe med den til venstre</target>
+
+<source>Do nothing</source>
+<target>Ikke gjør noe</target>
+
+<source>Copy file attributes only to left</source>
+<target>Kopier filattributter bare til venstre</target>
+
+<source>Copy file attributes only to right</source>
+<target>Kopier filattributter bare til høyre</target>
+
+<source>Multiple...</source>
+<target>Flere...</target>
+
+<source>Deleting file %x</source>
+<target>Sletter fil %x</target>
+
+<source>Deleting folder %x</source>
+<target>Sletter mappe %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>Sletter symbolsk lenke %x</target>
+
+<source>Moving file %x to recycle bin</source>
+<target>Flytter fil %x til papirkurv</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>Flytter mappe %x til papirkurv</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>Flytter symbolsk lenke %x til papirkurv</target>
+
+<source>Moving file %x to %y</source>
+<target>Flytter fil %x til %y</target>
+
+<source>Moving folder %x to %y</source>
+<target>Flytter mappe %x til %y</target>
+
+<source>Moving symbolic link %x to %y</source>
+<target>Flytter symbolsk lenke %x til %y</target>
+
+<source>Creating file %x</source>
+<target>Oppretter fil %x</target>
+
+<source>Creating symbolic link %x</source>
+<target>Oppretter symbolsk lenke %x</target>
+
+<source>Creating folder %x</source>
+<target>Oppretter mappe %x</target>
+
+<source>Overwriting file %x</source>
+<target>Overskriver fil %x</target>
+
+<source>Overwriting symbolic link %x</source>
+<target>Overskriver symbolsk lenke %x</target>
+
+<source>Verifying file %x</source>
+<target>Verifiserer fil %x</target>
+
+<source>Updating attributes of %x</source>
+<target>Oppdaterer attributter til %x</target>
+
+<source>Target directory name must not be empty!</source>
+<target>Navn på målmappe må ikke være tomt!</target>
+
+<source>Directory for file versioning was not supplied!</source>
+<target>Mappe for filversjonshåndtering ble ikke angitt!</target>
+
+<source>Source directory %x not found.</source>
+<target>Kildemappen %x ikke funnet.</target>
+
+<source>Unresolved conflicts existing!</source>
+<target>Uløste konflikter finnes!</target>
+
+<source>You can ignore conflicts and continue synchronization.</source>
+<target>Du kan ignorere konflikter og fortsette synkronisering.</target>
+
+<source>Significant difference detected:</source>
+<target>Betydelig forskjell oppdaget:</target>
+
+<source>More than 50% of the total number of files will be copied or deleted!</source>
+<target>Mer enn 50% av det totale antall filer blir kopiert eller slettet!</target>
+
+<source>Not enough free disk space available in:</source>
+<target>Ikke nok ledig diskplass tilgjengelig på:</target>
+
+<source>Free disk space required:</source>
+<target>Ledig diskplass som kreves:</target>
+
+<source>Free disk space available:</source>
+<target>Ledig diskplass tilgjengelig:</target>
+
+<source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
+<target>Papirkurv er ikke tilgjengelig for de følgende baner! Filer blir isteden slettet permanent:</target>
+
+<source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
+<target>En mappe blir endret som er del av flere mappepar! Kontroller synkroniseringsinnstillinger!</target>
+
+<source>Processing folder pair:</source>
+<target>Behandler mappepar:</target>
+
+<source>Generating database...</source>
+<target>Oppretter database...</target>
+
+<source>Data verification error: Source and target file have different content!</source>
+<target>Dataverifiseringsfeil: Kilde- og målfil har forskjellig innhold!</target>
+
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 44381d46..74d572c5 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -11,7 +11,7 @@
 <target>Szukanie katalogu %x...</target>
 
 <source>Show in Explorer</source>
-<target>Wyświetl w Exlporerze</target>
+<target>Wyświetl w Explorerze</target>
 
 <source>Open with default application</source>
 <target>Otwórz za pomocą domyślnej aplikacji</target>
@@ -19,9 +19,15 @@
 <source>Browse directory</source>
 <target>Przeglądaj katalog</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Żądanie przerwania: Czekaj na koniec aktualnie wykonywanego zadania...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatyczna Synchronizacja</target>
 
+<source>Error</source>
+<target>Błąd</target>
+
 <source>Select alternate comparison settings</source>
 <target>Określ alternatywne ustawienia porównywania</target>
 
@@ -52,11 +58,8 @@
 <source>About</source>
 <target>O Programie</target>
 
-<source>Error</source>
-<target>Błąd</target>
-
 <source>Warning</source>
-<target>Ostrzerzenie</target>
+<target>Ostrzeżenie</target>
 
 <source>Question</source>
 <target>Pytanie</target>
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Błąd systemu linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Błąd odczytu dowiązania symbolicznego:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nie można określić położenia dowiązania symbolicznego %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -137,35 +140,41 @@
 <pluralform>%x Bajtów</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Błąd odczytu z bazy danych synchronizacji:</target>
+<source>Cannot read file %x.</source>
+<target>Nie można odczytać pliku %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Błąd zapisu do bazy danych synchronizacji:</target>
+<source>Cannot write file %x.</source>
+<target>Nie można zapisać pliku %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Niepoprawny format bazy danych dla synchronizacji:</target>
+<source>Database file %x is incompatible.</source>
+<target>Plika bazy danych %x nie jest kompatybilny.</target>
 
 <source>Initial synchronization:</source>
 <target>Wstępna synchronizacja:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Jeden z plików bazy danych FreeFileSync nie istnieje:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Plik bazy danych %x nie istnieje.</target>
+
+<source>Out of memory!</source>
+<target>Brak wolnej pamięci!</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Pliki danych nie współdzielą wspólnej sesji synchronizacji:</target>
+<source>Database files do not share a common session.</source>
+<target>Pliki bazy danych nie współdzielą sesji.</target>
 
 <source>An exception occurred!</source>
 <target>Wystąpił wyjątek!</target>
 
-<source>Error reading file attributes:</source>
-<target>Błąd odczytu atrybutów pliku:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Nie można odczytać atrybutów pliku %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Nie można uzyskać informacji dla procesu.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Blokada katalogu (%x), oczekiwanie...</target>
 
-<source>Error setting directory lock:</source>
-<target>Błąd ustawiania blokady katalogu:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Nie można zablokować katalogu %x do zapisu.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -177,8 +186,8 @@
 <pluralform>%x sekund</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Błąd odczytu pliku:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Błąd podczas parsowania pliku %x, rząd %y, kolumna %z.</target>
 
 <source>Scanning:</source>
 <target>Skanowanie:</target>
@@ -196,41 +205,35 @@
 <pluralform>[%x Wątków]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Nieprawidłowy plik konfiguracyjny!</target>
-
-<source>Error parsing configuration file:</source>
-<target>Błąd parsowania pliku konfiguracyjnego:</target>
+<source>/sec</source>
+<target>/sekundę</target>
 
-<source>Configuration loaded partially only:</source>
-<target></target>
+<source>File %x does not contain a valid configuration.</source>
+<target>Plik %x nie zawiera prawidłowej konfiguracji</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target></target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Plik konfiguracyjny %x wczytany tylko częściowo.</target>
 
-<source>Cannot load file %x.</source>
-<target></target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Nie można uzyskać dostępu do usługi Volume Shadow Copy.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Błąd podczas dostępdu do usługi Volume Shadow Copy!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Usługa shadow copy jest aktywna tylko w wersji 64 bitowej programu FreeFileSync.</target>
 
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Tworzenie Shadow Copies dla WOW64 nie jest obsługiwane. Zainstaluj 64 bitową wersję FreeFileSync.</target>
+<source>Cannot load file %x.</source>
+<target>Nie można wczytać pliku %x.</target>
 
-<source>Cannot determine volume name for file:</source>
-<target></target>
+<source>Path %x does not contain a volume name.</source>
+<target>Ścieżka %x nie zawiera poprawnej etykiety dysku.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Dysk %x nie jest częścią pliku %y!</target>
 
-<source>/sec</source>
-<target>/sekundę</target>
-
-<source>File does not exist:</source>
-<target>Plik nie istnieje:</target>
+<source>Cannot find file %x.</source>
+<target>Nie można znaleźć pliku %x.</target>
 
 <source>Cannot read the following XML elements:</source>
-<target></target>
+<target>Nie można odczytać elementu XML:</target>
 
 <source>S&ave configuration...</source>
 <target>Z&apisz konfigurację...</target>
@@ -271,7 +274,7 @@ The command line is executed each time:
 - files within these directories or subdirectories are modified
 </source>
 <target>
-Komenda jest wykonwywana za każdym razem gdy:
+Komenda jest wykonywana za każdym razem gdy:
 - wszystkie katalogi będą dostępne (np. włożenie USB)
 - pliki w obrębie tych katalogów i podkatalogów ulegną zmianie
 </target>
@@ -295,19 +298,22 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target>Minimalny czas bezczynności [sekundy]</target>
 
 <source>Idle time between detection of last change and execution of command line in seconds</source>
-<target>Odstęp czasu w sekundach pomiędzy pomiędzy ostatnią wykrytą zmianą, a wykonaniem komendy</target>
+<target>Odstęp czasu w sekundach pomiędzy ostatnią wykrytą zmianą, a wykonaniem komendy</target>
 
 <source>Start</source>
 <target>Rozpocznij</target>
 
+<source>&Retry</source>
+<target>&Powtórz</target>
+
+<source>Cancel</source>
+<target>Anuluj</target>
+
 <source>(Build: %x)</source>
 <target>(Zbudowano: %x)</target>
 
 <source>RealtimeSync configuration</source>
-<target>RealtimeSync konfiguracja</target>
-
-<source>File already exists. Overwrite?</source>
-<target>Nadpisać istniejący już plik?</target>
+<target>Konfiguracja RealtimeSync</target>
 
 <source>&Restore</source>
 <target>&Przywróć</target>
@@ -346,40 +352,43 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target>Własne</target>
 
 <source>FreeFileSync batch file</source>
-<target>FreeFileSync plik wsadowy</target>
+<target>Plik wsadowy FreeFileSync</target>
 
 <source>FreeFileSync configuration</source>
 <target>Konfiguracja FreeFileSync</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync plik wsadowy</target>
-
-<source>Unable to create log file!</source>
-<target>Nie można utworzyć pliku z logami!</target>
-
 <source>Batch execution</source>
 <target>Uruchomienie pliku wsadowego</target>
 
-<source>Stop</source>
-<target>Zatrzymaj</target>
+<source>Items processed:</source>
+<target>Przetworzeone elementy:</target>
+
+<source>Items remaining:</source>
+<target>Pozostałe elementy:</target>
 
 <source>Total time:</source>
 <target>Całkowity czas:</target>
 
+<source>Stop</source>
+<target>Zatrzymaj</target>
+
 <source>Synchronization aborted!</source>
 <target>Synchronizacja przerwana!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronizacja zakończona z błędami.</target>
 
+<source>Nothing to synchronize!</source>
+<target>Brak plików do synchronizacji!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Synchronizacja zakończona pomyślnie!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Naciśnij "Przełącz" aby otworzyć moduł GUI.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Wciśnij "Przełącz" aby rozwiązać wszystkie problemy w głównym oknie FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Przełączanie do trybu GUI FreeFileSync</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Przełączanie do głównego okna FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Nie można się połączyć z sourceforge.net!</target>
@@ -394,7 +403,7 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target>Informacja</target>
 
 <source>FreeFileSync is up to date!</source>
-<target>FreeFileSync jest już uaktualniony!</target>
+<target>Posiadasz aktualną wersję FreeFileSync!</target>
 
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Czy chcesz aby FreeFileSync sprawdzał uaktualnienia co tydzień?</target>
@@ -409,7 +418,7 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target><Katalog></target>
 
 <source>Full path</source>
-<target>Pełna scieżka</target>
+<target>Pełna ścieżka</target>
 
 <source>Name</source>
 <target>Nazwa</target>
@@ -537,9 +546,6 @@ Komenda jest wykonwywana za każdym razem gdy:
 <source>Items found:</source>
 <target>Znalezione elementy:</target>
 
-<source>Items remaining:</source>
-<target>Pozostałe elementy:</target>
-
 <source>Speed:</source>
 <target>Prędkość:</target>
 
@@ -553,7 +559,7 @@ Komenda jest wykonwywana za każdym razem gdy:
 <target>Plik wsadowy</target>
 
 <source>Create a batch file and automate synchronization. To start in batch mode simply double-click this file or run command: FreeFileSync.exe SyncJob.ffs_batch. This can also be scheduled in your system's task planner.</source>
-<target></target>
+<target>Utwórz plik wsadowy aby zautomatyzować proces synchronizacji. Aby uruchomić synchronizację w trybie wsadowym kliknij dwa razy kliknij na ten plik lub wykonaj komendę: FreeFileSync.exe SyncJob.ffs_batch. Możesz to również wykorzystać w swoim harmonogramie zadań.</target>
 
 <source>Help</source>
 <target>Pomoc</target>
@@ -567,9 +573,6 @@ Komenda jest wykonwywana za każdym razem gdy:
 <source>Right</source>
 <target>Prawy</target>
 
-<source>Sync setttings</source>
-<target></target>
-
 <source>Status feedback</source>
 <target>Opinia statusu</target>
 
@@ -594,9 +597,6 @@ Komenda jest wykonwywana za każdym razem gdy:
 <source>&Load</source>
 <target>&Wczytaj</target>
 
-<source>&Cancel</source>
-<target>&Anuluj</target>
-
 <source>Select variant:</source>
 <target>Wybierz wariant:</target>
 
@@ -645,8 +645,8 @@ Komenda jest wykonwywana za każdym razem gdy:
 <source>Conflict/file cannot be categorized</source>
 <target>Konflikt/plik nie może zostać skategoryzowany</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Porównaj przez...</target>
@@ -681,9 +681,6 @@ jest identyczna
 <source>Synchronizing...</source>
 <target>Synchronizuję...</target>
 
-<source>Items processed:</source>
-<target>Przetworzeone elementy:</target>
-
 <source>&Pause</source>
 <target>&Pauza</target>
 
@@ -715,7 +712,7 @@ jest identyczna
 <target>Udostępnione na zasadach licencji GNU General Public License</target>
 
 <source>Ignore further errors</source>
-<target></target>
+<target>Ignoruj kolejne błędy</target>
 
 <source>Hide further error messages during the current process</source>
 <target>Ukryj kolejne informacje o błędach dla tego zadania</target>
@@ -723,9 +720,6 @@ jest identyczna
 <source>&Ignore</source>
 <target>&Ignoruj</target>
 
-<source>&Retry</source>
-<target>&Powtórz</target>
-
 <source>Do not show this dialog again</source>
 <target>Nie pokazuj tego okna ponownie</target>
 
@@ -751,13 +745,16 @@ jest identyczna
 Only files that match all filter settings will be synchronized.
 Note: File names must be relative to base directories!
 </source>
-<target></target>
+<target>
+Tylko pliki pasujące do wszystkich filtrów będą synchronizowane.
+Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowego.
+</target>
 
 <source>Hints:</source>
 <target>Wskazówki:</target>
 
 <source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Wprowdź relatywne scieżki do plików lub katalogów oddzielone ';' lub nową linią.</target>
+<target>1. Wprowadź relatywne scieżki do plików lub katalogów oddzielone ';' lub nową linią.</target>
 
 <source>2. Use wildcard characters '*' and '?'.</source>
 <target>2. Użyj wieloznacznika (wildcard) '*' i '?'.</target>
@@ -787,16 +784,16 @@ Wyklucz: \moje\temp\*
 <target>Wyklucz</target>
 
 <source>Time span</source>
-<target></target>
+<target>Przedział czasowy</target>
 
 <source>File size</source>
-<target></target>
+<target>Rozmiar pliku</target>
 
 <source>Minimum</source>
-<target></target>
+<target>Minimum</target>
 
 <source>Maximum</source>
-<target></target>
+<target>Maksimum</target>
 
 <source>&Default</source>
 <target>&Domyślne</target>
@@ -820,7 +817,7 @@ Wyklucz: \moje\temp\*
 <target>Transfer uprawnień plików i katalogów (Wymaga uprawnień Administratora)</target>
 
 <source>Restore hidden dialogs</source>
-<target></target>
+<target>Przywróc ukryte dialogi</target>
 
 <source>External applications</source>
 <target>Aplikacje zewnętrzne</target>
@@ -883,7 +880,7 @@ Wyklucz: \moje\temp\*
 <target>Odznacz wszystko</target>
 
 <source>Show icons:</source>
-<target></target>
+<target>Pokaż ikony:</target>
 
 <source>Small</source>
 <target>Mały</target>
@@ -910,7 +907,7 @@ Wyklucz: \moje\temp\*
 <target>Konfiguracja zapisana!</target>
 
 <source>Never save changes</source>
-<target></target>
+<target>Nigdy nie zapisuj zmian</target>
 
 <source>Save changes to current configuration?</source>
 <target>Zapisać zmiany obecnej konfiguracji?</target>
@@ -1020,9 +1017,6 @@ Wyklucz: \moje\temp\*
 <source>File list exported!</source>
 <target>Lista plików wyeksportowana!</target>
 
-<source>Error writing file:</source>
-<target>Błąd zapisu pliku:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1072,21 +1066,21 @@ Wyklucz: \moje\temp\*
 <source>Paused</source>
 <target>Pauza</target>
 
+<source>Initializing...</source>
+<target>Inicjalizacja...</target>
+
 <source>Aborted</source>
 <target>Przerwana</target>
 
 <source>Completed</source>
 <target>Zakończono</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Żądanie przerwania: Czekaj na koniec aktualnie wykonywanego zadania...</target>
+<source>Continue</source>
+<target>Kontynuuj</target>
 
 <source>Pause</source>
 <target>Pauza</target>
 
-<source>Continue</source>
-<target>Kontynuuj</target>
-
 <source>Cannot find %x</source>
 <target>Nie można znaleźć %x</target>
 
@@ -1106,7 +1100,7 @@ Wyklucz: \moje\temp\*
 <target>W tym roku</target>
 
 <source>Last x days</source>
-<target></target>
+<target>Ostatnie x dni</target>
 
 <source>Byte</source>
 <target>Bajtów</target>
@@ -1118,13 +1112,13 @@ Wyklucz: \moje\temp\*
 <target>MB</target>
 
 <source>Filter</source>
-<target></target>
+<target>Filtr</target>
 
 <source>Direct</source>
 <target>Bezpośrednio</target>
 
 <source>Follow</source>
-<target>Podąrzaj</target>
+<target>Podążaj</target>
 
 <source>Copy NTFS permissions</source>
 <target>Kopiuj uprawnienia NTFS</target>
@@ -1145,7 +1139,7 @@ Wyklucz: \moje\temp\*
 <target>- Odpowiednik %dir</target>
 
 <source>Make hidden dialogs and warning messages visible again?</source>
-<target></target>
+<target>Czy chcesz ponownie aktywować ukryte powiadomienia i ostrzeżenia?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1230,68 +1224,65 @@ Wyklucz: \moje\temp\*
 <pluralform>%x dni</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Nie można uruchomić monitora katalogów:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Błąd podczas monitorowania katalogów.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Nie można monitorować katalogu %x.</target>
 
 <source>Conversion error:</source>
 <target>Błąd konwersji:</target>
 
-<source>Error deleting file:</source>
-<target>Błąd podczas usuwania pliku:</target>
+<source>Cannot delete file %x.</source>
+<target>Nie można usunąć pliku %x.</target>
 
-<source>Error moving file:</source>
-<target>Błąd podczas przenoszenia pliku:</target>
+<source>The file is locked by another process:</source>
+<target>Plik jest zablokowany przez inny proces:</target>
 
-<source>Target file already existing!</source>
-<target>Plik docelowy już istnieje!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Nie można przenieść pliku %x do %y.</target>
 
-<source>Error moving directory:</source>
-<target>Błąd podczas przenoszenia katalogu:</target>
+<source>Cannot delete directory %x.</source>
+<target>Nie można usunąć katalogu %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Katalog docelowy już istnieje!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Nie można zapisać czasu modyfikacji %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Błąd podczas usuwania katalogu:</target>
+<source>Cannot find system function %x.</source>
+<target>Nie można odnaleźć funkcji systemowej %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Błąd zmiany godziny modyfikacji:</target>
+<source>Cannot read security context of %x.</source>
+<target>Nie można odczytać ustawień bezpieczeństwa %x.</target>
 
-<source>Error loading library function:</source>
-<target>Błąd wczytywania funkcji:</target>
+<source>Cannot write security context of %x.</source>
+<target>Nie można zapisać ustawień bezpieczeństwa %x.</target>
 
-<source>Error reading security context:</source>
-<target>Błąd odczytu kontekstu bezpieczeństwa:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Nie można odczytać uprawnień %x.</target>
 
-<source>Error writing security context:</source>
-<target>Błąd zapisu kontekstu bezpieczeństwa:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Nie można zapisać uprawnień %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Błąd podczas kopiowania uprawnień pliku:</target>
+<source>Cannot create directory %x.</source>
+<target>Nie można utworzyć katalogu %x.</target>
 
-<source>Error creating directory:</source>
-<target>Błąd podczas tworzenia katalogu:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Nie można skopiować dowiązania symbolicznego %x do %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Błąd podczas kopiowania dowiązania symbolicznego (symlink)</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Nie można zapisać atrybutów %x.</target>
 
-<source>Error copying file:</source>
-<target>Błąd podczas kopiowania pliku:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Nie można skopiować pliku %x do %y.</target>
 
-<source>Error opening file:</source>
-<target>Błąd odczytu pliku:</target>
+<source>Cannot read directory %x.</source>
+<target>Nie można odczytać katalogu %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Błąd podczas odczytywania katalogu:</target>
+<source>Endless loop.</source>
+<target>Nieskończona pętla.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Zapętlenie podczas przeglądania katalogu:</target>
+<source>Cannot set privilege %x.</source>
+<target>Nie można ustawić uprawnień %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Błąd ustawiania uprawnień:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Nie można przenieść %x do kosza!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Obie strony uległy zmianie od ostatniej synchronizacji!</target>
@@ -1317,8 +1308,8 @@ Wyklucz: \moje\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Możesz zignorować ten błąd uznająć jeden z katalogów jako pusty.</target>
 
-<source>Directory does not exist:</source>
-<target>Katalog nie istnieje:</target>
+<source>Cannot find directory %x.</source>
+<target>Nie można znaleźć katalogu %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Katalogi są zależne! Pamiętaj o tym podczas ustawiania zasad synchronizacji:</target>
@@ -1326,20 +1317,17 @@ Wyklucz: \moje\temp\*
 <source>Preparing synchronization...</source>
 <target>Przygotowywanie synchronizacji...</target>
 
-<source>Out of memory!</source>
-<target></target>
+<source>Conflict detected:</source>
+<target>Wykryto konflikt:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Plik %x ma nieprawidłową datę!</target>
 
-<source>Conflict detected:</source>
-<target>Wykryto konflikt:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Pliki %x mają tą samą datę lecz różne rozmiary!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Dowiązanie symboliczne %x ma te same dane, ale inny cel!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Dowiązania symboliczne %x mają tą samą datę, ale różne źródła.</target>
 
 <source>Comparing content of files %x</source>
 <target>Porównywanie zawartości plików %x</target>
@@ -1422,12 +1410,12 @@ Wyklucz: \moje\temp\*
 <source>Creating file %x</source>
 <target>Tworzenie pliku %x</target>
 
-<source>Creating folder %x</source>
-<target>Tworzenie folderu %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Tworzenie dowiązania symbolicznego %x</target>
 
+<source>Creating folder %x</source>
+<target>Tworzenie folderu %x</target>
+
 <source>Overwriting file %x</source>
 <target>Nadpisywanie pliku %x</target>
 
@@ -1446,8 +1434,8 @@ Wyklucz: \moje\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Nie określono katalogu do wersjonowania plików!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Katalog źródłowy nie istnieje:</target>
+<source>Source directory %x not found.</source>
+<target>Katalog źródłowy %x nie istnieje.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Istnieją nierozwiązane konflikty!</target>
@@ -1482,12 +1470,6 @@ Wyklucz: \moje\temp\*
 <source>Generating database...</source>
 <target>Generowanie bazy danych...</target>
 
-<source>Nothing to synchronize!</source>
-<target></target>
-
-<source>Unable to copy locked file %x!</source>
-<target></target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Błąd weryfikacji danych: Plik źródłowy i docelowy różnią się zawartością!</target>
 
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index 3bbf2d40..a3a07ba4 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -19,8 +19,11 @@
 <source>Browse directory</source>
 <target>Procurar directório</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Abortar pedido: À espera do fim da operação atual...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
-<target>RealtimeSync - Sincronização Automática</target>
+<target>RealtimeSync - Sincronização Automatizada</target>
 
 <source>Select alternate comparison settings</source>
 <target>Selecionar opções alternativas de comparação</target>
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Código de erro do Linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Erro na resolução do link simbólico:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Não é possível resolver o link simbólico %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Erro ao ler a base de dados de sincronização:</target>
+<source>Cannot read file %x.</source>
+<target>Não é possível ler o ficheiro %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Erro na escrita da base de dados de sincronização:</target>
+<source>Cannot write file %x.</source>
+<target>Não é possível escrever o ficheiro %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Formato de base de dados de sincronização incompatível:</target>
+<source>Database file %x is incompatible.</source>
+<target>Base de dados %x não é compatível.</target>
 
 <source>Initial synchronization:</source>
 <target>Sincronização inicial:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Um dos ficheiros da base de dados não existe:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Base de dados %x não existe.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Bases de dados não partilham a mesma sessão de sincronização:</target>
+<source>Out of memory!</source>
+<target>Sem memória disponível!</target>
+
+<source>Database files do not share a common session.</source>
+<target>As bases de dados são de sessões diferentes.</target>
 
 <source>An exception occurred!</source>
 <target>Ocorreu uma excepção!</target>
 
-<source>Error reading file attributes:</source>
-<target>Erro ao ler atributos do ficheiro:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Não é possível ler os atributos do ficheiro %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Não é possível obter informação sobre o processo.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Aguardar enquanto o directório é bloqueado (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Erro ao bloquear directório:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Não é possível bloquear o directório %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x segs</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Erro de leitura de ficheiro:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Erro ao analisar ficheiro %x, linha %y, coluna %z.</target>
 
 <source>Scanning:</source>
 <target>A pesquisar:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Ficheiro de configuração inválido!</target>
+<source>/sec</source>
+<target>/seg</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Ficheiro %x não tem uma configuração válida.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Erro de leitura do ficheiro de configuração:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Ficheiro de configuração %x carregado parcialmente.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Configuração carregada parcialmente:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Não é possível aceder ao serviço Volume Shadow Copy.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Não é possível mover %x para a Reciclagem!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Utilize a versão 64-bit do FreeFileSync para criar cópias sombra neste sistema.</target>
 
 <source>Cannot load file %x.</source>
 <target>Não é possível carregar o ficheiro %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Erro no acesso ao serviço Volume Shadow Copy!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Fazer cópias fantasma em WOW64 não é suportado. Por favor usar a versão 64-bit.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Não é possível obter o nome do volume para o ficheiro:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>O caminho %x não tem um nome de volume.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Nome do volume %x não faz parte do ficheiro %y!</target>
 
-<source>/sec</source>
-<target>/seg</target>
-
-<source>File does not exist:</source>
-<target>O ficheiro não existe:</target>
+<source>Cannot find file %x.</source>
+<target>Não é possível encontrar o ficheiro %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Não é possível ler os elementos XML:</target>
@@ -257,10 +260,10 @@
 <target>1. Selecionar directórios a monitorizar.</target>
 
 <source>2. Enter a command line.</source>
-<target>2. Insirir a linha de comando.</target>
+<target>2. Inserir a linha de comando.</target>
 
 <source>3. Press 'Start'.</source>
-<target>3. Pressione 'Iniciar'.</target>
+<target>3. Pressionar 'Iniciar'.</target>
 
 <source>
 The command line is executed each time:
@@ -303,9 +306,6 @@ A linha de comandos é executada cada vez que:
 <source>RealtimeSync configuration</source>
 <target>Configuração do RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>O ficheiro já existe. Deseja substituir?</target>
-
 <source>&Restore</source>
 <target>&Restaurar</target>
 
@@ -316,7 +316,7 @@ A linha de comandos é executada cada vez que:
 <target>Monitorizar activado...</target>
 
 <source>Waiting for missing directories...</source>
-<target>Aguardar pelos directórios em falta...</target>
+<target>A aguardar pelos directórios em falta...</target>
 
 <source>A directory input field is empty.</source>
 <target>Um campo de directório está vazio.</target>
@@ -348,35 +348,38 @@ A linha de comandos é executada cada vez que:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync configuração</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync ficheiro batch</target>
-
-<source>Unable to create log file!</source>
-<target>Não é possível criar ficheiro log!</target>
-
 <source>Batch execution</source>
 <target>Execução do batch</target>
 
-<source>Stop</source>
-<target>Parar</target>
+<source>Items processed:</source>
+<target>Elementos processados:</target>
+
+<source>Items remaining:</source>
+<target>Elementos restantes:</target>
 
 <source>Total time:</source>
 <target>Tempo total:</target>
 
+<source>Stop</source>
+<target>Parar</target>
+
 <source>Synchronization aborted!</source>
 <target>Sincronização abortada!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sincronização completa com erros!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Nada a sincronizar!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Sincronização completa com sucesso!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Clique "Trocar" para abrir o GUI do FreeFileSync.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Pressionar "Trocar" para resolver problemas com a interface principal do FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>A abrir o GUI do FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>A trocar para a interface principal do FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Não é possível ligar a sourceforge.net!</target>
@@ -502,7 +505,7 @@ A linha de comandos é executada cada vez que:
 <target>Trocar lados</target>
 
 <source>Save current configuration to file</source>
-<target>Guardar o actual ficheiro de configuração</target>
+<target>Guardar configuração actual para ficheiro</target>
 
 <source>Load configuration from file</source>
 <target>Carregar configuração do ficheiro</target>
@@ -534,9 +537,6 @@ A linha de comandos é executada cada vez que:
 <source>Items found:</source>
 <target>Elementos encontrados:</target>
 
-<source>Items remaining:</source>
-<target>Elementos restantes:</target>
-
 <source>Speed:</source>
 <target>Velocidade:</target>
 
@@ -586,16 +586,16 @@ A linha de comandos é executada cada vez que:
 <target>&Guardar</target>
 
 <source>&Load</source>
-<target>&Carregar</target>
+<target>C&arregar</target>
 
-<source>&Cancel</source>
-<target>&Cancelar</target>
+<source>Cancel</source>
+<target>Cancelar</target>
 
 <source>Select variant:</source>
 <target>Selecione uma variante:</target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>Identificar e propagar mudanças em ambos os lados utilizando base de dados. Eliminar, renomear e conflitos são detetados automaticamente.</target>
+<target>Identificar e propagar mudanças em ambos os lados utilizando base de dados. Itens eliminados, renomeados e conflitos são detetados automaticamente.</target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Cópia de segurança do directório à esquerda. O directório da direita é alterado para ficar igual ao da esquerda após sincronização.</target>
@@ -639,8 +639,8 @@ A linha de comandos é executada cada vez que:
 <source>Conflict/file cannot be categorized</source>
 <target>Ficheiro/conflito não pode ser categorizado</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Comparar por...</target>
@@ -674,14 +674,11 @@ Os ficheiros são considerados iguais se
 <source>Synchronizing...</source>
 <target>A sincronizar...</target>
 
-<source>Items processed:</source>
-<target>Elementos processados:</target>
-
 <source>&Pause</source>
 <target>&Pausa</target>
 
 <source>Source code written in C++ utilizing:</source>
-<target>Código fonte escrito em C++ usando:</target>
+<target>Código fonte escrito em C++ utilizando:</target>
 
 <source>Feedback and suggestions are welcome</source>
 <target>Comentários e sugestões são apreciados</target>
@@ -708,7 +705,7 @@ Os ficheiros são considerados iguais se
 <target>Publicado sobre GNU General Public License</target>
 
 <source>Ignore further errors</source>
-<target>Ignorar erros seguintes</target>
+<target>Ignorar próximos erros</target>
 
 <source>Hide further error messages during the current process</source>
 <target>Ocultar próximas mensagens de erro durante este processo</target>
@@ -720,7 +717,7 @@ Os ficheiros são considerados iguais se
 <target>&Tentar de Novo</target>
 
 <source>Do not show this dialog again</source>
-<target>Não mostrar novamente</target>
+<target>Não mostrar este diálogo novamente</target>
 
 <source>&Switch</source>
 <target>&Trocar</target>
@@ -753,7 +750,7 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <target>Dicas:</target>
 
 <source>1. Enter relative file or directory names separated by ';' or a new line.</source>
-<target>1. Inserir caminho(s) do(s) ficheiro(s) ou pasta(s) separados por ';' ou numa nova linha.</target>
+<target>1. Inserir caminhos dos ficheiros ou pastas separados por ';' ou numa nova linha.</target>
 
 <source>2. Use wildcard characters '*' and '?'.</source>
 <target>2. Usar '*' e '?' como caracteres de procura.</target>
@@ -774,7 +771,7 @@ 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>
+<target>Sincronizar todos os ficheiros .doc, .zip e .exe, excepto os da pasta "temp".</target>
 
 <source>Include</source>
 <target>Incluir</target>
@@ -798,10 +795,10 @@ Excluir: \stuff\temp\*
 <target>&Config. Iniciais</target>
 
 <source>Transactional file copy</source>
-<target>Copia ficheiro transacional</target>
+<target>Cópia de ficheiro transacional</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>Escrever para um ficheiro temporário (*.ffs_tmp) primeiro, depois renomear. Isto garante consistência mesmo em caso de erro fatal.</target>
+<target>Escrever para um ficheiro temporário (*.ffs_tmp) primeiro e depois renomear. Isto garante consistência mesmo em caso de erro fatal.</target>
 
 <source>Copy locked files</source>
 <target>Copiar ficheiros bloqueados</target>
@@ -852,7 +849,7 @@ Excluir: \stuff\temp\*
 <target>Vista</target>
 
 <source>Select view</source>
-<target>Seleccionar vista</target>
+<target>Selecionar vista</target>
 
 <source>Set direction:</source>
 <target>Escolher direcção:</target>
@@ -1008,7 +1005,7 @@ Excluir: \stuff\temp\*
 <target>Use Comparar antes da primeira sincronização!</target>
 
 <source>Comma separated list</source>
-<target>Lista de itens separados por virgulas</target>
+<target>Lista de itens separados por vírgulas</target>
 
 <source>Legend</source>
 <target>Legenda</target>
@@ -1016,9 +1013,6 @@ Excluir: \stuff\temp\*
 <source>File list exported!</source>
 <target>Lista dos ficheiros exportada!</target>
 
-<source>Error writing file:</source>
-<target>Erro de escrita no ficheiro:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1064,21 +1058,21 @@ Excluir: \stuff\temp\*
 <source>Paused</source>
 <target>Em pausa</target>
 
+<source>Initializing...</source>
+<target>A iniciar...</target>
+
 <source>Aborted</source>
 <target>Abortado</target>
 
 <source>Completed</source>
 <target>Terminado</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abortar pedido: À espera do fim da operação atual...</target>
+<source>Continue</source>
+<target>Continuar</target>
 
 <source>Pause</source>
 <target>Pausa</target>
 
-<source>Continue</source>
-<target>Continuar</target>
-
 <source>Cannot find %x</source>
 <target>Não é possível descobrir %x</target>
 
@@ -1144,8 +1138,8 @@ Excluir: \stuff\temp\*
 <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>
+<pluralform>Deseja mesmo mover o objecto para a Reciclagem?</pluralform>
+<pluralform>Deseja mesmo mover os %x objectos para a Reciclagem?</pluralform>
 </target>
 
 <source>
@@ -1217,65 +1211,65 @@ Excluir: \stuff\temp\*
 <pluralform>%x dias</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Não é possível iniciar monitorização do directório:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Erro ao monitorizar os directórios.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Não é possível monitorizar o directório %x.</target>
 
 <source>Conversion error:</source>
 <target>Erro de conversão:</target>
 
-<source>Error deleting file:</source>
-<target>Erro ao eliminar o ficheiro:</target>
+<source>Cannot delete file %x.</source>
+<target>Não é possível eliminar o ficheiro %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>O ficheiro está bloqueado por outro processo:</target>
 
-<source>Error moving file:</source>
-<target>Erro ao mover o ficheiro:</target>
+<source>Cannot move file %x to %y.</source>
+<target>Não é possível mover o ficheiro %x para %y.</target>
 
-<source>Target file already existing!</source>
-<target>Ficheiro de destino já existe!</target>
+<source>Cannot delete directory %x.</source>
+<target>Não é possível eliminar o directório %x.</target>
 
-<source>Error moving directory:</source>
-<target>Erro ao mover o directório:</target>
+<source>Cannot write modification time of %x.</source>
+<target>Não é possível alterar a data de modificação a %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Directório de destino já existe!</target>
+<source>Cannot find system function %x.</source>
+<target>Não é possível encontrar a função do sistema %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Erro ao eliminar a pasta:</target>
+<source>Cannot read security context of %x.</source>
+<target>Não é possível ler o contexto de segurança %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Erro ao mudar a hora de modificação:</target>
+<source>Cannot write security context of %x.</source>
+<target>Não é possível escrever o contexto de segurança %x.</target>
 
-<source>Error loading library function:</source>
-<target>Erro ao carregar a livraria:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Não é possível ler as permissões de %x.</target>
 
-<source>Error reading security context:</source>
-<target>Erro ao ler contexto de segurança:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Não é possível escrever as permissões de %x.</target>
 
-<source>Error writing security context:</source>
-<target>Erro de escrita no contexto de segurança:</target>
+<source>Cannot create directory %x.</source>
+<target>Não é possível criar o directório %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Erro ao copiar permissões dos ficheiros:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Não é possível copiar o link simbólico %x para %y.</target>
 
-<source>Error creating directory:</source>
-<target>Erro ao criar a pasta:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Não é possível escrever os atributos de %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Erro ao copiar o link:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Não é possível copiar o ficheiro %x para %y.</target>
 
-<source>Error copying file:</source>
-<target>Erro ao copiar ficheiro:</target>
+<source>Cannot read directory %x.</source>
+<target>Não é possível ler o directório %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Erro ao percorrer a pasta:</target>
+<source>Endless loop.</source>
+<target>Loop infinito.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Loop infinito ao percorrer directório:</target>
+<source>Cannot set privilege %x.</source>
+<target>Não é possível definir o privilégio %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Erro ao estabelecer privilégios:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Não é possível mover %x para a Reciclagem!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Ambos os lados tiveram alterações desde a última sincronização!</target>
@@ -1284,7 +1278,7 @@ Excluir: \stuff\temp\*
 <target>Não é possível saber a direção de sincronização:</target>
 
 <source>No change since last synchronization!</source>
-<target>Não há alterações desde a sincronização!</target>
+<target>Não há alterações desde a última sincronização!</target>
 
 <source>Filter settings have changed!</source>
 <target>Opções de filtro alteradas!</target>
@@ -1301,8 +1295,8 @@ Excluir: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Pode ignorar este erro para considerar o directório como vazio.</target>
 
-<source>Directory does not exist:</source>
-<target>A pasta não existe:</target>
+<source>Cannot find directory %x.</source>
+<target>Não é possível encontrar o directório %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Directórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
@@ -1310,20 +1304,17 @@ Excluir: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>A preparar sincronização...</target>
 
-<source>Out of memory!</source>
-<target>Sem memória disponível!</target>
+<source>Conflict detected:</source>
+<target>Conflito detectado:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Ficheiro %x tem data inválida!</target>
 
-<source>Conflict detected:</source>
-<target>Conflito detectado:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Os ficheiros %x têm a mesma data, mas tamanho diferente!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Links simbólicos %x tem a mesma data mas diferente destino!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Links simbólicos %x tem a mesma data, mas alvos diferentes.</target>
 
 <source>Comparing content of files %x</source>
 <target>A comparar o conteúdo do ficheiro %x</target>
@@ -1389,7 +1380,7 @@ Excluir: \stuff\temp\*
 <target>Mover ficheiro %x para a Reciclagem</target>
 
 <source>Moving folder %x to recycle bin</source>
-<target>Mover pasta %x para Reciclagem</target>
+<target>Mover pasta %x para a Reciclagem</target>
 
 <source>Moving symbolic link %x to recycle bin</source>
 <target>Mover link simbólico %x para a Reciclagem</target>
@@ -1406,12 +1397,12 @@ Excluir: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Criar ficheiro %x</target>
 
-<source>Creating folder %x</source>
-<target>Criar pasta %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Criar link simbólico %x</target>
 
+<source>Creating folder %x</source>
+<target>Criar pasta %x</target>
+
 <source>Overwriting file %x</source>
 <target>Substituir ficheiro %x</target>
 
@@ -1430,8 +1421,8 @@ Excluir: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Diretório para armazenar versões não foi definido!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>A pasta de origem já não existe:</target>
+<source>Source directory %x not found.</source>
+<target>Directório fonte %x não encontrado.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Existem conflitos por resolver!</target>
@@ -1455,10 +1446,10 @@ Excluir: \stuff\temp\*
 <target>Espaço livre disponível em disco:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
-<target>Reciclagem não disponível para os seguintes caminhos! Ficheiros serão apagados permanentemente:</target>
+<target>Reciclagem não disponível para os seguintes caminhos! Os ficheiros serão apagados permanentemente:</target>
 
 <source>A directory will be modified which is part of multiple folder pairs! Please review synchronization settings!</source>
-<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>
+<target>Um directório que pertencente a um conjunto de vários directórios vai ser alterado! Verifique as opções de sincronização!</target>
 
 <source>Processing folder pair:</source>
 <target>A processar o par do directorio:</target>
@@ -1466,12 +1457,6 @@ Excluir: \stuff\temp\*
 <source>Generating database...</source>
 <target>A gerar base de dados...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nada a sincronizar!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Não é possível copiar o ficheiro bloqueado %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Erro na verificação de dados: ficheiro fonte e de destino têm conteúdo diferente!</target>
 
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 9d91309a..0e14cfe7 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Navegar pelo diretório</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Cancelar solicitado: Esperando fim da operação...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automatizada</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Código de Erro do Linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Erro na resolução de link simbólico:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Não foi possível resolver o link simbólico %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Erro ao ler do banco de dados de sincronização:</target>
+<source>Cannot read file %x.</source>
+<target>Não foi possível ler o arquivo %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Erro ao escrever no banco de dados de sincronização:</target>
+<source>Cannot write file %x.</source>
+<target>Não foi possível escrever o arquivo %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Formato de banco de dados de sincronização incompatível:</target>
+<source>Database file %x is incompatible.</source>
+<target>O arquivo de banco de dados %x é incompatível.</target>
 
 <source>Initial synchronization:</source>
 <target>Sincronização inicial:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Um dos arquivos de banco de dados do FreeFileSync ainda não existe:</target>
+<source>Database file %x does not yet exist.</source>
+<target>O arquivo de banco de dados %x ainda não existe.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Arquivos de banco de dados não compartilham uma sessão de sincronização comum:</target>
+<source>Out of memory!</source>
+<target>Falta de memória!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Os arquivos de banco de dados não compartilham uma sessão comum.</target>
 
 <source>An exception occurred!</source>
 <target>Ocorreu uma exceção!</target>
 
-<source>Error reading file attributes:</source>
-<target>Erro ao ler atributos do arquivo:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Não foi possível ler os atributos do arquivo %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Não foi possível obter as informações do processo.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Esperando enquanto o diretório é travado (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Erro ao definir bloqueio no diretório:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Não foi possível ajustar o bloqueio no diretório %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x seg</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Erro ao ler arquivo:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Erro analisando o arquivo %x, linha %y, coluna %z.</target>
 
 <source>Scanning:</source>
 <target>Pesquisando:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Threads]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Arquivo de configuração do FreeFileSync inválido!</target>
+<source>/sec</source>
+<target>/seg</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>O arquivo %x não contém uma configuração válida.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Erro de leitura do arquivo de configuração:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>O arquivo de configuração %x foi lido parcialmente apenas.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>A configuração foi carregada parcialmente apenas:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Não foi possível acessar o Serviço Cópia de Sombra de Volume.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Não foi possível mover %x para a Lixeira!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Por favor, utilize a versão 64 bits do FreeFileSync para criar cópias de sombra neste sistema.</target>
 
 <source>Cannot load file %x.</source>
 <target>Não foi possível carregar o aquivo %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Erro ao acessar o Serviço de Cópia de Sombra de Volume!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Cópias de sombra no WOW64 não são suportadas. Por favor use a versão 64-bits do FreeFileSync.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Não foi possível determinar o nome do volume para o arquivo:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>O caminho %x não contém um nome de volume.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Nome do volume %x não é parte do arquivo %y!</target>
 
-<source>/sec</source>
-<target>/seg</target>
-
-<source>File does not exist:</source>
-<target>O arquivo não existe:</target>
+<source>Cannot find file %x.</source>
+<target>Não foi possível encontrar o aquivo %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Não foi possível ler os seguintes elementos XML:</target>
@@ -303,9 +306,6 @@ A linha de comando é executada cada vez que:
 <source>RealtimeSync configuration</source>
 <target>Configuração do RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>O arquivo já existe. Deseja substituir?</target>
-
 <source>&Restore</source>
 <target>&Restaurar</target>
 
@@ -348,35 +348,38 @@ A linha de comando é executada cada vez que:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync configuração</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>Tarefa em lote do FreeFileSync</target>
-
-<source>Unable to create log file!</source>
-<target>Não foi possível criar arquivo de log!</target>
-
 <source>Batch execution</source>
 <target>Execução da tarefa em lote</target>
 
-<source>Stop</source>
-<target>Parar</target>
+<source>Items processed:</source>
+<target>Elementos processados:</target>
+
+<source>Items remaining:</source>
+<target>Elementos restantes:</target>
 
 <source>Total time:</source>
 <target>Tempo total:</target>
 
+<source>Stop</source>
+<target>Parar</target>
+
 <source>Synchronization aborted!</source>
 <target>Sincronização cancelada!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sincronização finalizada com erros!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Nada para sincronizar!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Sincronização finalizada com sucesso!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Pressione "Alterar" para abrir o modo GUI do FreeFileSync.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Pressione "Alterar" para resolver os conflitos na tela principal do FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Alterando para o modo GUI do FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Alterando para a tela principal do FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Não foi possível conectar a sourceforge.net!</target>
@@ -534,9 +537,6 @@ A linha de comando é executada cada vez que:
 <source>Items found:</source>
 <target>Elementos encontrados:</target>
 
-<source>Items remaining:</source>
-<target>Elementos restantes:</target>
-
 <source>Speed:</source>
 <target>Velocidade:</target>
 
@@ -588,8 +588,8 @@ A linha de comando é executada cada vez que:
 <source>&Load</source>
 <target>&Carregar</target>
 
-<source>&Cancel</source>
-<target>&Cancelar</target>
+<source>Cancel</source>
+<target>Cancelar</target>
 
 <source>Select variant:</source>
 <target>Selecione um modo:</target>
@@ -628,19 +628,19 @@ A linha de comando é executada cada vez que:
 <target>Arquivo/pasta existente somente no lado direito</target>
 
 <source>Left file is newer</source>
-<target>Arquivo à esquerda é mais novo</target>
+<target>O arquivo à esquerda é mais novo</target>
 
 <source>Right file is newer</source>
-<target>Arquivo à direita é mais novo</target>
+<target>O arquivo à direita é mais novo</target>
 
 <source>Files have different content</source>
-<target>Arquivos possuem diferentes conteúdos</target>
+<target>Os arquivos possuem conteúdos diferentes</target>
 
 <source>Conflict/file cannot be categorized</source>
-<target>Conflito/arquivo não pode ser categorizado</target>
+<target>O conflito/arquivo não pode ser categorizado</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Comparar por...</target>
@@ -675,9 +675,6 @@ Os arquivos são considerados iguais se
 <source>Synchronizing...</source>
 <target>Sincronizando...</target>
 
-<source>Items processed:</source>
-<target>Elementos processados:</target>
-
 <source>&Pause</source>
 <target>&Pausar</target>
 
@@ -1017,9 +1014,6 @@ Excluir: \stuff\temp\*
 <source>File list exported!</source>
 <target>Lista de arquivos exportada!</target>
 
-<source>Error writing file:</source>
-<target>Erro ao escrever arquivo:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1065,21 +1059,21 @@ Excluir: \stuff\temp\*
 <source>Paused</source>
 <target>Pausado</target>
 
+<source>Initializing...</source>
+<target>Inicializando...</target>
+
 <source>Aborted</source>
 <target>Cancelado</target>
 
 <source>Completed</source>
 <target>Finalizado</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Cancelar solicitado: Esperando fim da operação...</target>
+<source>Continue</source>
+<target>Continuar</target>
 
 <source>Pause</source>
 <target>Pausar</target>
 
-<source>Continue</source>
-<target>Continuar</target>
-
 <source>Cannot find %x</source>
 <target>Não foi possível encontrar %x</target>
 
@@ -1218,65 +1212,65 @@ Excluir: \stuff\temp\*
 <pluralform>%x dias</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Não foi possível inicializar o monitoramento de diretórios:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Erro ao monitorar os diretórios.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Não foi possível monitorar o diretório %x.</target>
 
 <source>Conversion error:</source>
 <target>Erro de conversão:</target>
 
-<source>Error deleting file:</source>
-<target>Erro ao apagar arquivo:</target>
+<source>Cannot delete file %x.</source>
+<target>Não foi possível excluir o arquivo %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>O arquivo está bloqueado por outro processo:</target>
 
-<source>Error moving file:</source>
-<target>Erro ao mover arquivo:</target>
+<source>Cannot move file %x to %y.</source>
+<target>Não foi possível mover o arquivo %x para %y.</target>
 
-<source>Target file already existing!</source>
-<target>Arquivo de destino já existe!</target>
+<source>Cannot delete directory %x.</source>
+<target>Não foi possível excluir o diretório %x.</target>
 
-<source>Error moving directory:</source>
-<target>Erro ao mover diretório:</target>
+<source>Cannot write modification time of %x.</source>
+<target>Não foi possível escrever a data de modificação de %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Diretório de destino já existe!</target>
+<source>Cannot find system function %x.</source>
+<target>Não foi possível encontrar a função de sistema %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Erro ao apagar diretório:</target>
+<source>Cannot read security context of %x.</source>
+<target>Não foi possível ler o contexto de segurança de %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Erro ao mudar a hora de modificação:</target>
+<source>Cannot write security context of %x.</source>
+<target>Não foi possível escrever o contexto de segurança de %x.</target>
 
-<source>Error loading library function:</source>
-<target>Erro ao carregar a biblioteca de funções:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Não foi possível ler as permissões de %x.</target>
 
-<source>Error reading security context:</source>
-<target>Erro ao ler contexto de segurança:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Não foi possível escrever as permissões de %x.</target>
 
-<source>Error writing security context:</source>
-<target>Erro ao escrever contexto de segurança:</target>
+<source>Cannot create directory %x.</source>
+<target>Não foi possível criar o diretório %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Erro ao copiar permissões do arquivo:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Não foi possível copiar o link simbólico %x para %y.</target>
 
-<source>Error creating directory:</source>
-<target>Erro ao criar diretório:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Não foi possível escrever os atributos de arquivo de %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Erro ao copiar links simbólicos:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Não foi possível copiar o arquivo %x para %y.</target>
 
-<source>Error copying file:</source>
-<target>Erro ao copiar arquivo:</target>
+<source>Cannot read directory %x.</source>
+<target>Não foi possível ler o diretório %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Erro ao percorrer diretório:</target>
+<source>Endless loop.</source>
+<target>Loop infinito.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Loop infinito quando percorrendo diretório:</target>
+<source>Cannot set privilege %x.</source>
+<target>Não foi possível estabelecer o privilégio %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Erro ao definir privilégio:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Não foi possível mover %x para a Lixeira!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Ambos os lados foram alterados desde a última sincronização!</target>
@@ -1302,29 +1296,26 @@ Excluir: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Você pode ignorar esse erro para considerar o diretório como vazio.</target>
 
-<source>Directory does not exist:</source>
-<target>Diretório não existe:</target>
+<source>Cannot find directory %x.</source>
+<target>Não foi possível encontrar o diretório %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
-<target>Diretórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
+<target>Os diretórios são dependentes! Cuidado ao definir as regras de sincronização:</target>
 
 <source>Preparing synchronization...</source>
 <target>Preparando sincronização...</target>
 
-<source>Out of memory!</source>
-<target>Falta de memória!</target>
-
-<source>File %x has an invalid date!</source>
-<target>Arquivo %x tem uma data inválida!</target>
-
 <source>Conflict detected:</source>
 <target>Conflito detectado:</target>
 
+<source>File %x has an invalid date!</source>
+<target>O arquivo %x tem uma data inválida!</target>
+
 <source>Files %x have the same date but a different size!</source>
-<target>Arquivos %x têm a mesma data mas tamanhos diferentes!</target>
+<target>Os arquivos %x têm a mesma data mas tamanhos diferentes!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Links Simbólicos %x têm a mesma data mas um destino diferente!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Os links simbólicos %x têm a mesma data mas um destino diferente.</target>
 
 <source>Comparing content of files %x</source>
 <target>Comparando conteúdo do arquivo %x</target>
@@ -1339,7 +1330,7 @@ Excluir: \stuff\temp\*
 <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>
+<target>Os 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>
@@ -1407,12 +1398,12 @@ Excluir: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Criando arquivo %x</target>
 
-<source>Creating folder %x</source>
-<target>Criando pasta %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Criando link simbólico %x</target>
 
+<source>Creating folder %x</source>
+<target>Criando pasta %x</target>
+
 <source>Overwriting file %x</source>
 <target>Substituindo arquivo %x</target>
 
@@ -1429,10 +1420,10 @@ Excluir: \stuff\temp\*
 <target>Nome do diretório de destino não pode estar vazio!</target>
 
 <source>Directory for file versioning was not supplied!</source>
-<target>Diretório para controle de versões não foi fornecido!</target>
+<target>O diretório para controle de versões não foi fornecido!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Diretório de origem não existe mais:</target>
+<source>Source directory %x not found.</source>
+<target>O diretório de origem %x não foi encontrado.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Conflitos não resolvidos existentes!</target>
@@ -1467,12 +1458,6 @@ Excluir: \stuff\temp\*
 <source>Generating database...</source>
 <target>Gerando banco de dados...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nada para sincronizar!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Não foi possível copiar o arquivo bloqueado %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Erro de verificação de dados: Arquivo de origem e destino têm o mesmo conteúdo!</target>
 
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index e249df6d..c49c9158 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Explorează Dosarul</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Abandonare solicitată: Se așteaptă terminarea operației în curs...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronizare Inteligentă</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Codul Erorii Linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Eroare la rezolvarea legăturii simbolice:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Nu pot rezolva legătura simbolică %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -137,35 +140,41 @@
 <pluralform>%x de Baiți</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Eroare la citirea din baza de date a sincronizării:</target>
+<source>Cannot read file %x.</source>
+<target>Nu pot citi fila %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Eroare la scrierea în baza de date a sincronizării:</target>
+<source>Cannot write file %x.</source>
+<target>Nu pot scrie fila %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Format al bazei de date necompatibil cu versiunea softului:</target>
+<source>Database file %x is incompatible.</source>
+<target>Fila cu baza de date %x este incompatibilă.</target>
 
 <source>Initial synchronization:</source>
 <target>Sincronizare inițială:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Una dintre părți nu are o filă de tip bază de date FreeFileSync:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Fila cu baza de date %x nu există încă.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Filele bază de date nu partajează o sesiune comună de sincronizare</target>
+<source>Out of memory!</source>
+<target>Memorie epuizată!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Filele cu baze de date nu partajează o sesiune comună.</target>
 
 <source>An exception occurred!</source>
 <target>A apărut o excepție !</target>
 
-<source>Error reading file attributes:</source>
-<target>Eroare la citirea atributelor filei:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Nu pot citi atributele filei %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Nu pot obține informații despre proces.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Aștept ca dosarul să fie zăvorît (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Eroare la efectuarea zăvorîrii dosarului:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Nu pot seta zăvorîrea dosarului %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -177,8 +186,8 @@
 <pluralform>%x de sec</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Eroare la citirea filei:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Eroare la parsarea filei %x, rîndul %y, coloana %z.</target>
 
 <source>Scanning:</source>
 <target>Scanez:</target>
@@ -196,38 +205,32 @@
 <pluralform>[%x de Fire]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Filă de configurare FreeFileSync nevalidă!</target>
+<source>/sec</source>
+<target>/sec</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Fila %x nu conține o configurație validă.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Eroare la parsarea filei de configurare:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Fila de configurație %x a fost deschisă doar parțial.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Configuraţie doar parțial deschisă</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Nu pot accesa Serviciul de Conservare a Volumelor [Volume Shadow Copy].</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Nu pot muta %x în Reciclator!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Folosește versiunea pe 64-biți a FreeFileSync pentru a crea conservări (copii de rezervă) pe acest sistem.</target>
 
 <source>Cannot load file %x.</source>
 <target>Nu pot deschide fila %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Eroare la accesarea Serviciului de Conservare a Volumelor [Volume Shadow Copy]!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Realizarea de conservări (copii de rezervă) prin sistemul WOW64 nu este suportată. Folosește versiunea pe 64-biți a FreeFileSync.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Nu pot determina numele volumului pentru fila:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Calea %x nu conține un nume de volum valid.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Numele volumului %x nu face parte din numele filei %y !</target>
 
-<source>/sec</source>
-<target>/sec</target>
-
-<source>File does not exist:</source>
-<target>Fila nu există:</target>
+<source>Cannot find file %x.</source>
+<target>Nu pot găsi fila %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Nu pot citi următoarele elemente XML:</target>
@@ -306,9 +309,6 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>RealtimeSync configuration</source>
 <target>Configurația RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Fila există deja. Vrei s-o suprascrii?</target>
-
 <source>&Restore</source>
 <target>&Restaurează</target>
 
@@ -351,35 +351,38 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>FreeFileSync configuration</source>
 <target>Configurație FreeFileSync</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>Sarcină cu set de comenzi FreeFileSync</target>
-
-<source>Unable to create log file!</source>
-<target>Fila jurnal nu poate fi creată!</target>
-
 <source>Batch execution</source>
 <target>Execută Fila Set</target>
 
-<source>Stop</source>
-<target>Oprește</target>
+<source>Items processed:</source>
+<target>Elemente Procesate:</target>
+
+<source>Items remaining:</source>
+<target>Elemente Rămase:</target>
 
 <source>Total time:</source>
 <target>Timp Total:</target>
 
+<source>Stop</source>
+<target>Oprește</target>
+
 <source>Synchronization aborted!</source>
 <target>Sincronizare abandonată!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sincronizare terminată cu erori!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Nu e nimic de sincronizat!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Sincronizare terminată cu succes!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Apasă "Comută" pentru a deschide modul grafic al FreeFileSync</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Apasă "Comută" pentru a rezolva problemele din dialogul principal FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Comut la modul grafic al FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Comut la dialogul principal FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Conectarea la situl sourceforge.net nu poate fi realizată!</target>
@@ -537,9 +540,6 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>Items found:</source>
 <target>Elemente Găsite:</target>
 
-<source>Items remaining:</source>
-<target>Elemente Rămase:</target>
-
 <source>Speed:</source>
 <target>Viteză:</target>
 
@@ -591,8 +591,8 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>&Load</source>
 <target>&Deschide</target>
 
-<source>&Cancel</source>
-<target>&Anulează</target>
+<source>Cancel</source>
+<target>Anulează</target>
 
 <source>Select variant:</source>
 <target>Selectează Varianta de Sincronizare:</target>
@@ -642,8 +642,8 @@ Linia de comandă este executată de fiecare dată cînd:
 <source>Conflict/file cannot be categorized</source>
 <target>Conflictul de file nu poate fi inclus într-o anumită categorie</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Compară după:</target>
@@ -678,9 +678,6 @@ este același
 <source>Synchronizing...</source>
 <target>Sincronizare Aflată în Curs...</target>
 
-<source>Items processed:</source>
-<target>Elemente Procesate:</target>
-
 <source>&Pause</source>
 <target>&Pauzează</target>
 
@@ -717,9 +714,6 @@ este același
 <source>Hide further error messages during the current process</source>
 <target>Ascunde mesajele de eroare apărute ulterior în timpul acestui proces</target>
 
-<source>&Ignore</source>
-<target>&OK</target>
-
 <source>&Retry</source>
 <target>&Reîncearcă</target>
 
@@ -1020,9 +1014,6 @@ Excluse: \stuff\temp\*
 <source>File list exported!</source>
 <target>Lista de file a fost exportată!</target>
 
-<source>Error writing file:</source>
-<target>Eroare la scrierea filei:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1072,21 +1063,21 @@ Excluse: \stuff\temp\*
 <source>Paused</source>
 <target>Sincronizare Pauzată</target>
 
+<source>Initializing...</source>
+<target>Inițializez...</target>
+
 <source>Aborted</source>
 <target>Sincronizare Abandonată</target>
 
 <source>Completed</source>
 <target>Sincronizare Terminată</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Abandonare solicitată: Se așteaptă terminarea operației în curs...</target>
+<source>Continue</source>
+<target>Continuă</target>
 
 <source>Pause</source>
 <target>Pauzează</target>
 
-<source>Continue</source>
-<target>Continuă</target>
-
 <source>Cannot find %x</source>
 <target>Nu pot găsi %x</target>
 
@@ -1230,65 +1221,65 @@ Excluse: \stuff\temp\*
 <pluralform>%x de zile</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Nu pot inițializa monitorizarea dosarelor:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Eroare la monitorizarea dosarelor.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Nu pot monitoriza dosarul %x.</target>
 
 <source>Conversion error:</source>
 <target>Eroare de convertire:</target>
 
-<source>Error deleting file:</source>
-<target>Eroare la ștergerea filei:</target>
+<source>Cannot delete file %x.</source>
+<target>Nu pot șterge fila %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Fila este zăvorîtă [locked] de alt proces:</target>
 
-<source>Error moving file:</source>
-<target>Eroare la mutarea filei:</target>
+<source>Cannot move file %x to %y.</source>
+<target>Nu pot muta fila %x în %y.</target>
 
-<source>Target file already existing!</source>
-<target>Fila țintă există deja!</target>
+<source>Cannot delete directory %x.</source>
+<target>Nu pot șterge dosarul %x.</target>
 
-<source>Error moving directory:</source>
-<target>Eroare la mutarea dosarului:</target>
+<source>Cannot write modification time of %x.</source>
+<target>Nu pot scrie modificarea timpului pentru %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Dosarul țintă există deja!</target>
+<source>Cannot find system function %x.</source>
+<target>Nu pot găsi funcția de sistem %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Eroare la ștergerea dosarului:</target>
+<source>Cannot read security context of %x.</source>
+<target>Nu pot citi contextul de securitate pentru %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Eroare la schimbarea datei de modificare:</target>
+<source>Cannot write security context of %x.</source>
+<target>Nu pot scrie contextul de securitate pentru %x.</target>
 
-<source>Error loading library function:</source>
-<target>Eroare la deschiderea bibliotecii de funcții:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Nu pot citi permisiunile lui %x.</target>
 
-<source>Error reading security context:</source>
-<target>Eroare la citirea contextului de securitate:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Nu pot scrie permisiunile lui %x.</target>
 
-<source>Error writing security context:</source>
-<target>Eroare la scrierea contextului de securitate:</target>
+<source>Cannot create directory %x.</source>
+<target>Nu pot crea dosarul %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Eroare la copierea permisiunilor filei:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Nu pot copia legătura simbolică %x în %y.</target>
 
-<source>Error creating directory:</source>
-<target>Eroare la crearea dosarului:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Nu pot scrie atributele de filă ale lui %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Eroare la copierea legăturii simbolice:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Nu pot copia fila %x în %y.</target>
 
-<source>Error copying file:</source>
-<target>Eroare la copierea filei:</target>
+<source>Cannot read directory %x.</source>
+<target>Nu pot citi dosarul %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Eroare la parcurgerea dosarului:</target>
+<source>Endless loop.</source>
+<target>Buclă infinită.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Buclă infinită la parcurgerea dosarului:</target>
+<source>Cannot set privilege %x.</source>
+<target>Nu pot seta privilegiul %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Eroare la setarea privilegiului:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Nu pot muta %x în Reciclator!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Ambele părți s-au modificat de la ultima sincronizare!</target>
@@ -1314,8 +1305,8 @@ Excluse: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Poți ignora această eroare dacă vrei ca dosarul să fie considerat gol.</target>
 
-<source>Directory does not exist:</source>
-<target>Dosarul nu există:</target>
+<source>Cannot find directory %x.</source>
+<target>Nu pot găsi dosarul %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Dosarele sînt interdependente! Atenție la setarea regulilor de sincronizare:</target>
@@ -1323,20 +1314,17 @@ Excluse: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Pregătesc sincronizarea...</target>
 
-<source>Out of memory!</source>
-<target>Memorie epuizată!</target>
+<source>Conflict detected:</source>
+<target>Conflict detectat:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Fila %x are o dată nevalidă !</target>
 
-<source>Conflict detected:</source>
-<target>Conflict detectat:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <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 dată identică, dar ținte diferite!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Legăturile simbolice %x au aceeași dată, dar ținte diferite.</target>
 
 <source>Comparing content of files %x</source>
 <target>Compar conținutul filelor %x</target>
@@ -1419,12 +1407,12 @@ Excluse: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Creez fila %x</target>
 
-<source>Creating folder %x</source>
-<target>Creez dosarul %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Creez legătura simbolică %x</target>
 
+<source>Creating folder %x</source>
+<target>Creez dosarul %x</target>
+
 <source>Overwriting file %x</source>
 <target>Suprascriu fila %x</target>
 
@@ -1443,8 +1431,8 @@ Excluse: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Dosarul pentru versionarea filelor n-a fost specificat!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Dosarul sursă nu mai există:</target>
+<source>Source directory %x not found.</source>
+<target>Dosarul sursă %x nu a fost găsit.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Există conflicte nerezolvate!</target>
@@ -1479,12 +1467,6 @@ Excluse: \stuff\temp\*
 <source>Generating database...</source>
 <target>Generez baza de date...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nu e nimic de sincronizat!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Nu pot copia fila zăvorîtă %x</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Eroare la verificarea datelor: Filele sursă și țintă au conținut diferit!</target>
 
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 01f4eded..a5008215 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Обзор папок</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Запрос отмены: Ожидайте, пока текущая операция завершится...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Автоматическая синхронизация</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Код ошибки Linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Ошибка при решении символической ссылки:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Не удается разрешить символическую ссылку %x.</target>
 
 <source>%x MB</source>
 <target>%x МБ</target>
@@ -137,35 +140,41 @@
 <pluralform>%x Байт</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Ошибка при чтении из базы данных синхронизации:</target>
+<source>Cannot read file %x.</source>
+<target>Не удается прочитать файл %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Ошибка при записи в базу данных синхронизации:</target>
+<source>Cannot write file %x.</source>
+<target>Не удается записать файл %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Несовместимый формат базы данных синхронизации:</target>
+<source>Database file %x is incompatible.</source>
+<target>Файл базы данных %x несовместим.</target>
 
 <source>Initial synchronization:</source>
 <target>Первоначальная синхронизация:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Одного из файлов баз данных FreeFileSync еще не существует:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Файл базы данных %x еще не существует.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Файлы баз данных не имеют общей сессии синхронизации:</target>
+<source>Out of memory!</source>
+<target>Недостаточно памяти!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Файлы баз данных не имеют общей сессии.</target>
 
 <source>An exception occurred!</source>
 <target>Исключение произошло!</target>
 
-<source>Error reading file attributes:</source>
-<target>Ошибка при чтении параметров файла:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Не удается прочитать атрибуты файла %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Не удается получить информацию о процессе.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
-<target>Ожидание снятия блокировки с папки (%x)...</target>
+<target>Ожидание снятия блокировки с папки %x...</target>
 
-<source>Error setting directory lock:</source>
-<target>Ошибка блокировки папки:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Не удается установить блокировку папка %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -177,8 +186,8 @@
 <pluralform>%x секунд</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Ошибка при чтении файла:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Ошибка при разборе файла %x, строка %y, колонка %z.</target>
 
 <source>Scanning:</source>
 <target>Сканирую:</target>
@@ -196,38 +205,32 @@
 <pluralform>[%x потоков]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Неверный файл конфигурации FreeFileSync!</target>
+<source>/sec</source>
+<target>/с</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Файл %x не содержит действительной конфигурации.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Ошибка при анализе файла настроек синхронизации:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Файл конфигурации %x загрузился частично.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Конфигурация загрузилась частично:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Не удается получить доступ к службе Теневого Копирования Тома.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Невозможно переместить %x в "Корзину"!</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Пожалуйста, используйте 64-разрядную версию FreeFileSync для создания теневых копий на этой системе.</target>
 
 <source>Cannot load file %x.</source>
 <target>Не удается загрузить файл %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Ошибка доступа к службе Теневого Копирования Тома!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Создание теневых копий на WOW64 не поддерживается. Пожалуйста, используйте FreeFileSync 64-разрядной версии.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Невозможно определить имя тома для файла:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Путь %x не содержит имя тома.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Имя тома %x не является частью имени файла %y!</target>
 
-<source>/sec</source>
-<target>/с</target>
-
-<source>File does not exist:</source>
-<target>Файл не существует:</target>
+<source>Cannot find file %x.</source>
+<target>Не удается найти файл %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Невозможно прочитать следующие XML элементы:</target>
@@ -257,7 +260,7 @@
 <target>Инструкция:</target>
 
 <source>1. Select directories to monitor.</source>
-<target>1. Выберите папки для мониторинга;</target>
+<target>1. Выберите папки для наблюдения;</target>
 
 <source>2. Enter a command line.</source>
 <target>2. Введите командную строку;</target>
@@ -306,9 +309,6 @@ The command line is executed each time:
 <source>RealtimeSync configuration</source>
 <target>Настройка RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Файл уже существует. Перезаписать?</target>
-
 <source>&Restore</source>
 <target>&Восстановить</target>
 
@@ -316,7 +316,7 @@ The command line is executed each time:
 <target>&Выход</target>
 
 <source>Monitoring active...</source>
-<target>Мониторинг включен...</target>
+<target>Наблюдение включено...</target>
 
 <source>Waiting for missing directories...</source>
 <target>Ожидание пропущенных папок...</target>
@@ -351,35 +351,38 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>Настройка FreeFileSync</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>Пакетное задание FreeFileSync</target>
-
-<source>Unable to create log file!</source>
-<target>Невозможно создать лог-файл!</target>
-
 <source>Batch execution</source>
 <target>Выполнение пакетного задания</target>
 
-<source>Stop</source>
-<target>Стоп</target>
+<source>Items processed:</source>
+<target>Элементов обработано:</target>
+
+<source>Items remaining:</source>
+<target>Элементов осталось:</target>
 
 <source>Total time:</source>
 <target>Общее время:</target>
 
+<source>Stop</source>
+<target>Стоп</target>
+
 <source>Synchronization aborted!</source>
 <target>Синхронизация отменена!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Синхронизация закончена с ошибками!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Ничего нет для синхронизации!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Синхронизация прошла успешно!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Нажмите "Переключить" для открытия пользовательского графического интерфейса FreeFileSync.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Нажмите "Переключить" для продолжения работы в главном окне FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Переключение на пользовательский графический интерфейс FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Переключение на главное окно FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Невозможно соединиться с sourceforge.net!</target>
@@ -540,9 +543,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>Элементов найдено:</target>
 
-<source>Items remaining:</source>
-<target>Элементов осталось:</target>
-
 <source>Speed:</source>
 <target>Скорость:</target>
 
@@ -594,8 +594,8 @@ The command line is executed each time:
 <source>&Load</source>
 <target>&Загрузить</target>
 
-<source>&Cancel</source>
-<target>&Отмена</target>
+<source>Cancel</source>
+<target>Отмена</target>
 
 <source>Select variant:</source>
 <target>Варианты синхронизации</target>
@@ -645,8 +645,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>Конфликт/файл не может быть отнесен к какой-либо категории</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Критерии сравнения</target>
@@ -676,9 +676,6 @@ is the same
 <source>Synchronizing...</source>
 <target>Синхронизация...</target>
 
-<source>Items processed:</source>
-<target>Элементов обработано:</target>
-
 <source>&Pause</source>
 <target>&Пауза</target>
 
@@ -1018,9 +1015,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>Список файлов экспортирован!</target>
 
-<source>Error writing file:</source>
-<target>Ошибка при записи файла:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1070,21 +1064,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>Пауза</target>
 
+<source>Initializing...</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>Continue</source>
-<target>Продолжить</target>
-
 <source>Cannot find %x</source>
 <target>Невозможно найти %x</target>
 
@@ -1231,65 +1225,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x дней</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Не удалось инициализировать папку для мониторинга:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Ошибка при мониторинге папок.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Не удается наблюдать папку %x.</target>
 
 <source>Conversion error:</source>
 <target>Ошибка преобразования:</target>
 
-<source>Error deleting file:</source>
-<target>Ошибка при удалении файла:</target>
+<source>Cannot delete file %x.</source>
+<target>Не удается удалить файл %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Файл заблокирован другим процессом:</target>
 
-<source>Error moving file:</source>
-<target>Ошибка перемещения файла:</target>
+<source>Cannot move file %x to %y.</source>
+<target>Не удается перенести файл %x в %y.</target>
 
-<source>Target file already existing!</source>
-<target>Конечный файл уже существует!</target>
+<source>Cannot delete directory %x.</source>
+<target>Не удается удалить папку %x.</target>
 
-<source>Error moving directory:</source>
-<target>Ошибка перемещения папки:</target>
+<source>Cannot write modification time of %x.</source>
+<target>Не удается записать время модификации файла %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Конечная папка уже существует!</target>
+<source>Cannot find system function %x.</source>
+<target>Не удается найти системную функцию %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Ошибка при удалении папки:</target>
+<source>Cannot read security context of %x.</source>
+<target>Не удается прочитать контекст безобасности %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Ошибка при изменении времени модификации файла:</target>
+<source>Cannot write security context of %x.</source>
+<target>Не удается записать контекст безобасности %x.</target>
 
-<source>Error loading library function:</source>
-<target>Ошибка при загрузке функции библиотеки:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Не удается прочитать права доступа %x.</target>
 
-<source>Error reading security context:</source>
-<target>Ошибка при чтении контекста безобасности:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Не удается записать права доступа %x.</target>
 
-<source>Error writing security context:</source>
-<target>Ошибка при записи контекста безобасности:</target>
+<source>Cannot create directory %x.</source>
+<target>Не удается создать папку %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Ошибка при копировании прав доступа:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Не удается скопировать символьную ссылку %x в %y.</target>
 
-<source>Error creating directory:</source>
-<target>Ошибка при создании папки:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Не удается записать атрибуты файла %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Ошибка при копировании символьной ссылки:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Не удается скопировать файл %x в %y.</target>
 
-<source>Error copying file:</source>
-<target>Ошибка при копировании файла:</target>
+<source>Cannot read directory %x.</source>
+<target>Не удается прочесть папку %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Ошибка при пересечении папок:</target>
+<source>Endless loop.</source>
+<target>Бесконечный цикл.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Зацикливание при встрече пересекающихся путей:</target>
+<source>Cannot set privilege %x.</source>
+<target>Не удается установить привелегии %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Ошибка установки привилегий:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Невозможно переместить %x в "Корзину"!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Со времени последней синхронизации с обеих сторон произошли изменения!</target>
@@ -1318,8 +1312,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Вы можете проигнорировать ошибку, приняв папку за пустую.</target>
 
-<source>Directory does not exist:</source>
-<target>Папка не существует:</target>
+<source>Cannot find directory %x.</source>
+<target>Не удается найти папку %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Зависимые папки! Будьте внимательны при настройке правил синхронизации:</target>
@@ -1327,20 +1321,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Подготовка к синхронизации...</target>
 
-<source>Out of memory!</source>
-<target>Недостаточно памяти!</target>
+<source>Conflict detected:</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>Symbolic links %x have the same date but a different target.</source>
+<target>Символьная ссылка %x имеет ту же дату, но отличающуюся цель.</target>
 
 <source>Comparing content of files %x</source>
 <target>Сравнение содержания файлов %x</target>
@@ -1423,12 +1414,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Создание файла %x</target>
 
-<source>Creating folder %x</source>
-<target>Создание папки %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Создание символьной ссылки %x</target>
 
+<source>Creating folder %x</source>
+<target>Создание папки %x</target>
+
 <source>Overwriting file %x</source>
 <target>Перезапись файла %x</target>
 
@@ -1447,8 +1438,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Папка для старых версий файлов не была указана!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Исходная папка больше не существует:</target>
+<source>Source directory %x not found.</source>
+<target>Исходная папка %x не найдена.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Существуют нерешенные конфликты</target>
@@ -1483,12 +1474,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>Создание базы данных...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Ничего нет для синхронизации!</target>
-
-<source>Unable to copy 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/slovenian.lng b/BUILD/Languages/slovenian.lng
index 3a7cf10b..975074be 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Brskaj po imeniku</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Zahtevana je bila prekinitev: čakam, da se zaključi trenutna operacija...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Avtomatizirana sinhronizacija</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux koda napake %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Napaka pri razreševanju simbolične povezave:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Ne morem razrešiti simbolične povezave %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -138,35 +141,41 @@
 <pluralform>%x Bajtov</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Napaka pri branju iz sinhronizacijske podatkovne baze:</target>
+<source>Cannot read file %x.</source>
+<target>Ne morem prebrati datoteke %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Napaka pri pisanju v sinhronizacijsko podatkovno bazo:</target>
+<source>Cannot write file %x.</source>
+<target>Ne morem zapisati datoteke %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Nekompatibilen format sinhronizacijske podatkovne baze:</target>
+<source>Database file %x is incompatible.</source>
+<target>Datoteka podatkovne baze %x je nekopatibilna.</target>
 
 <source>Initial synchronization:</source>
 <target>Začetna sinhronizacija:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Ena od FreeFileSync datotek podatkovne baze še en obstaja:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Datoteka podatkovne baze %x še ne obstaja.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Datoteke podatkovne baze si ne delijo skupne sinhronizacijske seje:</target>
+<source>Out of memory!</source>
+<target>Zmanjkalo pomnilnika!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Datoteke podatkovne baze si ne delijo skupne seje.</target>
 
 <source>An exception occurred!</source>
 <target>Zgodila se je napaka!</target>
 
-<source>Error reading file attributes:</source>
-<target>Napaka pri branju atributov datoteke:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Ne morem brati datotečnih atributov od %x.</target>
+
+<source>Cannot get process information.</source>
+<target>Ne morem pridobiti informacij o procesu.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Čakam, medtem ko se zaklepa imenik (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Napaka pri nastavljanju zaklepanja imenika:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Ne morem nastaviti zaklepanja imenika %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -179,8 +188,8 @@
 <pluralform>%x sek</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Napaka pri branju datoteke:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Napaka pri razčlenjevanju datoteke %x, vrstica %y, stolpec %z.</target>
 
 <source>Scanning:</source>
 <target>Pregledujem:</target>
@@ -199,38 +208,32 @@
 <pluralform>[%x niti]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Neveljavna FreeFileSync nastavitvena datoteka!</target>
+<source>/sec</source>
+<target>/sek</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Datoteka %x ne vsebuje veljavnih nastavitev</target>
 
-<source>Error parsing configuration file:</source>
-<target>Napaka pri preverjanju konfiguracijske datoteke:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Nastavitvena datoteka %x naložena samo delno.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Nastavitev naložena samo delno:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Ne morem dostopati do servisa Volume Shadow Copy</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Ne morem premakniti %x v Koš</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Prosimo uporabite 64-bitno različico FreeFileSync za ustvarjanje senčnih kopij na tem sistemu.</target>
 
 <source>Cannot load file %x.</source>
 <target>Ne morem naložiti datoteko %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Napaka pri dostopu do servisa senčnih kopij!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Ustvarjanje senčnih kopij na WOW63 ni podprto. Prosimo uporabite 64-bitno FreeFileSync različico.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Ne morem določiti imena volumna za datoteko:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Pot %x ne vsebuje ime volumna.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Ime volumna %x ni del imena datoteke %y!</target>
 
-<source>/sec</source>
-<target>/sek</target>
-
-<source>File does not exist:</source>
-<target>Datoteka ne obstaja:</target>
+<source>Cannot find file %x.</source>
+<target>Ne morem najti datoteke %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Ne morem brati naslednje XML elemente:</target>
@@ -309,9 +312,6 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync nastavitve</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Datoteka že obstaja. Prepišem?</target>
-
 <source>&Restore</source>
 <target>&Obnovi</target>
 
@@ -354,35 +354,38 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync konfiguracija</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Paketno opravilo</target>
-
-<source>Unable to create log file!</source>
-<target>Ne morem ustvariti datoteko za beleženje!</target>
-
 <source>Batch execution</source>
 <target>Paketno izvajanje</target>
 
-<source>Stop</source>
-<target>Ustavi</target>
+<source>Items processed:</source>
+<target>Obdelanih elementov:</target>
+
+<source>Items remaining:</source>
+<target>Preostalih elementov:</target>
 
 <source>Total time:</source>
 <target>Celoten čas:</target>
 
+<source>Stop</source>
+<target>Ustavi</target>
+
 <source>Synchronization aborted!</source>
 <target>Sinhronizacija prekinjena!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sinhronizacija se je končala z napakami!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Nič za sinhronizirati!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Sinhronizacija uspešno zaključena!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Pritisnite "Zamenjaj", da odprete FreeFileSync GUI način.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Pritisnite "Preklopi", da razrešite vprašanja v glavnem pogovornem oknu FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Preklapljam v FreeFileSync GUI način...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Preklapljam na FreeFileSync glavno pogovorno okno...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Ne morem se povezati na sourceforge.net!</target>
@@ -540,9 +543,6 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>Items found:</source>
 <target>Najdenih elementov:</target>
 
-<source>Items remaining:</source>
-<target>Preostalih elementov:</target>
-
 <source>Speed:</source>
 <target>Hitrost:</target>
 
@@ -594,8 +594,8 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>&Load</source>
 <target>&Naloži</target>
 
-<source>&Cancel</source>
-<target>&Prekliči</target>
+<source>Cancel</source>
+<target>Prekliči</target>
 
 <source>Select variant:</source>
 <target>Izberite varianto:</target>
@@ -645,8 +645,8 @@ Ukazna vrstica se izvrši vsakič ko:
 <source>Conflict/file cannot be categorized</source>
 <target>Spor/datoteka ne more biti kategorizirana</target>
 
-<source>&OK</source>
-<target>&V redu</target>
+<source>OK</source>
+<target>V redu</target>
 
 <source>Compare by...</source>
 <target>Primerjaj po...</target>
@@ -681,9 +681,6 @@ enaka
 <source>Synchronizing...</source>
 <target>Sinhroniziram...</target>
 
-<source>Items processed:</source>
-<target>Obdelanih elementov:</target>
-
 <source>&Pause</source>
 <target>&Premor</target>
 
@@ -730,7 +727,7 @@ enaka
 <target>Ne prikaži več tega pogovornega okna</target>
 
 <source>&Switch</source>
-<target>&Zamenjaj</target>
+<target>&Preklopi</target>
 
 <source>&Yes</source>
 <target>&Da</target>
@@ -1023,9 +1020,6 @@ Izključi: \stuff\temp\*
 <source>File list exported!</source>
 <target>Seznam datotek je bil izvožen!</target>
 
-<source>Error writing file:</source>
-<target>Napaka pri pisanju datoteke:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1079,21 +1073,21 @@ Izključi: \stuff\temp\*
 <source>Paused</source>
 <target>Na premoru</target>
 
+<source>Initializing...</source>
+<target>Inicializiram...</target>
+
 <source>Aborted</source>
 <target>Prekinitev uspela</target>
 
 <source>Completed</source>
 <target>Zaključeno</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Zahtevana je bila prekinitev: čakam, da se zaključi trenutna operacija...</target>
+<source>Continue</source>
+<target>Nadaljuj</target>
 
 <source>Pause</source>
 <target>Premor</target>
 
-<source>Continue</source>
-<target>Nadaljuj</target>
-
 <source>Cannot find %x</source>
 <target>Ne najdem %x</target>
 
@@ -1242,65 +1236,65 @@ Izključi: \stuff\temp\*
 <pluralform>%x dni</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Ne morem začeti nadzorovanja imenikov:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Napaka pri nadzorovanju imenikov.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Ne morem nadzorovati imenika %x.</target>
 
 <source>Conversion error:</source>
 <target>Napaka pri pretvorbi:</target>
 
-<source>Error deleting file:</source>
-<target>Napaka pri brisanju datoteke:</target>
+<source>Cannot delete file %x.</source>
+<target>Ne morem izbrisati datoteke %x.</target>
+
+<source>The file is locked by another process:</source>
+<target>Datoteka je zaklenjena s strani drugega procesa:</target>
 
-<source>Error moving file:</source>
-<target>Napaka pri premikanju datoteke:</target>
+<source>Cannot move file %x to %y.</source>
+<target>Ne morem premakniti datoteko %x v %y.</target>
 
-<source>Target file already existing!</source>
-<target>Ciljna datoteka že obstaja!</target>
+<source>Cannot delete directory %x.</source>
+<target>Ne morem izbrisati imenika %x.</target>
 
-<source>Error moving directory:</source>
-<target>Napaka pri premikanju imenika:</target>
+<source>Cannot write modification time of %x.</source>
+<target>Ne morem zapisati časa spremembe od %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Ciljni imenik že obstaja!</target>
+<source>Cannot find system function %x.</source>
+<target>Ne morem najti sistemske funkcije %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Napaka pri brisanju imenika:</target>
+<source>Cannot read security context of %x.</source>
+<target>Ne morem prebrati varnostnega konteksta od %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Napaka pri spreminjanju časa modifikacije:</target>
+<source>Cannot write security context of %x.</source>
+<target>Ne morem zapisati varnostni kontekst od %x</target>
 
-<source>Error loading library function:</source>
-<target>Napaka pri nalaganju funkcije iz knjižnice:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Ne morem prebrati dovoljenja od %x.</target>
 
-<source>Error reading security context:</source>
-<target>Napaka pri branju varnostne skladnosti:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Ne morem zapisati dovoljenj od %x.</target>
 
-<source>Error writing security context:</source>
-<target>Napaka pri pisanju varnostne skladnosti:</target>
+<source>Cannot create directory %x.</source>
+<target>Ne morem ustvariti imenika %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Napaka pri kopiranju datotečnih dovoljenj:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Ne morem kopirati simboličnih povezav %x v %y.</target>
 
-<source>Error creating directory:</source>
-<target>Napaka pri ustvarjanju imenika:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Ne morem zapisati datotečnih atributov od %x.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Napaka pri kopiranju simboličnih povezav:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Ne morem kopirati datoteke %x v %y.</target>
 
-<source>Error copying file:</source>
-<target>Napaka pri kopiranju datoteke:</target>
+<source>Cannot read directory %x.</source>
+<target>Ne morem prebrati imenika %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Napaka pri prehajanju imenika:</target>
+<source>Endless loop.</source>
+<target>Neskončno zazankano</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Neskončna zanka pri prehodu imenika:</target>
+<source>Cannot set privilege %x.</source>
+<target>Ne morem nastaviti privilegija %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Napaka pri nastavljanju privilegija:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Ne morem premakniti %x v Koš</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Obe strani sta se spremenili od zadnje sinhronizacije!</target>
@@ -1326,8 +1320,8 @@ Izključi: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>To napako z obravnavanjem imenika kot praznega lahko ignorirate.</target>
 
-<source>Directory does not exist:</source>
-<target>Imenik ne obstaja:</target>
+<source>Cannot find directory %x.</source>
+<target>Ne morem najti imenika %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Imeniki so v odvisnosti! Bodite pozorni, ko nastavljate sinhronizacijska pravila:</target>
@@ -1335,20 +1329,17 @@ Izključi: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Pripravljam sinhronizacijo...</target>
 
-<source>Out of memory!</source>
-<target>Zmanjkalo pomnilnika!</target>
+<source>Conflict detected:</source>
+<target>Zaznan spor:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Datoteka %x ima neveljaven datum!</target>
 
-<source>Conflict detected:</source>
-<target>Zaznan spor:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Datoteki %x imata enak datum ampak različno velikost!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Simbolične povezave %x imajo isti datum, vendar različni cilj!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Simbolične povezave %x imajo isti datum, vendar različno tarčo.</target>
 
 <source>Comparing content of files %x</source>
 <target>Primerjam vsebino datotek %x</target>
@@ -1431,12 +1422,12 @@ Izključi: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Ustvarjam datoteko %x</target>
 
-<source>Creating folder %x</source>
-<target>Ustvarjam mapo %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Ustvarjam simbolično povezavo %x</target>
 
+<source>Creating folder %x</source>
+<target>Ustvarjam mapo %x</target>
+
 <source>Overwriting file %x</source>
 <target>Prepisujem datoteko %x</target>
 
@@ -1455,8 +1446,8 @@ Izključi: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Imenik za upravljanje z datotečnimi raličicami ni bil podan!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Izvorni imenik ne obstaja več:</target>
+<source>Source directory %x not found.</source>
+<target>Izvorni imenik %x ni bil najden.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Obstajajo nerešeni spori!</target>
@@ -1465,7 +1456,7 @@ Izključi: \stuff\temp\*
 <target>Lahko ignorirate spore in nadaljujete s sinhronizacijo.</target>
 
 <source>Significant difference detected:</source>
-<target>Zaznana je važna razlika:</target>
+<target>Zaznana je pomembna razlika:</target>
 
 <source>More than 50% of the total number of files will be copied or deleted!</source>
 <target>Več kot 50% od celotnega števila datotek bo kopiranih ali izbrisanih!</target>
@@ -1491,12 +1482,6 @@ Izključi: \stuff\temp\*
 <source>Generating database...</source>
 <target>Ustvarjam podatkovno bazo...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Nič za sinhronizirati!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Ne morem kopirati zaklenjeno datoteko %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Napaka pri preverjanju podatkov: izvorna in ciljna datoteka imata različno vsebino!</target>
 
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index 0dfb54d0..f7ceb578 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -19,9 +19,15 @@
 <source>Browse directory</source>
 <target>Examinar directorio</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Solicitud de aborto: Esperando a que la operación actual finalice...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronización Automática</target>
 
+<source>Error</source>
+<target>Error</target>
+
 <source>Select alternate comparison settings</source>
 <target>Seleccionar opciones alternativas de comparación</target>
 
@@ -52,9 +58,6 @@
 <source>About</source>
 <target>Acerca de</target>
 
-<source>Error</source>
-<target>Error</target>
-
 <source>Warning</source>
 <target>Atención</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Código de error de Linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Error al resolver enlace simbólico:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>No se puede resolver el enlace simbólico %x.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bytes</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Error al leer de la base de datos de sincronización:</target>
+<source>Cannot read file %x.</source>
+<target>No se puede leer el archivo %x</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Error al escribir en la base de datos de sincronización:</target>
+<source>Cannot write file %x.</source>
+<target>No se puede escribir el archivo %x</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Formato de base de datos de sincronización incompatible:</target>
+<source>Database file %x is incompatible.</source>
+<target>El archivo de base de datos %x es incompatible</target>
 
 <source>Initial synchronization:</source>
 <target>Sincronización inicial:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Uno de los archivos de la base de datos de FreeFileSync aún no existe:</target>
+<source>Database file %x does not yet exist.</source>
+<target>El archivo de base de datos %x aún no existe</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Archivos de base de datos no comparten la misma sesión de sincronización:</target>
+<source>Out of memory!</source>
+<target>¡Sin memoria!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Los archivos de base de datos no comparten una sesión común</target>
 
 <source>An exception occurred!</source>
 <target>¡Ha ocurrido una excepción!</target>
 
-<source>Error reading file attributes:</source>
-<target>Error al leer atributos del archivo:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>No se puede leer archivo de atributos de %x</target>
+
+<source>Cannot get process information.</source>
+<target>No se puede obtener información del proceso.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Esperando mientras el directorio se encuentre bloqueado (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Error al establecer bloqueo del directorio:</target>
+<source>Cannot set directory lock %x.</source>
+<target>No se puede establecer el directorio de bloqueo %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x segundos</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Error al leer archivo:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Error analizando archivo %x, fila %y, columna %z.</target>
 
 <source>Scanning:</source>
 <target>Escanear:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x Hilos]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>¡Archivo de configuración de FreeFileSync inválido!</target>
+<source>/sec</source>
+<target>/seg</target>
 
-<source>Error parsing configuration file:</source>
-<target>Error al analizar el archivo de configuración:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>El archivo %x no contiene una configuración válida.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Configuración cargada sólo parcialmente:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Archivo de configuración %x cargado sólo parcialmente.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>¡Incapaz de mover %x a la Papelera de reciclaje!</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>No se puede acceder al servicio de copia Volume Shadow.</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Por favor, use la versión de 64 bits de FreeFileSync para crear copias de Shadow en el sistema.</target>
 
 <source>Cannot load file %x.</source>
 <target>No se ha podido cargar el archivo %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>¡Error al acceder al servicio Volume Shadow Copy!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>La realización de copias shadow en WOW64 no está soportado. Por favor, use la versión 64-bit de FreeFileSync.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Incapaz de determinar nombre de volumen para el archivo:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>La ruta %x no contiene un nombre de volumen.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>El nombre del volumen %x no es una parte del nombre de archivo %y</target>
 
-<source>/sec</source>
-<target>/seg</target>
-
-<source>File does not exist:</source>
-<target>El archivo no existe:</target>
+<source>Cannot find file %x.</source>
+<target>No se puede encontrar el archivo %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Incapaz de leer los siguientes elementos XML:</target>
@@ -297,15 +300,18 @@ La línea de comandos se ejecuta cada vez:
 <source>Start</source>
 <target>Iniciar</target>
 
+<source>&Retry</source>
+<target>&Reintentar</target>
+
+<source>Cancel</source>
+<target>Cancelar</target>
+
 <source>(Build: %x)</source>
 <target>(Completado: %x)</target>
 
 <source>RealtimeSync configuration</source>
 <target>Configuración de RealtimeSync</target>
 
-<source>File already exists. Overwrite?</source>
-<target>El archivo ya existe. ¿Quiere sobreescribirlo?</target>
-
 <source>&Restore</source>
 <target>&Restaurar</target>
 
@@ -322,7 +328,7 @@ La línea de comandos se ejecuta cada vez:
 <target>Un campo de directorio está vacío.</target>
 
 <source>Logging</source>
-<target>Iniciando sesión</target>
+<target>Registro</target>
 
 <source>File time and size</source>
 <target>Fecha y tamaño del archivo</target>
@@ -348,35 +354,38 @@ La línea de comandos se ejecuta cada vez:
 <source>FreeFileSync configuration</source>
 <target>Configuración de FreeFileSync</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>Tarea por lotes de FreeFileSync</target>
-
-<source>Unable to create log file!</source>
-<target>¡Incapaz de crear un archivo de registro!</target>
-
 <source>Batch execution</source>
 <target>Ejecución por lotes</target>
 
-<source>Stop</source>
-<target>Detener</target>
+<source>Items processed:</source>
+<target>Elementos procesados:</target>
+
+<source>Items remaining:</source>
+<target>Elementos restantes:</target>
 
 <source>Total time:</source>
 <target>Tiempo total:</target>
 
+<source>Stop</source>
+<target>Detener</target>
+
 <source>Synchronization aborted!</source>
 <target>¡Sincronización abortada!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>¡Sincronización completada con errores!</target>
 
+<source>Nothing to synchronize!</source>
+<target>¡Nada que sincronizar!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>¡Sincronización completada con éxito!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Presionar "Cambiar" para abrir el modo GUI de FreeFileSync.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Presione "Cambiar" para resolver los problemas en el diálogo principal de FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Cambiando al modo GUI de FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Cambiando al diálogo principal de FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>¡Incapaz de conectar con sourceforge.net!</target>
@@ -534,9 +543,6 @@ La línea de comandos se ejecuta cada vez:
 <source>Items found:</source>
 <target>Elementos encontrados:</target>
 
-<source>Items remaining:</source>
-<target>Elementos restantes:</target>
-
 <source>Speed:</source>
 <target>Velocidad:</target>
 
@@ -588,9 +594,6 @@ La línea de comandos se ejecuta cada vez:
 <source>&Load</source>
 <target>&Cargar</target>
 
-<source>&Cancel</source>
-<target>&Cancelar</target>
-
 <source>Select variant:</source>
 <target>Seleccione un tipo:</target>
 
@@ -639,8 +642,8 @@ La línea de comandos se ejecuta cada vez:
 <source>Conflict/file cannot be categorized</source>
 <target>Conflicto/el achivo no puede ser categorizado</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Comparar por...</target>
@@ -675,9 +678,6 @@ es el mismo
 <source>Synchronizing...</source>
 <target>Sincronizando...</target>
 
-<source>Items processed:</source>
-<target>Elementos procesados:</target>
-
 <source>&Pause</source>
 <target>&Pausa</target>
 
@@ -717,9 +717,6 @@ es el mismo
 <source>&Ignore</source>
 <target>&Ignorar</target>
 
-<source>&Retry</source>
-<target>&Reintentar</target>
-
 <source>Do not show this dialog again</source>
 <target>No volver a mostrar este diálogo</target>
 
@@ -1017,9 +1014,6 @@ Excluir: \stuff\temp\*
 <source>File list exported!</source>
 <target>¡Lista de archivos exportada!</target>
 
-<source>Error writing file:</source>
-<target>Error al escribir archivo:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1065,21 +1059,21 @@ Excluir: \stuff\temp\*
 <source>Paused</source>
 <target>Pausado</target>
 
+<source>Initializing...</source>
+<target>Inicializando...</target>
+
 <source>Aborted</source>
 <target>Abortado</target>
 
 <source>Completed</source>
 <target>Terminado</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Solicitud de aborto: Esperando a que la operación actual finalice...</target>
+<source>Continue</source>
+<target>Continuar</target>
 
 <source>Pause</source>
 <target>Pausa</target>
 
-<source>Continue</source>
-<target>Continuar</target>
-
 <source>Cannot find %x</source>
 <target>No se puede encontrar %x</target>
 
@@ -1218,65 +1212,65 @@ Excluir: \stuff\temp\*
 <pluralform>%x días</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>No se ha podido inicializar la visualización de directorios:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Error al visualizar los directorios.</target>
+<source>Cannot monitor directory %x.</source>
+<target>No se puede monitorizar el directorio %x.</target>
 
 <source>Conversion error:</source>
 <target>Error de conversión:</target>
 
-<source>Error deleting file:</source>
-<target>Error al borrar archivo:</target>
+<source>Cannot delete file %x.</source>
+<target>No se puede eliminar el archivo %x.</target>
 
-<source>Error moving file:</source>
-<target>Error al mover archivo:</target>
+<source>The file is locked by another process:</source>
+<target>El archivo está bloqueado por otro proceso:</target>
 
-<source>Target file already existing!</source>
-<target>¡El archivo de destino ya existe!</target>
+<source>Cannot move file %x to %y.</source>
+<target>No se puede mover el archivo %x a %y.</target>
 
-<source>Error moving directory:</source>
-<target>Error al mover directorio:</target>
+<source>Cannot delete directory %x.</source>
+<target>No se puede eliminar el directorio %x.</target>
 
-<source>Target directory already existing!</source>
-<target>¡El directorio de destino ya existe!</target>
+<source>Cannot write modification time of %x.</source>
+<target>No se puede escribir el tiempo de modificación de %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Error al borrar directorio:</target>
+<source>Cannot find system function %x.</source>
+<target>No se puede encontrar la función del sistema %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Error al cambiar hora de modificación:</target>
+<source>Cannot read security context of %x.</source>
+<target>No se puede leer el contexto de seguridad de %x.</target>
 
-<source>Error loading library function:</source>
-<target>Error al cargar la función de biblioteca:</target>
+<source>Cannot write security context of %x.</source>
+<target>No se puede escribir el contexto de seguridad de %x.</target>
 
-<source>Error reading security context:</source>
-<target>Error al leer en contexto de seguridad:</target>
+<source>Cannot read permissions of %x.</source>
+<target>No se pueden leer los permisos de %x.</target>
 
-<source>Error writing security context:</source>
-<target>Error al escribir en contexto de seguridad:</target>
+<source>Cannot write permissions of %x.</source>
+<target>No se pueden escribir los permisos de %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Error al copiar permisos del fichero:</target>
+<source>Cannot create directory %x.</source>
+<target>No se puede crear el directorio %x.</target>
 
-<source>Error creating directory:</source>
-<target>Error al crear directorio:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>No se puede copiar el enlance simbólico %x a %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Error al copiar enlace simbólico:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>No se pueden escribir los atributos de archivo de %x.</target>
 
-<source>Error copying file:</source>
-<target>Error al copiar archivo:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>No se puede copiar el archivo %x a %y.</target>
 
-<source>Error traversing directory:</source>
-<target>Error al buscar en el directorio:</target>
+<source>Cannot read directory %x.</source>
+<target>No se puede leer el directorio %x.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Bucle infinito al buscar en el directorio:</target>
+<source>Endless loop.</source>
+<target>Bucle infinito.</target>
 
-<source>Error setting privilege:</source>
-<target>Error al establecer privilegios:</target>
+<source>Cannot set privilege %x.</source>
+<target>No se puede</target>
+
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>¡Incapaz de mover %x a la Papelera de reciclaje!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>¡Ambos lados han cambiado desde la última sincronizacion!</target>
@@ -1302,8 +1296,8 @@ Excluir: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Puede ignorar este error al considerar el directorio como vacío.</target>
 
-<source>Directory does not exist:</source>
-<target>El directorio no existe:</target>
+<source>Cannot find directory %x.</source>
+<target>No se puede encontrar el directorio %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>¡Los directorios son dependientes! Tenga cuidado al establecer las reglas de sincronización:</target>
@@ -1311,20 +1305,17 @@ Excluir: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Preparando sincronización...</target>
 
-<source>Out of memory!</source>
-<target>¡Sin memoria!</target>
+<source>Conflict detected:</source>
+<target>Conflicto detectado:</target>
 
 <source>File %x has an invalid date!</source>
 <target>¡El archivo %x tiene una fecha inválida!</target>
 
-<source>Conflict detected:</source>
-<target>Conflicto detectado:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>¡Los archivos %x tienen la misma fecha pero un tamaño diferente!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>¡Los enlaces simbólicos %x tienen la misma fecha pero un destino diferente!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>Los enlaces simbólicos %x tienen la misma fecha pero un destino diferente.</target>
 
 <source>Comparing content of files %x</source>
 <target>Comparación del contenido de los archivos %x</target>
@@ -1407,12 +1398,12 @@ Excluir: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Creando archivo %x</target>
 
-<source>Creating folder %x</source>
-<target>Creando carpeta %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Creando enlace simbólico %x</target>
 
+<source>Creating folder %x</source>
+<target>Creando carpeta %x</target>
+
 <source>Overwriting file %x</source>
 <target>Sobreescribir archivo %x</target>
 
@@ -1431,8 +1422,8 @@ Excluir: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>¡El directorio para el versionamiento de archivo no ha sido especificado!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>El directorio origen ya no existe:</target>
+<source>Source directory %x not found.</source>
+<target>Directorio fuente %x no encontrado.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>¡Existen conflictos sin resolver!</target>
@@ -1467,12 +1458,6 @@ Excluir: \stuff\temp\*
 <source>Generating database...</source>
 <target>Generando base de datos...</target>
 
-<source>Nothing to synchronize!</source>
-<target>¡Nada que sincronizar!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>¡Incapaz de copiar el archivo bloqueado %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Error de verificación de datos: ¡Los archivos de origen y destino tienen un contenido diferente!</target>
 
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index 1e59759d..06a0b627 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Sök upp katalog</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Avbryter: Väntar på att aktuell process skall slutföras...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatiserad synkronisering</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux Felkod %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Kan inte tyda symbolisk länk:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Den symboliska länken %x kan inte matchas.</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Byte</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Kan inte läsa från databasen:</target>
+<source>Cannot read file %x.</source>
+<target>Filen %x kan inte läsas in</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Kan inte skriva till databas:</target>
+<source>Cannot write file %x.</source>
+<target>Filen %x kan inte skrivas</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Inkompatibelt databasformat:</target>
+<source>Database file %x is incompatible.</source>
+<target>Databasfilen %x är inkompatibel</target>
 
 <source>Initial synchronization:</source>
 <target>Initial synkronisering:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>En av FreeFileSyncs databasfiler saknas:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Databasfilen %x finns ännu inte</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Databasfiler delar inte en gemensam synkroniseringssession:</target>
+<source>Out of memory!</source>
+<target>Minnesbrist!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Databasfilerna har ingen gemensam session</target>
 
 <source>An exception occurred!</source>
 <target>Ett undantag inträffade!</target>
 
-<source>Error reading file attributes:</source>
-<target>Kan inte läsa filattribut:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Kan inte läsa filattribut för %x</target>
+
+<source>Cannot get process information.</source>
+<target>Processinformation kan inte inhämtas</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Väntar medan katalogen låses (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Kan inte låsa katalogen:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Kan inte låsa katalogen %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x sek</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Kan inte läsa filen:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Tolkningsfel på filen %x, rad %y, kolumn %z.</target>
 
 <source>Scanning:</source>
 <target>Skannar:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x trådar]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Felaktig FreeFileSync konfigurationsfil!</target>
+<source>/sec</source>
+<target>/s</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>Filen %x innehåller ingen giltig konfiguration.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Kan inte läsa in konfigurationsfil:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Konfigurationsfilen %x lästes bara delvis in.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Konfigurationsfilen endast delvis inläst</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Kan inte komma åt tjänsten Volume Shadow Copy.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Kan inte flytta %x till Papperskorgen</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Använd FreeFileSync 64-bitarsversion för att skapa skuggkopior på detta system.</target>
 
 <source>Cannot load file %x.</source>
 <target>Kan inte läsa in %x</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Kunde inte starta tjänsten Volume Shadow Copy (VSS)</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Skuggkopior av wow64 stöds ej. Använd FreeFileSync x64 istället!</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Kan inte bestämma volymnamn för filen:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Sökvägen %x innehåller inget volymnamn.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Volymnamn %x saknas i filnamn %y!</target>
 
-<source>/sec</source>
-<target>/s</target>
-
-<source>File does not exist:</source>
-<target>Filen finns inte:</target>
+<source>Cannot find file %x.</source>
+<target>Filen %x kan inte hittas</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Kan inte läsa följande XML-element:</target>
@@ -303,9 +306,6 @@ Kommandot verkställes när:
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync konfiguration</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Filen finns redan. Vill du skriva över:</target>
-
 <source>&Restore</source>
 <target>&Återställ</target>
 
@@ -348,35 +348,38 @@ Kommandot verkställes när:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync konfiguration</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Batch-jobb</target>
-
-<source>Unable to create log file!</source>
-<target>Kan inte skapa loggfil!</target>
-
 <source>Batch execution</source>
 <target>Batch-körning</target>
 
-<source>Stop</source>
-<target>Stopp</target>
+<source>Items processed:</source>
+<target>Processade poster</target>
+
+<source>Items remaining:</source>
+<target>Återstående poster:</target>
 
 <source>Total time:</source>
 <target>Total tid:</target>
 
+<source>Stop</source>
+<target>Stopp</target>
+
 <source>Synchronization aborted!</source>
 <target>Synkronisering avbruten!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synkronisering slutförd med fel!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Det finns inget att synkronisera!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Synkronisering slutförd!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Tryck på "Växla" för att öppna FreeFileSyncs grafiska läge</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Tryck "Växla" för att lösa problem i FreeFileSyncs huvudfönster</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Växlar till FreeFileSyncs grafiska läge</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Växlar till FreeFileSyncs huvudfönster...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Kan inte ansluta sourceforge.net!</target>
@@ -534,9 +537,6 @@ Kommandot verkställes när:
 <source>Items found:</source>
 <target>Funna poster:</target>
 
-<source>Items remaining:</source>
-<target>Återstående poster:</target>
-
 <source>Speed:</source>
 <target>Hastighet:</target>
 
@@ -564,9 +564,6 @@ Kommandot verkställes när:
 <source>Right</source>
 <target>Höger</target>
 
-<source>Sync setttings</source>
-<target>Synkroniseringsinställningar</target>
-
 <source>Status feedback</source>
 <target>Status</target>
 
@@ -591,8 +588,8 @@ Kommandot verkställes när:
 <source>&Load</source>
 <target>&Läs in</target>
 
-<source>&Cancel</source>
-<target>&Avbryt</target>
+<source>Cancel</source>
+<target>Avbryt</target>
 
 <source>Select variant:</source>
 <target>Välj variant:</target>
@@ -642,8 +639,8 @@ Kommandot verkställes när:
 <source>Conflict/file cannot be categorized</source>
 <target>Konflikt/Fil kan inte kategoriseras</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Jämför...</target>
@@ -678,9 +675,6 @@ Filerna betecknas som lika om,
 <source>Synchronizing...</source>
 <target>Synkroniserar...</target>
 
-<source>Items processed:</source>
-<target>Processade poster</target>
-
 <source>&Pause</source>
 <target>&Paus</target>
 
@@ -1020,9 +1014,6 @@ Undanta: \stuff\temp\*
 <source>File list exported!</source>
 <target>Fillista exporterad!</target>
 
-<source>Error writing file:</source>
-<target>Kan inte skriva fil:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1068,21 +1059,21 @@ Undanta: \stuff\temp\*
 <source>Paused</source>
 <target>Pausad</target>
 
+<source>Initializing...</source>
+<target>Initierar...</target>
+
 <source>Aborted</source>
 <target>Användaren avbröt</target>
 
 <source>Completed</source>
 <target>Slutförd</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Avbryter: Väntar på att aktuell process skall slutföras...</target>
+<source>Continue</source>
+<target>Fortsätt</target>
 
 <source>Pause</source>
 <target>Paus</target>
 
-<source>Continue</source>
-<target>Fortsätt</target>
-
 <source>Cannot find %x</source>
 <target>Kan inte hitta %x</target>
 
@@ -1221,68 +1212,65 @@ Undanta: \stuff\temp\*
 <pluralform>%x dagar</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Kan inte initiera katalogskanner:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Fel vid övervakning av kataloger.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Katalogen %x kan inte övervakas.</target>
 
 <source>Conversion error:</source>
 <target>Konversionsfel:</target>
 
-<source>Error deleting file:</source>
-<target>Kan inte ta bort fil:</target>
+<source>Cannot delete file %x.</source>
+<target>Filen %x kan inte tas bort.</target>
 
-<source>Error moving file:</source>
-<target>Kan inte flytta fil:</target>
+<source>The file is locked by another process:</source>
+<target>Filen är låst av en annan process:</target>
 
-<source>Target file already existing!</source>
-<target>Filen finns redan!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Kan inte flytta filen %x till %y.</target>
 
-<source>Error moving directory:</source>
-<target>Kan inte flytta katalog:</target>
+<source>Cannot delete directory %x.</source>
+<target>Kan inte ta bort katalogen %x.</target>
 
-<source>Target directory already existing!</source>
-<target>Målkatalogen finns redan!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Kan inte ändra tidsangivelsen för %x.</target>
 
-<source>Error deleting directory:</source>
-<target>Kan inte ta bort katalog:</target>
+<source>Cannot find system function %x.</source>
+<target>Kan inte hitta systemfunktion %x</target>
 
-<source>Error changing modification time:</source>
-<target>Kan inte modifiera tidsstämpel:</target>
+<source>Cannot read security context of %x.</source>
+<target>Kan inte läsa säkerhetskontext för %x.</target>
 
-<source>Error loading library function:</source>
-<target>Kan inte starta biblioteksfunktion:</target>
+<source>Cannot write security context of %x.</source>
+<target>Kan inte skriva säkerhetskontext för %x.</target>
 
-<source>Error reading security context:</source>
-<target>Kan inte läsa säkerhetskontext:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Kan inte läsa behörigheter för %x.</target>
 
-<source>Error writing security context:</source>
-<target>Kan inte skriva säkerhetskontext:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Kan inte skriva behörigheter för %x.</target>
 
-<source>Error copying file permissions:</source>
-<target>Kan inte kopiera filsystembehörighet:</target>
+<source>Cannot create directory %x.</source>
+<target>Kan inte skapa katalogen %x.</target>
 
-<source>Error creating directory:</source>
-<target>Kan inte skapa katalog:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Kan inte kopiera den symboliska länken %x till %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Kan inte kopiera symbolisk länk:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Kan inte skriva filattribut för %x.</target>
 
-<source>Error copying file:</source>
-<target>Kan inte kopiera fil:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Kan inte kopiera filen %x till %y.</target>
 
-<source>Error opening file:</source>
-<target>Kan inte öppna fil:</target>
+<source>Cannot read directory %x.</source>
+<target>Kan inte läsa in katalogen %x.</target>
 
-<source>Error traversing directory:</source>
-<target>Accessfel på katalog:</target>
+<source>Endless loop.</source>
+<target>Oändlig loop.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Oändlig loop vid accessförsök på katalog:</target>
+<source>Cannot set privilege %x.</source>
+<target>Kan inte att ange behörigheten %x.</target>
 
-<source>Error setting privilege:</source>
-<target>Kan inte ange privilegie:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Kan inte flytta %x till Papperskorgen</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Båda sidor har ändrats sedan senaste synkroniseringen!</target>
@@ -1308,8 +1296,8 @@ Undanta: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Du kan bortse från det här felet och utgå ifrån att katalogen är tom</target>
 
-<source>Directory does not exist:</source>
-<target>Katalogen finns inte:</target>
+<source>Cannot find directory %x.</source>
+<target>Kan inte hitta katalogen  %x.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Kataloger är beroende! Var försiktig när du sätter upp synkroniseringsregler:</target>
@@ -1317,20 +1305,17 @@ Undanta: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Förbereder synkronisering...</target>
 
-<source>Out of memory!</source>
-<target>Minnesbrist!</target>
+<source>Conflict detected:</source>
+<target>Konflikt upptäckt:</target>
 
 <source>File %x has an invalid date!</source>
 <target>Filen %x har ett ogiltigt datum!</target>
 
-<source>Conflict detected:</source>
-<target>Konflikt upptäckt:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>Filerna %x har samma datum men olika storlek!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Symbolisk länk %x har samma datum, men annat mål!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>De symboliska länkarna %x har samma datumstämpel men olika mål.</target>
 
 <source>Comparing content of files %x</source>
 <target>Jämför filinnehåll för %x</target>
@@ -1413,12 +1398,12 @@ Undanta: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Skapar fil %x</target>
 
-<source>Creating folder %x</source>
-<target>Skapar katalog %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Skapar den symboliska länken %x</target>
 
+<source>Creating folder %x</source>
+<target>Skapar katalog %x</target>
+
 <source>Overwriting file %x</source>
 <target>Skriver över filen %x</target>
 
@@ -1437,8 +1422,8 @@ Undanta: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Katalog för versionshantering har inte specificerats</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Källkatalogen finns inte längre:</target>
+<source>Source directory %x not found.</source>
+<target>Källkatalogen %x hittas inte</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Obehandlad konflikt upptäckt!</target>
@@ -1473,12 +1458,6 @@ Undanta: \stuff\temp\*
 <source>Generating database...</source>
 <target>Skapar databas...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Det finns inget att synkronisera!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Kan inte kopiera den låsta filen %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Verifikationsfel: Källfil och målfil har olika innehåll!</target>
 
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 7d6ef2ce..5a440333 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -19,6 +19,9 @@
 <source>Browse directory</source>
 <target>Klasöre gözat</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Vazgeçildi: Yürürlükteki işlemin bitmesi bekleniyor...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Kendiliğinden Eşleştirme</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Linux Hata Kodu %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Sembolik bağlantı çözümlenirken hata:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>%x simge bağlantısı çözümlenemedi</target>
 
 <source>%x MB</source>
 <target>%x MB</target>
@@ -136,35 +139,41 @@
 <pluralform>%x Bayt</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Eşleştirme veri tabanı okunurken hata:</target>
+<source>Cannot read file %x.</source>
+<target>%x dosyası okunamadı.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Eşleştirme veri tabanına yazılırken hata:</target>
+<source>Cannot write file %x.</source>
+<target>%x dosyası yazılamadı.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Uyumsuz eşleştirme veritabanı biçimi:</target>
+<source>Database file %x is incompatible.</source>
+<target>%x veritabanı dosyası uyumsuz</target>
 
 <source>Initial synchronization:</source>
 <target>Başlangıç eşleştirmesi:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>FreeFileSync veritabanı dosyalarından biri henüz yok:</target>
+<source>Database file %x does not yet exist.</source>
+<target>%x veritabanı dosyası henüz yok.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Veritabanıdosyaları ortak bir eşleştirmeoturumunu paylaşmıyor:</target>
+<source>Out of memory!</source>
+<target>Bellek yetersiz!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Veritabanı dosyaları ortak bir oturumu paylaşamaz.</target>
 
 <source>An exception occurred!</source>
 <target>Olağan dışı bir durum oluştu!</target>
 
-<source>Error reading file attributes:</source>
-<target>Dosya öznitelikleri okunurken hata:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>%x dosyasının özellikleri okunamadı.</target>
+
+<source>Cannot get process information.</source>
+<target>İşlem bilgisi alınamadı.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Klasör kilitli olduğundan bekleniyor (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Klasör kilitlenirken hata:</target>
+<source>Cannot set directory lock %x.</source>
+<target>%x klasörü kilitlenemedi.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -175,8 +184,8 @@
 <pluralform>%x saniye</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Dosya okunurken hata:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>%x dosyası işlenirken hata, satır %y, sütun %z.</target>
 
 <source>Scanning:</source>
 <target>Taranıyor:</target>
@@ -193,38 +202,32 @@
 <pluralform>[%x İş]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Geçersiz FreeFileSync yapılandırma dosyası!</target>
+<source>/sec</source>
+<target>/san</target>
+
+<source>File %x does not contain a valid configuration.</source>
+<target>%x dosyası geçerli bir yapılandırma bilgisi içermiyor.</target>
 
-<source>Error parsing configuration file:</source>
-<target>Yapılandırma dosyası çözümlenirken hata:</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>%x yapılandırma dosyası tamamen yüklenemedi.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Yapılandırma yalnız kısmen yüklendi:</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Birim Gölge Kopya hizmetine erişilemedi.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>%x Geri Dönüşüm Kutusuna gönderilemedi</target>
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Bu sistem üzerinde gölge kopyalar oluşturmak için FreeFileSync 64-bit sürümünü kullanın.</target>
 
 <source>Cannot load file %x.</source>
 <target>%x dosyası yüklenemedi.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Gölge Kopya Hizmetine erişilirken hata oldu!</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>WOW64 üzerinde gölge kopyalama desteklenmiyor. FreeFileSync 64-bit sürümünü kullanın</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Dosya için birim adı belirlenemedi:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>%x yolu bir birim adı içermiyor.</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>%x birim adı, %y dosya adının parçası değil!</target>
 
-<source>/sec</source>
-<target>/san</target>
-
-<source>File does not exist:</source>
-<target>Dosya bulunamadı:</target>
+<source>Cannot find file %x.</source>
+<target>%x dosyası bulunamadı.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Şu XML elemanları okunamadı:</target>
@@ -303,9 +306,6 @@ Her seferinde çalıştırılacak komut satırı:
 <source>RealtimeSync configuration</source>
 <target>RealtimeSync yapılandırması</target>
 
-<source>File already exists. Overwrite?</source>
-<target>Dosya zaten var. Üzerine yazılsın mı?</target>
-
 <source>&Restore</source>
 <target>Ge&ri yükle</target>
 
@@ -348,35 +348,38 @@ Her seferinde çalıştırılacak komut satırı:
 <source>FreeFileSync configuration</source>
 <target>FreeFileSync yapılandırması</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>FreeFileSync Toplu İşi</target>
-
-<source>Unable to create log file!</source>
-<target>Günlük dosyası oluşturulamıyor!</target>
-
 <source>Batch execution</source>
 <target>Toplu komut yürütme</target>
 
-<source>Stop</source>
-<target>Durdur</target>
+<source>Items processed:</source>
+<target>İşlenen bileşenler:</target>
+
+<source>Items remaining:</source>
+<target>Kalan bileşenler:</target>
 
 <source>Total time:</source>
 <target>Toplam zaman:</target>
 
+<source>Stop</source>
+<target>Durdur</target>
+
 <source>Synchronization aborted!</source>
 <target>Eşleştirme durduruldu!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Eşleştirme hatalarla tamamlandı!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Eşleştirilecek bir şey yok!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Eşleştirme sorunsuz tamamlandı!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>FreeFileSync grafik kullanıcı arayüzünü açmak için "Geç" düğmesine tıklayın</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>FreeFileSync ana penceresindeki sorunları çözmek için "Değiştir" düğmesine tıklayın.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>FreeFileSync grafik kullanıcı arayüzüne geçiliyor...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>FreeFileSync ana penceresine geçiliyor...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>sourceforge.net sitesine bağlanılamıyor!</target>
@@ -534,9 +537,6 @@ Her seferinde çalıştırılacak komut satırı:
 <source>Items found:</source>
 <target>Bulunan bileşenler:</target>
 
-<source>Items remaining:</source>
-<target>Kalan bileşenler:</target>
-
 <source>Speed:</source>
 <target>Hız:</target>
 
@@ -588,8 +588,8 @@ Her seferinde çalıştırılacak komut satırı:
 <source>&Load</source>
 <target>Yük&le</target>
 
-<source>&Cancel</source>
-<target>İ&ptal</target>
+<source>Cancel</source>
+<target>İptal</target>
 
 <source>Select variant:</source>
 <target>Davranışı seçin:</target>
@@ -639,8 +639,8 @@ Her seferinde çalıştırılacak komut satırı:
 <source>Conflict/file cannot be categorized</source>
 <target>Çatışma/dosya kategorize edilemedi</target>
 
-<source>&OK</source>
-<target>&Tamam</target>
+<source>OK</source>
+<target>Tamam</target>
 
 <source>Compare by...</source>
 <target>Karşılaştırma ölçütünü seçin:</target>
@@ -675,9 +675,6 @@ aynı olmalıdır
 <source>Synchronizing...</source>
 <target>Eşleştiriliyor...</target>
 
-<source>Items processed:</source>
-<target>İşlenen bileşenler:</target>
-
 <source>&Pause</source>
 <target>&Duraklat</target>
 
@@ -1017,9 +1014,6 @@ Katma: \stuff\temp\*
 <source>File list exported!</source>
 <target>Dosya listesi verilmiş!</target>
 
-<source>Error writing file:</source>
-<target>Dosya yazılırken hata:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1065,21 +1059,21 @@ Katma: \stuff\temp\*
 <source>Paused</source>
 <target>Duraklatıldı</target>
 
+<source>Initializing...</source>
+<target>Başlatılıyor...</target>
+
 <source>Aborted</source>
 <target>Vazgeçildi</target>
 
 <source>Completed</source>
 <target>Tamamlandı</target>
 
-<source>Abort requested: Waiting for current operation to finish...</source>
-<target>Vazgeçildi: Yürürlükteki işlemin bitmesi bekleniyor...</target>
+<source>Continue</source>
+<target>Devam et</target>
 
 <source>Pause</source>
 <target>Duraklat</target>
 
-<source>Continue</source>
-<target>Devam et</target>
-
 <source>Cannot find %x</source>
 <target>%x bulunamadı</target>
 
@@ -1218,65 +1212,65 @@ Katma: \stuff\temp\*
 <pluralform>%x gün</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Klasör izlemesi başlatılamadı:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Klasörler izlenirken hata.</target>
+<source>Cannot monitor directory %x.</source>
+<target>%x klasörü izlenemiyor.</target>
 
 <source>Conversion error:</source>
 <target>Dönüştürme hatası:</target>
 
-<source>Error deleting file:</source>
-<target>Dosya silinirken hata:</target>
+<source>Cannot delete file %x.</source>
+<target>%x dosyası silinemiyor.</target>
+
+<source>The file is locked by another process:</source>
+<target>Dosya başka bir işlem tarafından kilitlenmiş:</target>
 
-<source>Error moving file:</source>
-<target>Dosya taşınırken hata:</target>
+<source>Cannot move file %x to %y.</source>
+<target>%x dosyası %y olarak taşınamadı.</target>
 
-<source>Target file already existing!</source>
-<target>Hedef dosya zaten var!</target>
+<source>Cannot delete directory %x.</source>
+<target>%x klasörü silinemedi.</target>
 
-<source>Error moving directory:</source>
-<target>Klasör taşınırken hata:</target>
+<source>Cannot write modification time of %x.</source>
+<target>%x son değişiklik zamanı yazılamadı.</target>
 
-<source>Target directory already existing!</source>
-<target>Hedef klasör zaten var!</target>
+<source>Cannot find system function %x.</source>
+<target>%x sistem işlevi bulunamadı.</target>
 
-<source>Error deleting directory:</source>
-<target>Klasör silinirken hata:</target>
+<source>Cannot read security context of %x.</source>
+<target>%x için güvenlik bağlamı okunamadı.</target>
 
-<source>Error changing modification time:</source>
-<target>Değişiklik tarihini değiştirirken hata:</target>
+<source>Cannot write security context of %x.</source>
+<target>%x için güvenlik bağlamı yazılamadı.</target>
 
-<source>Error loading library function:</source>
-<target>Kütüphane işlevi yüklenirken hata:</target>
+<source>Cannot read permissions of %x.</source>
+<target>%x izinleri okunamadı.</target>
 
-<source>Error reading security context:</source>
-<target>Güüvenlik bağlamı okunurken hata:</target>
+<source>Cannot write permissions of %x.</source>
+<target>%x izinleri yazılamadı.</target>
 
-<source>Error writing security context:</source>
-<target>Güvenlik bağlamı yazılırken hata:</target>
+<source>Cannot create directory %x.</source>
+<target>%x dosyası oluşturulamadı.</target>
 
-<source>Error copying file permissions:</source>
-<target>Dosya izinleri kopyalanırken hata:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>%x simgesel bağlantısı %y olarak kopyalanamadı.</target>
 
-<source>Error creating directory:</source>
-<target>Klasör oluşturulurken hata:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>%x dosya öznitelikleri yazılamadı.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Sembolik bağlantı kopyalanırken hata:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>%x dosyası %y olarak kopyalanamadı.</target>
 
-<source>Error copying file:</source>
-<target>Dosya kopyalanırken hata:</target>
+<source>Cannot read directory %x.</source>
+<target>%x klasörü okunamadı.</target>
 
-<source>Error traversing directory:</source>
-<target>Klasörde dolaşırken hata:</target>
+<source>Endless loop.</source>
+<target>Sonsuz çevrim.</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Klasörlerde dolaşırken sonsuz döngü:</target>
+<source>Cannot set privilege %x.</source>
+<target>%x izni verilemedi.</target>
 
-<source>Error setting privilege:</source>
-<target>İzinler ayarlanırken hata:</target>
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>%x Geri Dönüşüm Kutusuna gönderilemedi</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>Son eşleştirmeden bu yana iki yanın içeriği de değişmiş!</target>
@@ -1302,8 +1296,8 @@ Katma: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Bu hatayı, klasörü boş sayacak şekilde yok sayabilirsiniz.</target>
 
-<source>Directory does not exist:</source>
-<target>Klasör bulunamadı:</target>
+<source>Cannot find directory %x.</source>
+<target>%x klasörü bulunamadı.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Klasörler bağımlı! Eşleştirme kurallarını koyarken dikkatli olun:</target>
@@ -1311,20 +1305,17 @@ Katma: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Eşleştirmeye hazırlanıyor...</target>
 
-<source>Out of memory!</source>
-<target>Bellek yetersiz!</target>
+<source>Conflict detected:</source>
+<target>Çelişki bulundu:</target>
 
 <source>File %x has an invalid date!</source>
 <target>%x dosyasının tarihi geçersiz!</target>
 
-<source>Conflict detected:</source>
-<target>Çelişki bulundu:</target>
-
 <source>Files %x have the same date but a different size!</source>
 <target>%x dosyalarının tarihleri aynı fakat boyutları farklı!</target>
 
-<source>Symlinks %x have the same date but a different target!</source>
-<target>Sembolik bağlantılar %x aynı tarihli fakat hedefleri farklı!</target>
+<source>Symbolic links %x have the same date but a different target.</source>
+<target>%x simgesel bağlantıları aynı tarihe sahip ancak hedef yolları farklı.</target>
 
 <source>Comparing content of files %x</source>
 <target>%x dosyalarının içeriği karşılaştırılıyor</target>
@@ -1407,12 +1398,12 @@ Katma: \stuff\temp\*
 <source>Creating file %x</source>
 <target>%x dosyası oluşturuluyor</target>
 
-<source>Creating folder %x</source>
-<target>%x klasörü oluşturuluyor</target>
-
 <source>Creating symbolic link %x</source>
 <target>%x sembolik bağlantısı oluşturuluyor</target>
 
+<source>Creating folder %x</source>
+<target>%x klasörü oluşturuluyor</target>
+
 <source>Overwriting file %x</source>
 <target>%x dosyasının üzerine yazılıyor</target>
 
@@ -1431,8 +1422,8 @@ Katma: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Dosya sürümlemesi için klasör desteklenmiyor!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Kaynak klasör artık yok:</target>
+<source>Source directory %x not found.</source>
+<target>%x kaynak klasörü bulunamadı.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Çözülmemiş tutarsızlıklar var!</target>
@@ -1467,12 +1458,6 @@ Katma: \stuff\temp\*
 <source>Generating database...</source>
 <target>Veri tabanı oluşturuluyor...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Eşleştirilecek bir şey yok!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>%x dosyası kilitli olduğundan kopyalanamıyor!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Veri doğrulama hatası: Kaynak ve hedef dosyası içeriği farklı!</target>
 
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index 6ee50ff3..5eadfddd 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -19,9 +19,15 @@
 <source>Browse directory</source>
 <target>Переглянути каталог</target>
 
+<source>Abort requested: Waiting for current operation to finish...</source>
+<target>Запит переривання: В очікуванні завершення поточної операції...</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Автоматична синхронізація</target>
 
+<source>Error</source>
+<target>Помилка</target>
+
 <source>Select alternate comparison settings</source>
 <target>Вибрати альтернативні налаштування порівняння</target>
 
@@ -52,9 +58,6 @@
 <source>About</source>
 <target>Про</target>
 
-<source>Error</source>
-<target>Помилка</target>
-
 <source>Warning</source>
 <target>Увага</target>
 
@@ -115,8 +118,8 @@
 <source>Linux Error Code %x:</source>
 <target>Код помилки Linux %x:</target>
 
-<source>Error resolving symbolic link:</source>
-<target>Помилка при вирішені символічного посилання:</target>
+<source>Cannot resolve symbolic link %x.</source>
+<target>Не вдається вирішити символьне посилання %x.</target>
 
 <source>%x MB</source>
 <target>%x МБ</target>
@@ -137,35 +140,41 @@
 <pluralform>%x байтів</pluralform>
 </target>
 
-<source>Error reading from synchronization database:</source>
-<target>Помилка при читанні з бази даних синхронізації:</target>
+<source>Cannot read file %x.</source>
+<target>Не вдається прочитати файл %x.</target>
 
-<source>Error writing to synchronization database:</source>
-<target>Помилка при записі у базу данних синхронізації:</target>
+<source>Cannot write file %x.</source>
+<target>Не вдається записати файл %x.</target>
 
-<source>Incompatible synchronization database format:</source>
-<target>Несумісний формат бази даних синхронізації:</target>
+<source>Database file %x is incompatible.</source>
+<target>Несумісний файл бази даних %x.</target>
 
 <source>Initial synchronization:</source>
 <target>Вступна синхронізація:</target>
 
-<source>One of the FreeFileSync database files is not yet existing:</source>
-<target>Файлу бази даних FreeFileSync ще не існує:</target>
+<source>Database file %x does not yet exist.</source>
+<target>Файл бази даних %x ще не існує.</target>
 
-<source>Database files do not share a common synchronization session:</source>
-<target>Файли бази даних не мають спільної сесії синхронізації</target>
+<source>Out of memory!</source>
+<target>Бракує пам'яті!</target>
+
+<source>Database files do not share a common session.</source>
+<target>Файли баз даних не поділяють спільну сесію.</target>
 
 <source>An exception occurred!</source>
 <target>Відбулось виключення!</target>
 
-<source>Error reading file attributes:</source>
-<target>Помилка при читанні параметрів файлу:</target>
+<source>Cannot read file attributes of %x.</source>
+<target>Не вдається прочитати атрибути файла %х.</target>
+
+<source>Cannot get process information.</source>
+<target>Не вдається отримати інформацію процесу</target>
 
 <source>Waiting while directory is locked (%x)...</source>
 <target>Очікування зняття блокування з каталогу (%x)...</target>
 
-<source>Error setting directory lock:</source>
-<target>Помилка блокування каталогу:</target>
+<source>Cannot set directory lock %x.</source>
+<target>Не вдається встановити блокування каталога %х.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -177,8 +186,8 @@
 <pluralform>%x сек</pluralform>
 </target>
 
-<source>Error reading file:</source>
-<target>Помилка при читанні файлу:</target>
+<source>Error parsing file %x, row %y, column %z.</source>
+<target>Помилка розбору файла %x, рядок %y, колонка %z.</target>
 
 <source>Scanning:</source>
 <target>Сканую:</target>
@@ -196,38 +205,32 @@
 <pluralform>[%x Нитей виконання]</pluralform>
 </target>
 
-<source>Invalid FreeFileSync config file!</source>
-<target>Неправильний файл конфігурації FreeFileSync!</target>
+<source>/sec</source>
+<target>/сек</target>
 
-<source>Error parsing configuration file:</source>
-<target>Помилка при анализі файлу налаштувань синхронізації:</target>
+<source>File %x does not contain a valid configuration.</source>
+<target>Файл %x не містить правильної конфігурації.</target>
 
-<source>Configuration loaded partially only:</source>
-<target>Конфігурація завантажена лише частково</target>
+<source>Configuration file %x loaded partially only.</source>
+<target>Файл конфігурації %x завантажено лише частково.</target>
 
-<source>Unable to move %x to the Recycle Bin!</source>
-<target>Не вдається перенести %x до Корзини!</target>
+<source>Cannot access Volume Shadow Copy Service.</source>
+<target>Не вдається отримати доступ до послуги тіньового копіювання тому</target>
+
+<source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
+<target>Будь ласка, використовуйте 64-розрядну версію FreeFileSync для створення тіньових копій у цій системі.</target>
 
 <source>Cannot load file %x.</source>
 <target>Не вдається завантажити файл %x.</target>
 
-<source>Error accessing Volume Shadow Copy Service!</source>
-<target>Помилка доступу до послуги Тіньового Копіювання Тому</target>
-
-<source>Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version.</source>
-<target>Створення тіньових копій на WOW64 не підтримується. Будь ласка, використайте FreeFileSync 64-розрядної версії.</target>
-
-<source>Cannot determine volume name for file:</source>
-<target>Не вдається визначити назву тому для файла:</target>
+<source>Path %x does not contain a volume name.</source>
+<target>Шлях %x не містить імені тому</target>
 
 <source>Volume name %x not part of file name %y!</source>
 <target>Ім’я тому %x не є частиною імені файлу %y!</target>
 
-<source>/sec</source>
-<target>/сек</target>
-
-<source>File does not exist:</source>
-<target>Файл не існує:</target>
+<source>Cannot find file %x.</source>
+<target>Не вдається знайти файлу %x.</target>
 
 <source>Cannot read the following XML elements:</source>
 <target>Не вдається прочитати такі елементи XML:</target>
@@ -300,15 +303,18 @@ The command line is executed each time:
 <source>Start</source>
 <target>Старт</target>
 
+<source>&Retry</source>
+<target>&Повторити</target>
+
+<source>Cancel</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>
 
@@ -351,35 +357,38 @@ The command line is executed each time:
 <source>FreeFileSync configuration</source>
 <target>Налаштування FreeFileSync</target>
 
-<source>FreeFileSync Batch Job</source>
-<target>Пакетне завдання FreeFileSync</target>
-
-<source>Unable to create log file!</source>
-<target>Не можна створити лог-файл!</target>
-
 <source>Batch execution</source>
 <target>Виконання пакетного завдання</target>
 
-<source>Stop</source>
-<target>Стоп</target>
+<source>Items processed:</source>
+<target>Елементів оброблено:</target>
+
+<source>Items remaining:</source>
+<target>Елементів залишилось:</target>
 
 <source>Total time:</source>
 <target>Загальний час:</target>
 
+<source>Stop</source>
+<target>Стоп</target>
+
 <source>Synchronization aborted!</source>
 <target>Синхронізація припинена!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Синхронізація закінчилася з помилками!</target>
 
+<source>Nothing to synchronize!</source>
+<target>Нічого синхронізувати!</target>
+
 <source>Synchronization completed successfully!</source>
 <target>Синхронізація пройшла успішно!</target>
 
-<source>Press "Switch" to open FreeFileSync GUI mode.</source>
-<target>Натисніть "Змінити" для відкриття графічного інтерфейсу FreeFileSync.</target>
+<source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
+<target>Натисніть "Змінити" для вирішення питань у головному вікні FreeFileSync.</target>
 
-<source>Switching to FreeFileSync GUI mode...</source>
-<target>Перехід до графічного інтерфейсу FreeFileSync...</target>
+<source>Switching to FreeFileSync main dialog...</source>
+<target>Перехід до головного діалогу FreeFileSync...</target>
 
 <source>Unable to connect to sourceforge.net!</source>
 <target>Не можна з’єднатися з sourceforge.net!</target>
@@ -540,9 +549,6 @@ The command line is executed each time:
 <source>Items found:</source>
 <target>Елементів знайдено:</target>
 
-<source>Items remaining:</source>
-<target>Елементів залишилось:</target>
-
 <source>Speed:</source>
 <target>Швидкість:</target>
 
@@ -594,9 +600,6 @@ The command line is executed each time:
 <source>&Load</source>
 <target>&Завантажити</target>
 
-<source>&Cancel</source>
-<target>&Відмінити</target>
-
 <source>Select variant:</source>
 <target>Виберіть варіант:</target>
 
@@ -645,8 +648,8 @@ The command line is executed each time:
 <source>Conflict/file cannot be categorized</source>
 <target>Не можна категоризувати конфлікт/файл</target>
 
-<source>&OK</source>
-<target>&OK</target>
+<source>OK</source>
+<target>OK</target>
 
 <source>Compare by...</source>
 <target>Критерії порівнювання</target>
@@ -677,9 +680,6 @@ is the same
 <source>Synchronizing...</source>
 <target>Синхронізація...</target>
 
-<source>Items processed:</source>
-<target>Елементів оброблено:</target>
-
 <source>&Pause</source>
 <target>&Пауза</target>
 
@@ -719,9 +719,6 @@ is the same
 <source>&Ignore</source>
 <target>&Ігнорувати</target>
 
-<source>&Retry</source>
-<target>&Повторити</target>
-
 <source>Do not show this dialog again</source>
 <target>Надалі не показувати це вікно</target>
 
@@ -1019,9 +1016,6 @@ Exclude: \stuff\temp\*
 <source>File list exported!</source>
 <target>Список файлів експортовано!</target>
 
-<source>Error writing file:</source>
-<target>Помилка при записі файлу:</target>
-
 <source>
 <pluralform>Object deleted successfully!</pluralform>
 <pluralform>%x objects deleted successfully!</pluralform>
@@ -1071,21 +1065,21 @@ Exclude: \stuff\temp\*
 <source>Paused</source>
 <target>Призупинено</target>
 
+<source>Initializing...</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>Continue</source>
-<target>Далі</target>
-
 <source>Cannot find %x</source>
 <target>Не можна знайти %x</target>
 
@@ -1229,65 +1223,65 @@ Exclude: \stuff\temp\*
 <pluralform>%x днів</pluralform>
 </target>
 
-<source>Could not initialize directory monitoring:</source>
-<target>Не вдалося ініціювати каталог для моніторингу:</target>
-
-<source>Error when monitoring directories.</source>
-<target>Помилка моніторингу каталогу.</target>
+<source>Cannot monitor directory %x.</source>
+<target>Не вдається контролювати каталог %x.</target>
 
 <source>Conversion error:</source>
 <target>Помилка перетворення:</target>
 
-<source>Error deleting file:</source>
-<target>Помилка при вилученні файлу:</target>
+<source>Cannot delete file %x.</source>
+<target>Не вдається видалити файл %х.</target>
 
-<source>Error moving file:</source>
-<target>Помилка переміщення файлу:</target>
+<source>The file is locked by another process:</source>
+<target>Файл заблоковано іншим процесом:</target>
 
-<source>Target file already existing!</source>
-<target>Кінцевий файл уже існує!</target>
+<source>Cannot move file %x to %y.</source>
+<target>Не вдається перемістити файл %x до %y.</target>
 
-<source>Error moving directory:</source>
-<target>Помилка переміщення каталогу:</target>
+<source>Cannot delete directory %x.</source>
+<target>Не вдається видалити каталог х%.</target>
 
-<source>Target directory already existing!</source>
-<target>Кінцевий каталог вже існує!</target>
+<source>Cannot write modification time of %x.</source>
+<target>Не вдається записати часу модифікації %х.</target>
 
-<source>Error deleting directory:</source>
-<target>Помилка при вилученні каталогу:</target>
+<source>Cannot find system function %x.</source>
+<target>Не вдається знайти системної функції %x.</target>
 
-<source>Error changing modification time:</source>
-<target>Помилка при зміні часу модификації файлу:</target>
+<source>Cannot read security context of %x.</source>
+<target>Не вдається прочитати контексту безпеки %х.</target>
 
-<source>Error loading library function:</source>
-<target>Помилка при завантаженні функції бібліотеки:</target>
+<source>Cannot write security context of %x.</source>
+<target>Не вдається записати контексту безпеки %х.</target>
 
-<source>Error reading security context:</source>
-<target>Помилка при читанні контексту безпеки:</target>
+<source>Cannot read permissions of %x.</source>
+<target>Не вдається прочитати дозволів %х.</target>
 
-<source>Error writing security context:</source>
-<target>Помилка при записі контексту безпеки:</target>
+<source>Cannot write permissions of %x.</source>
+<target>Не вдається записати дозволів %х.</target>
 
-<source>Error copying file permissions:</source>
-<target>Помилка при копіюванні прав доступу:</target>
+<source>Cannot create directory %x.</source>
+<target>Не вдається створити каталогу %x.</target>
 
-<source>Error creating directory:</source>
-<target>Помилка при створенні каталогу:</target>
+<source>Cannot copy symbolic link %x to %y.</source>
+<target>Не вдається зкопіювати символьне посилання %х в %y.</target>
 
-<source>Error copying symbolic link:</source>
-<target>Помилка при копіюванні символьного посилання:</target>
+<source>Cannot write file attributes of %x.</source>
+<target>Не вдається записати атрибути файла %x.</target>
 
-<source>Error copying file:</source>
-<target>Помилка при копіюванні файлу:</target>
+<source>Cannot copy file %x to %y.</source>
+<target>Не вдається зкопіювати файл %х до %y.</target>
 
-<source>Error traversing directory:</source>
-<target>Помилка обходу каталогу:</target>
+<source>Cannot read directory %x.</source>
+<target>Не вдається прочитати каталог %x</target>
 
-<source>Endless loop when traversing directory:</source>
-<target>Зациклюванння при обході каталогу:</target>
+<source>Endless loop.</source>
+<target>Нескінченний цикл.</target>
 
-<source>Error setting privilege:</source>
-<target>Помилка встановлення привилеїв:</target>
+<source>Cannot set privilege %x.</source>
+<target>Не вдається встановити привілеї %х.</target>
+
+<source>Unable to move %x to the Recycle Bin!</source>
+<target>Не вдається перенести %x до Корзини!</target>
 
 <source>Both sides have changed since last synchronization!</source>
 <target>З моменту останньої синхронізації з обох сторін відбулися зміни!</target>
@@ -1316,8 +1310,8 @@ Exclude: \stuff\temp\*
 <source>You can ignore this error to consider the directory as empty.</source>
 <target>Ви можете проігнорувати помилку, вважаючи каталог порожнім.</target>
 
-<source>Directory does not exist:</source>
-<target>Каталог не існує:</target>
+<source>Cannot find directory %x.</source>
+<target>Не вдається знайти каталог х%.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>Залежні каталоги! Будьте уважні при налаштуванні правил синхронізації:</target>
@@ -1325,20 +1319,17 @@ Exclude: \stuff\temp\*
 <source>Preparing synchronization...</source>
 <target>Підготовка до синхронізації...</target>
 
-<source>Out of memory!</source>
-<target>Бракує пам'яті!</target>
+<source>Conflict detected:</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>Symbolic links %x have the same date but a different target.</source>
+<target>Символьні посилання %х мають таку ж дату, але різні цілі.</target>
 
 <source>Comparing content of files %x</source>
 <target>Порівнювання вмісту файлів %x</target>
@@ -1421,12 +1412,12 @@ Exclude: \stuff\temp\*
 <source>Creating file %x</source>
 <target>Створення файлу %x</target>
 
-<source>Creating folder %x</source>
-<target>Створення папки %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>Створення символьного посилання %x</target>
 
+<source>Creating folder %x</source>
+<target>Створення папки %x</target>
+
 <source>Overwriting file %x</source>
 <target>Перезапис файлу %x</target>
 
@@ -1445,8 +1436,8 @@ Exclude: \stuff\temp\*
 <source>Directory for file versioning was not supplied!</source>
 <target>Не вказаний каталог для старих версій файлів!</target>
 
-<source>Source directory does not exist anymore:</source>
-<target>Каталог-джерело вже не існує:</target>
+<source>Source directory %x not found.</source>
+<target>Вихідний каталог %x не знайдено.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>Є невирішені конфлікти</target>
@@ -1481,12 +1472,6 @@ Exclude: \stuff\temp\*
 <source>Generating database...</source>
 <target>Створення бази даних...</target>
 
-<source>Nothing to synchronize!</source>
-<target>Нічого синхронізувати!</target>
-
-<source>Unable to copy locked file %x!</source>
-<target>Не можу зкопіювати заблокований файл %x!</target>
-
 <source>Data verification error: Source and target file have different content!</source>
 <target>Помилка перевірки даних: вхідний і вихідний файли мають різний вміст!</target>