5.11

author: Daniel Wilhelm <daniel@wili.li> 2014-04-18 17:22:36 +0200
committer: Daniel Wilhelm <daniel@wili.li> 2014-04-18 17:22:36 +0200
commit: ecb1524f8da7901338b263384fed3c612f117b4c (patch)
tree: e7e06423fe27ea5ab45f27fc4b39ae597ba72490 /BUILD/Languages
parent: 5.10 (diff)
download: FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.gz
FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.bz2
FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.zip
29 files changed, 4448 insertions, 3752 deletions
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index 656c9079..57458c14 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>请求中止: 正在等待当前操作完成...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>实时同步 - 自动同步</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>清除过滤器设置</target>
 
-<source>Create a batch job</source>
-<target>创建一个批处理作业</target>
+<source>Save as batch job</source>
+<target></target>
 
 <source>Comparison settings</source>
 <target>比较设置</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>全局设置</target>
 
-<source>Summary</source>
-<target>总结</target>
-
 <source>Find</source>
 <target>查找</target>
 
@@ -268,8 +268,8 @@
 <source>Select a folder</source>
 <target>选择一个文件夹</target>
 
-<source>Delay [seconds]</source>
-<target>延时 [秒]</target>
+<source>Idle time [seconds]</source>
+<target></target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>最后检测到改变和命令执行之间的空闲时间</target>
@@ -318,38 +318,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>有一个文件夹输入框为空.</target>
 
-<source>File time and size</source>
-<target>文件时间和大小</target>
-
-<source>File content</source>
-<target>文件内容</target>
-
-<source><Automatic></source>
-<target><自动></target>
-
-<source>Mirror ->></source>
-<target>镜像 ->></target>
-
-<source>Update -></source>
-<target>更新 -></target>
-
-<source>Custom</source>
-<target>自定义</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync批处理文件</target>
-
 <source>Synchronization aborted!</source>
 <target>同步已被中止!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>同步已完成但有错误.</target>
 
+<source>Synchronization completed with warnings.</source>
+<target></target>
+
 <source>Nothing to synchronize!</source>
 <target>没有什么可同步!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>同步成功完成!</target>
+<source>Synchronization completed successfully.</source>
+<target></target>
+
+<source>Saving log file %x...</source>
+<target></target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>请按下"切换"来解决 FreeFileSync主对话框上的问题.</target>
@@ -357,9 +342,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>正在切换到 FreeFileSync 主对话框...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>无法链接到 Sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>已经有新版本的FreeFileSync可用:</target>
 
@@ -372,6 +354,12 @@ The command is triggered if:
 <source>Information</source>
 <target>信息</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>无法链接到 Sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target></target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>要让 FreeFileSync 保持每周检查一次更新吗?</target>
 
@@ -435,27 +423,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>休眠</target>
 
-<source>1. &Compare</source>
-<target>1. 比较(&C)</target>
-
-<source>2. &Synchronize</source>
-<target>2. 同步(&S)</target>
-
 <source>&New</source>
 <target>新建(&N)</target>
 
 <source>&Save</source>
 <target>保存(&S)</target>
 
+<source>Save as &batch job...</source>
+<target></target>
+
+<source>1. &Compare</source>
+<target>1. 比较(&C)</target>
+
+<source>2. &Synchronize</source>
+<target>2. 同步(&S)</target>
+
 <source>&Language</source>
 <target>切换语言(&L)</target>
 
 <source>&Global settings...</source>
 <target>全局设置(&G)...</target>
 
-<source>&Create batch job...</source>
-<target>创建批处理作业(&C)...</target>
-
 <source>&Export file list...</source>
 <target>导出文件列表(&E)...</target>
 
@@ -489,17 +477,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>两侧互换</target>
 
-<source>Load configuration from file</source>
-<target>从文件加载配置</target>
+<source>Open</source>
+<target></target>
 
-<source>Save current configuration to file</source>
-<target>保存当前配置到文件</target>
+<source>Save</source>
+<target></target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>最后使用的配置(按DEL键将其从列表中移除)</target>
 
-<source>Show excluded items</source>
-<target>显示已排除项目</target>
+<source>Hide excluded items</source>
+<target></target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>显示已被过滤或被临时排除的文件</target>
@@ -537,15 +525,6 @@ The command is triggered if:
 <source>Help</source>
 <target>帮助</target>
 
-<source>Filter files</source>
-<target>过滤器文件</target>
-
-<source>Left</source>
-<target>左侧</target>
-
-<source>Right</source>
-<target>右侧</target>
-
 <source>Error handling</source>
 <target>错误处理</target>
 
@@ -567,14 +546,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>在第一个错误时中止同步</target>
 
-<source>On completion:</source>
-<target>完成时:</target>
+<source>On completion</source>
+<target></target>
 
 <source>Show progress dialog</source>
 <target>显示进度对话框</target>
 
-<source>Generate log file</source>
-<target>生成日志文件</target>
+<source>Save log</source>
+<target></target>
 
 <source>Select folder to save log files</source>
 <target>选择要保存日志文件的文件夹</target>
@@ -585,11 +564,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>限制日志文件的量大个数</target>
 
-<source>Batch settings</source>
-<target>批处理设置</target>
-
-<source>Compare by...</source>
-<target>比较选项...</target>
+<source>Select variant</source>
+<target></target>
 
 <source>
 Files are found equal if
@@ -604,6 +580,9 @@ are the same
 是相同的
 </target>
 
+<source>File time and size</source>
+<target>文件时间和大小</target>
+
 <source>
 Files are found equal if
      - file content
@@ -615,24 +594,36 @@ is the same
 是相同的
 </target>
 
+<source>File content</source>
+<target>文件内容</target>
+
 <source>Symbolic Link handling</source>
 <target>符号连接处理方式</target>
 
 <source>OK</source>
 <target>确定</target>
 
-<source>Select variant:</source>
-<target>选择变化的:</target>
+<source><- Two way -></source>
+<target></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>使用一个数据库来识别和传播两边的改变. 删除，重命名和冲突会自动检测.</target>
 
+<source>Mirror ->></source>
+<target>镜像 ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>镜像备份左边的文件夹.同步后右边的文件夹被修改为和左边文件夹精确匹配.</target>
 
+<source>Update -></source>
+<target>更新 -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>复制新的或修改过的文件到右侧文件夹</target>
 
+<source>Custom</source>
+<target>自定义</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>配置你自己的同步规则.</target>
 
@@ -648,8 +639,8 @@ is the same
 <source>Recycle Bin</source>
 <target>回收站</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>当删除或覆盖文件时使用回收站</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target></target>
 
 <source>Versioning</source>
 <target>保留历史版本</target>
@@ -657,8 +648,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>移动时间标记文件到指定的文件夹</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>限制每个文件的最大历史版本数</target>
+<source>Naming convention:</source>
+<target></target>
 
 <source>Configuration</source>
 <target>配置</target>
@@ -807,6 +798,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>摘要</target>
 
+<source>Filter files</source>
+<target>过滤器文件</target>
+
 <source>Select view</source>
 <target>选择视图</target>
 
@@ -858,9 +852,15 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><最后会话></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>文件夹比较与同步</target>
+
 <source>Configuration saved!</source>
 <target>配置已保存!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync批处理文件</target>
+
 <source>Never save changes</source>
 <target>永不保存更改</target>
 
@@ -873,9 +873,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>配置已加载!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>文件夹比较与同步</target>
-
 <source>Hide files that exist on left side only</source>
 <target>隐藏仅在左侧的文件</target>
 
@@ -1028,6 +1025,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>正在比较文件内容...</target>
 
+<source>Copy</source>
+<target></target>
+
 <source>Paused</source>
 <target>已暂停</target>
 
@@ -1100,14 +1100,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- 只对文件夹部分</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- 另一侧参照 %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target></target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- 另一侧参照 %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target></target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>重新让被隐藏的对话框和警告信息变为可见?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target></target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1128,44 +1128,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>遗留为未解决的冲突</target>
 
-<source>Files</source>
-<target>文件</target>
+<source>Replace</source>
+<target></target>
 
-<source>Percentage</source>
-<target>百分比</target>
+<source>Move files and replace if existing</source>
+<target></target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target></target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target></target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target></target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x 分</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target></target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x 小时</pluralform>
-</target>
+<source>Files</source>
+<target>文件</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x 天</pluralform>
-</target>
+<source>Percentage</source>
+<target>百分比</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>无法监视目录 %x.</target>
@@ -1215,6 +1200,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>无法复制文件 %x 到 %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target></target>
+
 <source>Cannot open directory %x.</source>
 <target>无法打开目录 %x.</target>
 
@@ -1224,6 +1212,39 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>检测到无限的目录递归.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x 分</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x 小时</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x 天</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>无法设置 %x 的特权.</target>
 
@@ -1353,6 +1374,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>正在移动符号连接 %x 到 %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>正在创建文件 %x</target>
 
@@ -1374,6 +1398,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>更新 %x 的属性</target>
 
+<source>Target folder %x already existing.</source>
+<target>目标文件夹 %x 已经存在.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>目标文件夹输入框必须不为空.</target>
 
@@ -1383,11 +1410,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>无法找到源文件夹 %x.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>存在不可解决的冲突!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>你可忽略冲突并继续同步.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target></target>
 
 <source>Significant difference detected:</source>
 <target>已侦测到显著不同:</target>
@@ -1407,12 +1431,15 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>一个将被修改的文件夹是多个文件夹对的一部分. 请重新检视同步设置.</target>
 
+<source>Left</source>
+<target>左侧</target>
+
+<source>Right</source>
+<target>右侧</target>
+
 <source>Synchronizing folder pair:</source>
 <target>正在同步成对的文件夹:</target>
 
-<source>Target folder %x already existing.</source>
-<target>目标文件夹 %x 已经存在.</target>
-
 <source>Generating database...</source>
 <target>正在生成数据库...</target>
 
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
index 69e79b2d..79391ed1 100644
--- a/BUILD/Languages/chinese_traditional.lng
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -32,7 +32,7 @@
 <target>中止請求：正在等待目前操作完成...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>無法新建時間戳記的版本控制：</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>即時同步 - 自動同步</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>清除篩選器設定</target>
 
-<source>Create a batch job</source>
-<target>新建一個批次處理作業</target>
+<source>Save as batch job</source>
+<target>另存為批次處理作業</target>
 
 <source>Comparison settings</source>
 <target>比對設定</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>整體設定</target>
 
-<source>Summary</source>
-<target>概要</target>
-
 <source>Find</source>
 <target>尋找</target>
 
@@ -174,7 +171,7 @@
 </target>
 
 <source>Error parsing file %x, row %y, column %z.</source>
-<target>解析檔案 %x、行 %y、列 %z 時出現錯誤。</target>
+<target>解析 %x 檔案，第 %y 列，第 %z 行出現錯誤。</target>
 
 <source>Scanning:</source>
 <target>正在掃瞄：</target>
@@ -224,7 +221,7 @@
 <target>開啟(&O)...</target>
 
 <source>Save &as...</source>
-<target>另存新檔(&a)...</target>
+<target>另存新檔(&A)...</target>
 
 <source>&Quit</source>
 <target>離開(&Q)</target>
@@ -271,11 +268,11 @@
 <source>Select a folder</source>
 <target>選擇一個資料夾</target>
 
-<source>Delay [seconds]</source>
-<target>延遲 [秒]</target>
+<source>Idle time [seconds]</source>
+<target>閒置時間 [秒]</target>
 
 <source>Idle time between last detected change and execution of command</source>
-<target>最後檢測到更改和執行命令之間的閒置時間</target>
+<target>最後檢測到變更和執行命令之間的閒置時間</target>
 
 <source>Command line</source>
 <target>命令列</target>
@@ -287,7 +284,7 @@ The command is triggered if:
 </source>
 <target>
 假如要觸發該命令：
-- 檔案或子資料夾更改
+- 檔案或子資料夾變更
 - 新資料夾到來(例如插入USB隨身碟)
 </target>
 
@@ -321,48 +318,30 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>資料夾輸入欄位是空的。</target>
 
-<source>File time and size</source>
-<target>檔案大小和日期</target>
-
-<source>File content</source>
-<target>檔案内容</target>
-
-<source><Automatic></source>
-<target><自動></target>
-
-<source>Mirror ->></source>
-<target>鏡像 ->></target>
-
-<source>Update -></source>
-<target>更新 -></target>
-
-<source>Custom</source>
-<target>自訂</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync批次處理</target>
-
 <source>Synchronization aborted!</source>
 <target>同步已中止！</target>
 
 <source>Synchronization completed with errors!</source>
 <target>同步完成但有錯誤！</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>同步已完成，但出現警告。</target>
+
 <source>Nothing to synchronize!</source>
 <target>沒有什麼東西可同步！</target>
 
-<source>Synchronization completed successfully!</source>
-<target>已成功的完成同步！</target>
+<source>Synchronization completed successfully.</source>
+<target>同步已成功完成。</target>
+
+<source>Saving log file %x...</source>
+<target>正在儲存日誌檔 %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
-<target>在FreeFileSync主對話框，按下"切換"來解決問題。</target>
+<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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>FreeFileSync有新版本可用：</target>
 
@@ -375,6 +354,12 @@ The command is triggered if:
 <source>Information</source>
 <target>訊息</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>無法連接到sourceforge.net！</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>目前FreeFileSync版本號碼連線未找到！是否要手動檢查？</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>要每週自動檢查更新FreeFileSync嗎？</target>
 
@@ -438,27 +423,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>休眠</target>
 
+<source>&New</source>
+<target>新增(&N)</target>
+
+<source>&Save</source>
+<target>儲存(&S)</target>
+
+<source>Save as &batch job...</source>
+<target>另存為批次處理作業(&B)</target>
+
 <source>1. &Compare</source>
 <target>1. 比對(&C)</target>
 
 <source>2. &Synchronize</source>
 <target>2. 同步(&S)</target>
 
-<source>&New</source>
-<target>新增專案(&N)</target>
-
-<source>&Save</source>
-<target>儲存(&S)</target>
-
 <source>&Language</source>
 <target>語言(&L)</target>
 
 <source>&Global settings...</source>
 <target>整體設定(&G)...</target>
 
-<source>&Create batch job...</source>
-<target>新建批次處理作業(&C)...</target>
-
 <source>&Export file list...</source>
 <target>匯出檔案清單(&E)...</target>
 
@@ -466,7 +451,7 @@ The command is triggered if:
 <target>進階(&A)</target>
 
 <source>&Check for new version</source>
-<target>檢查更新(&C)</target>
+<target>檢查是否有新版本(&C)</target>
 
 <source>Compare</source>
 <target>比對</target>
@@ -492,17 +477,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>兩邊交換</target>
 
-<source>Load configuration from file</source>
-<target>從檔案載入配置</target>
+<source>Open</source>
+<target>開啟</target>
 
-<source>Save current configuration to file</source>
-<target>將目前配置儲存到檔案</target>
+<source>Save</source>
+<target>儲存</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>上次使用的配置(按DEL鍵，從清單中移除)</target>
 
-<source>Show excluded items</source>
-<target>顯示排除的項目</target>
+<source>Hide excluded items</source>
+<target>隱藏排除項目</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>顯示已篩選或暫時排除的檔案</target>
@@ -535,20 +520,11 @@ The command is triggered if:
 <target>批次處理作業</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>新建一個批次檔來自動執行同步。按兩下此檔案或安排在您的系統任務計畫表：FreeFileSync.exe <工作名稱>.ffs_batch</target>
+<target>新建一個批次檔來自動執行同步。 按兩下此檔案或安排在您的系統任務計畫表： FreeFileSync.exe <工作名稱>.ffs_batch</target>
 
 <source>Help</source>
 <target>說明</target>
 
-<source>Filter files</source>
-<target>篩選檔案</target>
-
-<source>Left</source>
-<target>左邊</target>
-
-<source>Right</source>
-<target>右邊</target>
-
 <source>Error handling</source>
 <target>錯誤處理</target>
 
@@ -570,14 +546,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>在第一個錯誤出現即中止同步</target>
 
-<source>On completion:</source>
-<target>完成後：</target>
+<source>On completion</source>
+<target>完成後</target>
 
 <source>Show progress dialog</source>
 <target>顯示進度對話框</target>
 
-<source>Generate log file</source>
-<target>產生日誌檔</target>
+<source>Save log</source>
+<target>儲存日誌</target>
 
 <source>Select folder to save log files</source>
 <target>選擇要儲存日誌檔的資料夾</target>
@@ -588,11 +564,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>限制日誌檔的最大數量</target>
 
-<source>Batch settings</source>
-<target>批次處理設定</target>
-
-<source>Compare by...</source>
-<target>比對選項...</target>
+<source>Select variant</source>
+<target>選擇變數</target>
 
 <source>
 Files are found equal if
@@ -602,6 +575,9 @@ are the same
 </source>
 <target>如果檔案大小和最後修改時間和日期相同則判斷兩者相同</target>
 
+<source>File time and size</source>
+<target>檔案大小和日期</target>
+
 <source>
 Files are found equal if
      - file content
@@ -609,24 +585,36 @@ is the same
 </source>
 <target>如果檔案内容相同則判斷兩者相同</target>
 
+<source>File content</source>
+<target>檔案内容</target>
+
 <source>Symbolic Link handling</source>
 <target>符號連結處理</target>
 
 <source>OK</source>
 <target>確定</target>
 
-<source>Select variant:</source>
-<target>選擇變數：</target>
+<source><- Two way -></source>
+<target><- 雙向 -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>對兩邊使用同一個資料庫來識別和傳送更改。自動檢測刪除、重新命名和衝突部份。</target>
+<target>對兩邊使用同一個資料庫來識別和傳送變更。 自動檢測刪除、重新命名和衝突部份。</target>
+
+<source>Mirror ->></source>
+<target>鏡像 ->></target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>鏡像備份的左邊的資料夾。同步後，右邊的資料夾進行修改以完全相配左邊的資料夾。</target>
+<target>鏡像備份的左邊的資料夾。 同步後，右邊的資料夾進行修改以完全相配左邊的資料夾。</target>
+
+<source>Update -></source>
+<target>更新 -></target>
 
 <source>Copy new or updated files to right folder.</source>
 <target>將新的或更新過的檔案複製到右邊的資料夾中。</target>
 
+<source>Custom</source>
+<target>自訂</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>配置你自己的同步規則。</target>
 
@@ -642,8 +630,8 @@ is the same
 <source>Recycle Bin</source>
 <target>資源回收筒</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>當刪除或覆蓋檔案時使用資源回收筒</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>將刪除和覆蓋的檔案移動到資源回收筒</target>
 
 <source>Versioning</source>
 <target>版本控制</target>
@@ -651,8 +639,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>將時間戳記檔案移動到指定的資料夾</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>限制每個檔案版本的最大數量</target>
+<source>Naming convention:</source>
+<target>命名慣例：</target>
 
 <source>Configuration</source>
 <target>配置</target>
@@ -748,7 +736,7 @@ Note: File names must be relative to base directories!
 <target>故障保護檔案複製</target>
 
 <source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>第一次將檔寫入到一個暫存(*.ffs_tmp)，順便將它們重新命名。即使在嚴重錯誤的情況下，還可確保一致的狀態。</target>
+<target>第一次將檔寫入到一個暫存(*.ffs_tmp)，順便將它們重新命名。 即使在嚴重錯誤的情況下，還可確保一致的狀態。</target>
 
 <source>Copy locked files</source>
 <target>複製被鎖定的檔案</target>
@@ -801,6 +789,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>摘要</target>
 
+<source>Filter files</source>
+<target>篩選檔案</target>
+
 <source>Select view</source>
 <target>選擇檢視</target>
 
@@ -852,24 +843,27 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><最後連線></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>資料夾比對和同步</target>
+
 <source>Configuration saved!</source>
 <target>配置已儲存！</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync批次處理</target>
+
 <source>Never save changes</source>
-<target>從不更改儲存</target>
+<target>不要儲存變更</target>
 
 <source>Do you want to save changes to %x?</source>
-<target>是否要更改儲存到 %x？</target>
+<target>是否要儲存變更到 %x？</target>
 
 <source>Do&n't save</source>
-<target>不儲存(&n)</target>
+<target>不儲存(&N)</target>
 
 <source>Configuration loaded!</source>
 <target>配置已載入！</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>資料夾比對和同步</target>
-
 <source>Hide files that exist on left side only</source>
 <target>隱藏只存在於左邊的檔案</target>
 
@@ -995,7 +989,7 @@ Note: File names must be relative to base directories!
 <pluralform>%x of %y rows in view</pluralform>
 </source>
 <target>
-<pluralform>顯示 %y 之 %x 行</pluralform>
+<pluralform>檢視中的 %x 之 %y 列</pluralform>
 </target>
 
 <source>Ignore further errors</source>
@@ -1022,6 +1016,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>正在比對内容...</target>
 
+<source>Copy</source>
+<target>複製</target>
+
 <source>Paused</source>
 <target>已暫停</target>
 
@@ -1080,13 +1077,13 @@ Note: File names must be relative to base directories!
 <target>直接</target>
 
 <source>Follow</source>
-<target>遵循</target>
+<target>遵從</target>
 
 <source>Copy NTFS permissions</source>
 <target>複製NTFS權限</target>
 
 <source>Integrate external applications into context menu. The following macros are available:</source>
-<target>整合上下文功能表中的外部應用程式。可以使用下面的巨集：</target>
+<target>整合上下文功能表中的外部應用程式。 可以使用下面的巨集：</target>
 
 <source>- full file or folder name</source>
 <target>- 完整檔案或資料夾名稱</target>
@@ -1094,14 +1091,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- 只有資料夾一部分</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- 另一邊對應到 %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- 另一邊對應到 %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- 另一邊對應到 %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- 另一邊對應到 %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>讓隱藏的對話框和警告訊息再被看見嗎？</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>使隱藏的警告和對話框再次可見？</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1122,44 +1119,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>保留給未解決的衝突</target>
 
-<source>Files</source>
-<target>檔案</target>
+<source>Replace</source>
+<target>取代</target>
 
-<source>Percentage</source>
-<target>百分比</target>
+<source>Move files and replace if existing</source>
+<target>如果存在，移動檔案並取代</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>將時間戳記附加到每個檔案名稱上</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>資料夾</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>檔案</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x 分</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x 小時</pluralform>
-</target>
+<source>Files</source>
+<target>檔案</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x 天</pluralform>
-</target>
+<source>Percentage</source>
+<target>百分比</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>無法監測目錄 %x。</target>
@@ -1209,6 +1191,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>無法複製檔案 %x 到 %y。</target>
 
+<source>Type of item %x is not supported:</source>
+<target>項目類型 %x 不被支援：</target>
+
 <source>Cannot open directory %x.</source>
 <target>無法開啟目錄 %x。</target>
 
@@ -1218,6 +1203,39 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>檢測到無限目錄遞迴。</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x 分</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x 小時</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x 天</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>無法設定權限 %x。</target>
 
@@ -1225,13 +1243,13 @@ Note: File names must be relative to base directories!
 <target>無法將 %x 移動到資源回收筒！</target>
 
 <source>Both sides have changed since last synchronization!</source>
-<target>自上次同步後，兩邊均已更改過！</target>
+<target>自上次同步後，兩邊均已變更過！</target>
 
 <source>Cannot determine sync-direction:</source>
 <target>無法判斷同步方向：</target>
 
 <source>No change since last synchronization!</source>
-<target>自上次同步以來都沒有更改！</target>
+<target>自上次同步以來都沒有變更！</target>
 
 <source>The corresponding database entries are not in sync considering current settings.</source>
 <target>相應的資料庫條目在同步時，不考慮到目前的設定。</target>
@@ -1252,7 +1270,7 @@ Note: File names must be relative to base directories!
 <target>目錄有依靠性！請小心設定同步規則：</target>
 
 <source>Start comparison</source>
-<target>開始比較</target>
+<target>開始比對</target>
 
 <source>Preparing synchronization...</source>
 <target>正在準備同步...</target>
@@ -1348,7 +1366,7 @@ Note: File names must be relative to base directories!
 <target>正在移動符號連結 %x 到 %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>正在刪除舊版本...</target>
 
 <source>Creating file %x</source>
 <target>正在新建檔案 %x</target>
@@ -1371,6 +1389,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>正在更新 %x 個屬性</target>
 
+<source>Target folder %x already existing.</source>
+<target>目標資料夾 %x 已存在。</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>目標資料夾輸入欄位不能為空。</target>
 
@@ -1380,11 +1401,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>來源資料夾 %x 找不到。</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>存在未解決的衝突！</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>你可以忽略衝突，並繼續同步。</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>下列項目有未解決的衝突，將不會同步：</target>
 
 <source>Significant difference detected:</source>
 <target>檢測到顯著的差異：</target>
@@ -1402,14 +1420,17 @@ Note: File names must be relative to base directories!
 <target>可用：</target>
 
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
-<target>一個將被修改的資料夾，是多個配對資料夾的一部分。請檢查同步設定。</target>
+<target>一個將被修改的資料夾，是多個配對資料夾的一部分。 請檢查同步設定。</target>
+
+<source>Left</source>
+<target>左邊</target>
+
+<source>Right</source>
+<target>右邊</target>
 
 <source>Synchronizing folder pair:</source>
 <target>同步配對資料夾：</target>
 
-<source>Target folder %x already existing.</source>
-<target>目標資料夾 %x 已存在。</target>
-
 <source>Generating database...</source>
 <target>正在產生資料庫...</target>
 
diff --git a/BUILD/Languages/croatian.lng b/BUILD/Languages/croatian.lng
index 91e26f43..1c5adb0d 100644
--- a/BUILD/Languages/croatian.lng
+++ b/BUILD/Languages/croatian.lng
@@ -32,7 +32,7 @@
 <target>Prekid zahtjevan: čekam da se trenutna akcija završi...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>Nije moguća vremenska oznaka za varijantu</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatska Sinkronizacija</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Počisti postavke filtera</target>
 
-<source>Create a batch job</source>
-<target>Izradi slijedni zadatak</target>
+<source>Save as batch job</source>
+<target>Spremi kao slijedni zadatak</target>
 
 <source>Comparison settings</source>
 <target>Postavke usporedbe</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Globalne postavke</target>
 
-<source>Summary</source>
-<target>Pregled</target>
-
 <source>Find</source>
 <target>Pronađi</target>
 
@@ -277,8 +274,8 @@
 <source>Select a folder</source>
 <target>Izaberite mapu</target>
 
-<source>Delay [seconds]</source>
-<target>Odgoditi [sekunda]</target>
+<source>Idle time [seconds]</source>
+<target>Vrijeme mirovanja [sekundi]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Vrijeme čekanja između zadnje prepoznate promjene i izvršenja naredbe</target>
@@ -327,38 +324,23 @@ Naredba će biti pokrenuta ako se:
 <source>A folder input field is empty.</source>
 <target>Polje za odabir foldera je prazno.</target>
 
-<source>File time and size</source>
-<target>Vrijeme i veličina datoteke</target>
-
-<source>File content</source>
-<target>Sadržaj datoteke</target>
-
-<source><Automatic></source>
-<target><Automatski></target>
-
-<source>Mirror ->></source>
-<target>Zrcalno ->></target>
-
-<source>Update -></source>
-<target>Ažuriraj -></target>
-
-<source>Custom</source>
-<target>Uobičajeno</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync slijedni zadatak</target>
-
 <source>Synchronization aborted!</source>
 <target>Sinkronizacija prekinuta!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sinkronizacija završena s greškama!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Sinkronizacija završena s upozorenjima</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>Synchronization completed successfully.</source>
+<target>Sinkronizacija uspješno dovršena</target>
+
+<source>Saving log file %x...</source>
+<target>Spremam izješće %x...</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>
@@ -366,9 +348,6 @@ Naredba će biti pokrenuta ako se:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Nova verzija FreeFileSync je dostupna:</target>
 
@@ -381,6 +360,12 @@ Naredba će biti pokrenuta ako se:
 <source>Information</source>
 <target>Informacija</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Ne mogu se povezati na sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Trenutna FreeFileSync verzija nije pronađena online! Da li želite pronaći ručno?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Dali želite da FreeFileSync automatski traži ažuriranja svaki tjedan?</target>
 
@@ -444,27 +429,27 @@ Naredba će biti pokrenuta ako se:
 <source>Hibernate</source>
 <target>Hibernacija</target>
 
-<source>1. &Compare</source>
-<target>1. &Usporedi</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Sinkroniziraj</target>
-
 <source>&New</source>
 <target>&Novo</target>
 
 <source>&Save</source>
 <target>&Spremi</target>
 
+<source>Save as &batch job...</source>
+<target>Spremi kao &slijedni zadatak...</target>
+
+<source>1. &Compare</source>
+<target>1. &Usporedi</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Sinkroniziraj</target>
+
 <source>&Language</source>
 <target>&Jezik</target>
 
 <source>&Global settings...</source>
 <target>&Globalne postavke...</target>
 
-<source>&Create batch job...</source>
-<target>&Izradi slijedni zadatak...</target>
-
 <source>&Export file list...</source>
 <target>&Izvoz liste datoteka...</target>
 
@@ -498,17 +483,17 @@ Naredba će biti pokrenuta ako se:
 <source>Swap sides</source>
 <target>Zamjeni strane</target>
 
-<source>Load configuration from file</source>
-<target>Uvezi postavke iz datoteke</target>
+<source>Open</source>
+<target>Otvori</target>
 
-<source>Save current configuration to file</source>
-<target>Spremi sadašnje postavke u datoteku</target>
+<source>Save</source>
+<target>Spremi</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Zadnje korištene postavke (pretisite DEL za ukloniti s liste)</target>
 
-<source>Show excluded items</source>
-<target>Prikaži isključene stavke</target>
+<source>Hide excluded items</source>
+<target>Sakrij isključene stavke</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Prikaži filtrirane ili privremeno izdvojene datoteke</target>
@@ -546,15 +531,6 @@ Naredba će biti pokrenuta ako se:
 <source>Help</source>
 <target>Pomoć</target>
 
-<source>Filter files</source>
-<target>Filtriraj datoteke</target>
-
-<source>Left</source>
-<target>Lijevo</target>
-
-<source>Right</source>
-<target>Desno</target>
-
 <source>Error handling</source>
 <target>Greška pri obradi</target>
 
@@ -576,29 +552,26 @@ Naredba će biti pokrenuta ako se:
 <source>Abort synchronization on first error</source>
 <target>Prekini sinkronizaciju pri prvoj pogrešci</target>
 
-<source>On completion:</source>
+<source>On completion</source>
 <target>Pri završetku</target>
 
 <source>Show progress dialog</source>
 <target>Prikaži napredak</target>
 
-<source>Generate log file</source>
-<target>Generiraj izvješće</target>
+<source>Save log</source>
+<target>Spremi izvješće</target>
 
 <source>Select folder to save log files</source>
 <target>Odaberi mapu za spremanje izvješća</target>
 
 <source>Limit</source>
-<target>Granica</target>
+<target>Ograniči</target>
 
 <source>Limit maximum number of log files</source>
 <target>Ograniči maksimalan broj izvješća</target>
 
-<source>Batch settings</source>
-<target>Slijedne postavke</target>
-
-<source>Compare by...</source>
-<target>Usporedi prema...</target>
+<source>Select variant</source>
+<target>Odaberi varijantu</target>
 
 <source>
 Files are found equal if
@@ -613,6 +586,9 @@ Datoteke se smatraju jednake ako su im
 jednaki
 </target>
 
+<source>File time and size</source>
+<target>Vrijeme i veličina datoteke</target>
+
 <source>
 Files are found equal if
      - file content
@@ -624,24 +600,36 @@ Datoteke se smatraju jednake ako im je
 jednak
 </target>
 
+<source>File content</source>
+<target>Sadržaj datoteke</target>
+
 <source>Symbolic Link handling</source>
 <target>Upravljanje simboličnim poveznicama</target>
 
 <source>OK</source>
 <target>U redu</target>
 
-<source>Select variant:</source>
-<target>Izaberite varijantu:</target>
+<source><- Two way -></source>
+<target>Dvosmjerno</target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identificiraj i izvedi promjene na obje strane koristeći bazu podataka. Brisanja, preimenovanja i sukobi se automatski detektiraju</target>
 
+<source>Mirror ->></source>
+<target>Zrcalno ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Zrcalna pričuva lijeve mape. Desna mapa je uređena da bi bila jednaka lijevom folderu nakon sinkronizacije.</target>
 
+<source>Update -></source>
+<target>Ažuriraj -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopiraj nove ili ažurirane datoteke u desnu mapu.</target>
 
+<source>Custom</source>
+<target>Uobičajeno</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Konfigurirajte vaša vlastita sinkronizacijska pravila.</target>
 
@@ -657,17 +645,17 @@ jednak
 <source>Recycle Bin</source>
 <target>Koš za smeće</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Koristi Koš za smeće pri brisanju ili prepisivanju datoteka</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Koristi Smeće za izbrisane i prepisane datoteke</target>
 
 <source>Versioning</source>
-<target>Verzija</target>
+<target>Označi</target>
 
 <source>Move time-stamped files into specified folder</source>
 <target>Premjesti vremenski-označene datoteke u određenu mapu</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Ograniči maksimalan broj verzija po datoteci</target>
+<source>Naming convention:</source>
+<target>Pravilo imena:</target>
 
 <source>Configuration</source>
 <target>Postavke</target>
@@ -816,6 +804,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Overview</source>
 <target>Pregled</target>
 
+<source>Filter files</source>
+<target>Filtriraj datoteke</target>
+
 <source>Select view</source>
 <target>Izaberite pogled</target>
 
@@ -867,9 +858,15 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source><Last session></source>
 <target><Zadnja sesija></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Usporedba i sinkronizacija mapa</target>
+
 <source>Configuration saved!</source>
 <target>Postavke spremljene!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync slijedni zadatak</target>
+
 <source>Never save changes</source>
 <target>Nikad ne spremaj promjene</target>
 
@@ -882,9 +879,6 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Configuration loaded!</source>
 <target>Postavke učitane!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Usporedba i sinkronizacija mapa</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Sakrij datoteke koje postoje samo na lijevoj strani</target>
 
@@ -1045,6 +1039,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Comparing content...</source>
 <target>Uspoređujem sadržaj...</target>
 
+<source>Copy</source>
+<target>Kopiraj</target>
+
 <source>Paused</source>
 <target>Pauzirano</target>
 
@@ -1117,14 +1114,14 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>- folder part only</source>
 <target>- samo mapa</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Duplikat s druge strane k %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Duplikat s druge strane u %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Duplikat s druge strane k %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Duplikat s druge strane u %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Učini skrivene prozore i upozorenja ponovno vidljivima</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Vrati skrivena upozorenja i dijaloški okvir ponovno vidljivim?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1149,50 +1146,29 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Leave as unresolved conflict</source>
 <target>Ostavi kao neriješeni sukob</target>
 
-<source>Files</source>
-<target>Datoteke</target>
+<source>Replace</source>
+<target>Zamjeni</target>
 
-<source>Percentage</source>
-<target>Postotak</target>
+<source>Move files and replace if existing</source>
+<target>Premjesti datoteke i zamjeni ako već postoji</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Dodaj vremensku oznaku svakom imenu datoteke</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Mapa</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Datoteka</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>GGGG-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x sat</pluralform>
-<pluralform>%x sata</pluralform>
-<pluralform>%x sati</pluralform>
-</target>
+<source>Files</source>
+<target>Datoteke</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x dan</pluralform>
-<pluralform>%x dana</pluralform>
-<pluralform>%x dana</pluralform>
-</target>
+<source>Percentage</source>
+<target>Postotak</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Ne mogu posmatrati direktorij %x.</target>
@@ -1242,6 +1218,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Cannot copy file %x to %y.</source>
 <target>Ne mogu kopirati datoteku %x na %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Tip stavke %x koji nije podržan:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Ne mogu otvoriti mapu %x.</target>
 
@@ -1251,6 +1230,45 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Detected endless directory recursion.</source>
 <target>Detektiran bezograničeni direktorij</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x sat</pluralform>
+<pluralform>%x sata</pluralform>
+<pluralform>%x sati</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x dan</pluralform>
+<pluralform>%x dana</pluralform>
+<pluralform>%x dana</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Ne mogu postaviti prava za %x.</target>
 
@@ -1381,7 +1399,7 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <target>Premještam simboličnu poveznicu %x u %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>Uklanjam starije verzije...</target>
 
 <source>Creating file %x</source>
 <target>Izrađujem datoteku %x</target>
@@ -1404,6 +1422,9 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Updating attributes of %x</source>
 <target>Obnavljam atribute od %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Odredišna mapa %x već postoji.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Odredišna mapa ne može biti prazna</target>
 
@@ -1413,11 +1434,8 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>Source folder %x not found.</source>
 <target>Izvorna mapa %x nije pronađena</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Nerješivi sukob postoji!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Možete ignorirati sukob i nastaviti s sinkronizacijom.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Slijedeće stavke imaju nedefiniranih sukoba te neće biti sinkronizirane:</target>
 
 <source>Significant difference detected:</source>
 <target>Značajna razlika opažena:</target>
@@ -1437,12 +1455,15 @@ Napomena: Imena datoteka moraju biti srodni s glavnim mapama!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Mapa će biti uređena koja je dio više pari mapa. Molimo provjerite sinkronizacijske postavke.</target>
 
+<source>Left</source>
+<target>Lijevo</target>
+
+<source>Right</source>
+<target>Desno</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Par sinkronizirane mape:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Odredišna mapa %x već postoji.</target>
-
 <source>Generating database...</source>
 <target>Izrađujem bazu podataka...</target>
 
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index 2ff7d45a..4bc84b0a 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -31,6 +31,9 @@
 <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>Failure to create time stamp for versioning:</source>
+<target>Chyba při vytvoření časové značky verzování:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatická synchronizace</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Zrušit nastavení filtru</target>
 
-<source>Create a batch job</source>
-<target>Vytvořit dávku</target>
+<source>Save as batch job</source>
+<target>Uložit jako dávku</target>
 
 <source>Comparison settings</source>
 <target>Nastavení porovnání</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Nastavení programu</target>
 
-<source>Summary</source>
-<target>Přehled</target>
-
 <source>Find</source>
 <target>Najít</target>
 
@@ -274,7 +274,7 @@
 <source>Select a folder</source>
 <target>Vyberte adresář</target>
 
-<source>Delay [seconds]</source>
+<source>Idle time [seconds]</source>
 <target>Prodleva (v sekundách)</target>
 
 <source>Idle time between last detected change and execution of command</source>
@@ -324,38 +324,23 @@ Příkaz je spuštěn když:
 <source>A folder input field is empty.</source>
 <target>Není zadána vstupní složka.</target>
 
-<source>File time and size</source>
-<target>Podle velikosti a data souboru</target>
-
-<source>File content</source>
-<target>Podle obsahu souboru</target>
-
-<source><Automatic></source>
-<target><- Automaticky -></target>
-
-<source>Mirror ->></source>
-<target>Zrcadlení ->></target>
-
-<source>Update -></source>
-<target>Aktualizuj -></target>
-
-<source>Custom</source>
-<target>Vlastní</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync dávka</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronizace zrušena!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronizace dokončena s chybami.</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Synchronizace dokončena s varováními.</target>
+
 <source>Nothing to synchronize!</source>
 <target>Není co synchronizovat!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synchronizace dokončena úspěšně!</target>
+<source>Synchronization completed successfully.</source>
+<target>Synchronizace dokončena úspěšně.</target>
+
+<source>Saving log file %x...</source>
+<target>Ukládání žurnálu %x...</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>
@@ -363,9 +348,6 @@ Příkaz je spuštěn když:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Je dostupná novější verze FreeFileSync:</target>
 
@@ -378,6 +360,12 @@ Příkaz je spuštěn když:
 <source>Information</source>
 <target>Informace</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Není možné se připojit k sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Současná verze FreeFileSync nebyla nalezena online! Chcete verzi zkontrolovat ručně?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Chcete aby FreeFileSync automaticky zjišťoval aktualizace každý týden?</target>
 
@@ -441,27 +429,27 @@ Příkaz je spuštěn když:
 <source>Hibernate</source>
 <target>Přepnout do režimu spánku</target>
 
-<source>1. &Compare</source>
-<target>1. &Porovnat</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synchronizovat</target>
-
 <source>&New</source>
 <target>&Nový</target>
 
 <source>&Save</source>
 <target>&Uložit</target>
 
+<source>Save as &batch job...</source>
+<target>Uložit jako &dávku</target>
+
+<source>1. &Compare</source>
+<target>1. &Porovnat</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synchronizovat</target>
+
 <source>&Language</source>
 <target>&Jazyk</target>
 
 <source>&Global settings...</source>
 <target>&Nastavení...</target>
 
-<source>&Create batch job...</source>
-<target>&Vytvořit dávku...</target>
-
 <source>&Export file list...</source>
 <target>&Exportovat seznam souborů...</target>
 
@@ -495,17 +483,17 @@ Příkaz je spuštěn když:
 <source>Swap sides</source>
 <target>Změna stran</target>
 
-<source>Load configuration from file</source>
-<target>Načíst konfiguraci ze souboru</target>
+<source>Open</source>
+<target>Načíst</target>
 
-<source>Save current configuration to file</source>
-<target>Uložit změny do konfiguračního souboru</target>
+<source>Save</source>
+<target>Uložit</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Posledně použité konfigurace (pomocí DEL můžete položku smazat)</target>
 
-<source>Show excluded items</source>
-<target>Zobrazit vynechané položky</target>
+<source>Hide excluded items</source>
+<target>Skrýt vynechané položky</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Zobrazit filtrované nebo dočasně vynechané soubory</target>
@@ -543,15 +531,6 @@ Příkaz je spuštěn když:
 <source>Help</source>
 <target>Nápověda</target>
 
-<source>Filter files</source>
-<target>Filtr souborů</target>
-
-<source>Left</source>
-<target>Levý</target>
-
-<source>Right</source>
-<target>Pravý</target>
-
 <source>Error handling</source>
 <target>Zpracování chyb</target>
 
@@ -573,29 +552,26 @@ Příkaz je spuštěn když:
 <source>Abort synchronization on first error</source>
 <target>Ukončit synchronizaci při první chybě</target>
 
-<source>On completion:</source>
-<target>Po dokončení:</target>
+<source>On completion</source>
+<target>Po dokončení</target>
 
 <source>Show progress dialog</source>
 <target>Zobrazit průběh zpracování</target>
 
-<source>Generate log file</source>
-<target>Vytvořit záznamový soubor</target>
+<source>Save log</source>
+<target>Uložit žurnál</target>
 
 <source>Select folder to save log files</source>
-<target>Vyberte složku pro záznamové soubory</target>
+<target>Vyberte složku pro žurnály</target>
 
 <source>Limit</source>
 <target>Omezení</target>
 
 <source>Limit maximum number of log files</source>
-<target>Omezení maximálního počtu záznamových souborů</target>
-
-<source>Batch settings</source>
-<target>Nastavení</target>
+<target>Omezení maximálního počtu žurnálů</target>
 
-<source>Compare by...</source>
-<target>Porovnat ...</target>
+<source>Select variant</source>
+<target>Výběr možnosti</target>
 
 <source>
 Files are found equal if
@@ -610,6 +586,9 @@ Soubory jsou shodné jestliže
 jsou stejné
 </target>
 
+<source>File time and size</source>
+<target>Podle velikosti a data souboru</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +600,36 @@ Soubory jsou shodné jestliže
 je stejný
 </target>
 
+<source>File content</source>
+<target>Podle obsahu souboru</target>
+
 <source>Symbolic Link handling</source>
 <target>Zpracování symbolických odkazů</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Vyberte variantu:</target>
+<source><- Two way -></source>
+<target><- Databáze -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Rozpoznat a provést změny na obou stranách pomocí databáze. Odstraněné nebo přejmenované soubory a konflikty budou detekovány automaticky.</target>
 
+<source>Mirror ->></source>
+<target>Zrcadlení ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Zrcadlení levého adresáře. Pravý adresář bude změněn tak, aby po synchronizaci byl totožný s levým.</target>
 
+<source>Update -></source>
+<target>Aktualizace -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopírovat nové nebo aktualizované soubory do adresáře vpravo.</target>
 
+<source>Custom</source>
+<target>Vlastní</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Nastavení vlastních pravidel synchronizace.</target>
 
@@ -654,7 +645,7 @@ je stejný
 <source>Recycle Bin</source>
 <target>Koš</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
+<source>Use Recycle Bin for deleted and overwritten files</source>
 <target>Použít Koš při mazání nebo přepisu souborů</target>
 
 <source>Versioning</source>
@@ -663,8 +654,8 @@ je stejný
 <source>Move time-stamped files into specified folder</source>
 <target>Přesunout časově označení soubory do zvláštního adresáře</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Omezit maximální počet verzí jednoho souboru</target>
+<source>Naming convention:</source>
+<target>Pojmenování:</target>
 
 <source>Configuration</source>
 <target>Konfigurace</target>
@@ -811,7 +802,10 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Adresářové páry</target>
 
 <source>Overview</source>
-<target>Navigační zobrazení</target>
+<target>Přehled</target>
+
+<source>Filter files</source>
+<target>Filtr souborů</target>
 
 <source>Select view</source>
 <target>Vyberte zobrazení</target>
@@ -864,9 +858,15 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source><Last session></source>
 <target><Poslední sezení></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Porovnání a Synchronizace adresářů</target>
+
 <source>Configuration saved!</source>
 <target>Konfigurace uložena.</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync dávka</target>
+
 <source>Never save changes</source>
 <target>Nikdy neukládat změny</target>
 
@@ -879,9 +879,6 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Configuration loaded!</source>
 <target>Konfigurace načtena.</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Porovnání a Synchronizace adresářů</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Skrýt soubory existující pouze vlevo</target>
 
@@ -1042,6 +1039,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Comparing content...</source>
 <target>Porovnávání obsahu...</target>
 
+<source>Copy</source>
+<target>Kopírovat</target>
+
 <source>Paused</source>
 <target>Pauza</target>
 
@@ -1082,7 +1082,7 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <target>Tento rok</target>
 
 <source>Last x days</source>
-<target>Za posledních x dní</target>
+<target>dní zpětně</target>
 
 <source>Byte</source>
 <target>Byte</target>
@@ -1114,13 +1114,13 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>- folder part only</source>
 <target>- pouze cesta</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- celá cesta nebo jméno souboru z opačného panelu</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- celá cesta nebo jméno z opačného panelu pro %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- pouze cesta z opačného panelu</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- pouze cesta z opačného panelu pro %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
+<source>Make hidden warnings and dialogs visible again?</source>
 <target>Povolit opět zobrazování skrytých dialogů a hlášení?</target>
 
 <source>
@@ -1146,50 +1146,29 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Leave as unresolved conflict</source>
 <target>Ponechat jako nevyřešený konflikt</target>
 
-<source>Files</source>
-<target>Soubory</target>
+<source>Replace</source>
+<target>Nahradit</target>
 
-<source>Percentage</source>
-<target>Procentní podíl</target>
+<source>Move files and replace if existing</source>
+<target>Přesunout a nahradit pokud soubory existují</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Přidat časovou značku ke jménu souboru</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Složka</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Soubor</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 minuta</pluralform>
-<pluralform>%x minuty</pluralform>
-<pluralform>%x minut</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>RRRR-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hodina</pluralform>
-<pluralform>%x hodiny</pluralform>
-<pluralform>%x hodin</pluralform>
-</target>
+<source>Files</source>
+<target>Soubory</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 den</pluralform>
-<pluralform>%x dny</pluralform>
-<pluralform>%x dnů</pluralform>
-</target>
+<source>Percentage</source>
+<target>Procentní podíl</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Nelze nastavit monitorování adresáře %x.</target>
@@ -1239,6 +1218,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Cannot copy file %x to %y.</source>
 <target>Nelze kopírovat soubor %x do %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Typ položky %x není podporován:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Nelze otevřít adresář %x.</target>
 
@@ -1248,6 +1230,45 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Detected endless directory recursion.</source>
 <target>Nalezena nekonečná adresářová smyčka.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 minuta</pluralform>
+<pluralform>%x minuty</pluralform>
+<pluralform>%x minut</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hodina</pluralform>
+<pluralform>%x hodiny</pluralform>
+<pluralform>%x hodin</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 den</pluralform>
+<pluralform>%x dny</pluralform>
+<pluralform>%x dnů</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Nelze nastavit práva pro %x.</target>
 
@@ -1377,6 +1398,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Moving symbolic link %x to %y</source>
 <target>Přesouvání symbolického odkazu %x do %y</target>
 
+<source>Removing old versions...</source>
+<target>Odstraňování starých verzí...</target>
+
 <source>Creating file %x</source>
 <target>Vytváření souboru %x</target>
 
@@ -1398,6 +1422,9 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Updating attributes of %x</source>
 <target>Aktualizace atributů souboru %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Cílova složka %x již existuje.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Cílová složka nesmí být prázdná.</target>
 
@@ -1407,11 +1434,8 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>Source folder %x not found.</source>
 <target>Zdrojovou složku %x nelze najít.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Nevyřešené konflikty!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Je možné konflikt ignorovat a pokračovat v synchronizaci.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Následující položky jsou nevyřešené konflikty a nebudou synchronizovány:</target>
 
 <source>Significant difference detected:</source>
 <target>Nalezeny významné změny:</target>
@@ -1431,12 +1455,15 @@ Poznámka: Filtr je aplikován relativně k základním adresářům.
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Bude změněna složka, která je součástí adresářového páru vícenásobného porovnání. Prosím zkontrolujte si nastavení synchronizacem.</target>
 
+<source>Left</source>
+<target>Levý</target>
+
+<source>Right</source>
+<target>Pravý</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Zpracovávání páru složek:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Cílova složka %x již existuje.</target>
-
 <source>Generating database...</source>
 <target>Vytváření databáze...</target>
 
diff --git a/BUILD/Languages/danish.lng b/BUILD/Languages/danish.lng
index da76bd5e..225019ac 100644
--- a/BUILD/Languages/danish.lng
+++ b/BUILD/Languages/danish.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Afbrydelse: Venter på nuværende opgave afsluttes...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSynk - Automatisk Synkronisering</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Ryd filter indstillinger</target>
 
-<source>Create a batch job</source>
-<target>Lav et batch job</target>
+<source>Save as batch job</source>
+<target></target>
 
 <source>Comparison settings</source>
 <target>Sammenlignings indstillinger</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Fælles indstillinger</target>
 
-<source>Summary</source>
-<target>Opsummering</target>
-
 <source>Find</source>
 <target>Find</target>
 
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Vælg en mappe</target>
 
-<source>Delay [seconds]</source>
-<target>Forsinkelse [sekunder]</target>
+<source>Idle time [seconds]</source>
+<target></target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Tid imellem sidste ændring og udførelse</target>
@@ -321,38 +321,23 @@ Kommandoen udføres hvis:
 <source>A folder input field is empty.</source>
 <target>Et mappe felt er tomt.</target>
 
-<source>File time and size</source>
-<target>Fil tid og størrelse</target>
-
-<source>File content</source>
-<target>Fil indhold</target>
-
-<source><Automatic></source>
-<target><Automatisk></target>
-
-<source>Mirror ->></source>
-<target>Spejl ->></target>
-
-<source>Update -></source>
-<target>Opdater -></target>
-
-<source>Custom</source>
-<target>Brugerdefineret</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Synkronisering afbrudt!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synkronisering afsluttet med fejl!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target></target>
+
 <source>Nothing to synchronize!</source>
 <target>Intet at synkronisere!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synkronisering afsluttet uden fejl!</target>
+<source>Synchronization completed successfully.</source>
+<target></target>
+
+<source>Saving log file %x...</source>
+<target></target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Tryk "Skift" for at løse problemer i hoved vinduet.</target>
@@ -360,9 +345,6 @@ Kommandoen udføres hvis:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>En ny version af FreeFilesyns er tilgængelig:</target>
 
@@ -375,6 +357,12 @@ Kommandoen udføres hvis:
 <source>Information</source>
 <target>Information</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Kan ikke forbinde til sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target></target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Skal FreeFileSync automatisk checke efter opdateringer hver uge?</target>
 
@@ -438,27 +426,27 @@ Kommandoen udføres hvis:
 <source>Hibernate</source>
 <target>Dvale</target>
 
-<source>1. &Compare</source>
-<target>1. &Sammenlign</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synkroniser</target>
-
 <source>&New</source>
 <target>&Ny</target>
 
 <source>&Save</source>
 <target>&Gem</target>
 
+<source>Save as &batch job...</source>
+<target></target>
+
+<source>1. &Compare</source>
+<target>1. &Sammenlign</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synkroniser</target>
+
 <source>&Language</source>
 <target>&Sprog</target>
 
 <source>&Global settings...</source>
 <target>&Fælles indstillinger...</target>
 
-<source>&Create batch job...</source>
-<target>&Opret batch job...</target>
-
 <source>&Export file list...</source>
 <target>&Eksporter fil liste...</target>
 
@@ -492,17 +480,17 @@ Kommandoen udføres hvis:
 <source>Swap sides</source>
 <target>Byt sider</target>
 
-<source>Load configuration from file</source>
-<target>Læs konfiguration fra fil</target>
+<source>Open</source>
+<target></target>
 
-<source>Save current configuration to file</source>
-<target>Gem nuværende konfiguration i fil</target>
+<source>Save</source>
+<target></target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Senest brugte konfigurationer (tryk DEL for at fjerne fra listen)</target>
 
-<source>Show excluded items</source>
-<target>Vis afviste emner</target>
+<source>Hide excluded items</source>
+<target></target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Vis filtrerede eller midlertidigt afviste filer</target>
@@ -540,15 +528,6 @@ Kommandoen udføres hvis:
 <source>Help</source>
 <target>Hjælp</target>
 
-<source>Filter files</source>
-<target>Filter filer</target>
-
-<source>Left</source>
-<target>Venstre</target>
-
-<source>Right</source>
-<target>Højre</target>
-
 <source>Error handling</source>
 <target>Fejl håndtering</target>
 
@@ -570,14 +549,14 @@ Kommandoen udføres hvis:
 <source>Abort synchronization on first error</source>
 <target>Stop synkronisering ved første fejl</target>
 
-<source>On completion:</source>
-<target>Før færdiggørelse:</target>
+<source>On completion</source>
+<target></target>
 
 <source>Show progress dialog</source>
 <target>Vis dialog boks</target>
 
-<source>Generate log file</source>
-<target>Lav log fil</target>
+<source>Save log</source>
+<target></target>
 
 <source>Select folder to save log files</source>
 <target>Vælg destinations mappe til log filer</target>
@@ -588,11 +567,8 @@ Kommandoen udføres hvis:
 <source>Limit maximum number of log files</source>
 <target>Maksimale antal log filer</target>
 
-<source>Batch settings</source>
-<target>Batch indstillinger</target>
-
-<source>Compare by...</source>
-<target>Sammenlign ved...</target>
+<source>Select variant</source>
+<target></target>
 
 <source>
 Files are found equal if
@@ -607,6 +583,9 @@ Filer bliver set som ens hvis
 er ens
 </target>
 
+<source>File time and size</source>
+<target>Fil tid og størrelse</target>
+
 <source>
 Files are found equal if
      - file content
@@ -618,24 +597,36 @@ Filer er ens hvis
 er det samme
 </target>
 
+<source>File content</source>
+<target>Fil indhold</target>
+
 <source>Symbolic Link handling</source>
 <target>Link håndtering</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Vælg variant:</target>
+<source><- Two way -></source>
+<target></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>find ændringer på begge sider via. database. Sletninger, omdøbninger og konflikter bliver automatisk fundet.</target>
 
+<source>Mirror ->></source>
+<target>Spejl ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Spejling af venstre mappe. Højre mappe tilpasses så den ligner den venstre efter synkronisering.</target>
 
+<source>Update -></source>
+<target>Opdater -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopier nye eller opdaterede filer til højre mappe.</target>
 
+<source>Custom</source>
+<target>Brugerdefineret</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Konfigurer dine egne synkroniserings regler.</target>
 
@@ -651,8 +642,8 @@ er det samme
 <source>Recycle Bin</source>
 <target>Skralsespand</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Brug skraldespand ved sletning eller overskrivning</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target></target>
 
 <source>Versioning</source>
 <target>Versionering</target>
@@ -660,8 +651,8 @@ er det samme
 <source>Move time-stamped files into specified folder</source>
 <target>Flyt tids-stemplede filer til den valgte mappe</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Begræns det maksimale antal fil versioner</target>
+<source>Naming convention:</source>
+<target></target>
 
 <source>Configuration</source>
 <target>Konfiguration</target>
@@ -810,6 +801,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Overview</source>
 <target>Overblik</target>
 
+<source>Filter files</source>
+<target>Filter filer</target>
+
 <source>Select view</source>
 <target>Vælg udseende</target>
 
@@ -861,9 +855,15 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source><Last session></source>
 <target><Sidste opgave></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Mappe sammenligning og synkronisering</target>
+
 <source>Configuration saved!</source>
 <target>Konfiguration gemt!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Gem aldrig ændringer</target>
 
@@ -876,9 +876,6 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Configuration loaded!</source>
 <target>Konfiguration hentet!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Mappe sammenligning og synkronisering</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Skjul filder der kun findes på venstre side</target>
 
@@ -1035,6 +1032,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Comparing content...</source>
 <target>Sammenligner indhold...</target>
 
+<source>Copy</source>
+<target></target>
+
 <source>Paused</source>
 <target>Pauset</target>
 
@@ -1107,14 +1107,14 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>- folder part only</source>
 <target>- kun mappe delen</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Modsatte sides modpart til %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target></target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Modsatte sides modpart til %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target></target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Lav skjulte dialoger og advarselsbeskeder synlige igen?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target></target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1137,47 +1137,29 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Leave as unresolved conflict</source>
 <target>Efterlad som uløste konflikter</target>
 
-<source>Files</source>
-<target>Filer</target>
+<source>Replace</source>
+<target></target>
 
-<source>Percentage</source>
-<target>Procent</target>
+<source>Move files and replace if existing</source>
+<target></target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target></target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target></target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target></target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target></target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 timer</pluralform>
-<pluralform>%x timer</pluralform>
-</target>
+<source>Files</source>
+<target>Filer</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dag</pluralform>
-<pluralform>%x dage</pluralform>
-</target>
+<source>Percentage</source>
+<target>Procent</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Kan ikke overvåge biblioteket %x.</target>
@@ -1227,6 +1209,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target></target>
+
 <source>Cannot open directory %x.</source>
 <target>Kan ikke åbne bibliotek %x.</target>
 
@@ -1236,6 +1221,42 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Detected endless directory recursion.</source>
 <target>Opdaget en uendelig biblioteks løkke.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 timer</pluralform>
+<pluralform>%x timer</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dag</pluralform>
+<pluralform>%x dage</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Kan ikke sætte privilegier til %x.</target>
 
@@ -1365,6 +1386,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Moving symbolic link %x to %y</source>
 <target>Flytter linket %x til %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Opretter filen %x</target>
 
@@ -1386,6 +1410,9 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Updating attributes of %x</source>
 <target>Opdaterer attributter af %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Destinations mappen %x eksisterer allerede.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Destinations mappe feltet må ikke være tomt.</target>
 
@@ -1395,11 +1422,8 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>Source folder %x not found.</source>
 <target>Kilde mappen %x blev ikke fundet.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Er er uløste konflikter!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Du kan ignorere konflikter og fortsætte synkronisering.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target></target>
 
 <source>Significant difference detected:</source>
 <target>Betydelig forskel fundet:</target>
@@ -1419,12 +1443,15 @@ Note: Fil navne må skal passe til grund bibliotekerne!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>En mappe som er en del af flere mappe parringer vil blive ændret. Gennemse venligst synkroniserings indstillingerne.</target>
 
+<source>Left</source>
+<target>Venstre</target>
+
+<source>Right</source>
+<target>Højre</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Synkroniserer mappe par:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Destinations mappen %x eksisterer allerede.</target>
-
 <source>Generating database...</source>
 <target>Opretter database...</target>
 
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index bf6459e1..afe5ce0e 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Verwijder filterinstellingen</target>
 
-<source>Create a batch job</source>
-<target>Creëer een taaklijst</target>
+<source>Save as batch job</source>
+<target></target>
 
 <source>Comparison settings</source>
 <target>Vergelijksinstellingen</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Algemene instellingen</target>
 
-<source>Summary</source>
-<target>Overzicht</target>
-
 <source>Find</source>
 <target>Vind</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>Selecteer een map</target>
 
-<source>Delay [seconds]</source>
-<target>Vertraging [seconden]</target>
+<source>Idle time [seconds]</source>
+<target></target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Tijd tussen de laatste gedetecteerde verandering en de uitvoering van het commando</target>
@@ -324,38 +321,23 @@ De opdracht word geactiveerd als:
 <source>A folder input field is empty.</source>
 <target>Een map invoerveld is leeg.</target>
 
-<source>File time and size</source>
-<target>Bestandstijd- en grootte</target>
-
-<source>File content</source>
-<target>Bestandsinhoud</target>
-
-<source><Automatic></source>
-<target><Automatisch></target>
-
-<source>Mirror ->></source>
-<target>Spiegelen ->></target>
-
-<source>Update -></source>
-<target>Bijwerken -></target>
-
-<source>Custom</source>
-<target>Aangepast</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync taak</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronisatie afgebroken!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronisatie is met fouten afgerond!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target></target>
+
 <source>Nothing to synchronize!</source>
 <target>Niets om te synchroniseren!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synchronisatie succesvol afgerond!</target>
+<source>Synchronization completed successfully.</source>
+<target></target>
+
+<source>Saving log file %x...</source>
+<target></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>
@@ -363,9 +345,6 @@ De opdracht word geactiveerd als:
 <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>Kan geen verbinding maken met sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Er is een nieuwe versie van FreeFileSync beschikbaar:</target>
 
@@ -378,6 +357,12 @@ De opdracht word geactiveerd als:
 <source>Information</source>
 <target>Informatie</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Kan geen verbinding maken met sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target></target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Wilt u FreeFileSync elke week automatisch laten controleren of er een nieuwe versie is?</target>
 
@@ -441,27 +426,27 @@ De opdracht word geactiveerd als:
 <source>Hibernate</source>
 <target>Slaapstand</target>
 
-<source>1. &Compare</source>
-<target>1. &Vergelijk</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synchroniseer</target>
-
 <source>&New</source>
 <target>&Nieuw</target>
 
 <source>&Save</source>
 <target>O&pslaan</target>
 
+<source>Save as &batch job...</source>
+<target></target>
+
+<source>1. &Compare</source>
+<target>1. &Vergelijk</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synchroniseer</target>
+
 <source>&Language</source>
 <target>&Taal</target>
 
 <source>&Global settings...</source>
 <target>&Algemene instellingen...</target>
 
-<source>&Create batch job...</source>
-<target>&Creëer taaklijst...</target>
-
 <source>&Export file list...</source>
 <target>&Exporteer bestandslijst...</target>
 
@@ -495,17 +480,17 @@ De opdracht word geactiveerd als:
 <source>Swap sides</source>
 <target>Wissel zijdes</target>
 
-<source>Load configuration from file</source>
-<target>Laad configuratie uit bestand</target>
+<source>Open</source>
+<target></target>
 
-<source>Save current configuration to file</source>
-<target>Sla de huidige configuratie op in een bestand</target>
+<source>Save</source>
+<target></target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Laatst gebruikte instellingen (druk op DEL om iets te verwijderen)</target>
 
-<source>Show excluded items</source>
-<target>Laat uitgesloten bestanden zien</target>
+<source>Hide excluded items</source>
+<target></target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Laat gefilterde of tijdelijk uitgesloten bestanden zien</target>
@@ -543,15 +528,6 @@ De opdracht word geactiveerd als:
 <source>Help</source>
 <target>Help</target>
 
-<source>Filter files</source>
-<target>Filter bestanden</target>
-
-<source>Left</source>
-<target>Links</target>
-
-<source>Right</source>
-<target>Rechts</target>
-
 <source>Error handling</source>
 <target>Fout afhandeling</target>
 
@@ -573,14 +549,14 @@ De opdracht word geactiveerd als:
 <source>Abort synchronization on first error</source>
 <target>Synchronisatie stoppen bij eerste foutmelding</target>
 
-<source>On completion:</source>
-<target>Bij voltooiing:</target>
+<source>On completion</source>
+<target></target>
 
 <source>Show progress dialog</source>
 <target>Toon voortgangsdialoogvenster</target>
 
-<source>Generate log file</source>
-<target>Log bestand aanmaken</target>
+<source>Save log</source>
+<target></target>
 
 <source>Select folder to save log files</source>
 <target>Selecteer map om log bestanden op te slaan</target>
@@ -591,11 +567,8 @@ De opdracht word geactiveerd als:
 <source>Limit maximum number of log files</source>
 <target>Limiteer maximaal aantal log bestanden</target>
 
-<source>Batch settings</source>
-<target>Batchinstellingen</target>
-
-<source>Compare by...</source>
-<target>Vergelijk met...</target>
+<source>Select variant</source>
+<target></target>
 
 <source>
 Files are found equal if
@@ -610,6 +583,9 @@ Bestanden worden als gelijk bevonden indien
 gelijk zijn
 </target>
 
+<source>File time and size</source>
+<target>Bestandstijd- en grootte</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +597,36 @@ Bestanden worden als gelijk beschouwd indien
 overeenkomt
 </target>
 
+<source>File content</source>
+<target>Bestandsinhoud</target>
+
 <source>Symbolic Link handling</source>
 <target>Afhandeling van snelkoppelingen</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Selecteer een variant:</target>
+<source><- Two way -></source>
+<target></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identificeer en verspreid veranderingen aan beide kanten met behulp van een database. Verwijderingen, hernoemingen en conflicten worden automatisch gedetecteerd.</target>
 
+<source>Mirror ->></source>
+<target>Spiegelen ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Spiegel backup van linker map. Rechter map is na synchronisatie een exacte kopie van de linker map.</target>
 
+<source>Update -></source>
+<target>Bijwerken -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopiëer nieuwe of geupdate bestanden naar de rechter map.</target>
 
+<source>Custom</source>
+<target>Aangepast</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Configureer uw eigen synchronisatieregels.</target>
 
@@ -654,8 +642,8 @@ overeenkomt
 <source>Recycle Bin</source>
 <target>Prullenbak</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Gebruik de prullenbak bij verwijderen of overschrijven van bestanden</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target></target>
 
 <source>Versioning</source>
 <target>Versiebeheer</target>
@@ -663,8 +651,8 @@ overeenkomt
 <source>Move time-stamped files into specified folder</source>
 <target>Verplaats bestanden met tijdstempel naar specifieke map</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Limiteer maximaal aantal versies per bestand</target>
+<source>Naming convention:</source>
+<target></target>
 
 <source>Configuration</source>
 <target>Configuratie</target>
@@ -813,6 +801,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Overview</source>
 <target>Overzicht</target>
 
+<source>Filter files</source>
+<target>Filter bestanden</target>
+
 <source>Select view</source>
 <target>Selecteer weergave</target>
 
@@ -864,9 +855,15 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source><Last session></source>
 <target><Laatste sessie></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Mappen vergelijken en synchroniseren</target>
+
 <source>Configuration saved!</source>
 <target>Configuratie opgeslagen!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync taak</target>
+
 <source>Never save changes</source>
 <target>Wijzigingen nooit opslaan</target>
 
@@ -879,9 +876,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Configuration loaded!</source>
 <target>Configuratie geladen!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Mappen vergelijken en synchroniseren</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Verberg bestanden die alleen aan de linkerzijde bestaan</target>
 
@@ -1038,6 +1032,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Comparing content...</source>
 <target>Inhoud vergelijken...</target>
 
+<source>Copy</source>
+<target></target>
+
 <source>Paused</source>
 <target>Gepauzeerd</target>
 
@@ -1048,7 +1045,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <target>Afgebroken</target>
 
 <source>Completed</source>
-<target>Volbracht</target>
+<target>Voltooid</target>
 
 <source>Continue</source>
 <target>Doorgaan</target>
@@ -1110,14 +1107,14 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>- folder part only</source>
 <target>- alleen het map gedeelte</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Tegenhanger andere zijde naar %naam</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target></target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Tegenhanger andere zijde naar %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target></target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Verborgen dialogen en waarschuwings berichten opnieuw zichtbaar maken?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target></target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1140,47 +1137,29 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Leave as unresolved conflict</source>
 <target>Beschouw als onopgelost conflict</target>
 
-<source>Files</source>
-<target>Bestanden</target>
+<source>Replace</source>
+<target></target>
 
-<source>Percentage</source>
-<target>Percentage</target>
+<source>Move files and replace if existing</source>
+<target></target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target></target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target></target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target></target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target></target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 uur</pluralform>
-<pluralform>%x uren</pluralform>
-</target>
+<source>Files</source>
+<target>Bestanden</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dag</pluralform>
-<pluralform>%x dagen</pluralform>
-</target>
+<source>Percentage</source>
+<target>Percentage</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Kan locatie %x niet controleren.</target>
@@ -1230,6 +1209,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Cannot copy file %x to %y.</source>
 <target>Kan bestand %x niet kopiëren naar %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target></target>
+
 <source>Cannot open directory %x.</source>
 <target>Kan map %x niet openen.</target>
 
@@ -1239,6 +1221,42 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Detected endless directory recursion.</source>
 <target>Eindeloze map recursie gedetecteerd.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 uur</pluralform>
+<pluralform>%x uren</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dag</pluralform>
+<pluralform>%x dagen</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Kan privilege %x niet instellen.</target>
 
@@ -1392,6 +1410,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Updating attributes of %x</source>
 <target>Attributen bijwerken van %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Doelmap %x bestaat al.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Doelmap mag niet leeg zijn.</target>
 
@@ -1401,11 +1422,8 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>Source folder %x not found.</source>
 <target>Bronmap %x niet gevonden.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Er bestaan onopgeloste conflicten!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>U kunt de conflicten negeren en doorgaan met synchronisatie.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target></target>
 
 <source>Significant difference detected:</source>
 <target>Significant verschil gedetecteerd:</target>
@@ -1425,12 +1443,15 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Een map die onderdeel is van meerdere map paren word aangepast. Kijk alstublieft uw synchronisatie instellingen na.</target>
 
+<source>Left</source>
+<target>Links</target>
+
+<source>Right</source>
+<target>Rechts</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Bezig met synchroniseren van folder paar:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Doelmap %x bestaat al.</target>
-
 <source>Generating database...</source>
 <target>Genereren van database...</target>
 
diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng
index 4d6a5611..35ee5f16 100644
--- a/BUILD/Languages/english_uk.lng
+++ b/BUILD/Languages/english_uk.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abort requested: Waiting for current operation to finish...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Failure to create time stamp for versioning:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automated Synchronisation</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Clear filter settings</target>
 
-<source>Create a batch job</source>
-<target>Create a batch job</target>
+<source>Save as batch job</source>
+<target>Save as batch job</target>
 
 <source>Comparison settings</source>
 <target>Comparison settings</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Global settings</target>
 
-<source>Summary</source>
-<target>Summary</target>
-
 <source>Find</source>
 <target>Find</target>
 
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Select a folder</target>
 
-<source>Delay [seconds]</source>
-<target>Delay [seconds]</target>
+<source>Idle time [seconds]</source>
+<target>Idle time [seconds]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Idle time between last detected change and execution of command</target>
@@ -321,38 +321,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>A folder input field is empty.</target>
 
-<source>File time and size</source>
-<target>File time and size</target>
-
-<source>File content</source>
-<target>File content</target>
-
-<source><Automatic></source>
-<target><Automatic></target>
-
-<source>Mirror ->></source>
-<target>Mirror ->></target>
-
-<source>Update -></source>
-<target>Update -></target>
-
-<source>Custom</source>
-<target>Custom</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronisation aborted!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronisation completed with errors!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Synchronization completed with warnings.</target>
+
 <source>Nothing to synchronize!</source>
 <target>Nothing to synchronise!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synchronisation completed successfully!</target>
+<source>Synchronization completed successfully.</source>
+<target>Synchronisation completed successfully.</target>
+
+<source>Saving log file %x...</source>
+<target>Saving log file %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Press "Switch" to resolve issues in FreeFileSync main dialogue.</target>
@@ -360,9 +345,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Switching to FreeFileSync main dialogue...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Unable to connect to sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>A new version of FreeFileSync is available:</target>
 
@@ -375,6 +357,12 @@ The command is triggered if:
 <source>Information</source>
 <target>Information</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Unable to connect to sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Current FreeFileSync version number was not found online! Do you want to check manually?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Do you want FreeFileSync to automatically check for updates every week?</target>
 
@@ -438,27 +426,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>Hibernate</target>
 
-<source>1. &Compare</source>
-<target>1. &Compare</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synchronise</target>
-
 <source>&New</source>
 <target>&New</target>
 
 <source>&Save</source>
 <target>&Save</target>
 
+<source>Save as &batch job...</source>
+<target>Save as &batch job...</target>
+
+<source>1. &Compare</source>
+<target>1. &Compare</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synchronise</target>
+
 <source>&Language</source>
 <target>&Language</target>
 
 <source>&Global settings...</source>
 <target>&Global settings...</target>
 
-<source>&Create batch job...</source>
-<target>&Create batch job...</target>
-
 <source>&Export file list...</source>
 <target>&Export file list...</target>
 
@@ -492,17 +480,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Swap sides</target>
 
-<source>Load configuration from file</source>
-<target>Load configuration from file</target>
+<source>Open</source>
+<target>Open</target>
 
-<source>Save current configuration to file</source>
-<target>Save current configuration to file</target>
+<source>Save</source>
+<target>Save</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Last used configurations (press DEL to remove from list)</target>
 
-<source>Show excluded items</source>
-<target>Show excluded items</target>
+<source>Hide excluded items</source>
+<target>Hide excluded items</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Show filtered or temporarily excluded files</target>
@@ -540,15 +528,6 @@ The command is triggered if:
 <source>Help</source>
 <target>Help</target>
 
-<source>Filter files</source>
-<target>Filter files</target>
-
-<source>Left</source>
-<target>Left</target>
-
-<source>Right</source>
-<target>Right</target>
-
 <source>Error handling</source>
 <target>Error handling</target>
 
@@ -570,14 +549,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>Abort synchronisation on first error</target>
 
-<source>On completion:</source>
-<target>On completion:</target>
+<source>On completion</source>
+<target>On completion</target>
 
 <source>Show progress dialog</source>
 <target>Show progress dialogue</target>
 
-<source>Generate log file</source>
-<target>Generate log file</target>
+<source>Save log</source>
+<target>Save log</target>
 
 <source>Select folder to save log files</source>
 <target>Select folder to save log files</target>
@@ -588,11 +567,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>Limit maximum number of log files</target>
 
-<source>Batch settings</source>
-<target>Batch settings</target>
-
-<source>Compare by...</source>
-<target>Compare by...</target>
+<source>Select variant</source>
+<target>Select variant</target>
 
 <source>
 Files are found equal if
@@ -607,6 +583,9 @@ Files are found equal if
 are the same
 </target>
 
+<source>File time and size</source>
+<target>File time and size</target>
+
 <source>
 Files are found equal if
      - file content
@@ -618,24 +597,36 @@ Files are found equal if
 is the same
 </target>
 
+<source>File content</source>
+<target>File content</target>
+
 <source>Symbolic Link handling</source>
 <target>Symbolic Link handling</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Select variant:</target>
+<source><- Two way -></source>
+<target><- Two way -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</target>
 
+<source>Mirror ->></source>
+<target>Mirror ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronisation.</target>
 
+<source>Update -></source>
+<target>Update -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Copy new or updated files to right folder.</target>
 
+<source>Custom</source>
+<target>Custom</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Configure your own synchronisation rules.</target>
 
@@ -651,8 +642,8 @@ is the same
 <source>Recycle Bin</source>
 <target>Recycle Bin</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Use Recycle Bin when deleting or overwriting files</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Use Recycle Bin for deleted and overwritten files</target>
 
 <source>Versioning</source>
 <target>Versioning</target>
@@ -660,8 +651,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>Move time-stamped files into specified folder</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Limit maximum number of versions per file</target>
+<source>Naming convention:</source>
+<target>Naming convention:</target>
 
 <source>Configuration</source>
 <target>Configuration</target>
@@ -810,6 +801,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Overview</target>
 
+<source>Filter files</source>
+<target>Filter files</target>
+
 <source>Select view</source>
 <target>Select view</target>
 
@@ -861,9 +855,15 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><Last session></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Folder Comparison and Synchronisation</target>
+
 <source>Configuration saved!</source>
 <target>Configuration saved!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Never save changes</target>
 
@@ -876,9 +876,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>Configuration loaded!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Folder Comparison and Synchronisation</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Hide files that exist on left side only</target>
 
@@ -1035,6 +1032,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Comparing content...</target>
 
+<source>Copy</source>
+<target>Copy</target>
+
 <source>Paused</source>
 <target>Paused</target>
 
@@ -1107,14 +1107,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- folder part only</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Other side's counterpart to %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Other side's counterpart to %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Other side's counterpart to %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Other side's counterpart to %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Make hidden dialogues and warning messages visible again?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Make hidden warnings and dialogues visible again?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1137,47 +1137,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Leave as unresolved conflict</target>
 
-<source>Files</source>
-<target>Files</target>
+<source>Replace</source>
+<target>Replace</target>
 
-<source>Percentage</source>
-<target>Percentage</target>
+<source>Move files and replace if existing</source>
+<target>Move files and replace if existing</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Append a timestamp to each file name</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Folder</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>File</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</target>
+<source>Files</source>
+<target>Files</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</target>
+<source>Percentage</source>
+<target>Percentage</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Cannot monitor directory %x.</target>
@@ -1227,6 +1209,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>Cannot copy file %x to %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Type of item %x is not supported:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Cannot open directory %x.</target>
 
@@ -1236,6 +1221,42 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>Detected endless directory recursion.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Cannot set privilege %x.</target>
 
@@ -1365,6 +1386,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>Moving symbolic link %x to %y</target>
 
+<source>Removing old versions...</source>
+<target>Removing old versions...</target>
+
 <source>Creating file %x</source>
 <target>Creating file %x</target>
 
@@ -1386,6 +1410,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Updating attributes of %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Target folder %x already existing.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Target folder input field must not be empty.</target>
 
@@ -1395,11 +1422,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>Source folder %x not found.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Unresolved conflicts existing!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>You can ignore conflicts and continue synchronisation.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>The following items have unresolved conflicts and will not be synchronised:</target>
 
 <source>Significant difference detected:</source>
 <target>Significant difference detected:</target>
@@ -1419,12 +1443,15 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>A folder will be modified which is part of multiple folder pairs. Please review synchronisation settings.</target>
 
+<source>Left</source>
+<target>Left</target>
+
+<source>Right</source>
+<target>Right</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Synchronising folder pair:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Target folder %x already existing.</target>
-
 <source>Generating database...</source>
 <target>Generating database...</target>
 
diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng
index 93220ec4..b4115ad9 100644
--- a/BUILD/Languages/finnish.lng
+++ b/BUILD/Languages/finnish.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Keskeytys pyydetty: Odotetaan toiminnon loppumista...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Ongelma luoda aikaleimaa versionnissa:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automaattisoitu täsmäytys</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Nollaa suodin</target>
 
-<source>Create a batch job</source>
-<target>Eräajon luonti</target>
+<source>Save as batch job</source>
+<target>Tallenna eräajona</target>
 
 <source>Comparison settings</source>
 <target>Vertailun asetukset</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Yleiset asetukset</target>
 
-<source>Summary</source>
-<target>Yhteenveto</target>
-
 <source>Find</source>
 <target>Etsi</target>
 
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Valitse hakemisto</target>
 
-<source>Delay [seconds]</source>
-<target>Viive [sekunttia]</target>
+<source>Idle time [seconds]</source>
+<target>Jouto aika [sekunttia]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Joutoaika edellisen muutoksen ja käskyn suorittamisen välillä</target>
@@ -321,38 +321,23 @@ Käsky suoritetaan jos:
 <source>A folder input field is empty.</source>
 <target>Hakemiston syöte on tyhjä.</target>
 
-<source>File time and size</source>
-<target>Tiedoston aika ja koko</target>
-
-<source>File content</source>
-<target>Tiedoston sisältö</target>
-
-<source><Automatic></source>
-<target><- Automaattinen -></target>
-
-<source>Mirror ->></source>
-<target>Peilaava ->></target>
-
-<source>Update -></source>
-<target>Päivittävä -></target>
-
-<source>Custom</source>
-<target>Oma määritelmä</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync eräajo</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>Synchronization completed with warnings.</source>
+<target>Täsmäytys päättyi varoituksin.</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>Synchronization completed successfully.</source>
+<target>Täsmäytys päättyi onnistuneesti.</target>
+
+<source>Saving log file %x...</source>
+<target>Lokitiedosto: tallennetaan %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Paina "Vaihda" ja korjaa virheet FreeFileSync päävalintaikkunassa</target>
@@ -360,9 +345,6 @@ Käsky suoritetaan jos:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Siiry FreeFileSync päävalintaikkunaan ...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Yhteys sourceforge.net:n ei onnistu!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>FreeFileSync:n uusi verio on saatavilla:</target>
 
@@ -375,6 +357,12 @@ Käsky suoritetaan jos:
 <source>Information</source>
 <target>Tietoja</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Yhteys sourceforge.net:n ei onnistu!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Nykyinen FreeFileSync versionumero ei löytynyt online! Haluatko tarkistaa manuaalisesti?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Haluatko että FreeFileSync hakee päivityksiä automaattisesti viikoittain?</target>
 
@@ -438,27 +426,27 @@ Käsky suoritetaan jos:
 <source>Hibernate</source>
 <target>Horrostila</target>
 
-<source>1. &Compare</source>
-<target>1. &Vertaa</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Täsmäytä</target>
-
 <source>&New</source>
 <target>&Uusi</target>
 
 <source>&Save</source>
 <target>Tallenna</target>
 
+<source>Save as &batch job...</source>
+<target>Tallenna &eräajona...</target>
+
+<source>1. &Compare</source>
+<target>1. &Vertaa</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Täsmäytä</target>
+
 <source>&Language</source>
 <target>&Kieli</target>
 
 <source>&Global settings...</source>
 <target>&Yleiset asetukset...</target>
 
-<source>&Create batch job...</source>
-<target>&Luo eräajo...</target>
-
 <source>&Export file list...</source>
 <target>&Vie tiedostojoukko...</target>
 
@@ -492,17 +480,17 @@ Käsky suoritetaan jos:
 <source>Swap sides</source>
 <target>Puolten vaihto</target>
 
-<source>Load configuration from file</source>
-<target>Lataa asetuksia tiedostosta</target>
+<source>Open</source>
+<target>Avaa</target>
 
-<source>Save current configuration to file</source>
-<target>Tallenna nämä asetukset tiedostoon</target>
+<source>Save</source>
+<target>Tallenna</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Viimeksi käytetty asetus (poista listalta paina DEL)</target>
 
-<source>Show excluded items</source>
-<target>Näytä suodatetut</target>
+<source>Hide excluded items</source>
+<target>Piilota poissuljetus</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Näytä suodatetut/nyt pois suljetut tiedostot</target>
@@ -540,15 +528,6 @@ Käsky suoritetaan jos:
 <source>Help</source>
 <target>Ohje</target>
 
-<source>Filter files</source>
-<target>Suodata tiedostot</target>
-
-<source>Left</source>
-<target>Vasen</target>
-
-<source>Right</source>
-<target>Oikea</target>
-
 <source>Error handling</source>
 <target>Virheiden käsittely</target>
 
@@ -570,14 +549,14 @@ Käsky suoritetaan jos:
 <source>Abort synchronization on first error</source>
 <target>Keskeytä täsmäytys ensimmäisestä virheestä</target>
 
-<source>On completion:</source>
-<target>Kun valmis</target>
+<source>On completion</source>
+<target>Valmistuttua</target>
 
 <source>Show progress dialog</source>
 <target>Näytä etenemä ikkuna</target>
 
-<source>Generate log file</source>
-<target>Luo lokitiedosto</target>
+<source>Save log</source>
+<target>Tallenna loki</target>
 
 <source>Select folder to save log files</source>
 <target>Valitse tallennushakemisto lokeille</target>
@@ -588,11 +567,8 @@ Käsky suoritetaan jos:
 <source>Limit maximum number of log files</source>
 <target>Lokeja enintäin</target>
 
-<source>Batch settings</source>
-<target>Eräajo asetukset</target>
-
-<source>Compare by...</source>
-<target>Vertaile...</target>
+<source>Select variant</source>
+<target>Valitse tyyppi</target>
 
 <source>
 Files are found equal if
@@ -607,6 +583,9 @@ Tiedostot samat jos
 ovat samat
 </target>
 
+<source>File time and size</source>
+<target>Tiedoston aika ja koko</target>
+
 <source>
 Files are found equal if
      - file content
@@ -618,24 +597,36 @@ Tiedostot samat jos,
 on sama
 </target>
 
+<source>File content</source>
+<target>Tiedoston sisältö</target>
+
 <source>Symbolic Link handling</source>
 <target>Pikakuvakkeiden hallinta</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Valitse vaihtoehto:</target>
+<source><- Two way -></source>
+<target><- Molemmat -></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. Poistot, uudelleennimeäminen ja ristiriidat havaitaan automaattisesti.</target>
 
+<source>Mirror ->></source>
+<target>Peilaava ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Vasemman peilaava varmuuskopio. Oikeanpuoleinen hakemisto muutetaan täsmäytyksessä vastaamaan tarkasti vasenta.</target>
 
+<source>Update -></source>
+<target>Päivittävä -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopioi uudet tai päivitetyt tiedostot oikeaan kansioon.</target>
 
+<source>Custom</source>
+<target>Oma määritelmä</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Määritä omat täsmäyssäännöt.</target>
 
@@ -651,8 +642,8 @@ on sama
 <source>Recycle Bin</source>
 <target>Roskakori</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Käytä Roskakoria kun poistat tai korvaat tiedostoja</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Käytä Roskakoria poistetuille/korvatille tiedostoille</target>
 
 <source>Versioning</source>
 <target>Versiointi</target>
@@ -660,8 +651,8 @@ on sama
 <source>Move time-stamped files into specified folder</source>
 <target>Siirrä aikaleimatut tiedostot hakemistoon</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Tiedostoversioita enintäin</target>
+<source>Naming convention:</source>
+<target>Nimeämis käytäntö:</target>
 
 <source>Configuration</source>
 <target>Asetukset</target>
@@ -772,7 +763,7 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <target>Kopioi tiedosto ja hakemisto käyttöoikeuksia (Pääkäyttäjän oikeudet tarvitaan)</target>
 
 <source>Restore hidden dialogs</source>
-<target>Palauta piilotetut ikkunat</target>
+<target>Palauta piiloitetut ikkunat</target>
 
 <source>External applications</source>
 <target>Ulkopuolinen sovellus</target>
@@ -810,6 +801,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Overview</source>
 <target>Yleiskatsaus</target>
 
+<source>Filter files</source>
+<target>Suodata tiedostot</target>
+
 <source>Select view</source>
 <target>Valitse näkymä</target>
 
@@ -861,9 +855,15 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source><Last session></source>
 <target><Edellinen istunto></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Hakemistojen vertailu ja täsmäytys</target>
+
 <source>Configuration saved!</source>
 <target>Asetukset tallennettu!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync eräajo</target>
+
 <source>Never save changes</source>
 <target>Älä tallenna muutoksia</target>
 
@@ -876,9 +876,6 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Configuration loaded!</source>
 <target>Asetukset ladattu!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Hakemistojen vertailu ja täsmäytys</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Piilota vain vasemmalla esiintyvät tiedostot</target>
 
@@ -1035,6 +1032,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Comparing content...</source>
 <target>Sisällön vertailu...</target>
 
+<source>Copy</source>
+<target>Monista</target>
+
 <source>Paused</source>
 <target>Pysäytetty</target>
 
@@ -1107,14 +1107,14 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>- folder part only</source>
 <target>- vain hakemisto-osa</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Toisen puolen vastaavuus on %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Toisen puolen osa liittyy %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Toisen puolen vastaavuus on %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Toisen puolen osa liittyy %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Näytetäänkö piiloitetut käskyt ja viestit?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Näytä piiloitetut varoitukset/ikkunnat uudestaan?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1137,47 +1137,29 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Leave as unresolved conflict</source>
 <target>Jätä ratkaisemattomana virheenä</target>
 
-<source>Files</source>
-<target>Tiedostot</target>
+<source>Replace</source>
+<target>Korvaa</target>
 
-<source>Percentage</source>
-<target>Prosenttia</target>
+<source>Move files and replace if existing</source>
+<target>Siirrä tiedostot ja korvaa tarvittaessa</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Lisää aikaleima tiedostoihin</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Hakemisto</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Tiedosto</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>VVVV-KK-PP ttmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 tunti</pluralform>
-<pluralform>%x tuntia</pluralform>
-</target>
+<source>Files</source>
+<target>Tiedostot</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 päivä</pluralform>
-<pluralform>%x päivää</pluralform>
-</target>
+<source>Percentage</source>
+<target>Prosenttia</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Hakemistoa %x ei voida tarkkaila.</target>
@@ -1227,6 +1209,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Cannot copy file %x to %y.</source>
 <target>Tiedostoa %x ei voida kopioida kohtaan %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Kohteen %x tyyppiä ei tueta:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Hakemistoa %x ei voida avata.</target>
 
@@ -1236,6 +1221,42 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Detected endless directory recursion.</source>
 <target>Päättymätön hakemiston toisto.</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 tunti</pluralform>
+<pluralform>%x tuntia</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 päivä</pluralform>
+<pluralform>%x päivää</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Oikeuksia %x ei voitu asettaa.</target>
 
@@ -1365,6 +1386,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Moving symbolic link %x to %y</source>
 <target>Siirrä pikakuvike %x -> %y</target>
 
+<source>Removing old versions...</source>
+<target>Vanhat poistetaa...</target>
+
 <source>Creating file %x</source>
 <target>Luodaan tiedosto %x</target>
 
@@ -1386,6 +1410,9 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Updating attributes of %x</source>
 <target>Päivitän %x:n ominaisuudet</target>
 
+<source>Target folder %x already existing.</source>
+<target>Kohdehakemisto %x on olemassa.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Kohde hakemiston kenttä on annettava.</target>
 
@@ -1395,11 +1422,8 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>Source folder %x not found.</source>
 <target>Lähdehakemisto %x ei löydy.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Ratkaisemattomia ristiriitoja!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Voit jatkaa täsmäystä, ristiriidoista huolimatta.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Näissä kohteissa on selvittämättömiä ristiriitoja, niitä ei täsmäytetä:</target>
 
 <source>Significant difference detected:</source>
 <target>Merkittävä eroavavuus todettu:</target>
@@ -1419,12 +1443,15 @@ Huom: Tiedostojen nimet täytyy olla suhteessa pää hakemistoihin!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Moniosaisen hakemistoparin hakemistoa muutetaan. Tarkista täsmäytyksen asetuksia.</target>
 
+<source>Left</source>
+<target>Vasen</target>
+
+<source>Right</source>
+<target>Oikea</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Täsmäytetään  hakemistoparia:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Kohdehakemisto %x on olemassa.</target>
-
 <source>Generating database...</source>
 <target>
 Tietokanta luodaan.
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 91d1c1b0..20fddc36 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -31,6 +31,9 @@
 <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>Failure to create time stamp for versioning:</source>
+<target>Impossible de créer l'horodatage des versions</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Synchronisation Automatisée</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Effacer la configuration du filtrage</target>
 
-<source>Create a batch job</source>
-<target>Créer un traitement batch</target>
+<source>Save as batch job</source>
+<target>Enrgistrer en temps que fichier batch</target>
 
 <source>Comparison settings</source>
 <target>Paramètres de comparaison</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Paramètres généraux</target>
 
-<source>Summary</source>
-<target>Résumé</target>
-
 <source>Find</source>
 <target>Chercher</target>
 
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Choisissez un dossier</target>
 
-<source>Delay [seconds]</source>
-<target>Latence [secondes]</target>
+<source>Idle time [seconds]</source>
+<target>Pause [secondes]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Délai entre le dernier changement détecté et la dernière exécution de la commande</target>
@@ -321,38 +321,23 @@ La commande est déclenchée si :
 <source>A folder input field is empty.</source>
 <target>Une entrée dossier est vide.</target>
 
-<source>File time and size</source>
-<target>Heure et taille du fichier</target>
-
-<source>File content</source>
-<target>Contenu du fichier</target>
-
-<source><Automatic></source>
-<target><Automatique></target>
-
-<source>Mirror ->></source>
-<target>Miroir ->></target>
-
-<source>Update -></source>
-<target>Mise à Jour -></target>
-
-<source>Custom</source>
-<target>Personnaliser</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</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>Synchronization completed with warnings.</source>
+<target>Synchronisation terminée avec avertissements</target>
+
 <source>Nothing to synchronize!</source>
 <target>Rien à synchroniser !</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synchronisation terminée avec succès !</target>
+<source>Synchronization completed successfully.</source>
+<target>Synchronisation terminée sans erreurs</target>
+
+<source>Saving log file %x...</source>
+<target>Enregistrement du fichier log %x...</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>
@@ -360,9 +345,6 @@ La commande est déclenchée si :
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Une nouvelle version de FreeFileSync est disponible</target>
 
@@ -375,6 +357,12 @@ La commande est déclenchée si :
 <source>Information</source>
 <target>Information</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Impossible de se connecter à sourceforge.net !</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Le numéro de la version actuelle de FreeFileSync n'a pas été trouvé en ligne ! Voulez-vous le rechercher manuellement ?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Voulez-vous que FreeFileSync recherche automatiquement une nouvelle version chaque semaine ?</target>
 
@@ -438,27 +426,27 @@ La commande est déclenchée si :
 <source>Hibernate</source>
 <target>Figer</target>
 
-<source>1. &Compare</source>
-<target>1. &Comparer</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synchroniser</target>
-
 <source>&New</source>
 <target>&Nouveau</target>
 
 <source>&Save</source>
 <target>&Sauvegarder</target>
 
+<source>Save as &batch job...</source>
+<target>Enregistrer en temps que job &batch...</target>
+
+<source>1. &Compare</source>
+<target>1. &Comparer</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synchroniser</target>
+
 <source>&Language</source>
 <target>&Langue</target>
 
 <source>&Global settings...</source>
 <target>&Paramètres généraux...</target>
 
-<source>&Create batch job...</source>
-<target>&Créer une tâche de traitement batch...</target>
-
 <source>&Export file list...</source>
 <target>&Exportation de la liste des fichiers...</target>
 
@@ -492,17 +480,17 @@ La commande est déclenchée si :
 <source>Swap sides</source>
 <target>Permuter les côtés</target>
 
-<source>Load configuration from file</source>
-<target>Charger la configuration à partir du fichier</target>
+<source>Open</source>
+<target>Ouvrir</target>
 
-<source>Save current configuration to file</source>
-<target>Enregistrer la configuration actuelle</target>
+<source>Save</source>
+<target>Sauvegarder</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Dernière configuration utilisée (Appuyez sur SUPPR pour l'enlever de la liste)</target>
 
-<source>Show excluded items</source>
-<target>Afficher les éléments exclus</target>
+<source>Hide excluded items</source>
+<target>Cacher les éléments exclus</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Afficher les fichiers filtrés ou temporairement exclus</target>
@@ -540,15 +528,6 @@ La commande est déclenchée si :
 <source>Help</source>
 <target>Aide</target>
 
-<source>Filter files</source>
-<target>Filtrage des fichiers</target>
-
-<source>Left</source>
-<target>Gauche</target>
-
-<source>Right</source>
-<target>Droite</target>
-
 <source>Error handling</source>
 <target>Erreur de gestion de fichiers</target>
 
@@ -570,14 +549,14 @@ La commande est déclenchée si :
 <source>Abort synchronization on first error</source>
 <target>Abandonner la synchronisation dès la première erreur</target>
 
-<source>On completion:</source>
-<target>A la fin :</target>
+<source>On completion</source>
+<target>À la fin</target>
 
 <source>Show progress dialog</source>
 <target>Montrer la fenêtre de progression</target>
 
-<source>Generate log file</source>
-<target>Créer le fichier log</target>
+<source>Save log</source>
+<target>Sauvegarder le fichier log</target>
 
 <source>Select folder to save log files</source>
 <target>Choisir le dossier de sauvegarde des fichiers log</target>
@@ -588,11 +567,8 @@ La commande est déclenchée si :
 <source>Limit maximum number of log files</source>
 <target>Nombre maximal de fichiers log</target>
 
-<source>Batch settings</source>
-<target>Configuration du traitement batch</target>
-
-<source>Compare by...</source>
-<target>Comparaison par...</target>
+<source>Select variant</source>
+<target>Choisir une variante</target>
 
 <source>
 Files are found equal if
@@ -607,6 +583,9 @@ Les fichiers sont considérés comme identiques si
 sont les mêmes
 </target>
 
+<source>File time and size</source>
+<target>Heure et taille du fichier</target>
+
 <source>
 Files are found equal if
      - file content
@@ -618,24 +597,36 @@ Les fichiers sont considérés comme identiques si
 est identique
 </target>
 
+<source>File content</source>
+<target>Contenu du fichier</target>
+
 <source>Symbolic Link handling</source>
 <target>Gestion des Liens Symboliques</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Choisissez une variante :</target>
+<source><- Two way -></source>
+<target><- Deux sens -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identifie et propage les modifications des deux côtés à l'aide d'une base de données. Les suppressions, renommages et conflits sont détectés automatiquement.</target>
 
+<source>Mirror ->></source>
+<target>Miroir ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Copie miroir du dossier de gauche. Le dossier de droite est modifié pour être strictement identique après la synchronisation.</target>
 
+<source>Update -></source>
+<target>Mise à Jour -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Copie les fichiers nouveaux ou modifiés dans le dossier de droite.</target>
 
+<source>Custom</source>
+<target>Personnaliser</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Paramétrage de vos règles de synchronisation.</target>
 
@@ -651,8 +642,8 @@ est identique
 <source>Recycle Bin</source>
 <target>Corbeille</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Utiliser la Corbeille lors de la suppression ou du remplacement d'un fichier</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Utiliser la corbeille pour les fichiers supprimés ou écrasés</target>
 
 <source>Versioning</source>
 <target>Gestion des versions</target>
@@ -660,8 +651,8 @@ est identique
 <source>Move time-stamped files into specified folder</source>
 <target>Déplacer les fichiers horodatés dans le dossier spécifié</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Nombre maximal de versions par fichier</target>
+<source>Naming convention:</source>
+<target>Convention de nommage :</target>
 
 <source>Configuration</source>
 <target>Configuration</target>
@@ -810,6 +801,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Overview</source>
 <target>Présentation</target>
 
+<source>Filter files</source>
+<target>Filtrage des fichiers</target>
+
 <source>Select view</source>
 <target>Choisissez une vue</target>
 
@@ -861,9 +855,15 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source><Last session></source>
 <target><Dernière session></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Comparaison de dossiers et Synchronisation</target>
+
 <source>Configuration saved!</source>
 <target>Configuration enregistrée !</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Ne jamais enregistrer les modifications</target>
 
@@ -876,9 +876,6 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Configuration loaded!</source>
 <target>Configuration chargée !</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Comparaison de dossiers et Synchronisation</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Masquer les fichiers n'existant qu'à gauche</target>
 
@@ -1035,6 +1032,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Comparing content...</source>
 <target>Comparaison du contenu...</target>
 
+<source>Copy</source>
+<target>Copier</target>
+
 <source>Paused</source>
 <target>En pause</target>
 
@@ -1107,14 +1107,14 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>- folder part only</source>
 <target>- Partie dossier seulement</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- équivalent de %name de l'autre côté</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Duplication vers %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- équivalent de %dir de l'autre côté</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>Duplication vers %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Rendre de nouveau visibles les boîtes de dialogue et les messages d'avertissement ?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Voulez-vous réafficher les avertissements et les boîtes de dialogue ?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1137,47 +1137,29 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Leave as unresolved conflict</source>
 <target>Abandonner en tant que conflit non résolu</target>
 
-<source>Files</source>
-<target>Fichiers</target>
+<source>Replace</source>
+<target>Remplacer</target>
 
-<source>Percentage</source>
-<target>Pourcentage</target>
+<source>Move files and replace if existing</source>
+<target>Déplacer les fichiers et remplacer ceux existant</target>
 
-<source>%x TB</source>
-<target>%x To</target>
+<source>Append a timestamp to each file name</source>
+<target>Ajouter un horodatage à chaque fichier</target>
 
-<source>%x PB</source>
-<target>%x Po</target>
+<source>Folder</source>
+<target>Dossier</target>
 
-<source>%x%</source>
-<target>%x %</target>
+<source>File</source>
+<target>Fichier</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>AAAA-MM-JJ hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x heure</pluralform>
-<pluralform>%x heures</pluralform>
-</target>
+<source>Files</source>
+<target>Fichiers</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x jour</pluralform>
-<pluralform>%x jours</pluralform>
-</target>
+<source>Percentage</source>
+<target>Pourcentage</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Impossible de gérer le répertoire %x.</target>
@@ -1227,6 +1209,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Cannot copy file %x to %y.</source>
 <target>Impossible de copier le fichier %X vers %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Le type de l'élément %x n'est pas accepté :</target>
+
 <source>Cannot open directory %x.</source>
 <target>Impossible d'ouvrir le répertoire %x.</target>
 
@@ -1236,6 +1221,42 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Detected endless directory recursion.</source>
 <target>Une boucle sans fin détectée dans un répertoire.</target>
 
+<source>%x TB</source>
+<target>%x To</target>
+
+<source>%x PB</source>
+<target>%x Po</target>
+
+<source>%x%</source>
+<target>%x %</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x heure</pluralform>
+<pluralform>%x heures</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x jour</pluralform>
+<pluralform>%x jours</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Impossible de fixer le privilège %x.</target>
 
@@ -1365,6 +1386,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Moving symbolic link %x to %y</source>
 <target>Déplacement du lien symbolique %x vers %y</target>
 
+<source>Removing old versions...</source>
+<target>Suppression des anciennes versions...</target>
+
 <source>Creating file %x</source>
 <target>Création du fichier %x</target>
 
@@ -1386,6 +1410,9 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Updating attributes of %x</source>
 <target>Mise à jour des attributs de %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Le dossier destination %x existe déjà.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>L'entrée dossier de destination ne doit pas être vide.</target>
 
@@ -1395,11 +1422,8 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>Source folder %x not found.</source>
 <target>Dossier source %x non trouvé.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Il y a des conflits non résolus !</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Vous pouvez ignorer ces conflits et continuer la synchronisation.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Les éléments suivants sont en conflit non résolu et ne seront pas synchronisés :</target>
 
 <source>Significant difference detected:</source>
 <target>Différence significative détectée :</target>
@@ -1419,12 +1443,15 @@ Attention : les noms de fichiers doivent être relatifs aux répertoires de base
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Un dossier faisant partie de paires multiples sera modifié. Veuillez vérifier les paramètres de synchronisation.</target>
 
+<source>Left</source>
+<target>Gauche</target>
+
+<source>Right</source>
+<target>Droite</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Synchronisation de la paire de dossiers</target>
 
-<source>Target folder %x already existing.</source>
-<target>Le dossier destination %x existe déjà.</target>
-
 <source>Generating database...</source>
 <target>Génération de la base de données...</target>
 
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index d2fca6cf..6ca3b96b 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -59,7 +59,7 @@
 <target>Filtereinstellungen löschen</target>
 
 <source>Save as batch job</source>
-<target>Speichern als Batch-Job</target>
+<target>Als Batch-Job speichern</target>
 
 <source>Comparison settings</source>
 <target>Vergleichseinstellungen</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Globale Einstellungen</target>
 
-<source>Summary</source>
-<target>Zusammenfassung</target>
-
 <source>Find</source>
 <target>Suchen</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>Ordner auswählen</target>
 
-<source>Delay [seconds]</source>
-<target>Verzögerung [Sekunden]</target>
+<source>Idle time [seconds]</source>
+<target>Ruhezeit [Sekunden]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Ruhezeit zwischen der letzten erkannten Änderung und dem Aufruf der Befehlszeile</target>
@@ -324,44 +321,23 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>A folder input field is empty.</source>
 <target>Ein Ordnereingabefeld ist leer.</target>
 
-<source>File time and size</source>
-<target>Datum und Größe</target>
-
-<source>File content</source>
-<target>Dateiinhalt</target>
-
-<source><Automatic></source>
-<target><Automatik></target>
-
-<source>Mirror ->></source>
-<target>Spiegeln ->></target>
-
-<source>Update -></source>
-<target>Aktualisieren -></target>
-
-<source>Custom</source>
-<target>Eigene</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync Batch</target>
-
-<source>Saving log file %x</source>
-<target>Speichere Logdatei %x</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronisation abgebrochen!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronisation mit Fehlern abgeschlossen!</target>
 
-<source>Synchronization completed with warnings!</source>
-<target>Synchronisation mit Warnungen abgeschlossen!</target>
+<source>Synchronization completed with warnings.</source>
+<target>Synchronisation mit Warnungen abgeschlossen.</target>
 
 <source>Nothing to synchronize!</source>
 <target>Es gibt nichts zu synchronisieren!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synchronisation erfolgreich abgeschlossen!</target>
+<source>Synchronization completed successfully.</source>
+<target>Synchronisation erfolgreich abgeschlossen.</target>
+
+<source>Saving log file %x...</source>
+<target>Speichere Logdatei %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Drücken Sie "Wechseln", um die Probleme in FreeFileSyncs Hauptdialog zu beheben.</target>
@@ -513,8 +489,8 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Zuletzt benutzte Konfigurationen (Entf-Taste löscht Einträge)</target>
 
-<source>Show excluded items</source>
-<target>Ausgeschlossene Elemente anzeigen</target>
+<source>Hide excluded items</source>
+<target>Ausgeschlossene Elemente verstecken</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Gefilterte oder temporär ausgeschlossene Dateien zeigen</target>
@@ -552,15 +528,6 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Help</source>
 <target>Hilfe</target>
 
-<source>Filter files</source>
-<target>Dateien filtern</target>
-
-<source>Left</source>
-<target>Links</target>
-
-<source>Right</source>
-<target>Rechts</target>
-
 <source>Error handling</source>
 <target>Fehlerbehandlung</target>
 
@@ -582,14 +549,14 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Abort synchronization on first error</source>
 <target>Synchronisation beim ersten Fehler abbrechen</target>
 
-<source>On completion:</source>
-<target>Nach Abschluss:</target>
+<source>On completion</source>
+<target>Nach Abschluss</target>
 
 <source>Show progress dialog</source>
 <target>Fortschrittsdialog zeigen</target>
 
-<source>Generate log file</source>
-<target>Logdatei erzeugen</target>
+<source>Save log</source>
+<target>Log speichern</target>
 
 <source>Select folder to save log files</source>
 <target>Ordner zum speichern der Logdateien wählen</target>
@@ -600,11 +567,8 @@ Die Befehlszeile wird ausgelöst wenn:
 <source>Limit maximum number of log files</source>
 <target>Maximale Anzahl von Logdateien begrenzen</target>
 
-<source>Batch settings</source>
-<target>Batch Einstellungen</target>
-
-<source>Compare by...</source>
-<target>Vergleichen nach...</target>
+<source>Select variant</source>
+<target>Variante auswählen</target>
 
 <source>
 Files are found equal if
@@ -619,6 +583,9 @@ Dateien gelten als gleich, wenn
 gleich sind
 </target>
 
+<source>File time and size</source>
+<target>Datum und Größe</target>
+
 <source>
 Files are found equal if
      - file content
@@ -630,24 +597,36 @@ Dateien gelten als gleich, wenn
 gleich ist
 </target>
 
+<source>File content</source>
+<target>Dateiinhalt</target>
+
 <source>Symbolic Link handling</source>
-<target>Behandlung Symbolischer Links</target>
+<target>Symbolische Links</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Variante auswählen:</target>
+<source><- Two way -></source>
+<target><- Zwei Wege -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identifiziere und propagiere Änderungen auf beiden Seiten mit Hilfe einer Datenbank. Löschungen, Umbenennungen und Konflikte werden automatisch erkannt.</target>
 
+<source>Mirror ->></source>
+<target>Spiegeln ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Spiegelkopie des linken Ordners erstellen. Der rechte Ordner wird dem linken exakt angeglichen.</target>
 
+<source>Update -></source>
+<target>Aktualisieren -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Neue oder aktualisierte Dateien in den rechten Ordner kopieren.</target>
 
+<source>Custom</source>
+<target>Eigene</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Eigene Synchronisationsregeln definieren.</target>
 
@@ -655,7 +634,7 @@ gleich ist
 <target>Behandlung von Löschungen</target>
 
 <source>Permanent</source>
-<target>Endgültig</target>
+<target>Permanent</target>
 
 <source>Delete or overwrite files permanently</source>
 <target>Dateien endgültig löschen oder überschreiben</target>
@@ -663,8 +642,8 @@ gleich ist
 <source>Recycle Bin</source>
 <target>Papierkorb</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Papierkorb für zu löschende oder zu überschreibende Dateien nutzen</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Verwende den Papierkorb für gelöschte und überschriebene Dateien</target>
 
 <source>Versioning</source>
 <target>Versionierung</target>
@@ -672,8 +651,8 @@ gleich ist
 <source>Move time-stamped files into specified folder</source>
 <target>Dateien mit Zeitstempel in den angegebenen Ordner verschieben</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Maximale Anzahl von Versionen pro Datei begrenzen</target>
+<source>Naming convention:</source>
+<target>Namenskonvention:</target>
 
 <source>Configuration</source>
 <target>Konfiguration</target>
@@ -822,6 +801,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Overview</source>
 <target>Übersicht</target>
 
+<source>Filter files</source>
+<target>Dateien filtern</target>
+
 <source>Select view</source>
 <target>Ansicht auswählen</target>
 
@@ -879,6 +861,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Configuration saved!</source>
 <target>Konfiguration gespeichert!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync Batch</target>
+
 <source>Never save changes</source>
 <target>Änderungen niemals speichern</target>
 
@@ -1128,8 +1113,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>- Other side's counterpart to %item_folder%</source>
 <target>- Entsprechung der anderen Seite zu %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Versteckte Dialoge und Warnungen wieder sichtbar machen?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Versteckte Warnungen und Dialoge wieder sichtbar machen?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1152,6 +1137,24 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Leave as unresolved conflict</source>
 <target>Als unbehandelten Konflikt belassen</target>
 
+<source>Replace</source>
+<target>Ersetzen</target>
+
+<source>Move files and replace if existing</source>
+<target>Dateien verschieben und bereits vorhandene ersetzen</target>
+
+<source>Append a timestamp to each file name</source>
+<target>Einen Zeitstempel an jeden Dateinamen hinzufügen</target>
+
+<source>Folder</source>
+<target>Ordner</target>
+
+<source>File</source>
+<target>Datei</target>
+
+<source>YYYY-MM-DD hhmmss</source>
+<target>JJJJ-MM-TT hhmmss</target>
+
 <source>Files</source>
 <target>Dateien</target>
 
@@ -1419,11 +1422,8 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>Source folder %x not found.</source>
 <target>Der Quellordner %x wurde nicht gefunden.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Es existieren ungelöste Konflikte!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Die Konflikte können ignoriert und die Synchronisation fortgesetzt werden.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Die folgenden Elemente haben ungelöste Konflikte und werden nicht synchronisiert werden:</target>
 
 <source>Significant difference detected:</source>
 <target>Ein erheblicher Unterschied wurde festgestellt:</target>
@@ -1443,6 +1443,12 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Ein Ordner wird verändert werden, der Teil mehrerer Ordnerpaare ist. Bitte überprüfen Sie die Synchronisationseinstellungen.</target>
 
+<source>Left</source>
+<target>Links</target>
+
+<source>Right</source>
+<target>Rechts</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Synchronisiere Ordnerpaar:</target>
 
diff --git a/BUILD/Languages/greek.lng b/BUILD/Languages/greek.lng
index ed8e6f27..fbdf907c 100644
--- a/BUILD/Languages/greek.lng
+++ b/BUILD/Languages/greek.lng
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Διαγραφή όλων των ρυθμίσεων φίλτρου</target>
 
-<source>Create a batch job</source>
-<target>Δημιουργία μιας δέσμης ενεργειών</target>
+<source>Save as batch job</source>
+<target></target>
 
 <source>Comparison settings</source>
 <target>Ρυθμίσεις σύγκρισης</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Γενικές ρυθμίσεις</target>
 
-<source>Summary</source>
-<target>Σύνοψη</target>
-
 <source>Find</source>
 <target>Αναζήτηση</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>Επιλογή υποκαταλόγου</target>
 
-<source>Delay [seconds]</source>
-<target>Καθυστέρηση [δευτερόλεπτα]</target>
+<source>Idle time [seconds]</source>
+<target></target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Λανθάνων χρόνος μεταξύ τελευταίας αλλαγής που ανιχνεύθηκε και εκτέλεσης της εντολής</target>
@@ -324,38 +321,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>Ένα πεδίο εισαγωγής υποκαταλόγων είναι άδειο.</target>
 
-<source>File time and size</source>
-<target>Ημερομηνία και μέγεθος αρχείων</target>
-
-<source>File content</source>
-<target>Περιεχόμενο αρχείων</target>
-
-<source><Automatic></source>
-<target><Αυτόματα></target>
-
-<source>Mirror ->></source>
-<target>Κατοπτρισμός ->></target>
-
-<source>Update -></source>
-<target>Ενημέρωση -></target>
-
-<source>Custom</source>
-<target>Εξατομίκευση</target>
-
-<source>FreeFileSync batch</source>
-<target>Δέσμη ενεργειών του FreeFileSync</target>
-
 <source>Synchronization aborted!</source>
 <target>Ο συγχρονισμός ματαιώθηκε!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Ο συγχρονισμός ολοκληρώθηκε με σφάλματα!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target></target>
+
 <source>Nothing to synchronize!</source>
 <target>Δεν υπάρχει τίποτα προς συγχρονισμό!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Ο συγχρονισμός ολοκληρώθηκε επιτυχώς!</target>
+<source>Synchronization completed successfully.</source>
+<target></target>
+
+<source>Saving log file %x...</source>
+<target></target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Πατήστε "Εναλλαγή" για να επιλύσετε τα θέματα στο κεντρικό παράθυρο του FreeFileSync.</target>
@@ -363,9 +345,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Επιστρέφοντας στο κεντρικό παράθυρο του FreeFileSync...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Δεν είναι δυνατή η σύνδεση με το sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Μια νέα έκδοση του FreeFileSync είναι διαθέσιμη:</target>
 
@@ -378,6 +357,12 @@ The command is triggered if:
 <source>Information</source>
 <target>Πληροφορία</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Δεν είναι δυνατή η σύνδεση με το sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target></target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Θέλετε το FreeFileSync να ελέγχει αυτόματα για ενημερώσεις κάθε εβδομάδα;</target>
 
@@ -441,27 +426,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>Αδρανοποίηση</target>
 
-<source>1. &Compare</source>
-<target>1. &Σύγκριση</target>
-
-<source>2. &Synchronize</source>
-<target>2. Συ&γχρονισμός</target>
-
 <source>&New</source>
 <target>&Δημιουργία</target>
 
 <source>&Save</source>
 <target>Απο&θήκευση</target>
 
+<source>Save as &batch job...</source>
+<target></target>
+
+<source>1. &Compare</source>
+<target>1. &Σύγκριση</target>
+
+<source>2. &Synchronize</source>
+<target>2. Συ&γχρονισμός</target>
+
 <source>&Language</source>
 <target>&Γλώσσα</target>
 
 <source>&Global settings...</source>
 <target>Γε&νικές ρυθμίσεις...</target>
 
-<source>&Create batch job...</source>
-<target>&Δημιουργία μιας δέσμης ενεργειών...</target>
-
 <source>&Export file list...</source>
 <target>Ε&ξαγωγή καταλόγου αρχείων...</target>
 
@@ -495,17 +480,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Ανταλλαγή πλευρών</target>
 
-<source>Load configuration from file</source>
-<target>Άνοιγμα διάταξης από αρχείο</target>
+<source>Open</source>
+<target></target>
 
-<source>Save current configuration to file</source>
-<target>Αποθήκευση της τρέχουσας διάταξης</target>
+<source>Save</source>
+<target></target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Διατάξεις που χρησιμοποιήθηκαν τελευταία (πατήστε DEL για διαγραφή από τη λίστα)</target>
 
-<source>Show excluded items</source>
-<target>Εμφάνιση εξαιρεθέντων στοιχείων</target>
+<source>Hide excluded items</source>
+<target></target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Εμφάνιση φιλτραρισμένων ή προσωρινά εξαιρεθέντων αρχείων</target>
@@ -543,15 +528,6 @@ The command is triggered if:
 <source>Help</source>
 <target>Βοήθεια</target>
 
-<source>Filter files</source>
-<target>Φιλτράρισμα</target>
-
-<source>Left</source>
-<target>Αριστερά</target>
-
-<source>Right</source>
-<target>Δεξιά</target>
-
 <source>Error handling</source>
 <target>Διαχείριση σφαλμάτων</target>
 
@@ -573,14 +549,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>Ματαίωση του συγχρονισμού με το πρώτο σφάλμα</target>
 
-<source>On completion:</source>
-<target>Μετά την ολοκλήρωση:</target>
+<source>On completion</source>
+<target></target>
 
 <source>Show progress dialog</source>
 <target>Εμφάνιση της αναφοράς προόδου</target>
 
-<source>Generate log file</source>
-<target>Δημιουργία αρχείων καταγραφής</target>
+<source>Save log</source>
+<target></target>
 
 <source>Select folder to save log files</source>
 <target>Επιλογή υποκαταλόγου για την αποθήκευση των αρχείων καταγραφής</target>
@@ -591,11 +567,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>Μέγιστος αριθμός αρχείων καταγραφής</target>
 
-<source>Batch settings</source>
-<target>Ρυθμίσεις δέσμης ενεργειών</target>
-
-<source>Compare by...</source>
-<target>Σύγκριση με βάση το...</target>
+<source>Select variant</source>
+<target></target>
 
 <source>
 Files are found equal if
@@ -610,6 +583,9 @@ are the same
 είναι ίδια
 </target>
 
+<source>File time and size</source>
+<target>Ημερομηνία και μέγεθος αρχείων</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +597,36 @@ is the same
 είναι ίδιο
 </target>
 
+<source>File content</source>
+<target>Περιεχόμενο αρχείων</target>
+
 <source>Symbolic Link handling</source>
 <target>Τρόπος διαχείρισης των συμβολικών δεσμών</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Επιλέξτε μια μέθοδο:</target>
+<source><- Two way -></source>
+<target></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Αναγνώριση και αναπαραγωγή των αλλαγών και στις δύο πλευρές με τη χρήση μιας βάσης δεδομένων. Διαγραφές, μετονομασίες και διενέξεις ανιχνεύονται αυτόματα.</target>
 
+<source>Mirror ->></source>
+<target>Κατοπτρισμός ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Κατοπτρικό αντίγραφο του αριστερού υποκαταλόγου. Ο υποκατάλογος δεξιά θα τροποποιηθεί και θα αντιστοιχεί εξολοκλήρου στον αριστερό μετά το συγχρονισμό</target>
 
+<source>Update -></source>
+<target>Ενημέρωση -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Αντιγραφή των νέων ή πιο πρόσφατων αρχείων στον υποκατάλογο δεξιά.</target>
 
+<source>Custom</source>
+<target>Εξατομίκευση</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Ορίστε τους δικούς σας κανόνες συγχρονισμού.</target>
 
@@ -654,8 +642,8 @@ is the same
 <source>Recycle Bin</source>
 <target>Κάδος Ανακύκλωσης</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Χρήση του Κάδου Ανακύκλωσης κατά τη διαγραφή ή αντικατάσταση αρχείων</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target></target>
 
 <source>Versioning</source>
 <target>Διατήρηση παλιών εκδόσεων</target>
@@ -663,8 +651,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>Μεταφορά χρονοσημασμένων αρχείων σε συγκεκριμένο υποκατάλογο</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Περιορισμός του μέγιστου αριθμού εκδόσεων ανά αρχείο</target>
+<source>Naming convention:</source>
+<target></target>
 
 <source>Configuration</source>
 <target>Διάταξη</target>
@@ -813,6 +801,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Σύνοψη</target>
 
+<source>Filter files</source>
+<target>Φιλτράρισμα</target>
+
 <source>Select view</source>
 <target>Επιλογή εμφάνισης</target>
 
@@ -864,9 +855,15 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><Τελευταία χρήση></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Σύγκριση υποκαταλόγων και Συγχρονισμός</target>
+
 <source>Configuration saved!</source>
 <target>Η διάταξη αποθηκεύτηκε!</target>
 
+<source>FreeFileSync batch</source>
+<target>Δέσμη ενεργειών του FreeFileSync</target>
+
 <source>Never save changes</source>
 <target>Να μην αποθηκεύονται οι αλλαγές</target>
 
@@ -879,9 +876,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>Η διάταξη έχει ανοιχθεί!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Σύγκριση υποκαταλόγων και Συγχρονισμός</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Απόκρυψη των αρχείων που υπάρχουν μόνο στα αριστερά</target>
 
@@ -1038,6 +1032,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Σύγκριση του περιεχομένου...</target>
 
+<source>Copy</source>
+<target></target>
+
 <source>Paused</source>
 <target>Σε παύση</target>
 
@@ -1110,14 +1107,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- μέρος μόνο του υποκαταλόγου</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Το αντίστοιχο %name της άλλης πλευράς</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target></target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Ο αντίστοιχος %dir της άλλης πλευράς</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target></target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Να φαίνονται τα παράθυρα και οι αναφορές σφαλμάτων που είχατε διαλέξει να μην εμφανίζονται;</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target></target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1140,47 +1137,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Παράβλεψη ως ανεπίλυτη διένεξη</target>
 
-<source>Files</source>
-<target>Αρχεία</target>
+<source>Replace</source>
+<target></target>
 
-<source>Percentage</source>
-<target>Ποσοστό</target>
+<source>Move files and replace if existing</source>
+<target></target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target></target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target></target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target></target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 λεπτό</pluralform>
-<pluralform>%x λεπτά</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target></target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 ώρα</pluralform>
-<pluralform>%x ώρες</pluralform>
-</target>
+<source>Files</source>
+<target>Αρχεία</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 μέρα</pluralform>
-<pluralform>%x μέρες</pluralform>
-</target>
+<source>Percentage</source>
+<target>Ποσοστό</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Δεν είναι δυνατή η παρακολύθηση του υποκαταλόγου %x.</target>
@@ -1230,6 +1209,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>Δεν μπορεί να αντιγραφεί το αρχείο %x στο %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target></target>
+
 <source>Cannot open directory %x.</source>
 <target>Δεν είναι δυνατό το άνοιγμα του υποκαταλόγου %x.</target>
 
@@ -1239,6 +1221,42 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>Ανιχνεύτηκε αέναος βρόχος υποκαταλόγων.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 λεπτό</pluralform>
+<pluralform>%x λεπτά</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 ώρα</pluralform>
+<pluralform>%x ώρες</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 μέρα</pluralform>
+<pluralform>%x μέρες</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Τα δικαιώματα %x δεν μπορούν να οριστούν.</target>
 
@@ -1392,6 +1410,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Ενημέρωση των χαρακτηριστικών αρχείου του %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Ο υποκατάλογος-στόχος %x υπάρχει ήδη.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Το πεδίο εισαγωγής του υποκαταλόγου-στόχου πρέπει να μην είναι κενό.</target>
 
@@ -1401,11 +1422,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>Ο υποκατάλογος %x δε βρέθηκε.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Υπάρχουν ανεπίλυτες διενέξεις!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Μπορείτε να αγνοήσετε τις διενέξεις και να συνεχίσετε το συγχρονισμό.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target></target>
 
 <source>Significant difference detected:</source>
 <target>Ανιχνεύθηκαν σημαντικές διαφορές:</target>
@@ -1425,12 +1443,15 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Θα τροποποιηθεί ένας υποκατάλογος που είναι μέρος από πολλαπλά ζεύγη υποκαταλόγων. Παρακαλούμε επανελέγξτε τις ρυθμίσεις συγχρονισμού.</target>
 
+<source>Left</source>
+<target>Αριστερά</target>
+
+<source>Right</source>
+<target>Δεξιά</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Συγχρονίζεται το ζευγάρι υποκαταλόγων:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Ο υποκατάλογος-στόχος %x υπάρχει ήδη.</target>
-
 <source>Generating database...</source>
 <target>Δημιουργία βάσης δεδομένων...</target>
 
diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng
index 16d7919a..532a3bcc 100644
--- a/BUILD/Languages/hebrew.lng
+++ b/BUILD/Languages/hebrew.lng
@@ -32,7 +32,7 @@
 <target>התקבלה בקשת ביטול: מחכה לפעולה הנוכחית להסתיים...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>נכשל ייצור תג זמן עבור עדכון גרסאות</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - סינכרון  אוטומטי</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>נקה בחירת מסנן</target>
 
-<source>Create a batch job</source>
-<target>יוצר עבודת אצווה</target>
+<source>Save as batch job</source>
+<target>שמור כעבודת אצווה</target>
 
 <source>Comparison settings</source>
 <target>הגדרות השוואה</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>משתנים גלובליים</target>
 
-<source>Summary</source>
-<target>תקציר</target>
-
 <source>Find</source>
 <target>חפש</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>בחר מחיצה</target>
 
-<source>Delay [seconds]</source>
-<target>השהייה [שניות]</target>
+<source>Idle time [seconds]</source>
+<target>זמן סרק [שניות]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>זמן המתנה בין שינויי מאובחן אחרון לבין ביצוע של פקודה</target>
@@ -324,38 +321,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>שדה קלט תיקייה ריק.</target>
 
-<source>File time and size</source>
-<target>זמן וגודל קובץ</target>
-
-<source>File content</source>
-<target>תכולת הקובץ</target>
-
-<source><Automatic></source>
-<target><אוטומטי></target>
-
-<source>Mirror ->></source>
-<target>מראה ->></target>
-
-<source>Update -></source>
-<target>שדרג -></target>
-
-<source>Custom</source>
-<target>מותאם</target>
-
-<source>FreeFileSync batch</source>
-<target>אצוות FreeFileSync</target>
-
 <source>Synchronization aborted!</source>
 <target>סינכרון בוטל!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>סנכרון הושלם עם שגיאות!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>סנכרון הסתיים עם אזהרות.</target>
+
 <source>Nothing to synchronize!</source>
 <target>אין מה לסנכרן!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>סינכרון הושלם בהצלחה!</target>
+<source>Synchronization completed successfully.</source>
+<target>סנכרון הסתיים בהצלחה.</target>
+
+<source>Saving log file %x...</source>
+<target>שומר קובץ יומן %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>לחץ על "החלפה" בכדי לפתור בעיות בדיאלוג הראשי.</target>
@@ -363,9 +345,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>עובר לדיאלוג הראשי של FreeFileSync</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>אין תקשורת ל sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>גירסה חדשה של FreeFileSync זמינה:</target>
 
@@ -378,6 +357,12 @@ The command is triggered if:
 <source>Information</source>
 <target>מידע</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>אין תקשורת ל sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>מספר גירסה נוכחית של FreeFileSync לא נמצא באופן מכוון! האם ברצונך לבדוק ידנית?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>האם ברצונך שהתוכנה תבדוק לעדכון בכל שבוע?</target>
 
@@ -441,27 +426,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>עבור למצב שינה</target>
 
-<source>1. &Compare</source>
-<target>1. &השווה</target>
-
-<source>2. &Synchronize</source>
-<target>2. &סנכרן</target>
-
 <source>&New</source>
 <target>&חדש</target>
 
 <source>&Save</source>
 <target>&שמור</target>
 
+<source>Save as &batch job...</source>
+<target>שמור כעבודת &אצווה</target>
+
+<source>1. &Compare</source>
+<target>1. &השווה</target>
+
+<source>2. &Synchronize</source>
+<target>2. &סנכרן</target>
+
 <source>&Language</source>
 <target>&שפה</target>
 
 <source>&Global settings...</source>
 <target>&משתנים גלובליים...</target>
 
-<source>&Create batch job...</source>
-<target>&צור קובץ אצווה...</target>
-
 <source>&Export file list...</source>
 <target>&יצא רשימת קבצים...</target>
 
@@ -495,17 +480,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>החלף צדדים</target>
 
-<source>Load configuration from file</source>
-<target>טען קונפיגורציה מקובץ</target>
+<source>Open</source>
+<target>פתח</target>
 
-<source>Save current configuration to file</source>
-<target>שמור תצורה נוכחית לקובץ</target>
+<source>Save</source>
+<target>שמור</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>תצורות אחרונות שהיו בשמוש (לחץ DEL להסרה מהרשימה)</target>
 
-<source>Show excluded items</source>
-<target>הראה פריטים שלא נכללו</target>
+<source>Hide excluded items</source>
+<target>הסתר פריטים שלט נכללו</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>הראה קבצים שסוננו או לא נכללו זמנית</target>
@@ -538,20 +523,11 @@ The command is triggered if:
 <target>עבודת אצווה</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>יצור קובץ אצווה לסינכרון אוטומטי. הפעל בהקלקה כפולה או תזמן באמצעות מתזמן המשימות של המערכת: FreeFileSync.exe</target>
+<target>יצר קובץ אצווה למכן את הסנכרון. הקלק פעמיים על קובץ זה או תזמן במתכנן המשימות: FreeFileSYnc.exe <jobname>.ffs</target>
 
 <source>Help</source>
 <target>עזרה</target>
 
-<source>Filter files</source>
-<target>קבצי המסנן</target>
-
-<source>Left</source>
-<target>ימין</target>
-
-<source>Right</source>
-<target>שמאל</target>
-
 <source>Error handling</source>
 <target>טיפול בשגיאות</target>
 
@@ -573,14 +549,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>הפסק פעולת סינכרון בשגיאה ראשונה</target>
 
-<source>On completion:</source>
+<source>On completion</source>
 <target>לאחר סיום:</target>
 
 <source>Show progress dialog</source>
 <target>הראה שיח התקדמות</target>
 
-<source>Generate log file</source>
-<target>יצר קובץ יומן</target>
+<source>Save log</source>
+<target>שמור קובץ יומן</target>
 
 <source>Select folder to save log files</source>
 <target>בחר תיקיה לשמירת קובץ יומן</target>
@@ -591,11 +567,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>הגבל מספר מכסימלי של קבצי יומן</target>
 
-<source>Batch settings</source>
-<target>הגדרות אצווה</target>
-
-<source>Compare by...</source>
-<target>השווה ע"י...</target>
+<source>Select variant</source>
+<target>בחר גרסה</target>
 
 <source>
 Files are found equal if
@@ -610,6 +583,9 @@ are the same
 הם זהים
 </target>
 
+<source>File time and size</source>
+<target>זמן וגודל קובץ</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +597,36 @@ is the same
 היא זהה
 </target>
 
+<source>File content</source>
+<target>תכולת הקובץ</target>
+
 <source>Symbolic Link handling</source>
 <target>טיפול בקישור סימבולי</target>
 
 <source>OK</source>
 <target>אשר</target>
 
-<source>Select variant:</source>
-<target>בחר משתנה:</target>
+<source><- Two way -></source>
+<target>- דו כווני -</target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>זהה והפץ שינויים בשני הצדדים באמצעות שימוש במסד נתונים. מחיקות, שינויי שמות וסתירות מתגלים באופן אוטומטי.</target>
 
+<source>Mirror ->></source>
+<target>מראה ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>גיבוי מראה של מחיצה ימנית. מחיצה שמאלית תתעדכן ותהיה זהה לימנית לאחר הסינכרון.</target>
 
+<source>Update -></source>
+<target>שדרג -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>העתק קבצים חדשים או מעודכנים למחיצה השמאלית.</target>
 
+<source>Custom</source>
+<target>מותאם</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>סדר את כללי הסנכרון שלך.</target>
 
@@ -654,8 +642,8 @@ is the same
 <source>Recycle Bin</source>
 <target>סל מחזור</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>השתמש בסל המיחזור כאשר מוחק או דורס קבצים</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>השתמש בסל המחזור עבור קבצים נמחקים או נדרסים</target>
 
 <source>Versioning</source>
 <target>עדכון גרסאות</target>
@@ -663,8 +651,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>העבר קבצים עם חתימת זמן לתיקיה מיוחדת</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>הגבל מספר מכסימלי של גרסאות לקובץ</target>
+<source>Naming convention:</source>
+<target>מוסכמות לקביעת שמות:</target>
 
 <source>Configuration</source>
 <target>תצורה</target>
@@ -813,6 +801,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>מבט כללי</target>
 
+<source>Filter files</source>
+<target>קבצי המסנן</target>
+
 <source>Select view</source>
 <target>בחר תצוגה</target>
 
@@ -864,9 +855,15 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><פעילות אחרונה></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>סנכרון קבצים ומחיצות</target>
+
 <source>Configuration saved!</source>
 <target>תצורה נשמרה!</target>
 
+<source>FreeFileSync batch</source>
+<target>אצוות FreeFileSync</target>
+
 <source>Never save changes</source>
 <target>אל תשמור שינויים לעולם</target>
 
@@ -879,9 +876,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>תצורה הוטענה!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>סנכרון קבצים ומחיצות</target>
-
 <source>Hide files that exist on left side only</source>
 <target>הסתר קבצים הקימים אך ורק בצד ימין</target>
 
@@ -1038,6 +1032,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>משווה תכולה...</target>
 
+<source>Copy</source>
+<target>העתק</target>
+
 <source>Paused</source>
 <target>עצור</target>
 
@@ -1110,14 +1107,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- תיקייה בלבד</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- הצד השני מקביל ל- %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- הצד השני מקביל ל %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- הצד השני מקביל ל- %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>הצד השני מקביל ל %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>להפוך דיאלוגים מוסתרים לגלויים שוב?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>להפוך דיאלוגים מוסתרים ואזהרות לגלויים שוב?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1140,47 +1137,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>השאר כקונפליקט לא מטופל</target>
 
-<source>Files</source>
-<target>קבצים</target>
+<source>Replace</source>
+<target>החלף</target>
 
-<source>Percentage</source>
-<target>אחוז</target>
+<source>Move files and replace if existing</source>
+<target>העבר קבצים והחלף במדה וקיימים</target>
 
-<source>%x TB</source>
-<target>%x טרה בייט</target>
+<source>Append a timestamp to each file name</source>
+<target>הצמד תג זמן לכל שם קובץ</target>
 
-<source>%x PB</source>
-<target>%x פטה בייט</target>
+<source>Folder</source>
+<target>תיקייה</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>קובץ</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 דקה</pluralform>
-<pluralform>%x דקות</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 שעה</pluralform>
-<pluralform>%x שעות</pluralform>
-</target>
+<source>Files</source>
+<target>קבצים</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 יום</pluralform>
-<pluralform>%x ימים</pluralform>
-</target>
+<source>Percentage</source>
+<target>אחוז</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>לא יכול לנטר מחיצה %x.</target>
@@ -1230,6 +1209,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>לא יכול להעתיק קובץ %x  אל %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>סוג של פריט %x אינו נתמך:</target>
+
 <source>Cannot open directory %x.</source>
 <target>לא יכול לפתוח מחיצה %x.</target>
 
@@ -1239,6 +1221,42 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>אובחנה רקורסית תיקיות אינסופית.</target>
 
+<source>%x TB</source>
+<target>%x טרה בייט</target>
+
+<source>%x PB</source>
+<target>%x פטה בייט</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 דקה</pluralform>
+<pluralform>%x דקות</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 שעה</pluralform>
+<pluralform>%x שעות</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 יום</pluralform>
+<pluralform>%x ימים</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>לא יכול להגדיר זבות %x.</target>
 
@@ -1369,7 +1387,7 @@ Note: File names must be relative to base directories!
 <target>מעביר קישור סימבולי %x אל %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>מסיר גרסאות ישנות...</target>
 
 <source>Creating file %x</source>
 <target>יוצר קובץ %x</target>
@@ -1392,6 +1410,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>מעדכן תכונות של %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>תיקיית מטרה %x כבר קיימת.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>קלט תיקיית מטרה אינה יכול להיות ריק.</target>
 
@@ -1401,11 +1422,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>תיקיית מקור %x לא נמצאת.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>קיים קונפליקט לא פתור!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>באפשרותך להתעלם מהקונפליקטים ולהמשיך בסנכרון.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>לפריטים הבאים יש קונפליקטים בלתי פתורים והם לא יסונכרנו:</target>
 
 <source>Significant difference detected:</source>
 <target>התגלה שוני גדול מידי:</target>
@@ -1425,12 +1443,15 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>התיקייה שתשתנה היא חלק מריבוי זוגות תיקיות. אנא סקור מחדש הגדרות סינכרון.</target>
 
+<source>Left</source>
+<target>ימין</target>
+
+<source>Right</source>
+<target>שמאל</target>
+
 <source>Synchronizing folder pair:</source>
 <target>מסנכרן זוג תיקיות:</target>
 
-<source>Target folder %x already existing.</source>
-<target>תיקיית מטרה %x כבר קיימת.</target>
-
 <source>Generating database...</source>
 <target>מייצר מסד נתונים...</target>
 
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index adca1b46..e0ced192 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Szűrőbeállítások törlése</target>
 
-<source>Create a batch job</source>
-<target>Kötegelt feladat létrehozása</target>
+<source>Save as batch job</source>
+<target></target>
 
 <source>Comparison settings</source>
 <target>Összehasonlítási beállítások</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Globális beállítások</target>
 
-<source>Summary</source>
-<target>Összegzés</target>
-
 <source>Find</source>
 <target>Keresés:</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>Mappa kiválasztása</target>
 
-<source>Delay [seconds]</source>
-<target>Késleltetés (másodperc)</target>
+<source>Idle time [seconds]</source>
+<target></target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Tétlenség időtartama az utolsó változás észlelése és a parancs végrehajtása között</target>
@@ -324,38 +321,23 @@ A parancs végrehajtódik, ha:
 <source>A folder input field is empty.</source>
 <target>A mappa beviteli mezeje üres.</target>
 
-<source>File time and size</source>
-<target>Fájl dátuma és mérete</target>
-
-<source>File content</source>
-<target>fájl tartalma alapján</target>
-
-<source><Automatic></source>
-<target><Automatikus></target>
-
-<source>Mirror ->></source>
-<target>Tükrözés ->></target>
-
-<source>Update -></source>
-<target>Frissítés -></target>
-
-<source>Custom</source>
-<target>Egyedi</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync kötegelt fájl</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>Synchronization completed with warnings.</source>
+<target></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>Synchronization completed successfully.</source>
+<target></target>
+
+<source>Saving log file %x...</source>
+<target></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>
@@ -363,9 +345,6 @@ A parancs végrehajtódik, ha:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Elérhető a FreeFileSync új verziója:</target>
 
@@ -378,6 +357,12 @@ A parancs végrehajtódik, ha:
 <source>Information</source>
 <target>Információ</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>A csatlakozás a sourceforge.net-hez sikertelen!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target></target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Akarod, hogy a FreeFileSync automatikusan minden héten keressen frissítést?</target>
 
@@ -441,27 +426,27 @@ A parancs végrehajtódik, ha:
 <source>Hibernate</source>
 <target>Hibernálás</target>
 
-<source>1. &Compare</source>
-<target>1. &Összehasonlítás</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Szinkronizálás</target>
-
 <source>&New</source>
 <target>&Új</target>
 
 <source>&Save</source>
 <target>&Mentés</target>
 
+<source>Save as &batch job...</source>
+<target></target>
+
+<source>1. &Compare</source>
+<target>1. &Összehasonlítás</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Szinkronizálás</target>
+
 <source>&Language</source>
 <target>&Nyelv</target>
 
 <source>&Global settings...</source>
 <target>&Globális beállítások...</target>
 
-<source>&Create batch job...</source>
-<target>&Kötegelt feladat létrehozása...</target>
-
 <source>&Export file list...</source>
 <target>&Fájllista exportálása...</target>
 
@@ -495,17 +480,17 @@ A parancs végrehajtódik, ha:
 <source>Swap sides</source>
 <target>Oldalak felcserélése</target>
 
-<source>Load configuration from file</source>
-<target>Beállítások betöltése fájlból</target>
+<source>Open</source>
+<target></target>
 
-<source>Save current configuration to file</source>
-<target>Aktuális beállítások mentése fájlba</target>
+<source>Save</source>
+<target></target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Utoljára használt beállítások (DEL billentyűvel törölhető a listából)</target>
 
-<source>Show excluded items</source>
-<target>Kizárt elemek mutatása</target>
+<source>Hide excluded items</source>
+<target></target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>A szűrt vagy ideiglenesen kizárt fájlok mutatása</target>
@@ -543,15 +528,6 @@ A parancs végrehajtódik, ha:
 <source>Help</source>
 <target>Súgó</target>
 
-<source>Filter files</source>
-<target>Fájlok szűrése</target>
-
-<source>Left</source>
-<target>Bal oldal</target>
-
-<source>Right</source>
-<target>Jobb oldal</target>
-
 <source>Error handling</source>
 <target>Hibakezelés</target>
 
@@ -573,14 +549,14 @@ A parancs végrehajtódik, ha:
 <source>Abort synchronization on first error</source>
 <target>Szinkronizáció leállítása az első hibánál</target>
 
-<source>On completion:</source>
-<target>Végrehajtás után:</target>
+<source>On completion</source>
+<target></target>
 
 <source>Show progress dialog</source>
 <target>Folyamatjelző párbeszédablak mutatása</target>
 
-<source>Generate log file</source>
-<target>Naplófájl generálása</target>
+<source>Save log</source>
+<target></target>
 
 <source>Select folder to save log files</source>
 <target>Válaszd ki a mappát a naplófájlok mentéséhez</target>
@@ -591,11 +567,8 @@ A parancs végrehajtódik, ha:
 <source>Limit maximum number of log files</source>
 <target>Naplófájlok maximális számának korlátozása</target>
 
-<source>Batch settings</source>
-<target>Beállítások</target>
-
-<source>Compare by...</source>
-<target>Összehasonlítás</target>
+<source>Select variant</source>
+<target></target>
 
 <source>
 Files are found equal if
@@ -609,6 +582,9 @@ A fájlok egyezőnek tekintendők, ha megegyezik
      - a fájlméret
 </target>
 
+<source>File time and size</source>
+<target>Fájl dátuma és mérete</target>
+
 <source>
 Files are found equal if
      - file content
@@ -619,24 +595,36 @@ A fájlok megegyeznek, ha megegyezik
   - a fájlok tartalma
 </target>
 
+<source>File content</source>
+<target>fájl tartalma alapján</target>
+
 <source>Symbolic Link handling</source>
 <target>Symlink kezelés</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Változat kiválasztása:</target>
+<source><- Two way -></source>
+<target></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Változások azonosítása és végrehajtása mindkét oldalon adatbázis segítségével. Automatikusan felismerődnek a törlések, átnevezések és ütközések.</target>
 
+<source>Mirror ->></source>
+<target>Tükrözés ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>A bal oldali mappa tükrözött másolata. A jobb oldali mappa úgy lesz megváltoztatva, hogy a szinkronizáció után pontosan megegyezzen a bal oldalival.</target>
 
+<source>Update -></source>
+<target>Frissítés -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Új vagy frissített fájlok másolása a jobb oldali mappába.</target>
 
+<source>Custom</source>
+<target>Egyedi</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Saját szinkronizálási szabályok beállítása.</target>
 
@@ -652,8 +640,8 @@ A fájlok megegyeznek, ha megegyezik
 <source>Recycle Bin</source>
 <target>Lomtár (Recycle Bin)</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>A Lomtár (Recycle Bin) használata fájlok törlésénél vagy felülírásánál</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target></target>
 
 <source>Versioning</source>
 <target>Verziókövetés</target>
@@ -661,8 +649,8 @@ A fájlok megegyeznek, ha megegyezik
 <source>Move time-stamped files into specified folder</source>
 <target>Időbélyeges fájlok mozgatása a megadott mappába</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Verziók maximális számának korlátozása fájlonként</target>
+<source>Naming convention:</source>
+<target></target>
 
 <source>Configuration</source>
 <target>Beállítás</target>
@@ -811,6 +799,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Overview</source>
 <target>Összefoglaló</target>
 
+<source>Filter files</source>
+<target>Fájlok szűrése</target>
+
 <source>Select view</source>
 <target>Nézet kiválasztása</target>
 
@@ -862,9 +853,15 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source><Last session></source>
 <target><Utolsó munkamenet></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Mappa összehasonlítás és szinkronizáció</target>
+
 <source>Configuration saved!</source>
 <target>Beállítások elmentve!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync kötegelt fájl</target>
+
 <source>Never save changes</source>
 <target>Változtatások figyelmen kívül hagyása</target>
 
@@ -877,9 +874,6 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Configuration loaded!</source>
 <target>Beállítások betöltve!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Mappa összehasonlítás és szinkronizáció</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Csak a bal oldalon létező fájlok elrejtése</target>
 
@@ -1036,6 +1030,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Comparing content...</source>
 <target>Tartalom összehasonlítása...</target>
 
+<source>Copy</source>
+<target></target>
+
 <source>Paused</source>
 <target>Szüneteltetve</target>
 
@@ -1108,14 +1105,14 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>- folder part only</source>
 <target>- csak mappa rész</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- A %name másik oldalon szereplő párja</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target></target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- A %dir másik oldalon szereplő párja</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target></target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>A rejtett párbeszédablakok és figyelmeztető üzenetek újra legyenek láthatóak?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target></target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1138,47 +1135,29 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Leave as unresolved conflict</source>
 <target>Feloldatlan ütközésként hagyni</target>
 
-<source>Files</source>
-<target>Fájlok</target>
+<source>Replace</source>
+<target></target>
 
-<source>Percentage</source>
-<target>Százalék</target>
+<source>Move files and replace if existing</source>
+<target></target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target></target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target></target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target></target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 perc</pluralform>
-<pluralform>%x perc</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target></target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 óra</pluralform>
-<pluralform>%x óra</pluralform>
-</target>
+<source>Files</source>
+<target>Fájlok</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 nap</pluralform>
-<pluralform>%x nap</pluralform>
-</target>
+<source>Percentage</source>
+<target>Százalék</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>A következő mappa monitorozása sikertelen: %x.</target>
@@ -1228,6 +1207,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Cannot copy file %x to %y.</source>
 <target>%x fájl másolása a(z) %y fájlba sikertelen.</target>
 
+<source>Type of item %x is not supported:</source>
+<target></target>
+
 <source>Cannot open directory %x.</source>
 <target>A következő mappa megnyitása sikertelen: %x.</target>
 
@@ -1237,6 +1219,42 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Detected endless directory recursion.</source>
 <target>Végtelen mapparekurzió detektálva.</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 perc</pluralform>
+<pluralform>%x perc</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 óra</pluralform>
+<pluralform>%x óra</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 nap</pluralform>
+<pluralform>%x nap</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>A következő privilégium beállítása sikertelen: %x.</target>
 
@@ -1390,6 +1408,9 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Updating attributes of %x</source>
 <target>A(z) %x attribútumainak frissítése</target>
 
+<source>Target folder %x already existing.</source>
+<target>A következő célmappa már létezik: %x.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>A célmappa beviteli mezeje nem lehet üres.</target>
 
@@ -1399,11 +1420,8 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>Source folder %x not found.</source>
 <target>A következő forrásmappa nem található: %x.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Feloldatlan ütközések vannak!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Figyelmen kívül hagyhatod az ütközéseket és folytathatod a szinkronizálást.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target></target>
 
 <source>Significant difference detected:</source>
 <target>Jelentős különbség érzékelve:</target>
@@ -1423,12 +1441,15 @@ Megjegyzés: A fájlneveknek relatívnak kell lenniük az alap mappához viszony
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Egy olyan mappa kerül módosításra, amely része több mappapárnak. Kérjük, ellenőrizze a szinkronizációs beállításokat.</target>
 
+<source>Left</source>
+<target>Bal oldal</target>
+
+<source>Right</source>
+<target>Jobb oldal</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Mappapár szinkronizálása:</target>
 
-<source>Target folder %x already existing.</source>
-<target>A következő célmappa már létezik: %x.</target>
-
 <source>Generating database...</source>
 <target>Adatbázis generálása...</target>
 
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 177ea600..aff424ad 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -32,7 +32,7 @@
 <target>Selezionata interruazione: conclusione dell'operazione...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>Errore nella creazione di data e ora per il controllo delle versioni:</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronizzazione automatizzata</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Azzera impostazioni filtro</target>
 
-<source>Create a batch job</source>
-<target>Creazione di un attività batch</target>
+<source>Save as batch job</source>
+<target>Salva come processo batch</target>
 
 <source>Comparison settings</source>
 <target>Impostazioni di comparazione</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Preferenze</target>
 
-<source>Summary</source>
-<target>Sommario</target>
-
 <source>Find</source>
 <target>Trova</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>Seleziona una cartella</target>
 
-<source>Delay [seconds]</source>
-<target>Ritardo [secondi]</target>
+<source>Idle time [seconds]</source>
+<target>Tempo di attesa [secondi]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Tempo di attesa tra ultimo cambiamento rilevato ed esecuzione dei comandi</target>
@@ -324,38 +321,23 @@ Il comando è attivato se:
 <source>A folder input field is empty.</source>
 <target>Un campo cartella input è vuoto.</target>
 
-<source>File time and size</source>
-<target>Ora e dimensione file</target>
-
-<source>File content</source>
-<target>Contenuto del file</target>
-
-<source><Automatic></source>
-<target><Automatico></target>
-
-<source>Mirror ->></source>
-<target>Mirror ->></target>
-
-<source>Update -></source>
-<target>Aggiorna -></target>
-
-<source>Custom</source>
-<target>Personalizza</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Sincronizzazione abortita!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sincronizzazione completata con errori!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Sincronizzazione completata con avvisi.</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>Synchronization completed successfully.</source>
+<target>Sincronizzazione completata con successo.</target>
+
+<source>Saving log file %x...</source>
+<target>Salvataggio file di log %x...</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>
@@ -363,9 +345,6 @@ Il comando è attivato se:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>E' disponibile una nuova versione di FreeFileSync:</target>
 
@@ -378,6 +357,12 @@ Il comando è attivato se:
 <source>Information</source>
 <target>Informazioni</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Impossibile collegarsi a sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>La versione aggiornata di FreeFileSync non è stata trovata online! Vuoi controllare manualmente?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Vuoi che FreeFileSync controlli automaticamente gli aggiornamenti ogni settimana?</target>
 
@@ -441,27 +426,27 @@ Il comando è attivato se:
 <source>Hibernate</source>
 <target>Iberna</target>
 
-<source>1. &Compare</source>
-<target>1. &Compara</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Sincronizza</target>
-
 <source>&New</source>
 <target>&Nuovo</target>
 
 <source>&Save</source>
 <target>&Salva</target>
 
+<source>Save as &batch job...</source>
+<target>Salva come &processo batch...</target>
+
+<source>1. &Compare</source>
+<target>1. &Compara</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Sincronizza</target>
+
 <source>&Language</source>
 <target>&Lingua</target>
 
 <source>&Global settings...</source>
 <target>&Preferenze...</target>
 
-<source>&Create batch job...</source>
-<target>&Crea una attività batch...</target>
-
 <source>&Export file list...</source>
 <target>&Esporta l'elenco dei file...</target>
 
@@ -495,17 +480,17 @@ Il comando è attivato se:
 <source>Swap sides</source>
 <target>Inverti i lati</target>
 
-<source>Load configuration from file</source>
-<target>Carica configurazione da file</target>
+<source>Open</source>
+<target>Apri</target>
 
-<source>Save current configuration to file</source>
-<target>Salva la configurazione corrente in un file</target>
+<source>Save</source>
+<target>Salva</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Ultima configurazione utilizzata (premi CANC per rimuovere dall'elenco)</target>
 
-<source>Show excluded items</source>
-<target>Mostra oggetti esclusi</target>
+<source>Hide excluded items</source>
+<target>Nascondi oggetti esclusi</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Mostra file filtrati o temporaneamente esclusi</target>
@@ -543,15 +528,6 @@ Il comando è attivato se:
 <source>Help</source>
 <target>?</target>
 
-<source>Filter files</source>
-<target>Filtro dei file</target>
-
-<source>Left</source>
-<target>Sinistra</target>
-
-<source>Right</source>
-<target>Destra</target>
-
 <source>Error handling</source>
 <target>Gestione degli errori</target>
 
@@ -568,19 +544,19 @@ Il comando è attivato se:
 <target>Mostra popup di errore o avviso</target>
 
 <source>Exit</source>
-<target></target>
+<target>Esci</target>
 
 <source>Abort synchronization on first error</source>
 <target>Abortisci sincronizzazione al primo errore</target>
 
-<source>On completion:</source>
-<target>In completamento:</target>
+<source>On completion</source>
+<target>In completamento</target>
 
 <source>Show progress dialog</source>
 <target>Mostra stato di avanzamento</target>
 
-<source>Generate log file</source>
-<target>Genera file log</target>
+<source>Save log</source>
+<target>Salva log</target>
 
 <source>Select folder to save log files</source>
 <target>Seleziona cartella dove salvare i file log</target>
@@ -591,11 +567,8 @@ Il comando è attivato se:
 <source>Limit maximum number of log files</source>
 <target>Limita il numero massimo di file log</target>
 
-<source>Batch settings</source>
-<target>Impostazioni batch</target>
-
-<source>Compare by...</source>
-<target>Compara per...</target>
+<source>Select variant</source>
+<target>Seleziona variante</target>
 
 <source>
 Files are found equal if
@@ -610,6 +583,9 @@ I file sono considerati identici se
 sono identici
 </target>
 
+<source>File time and size</source>
+<target>Ora e dimensione file</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +597,36 @@ I file sono considerati identici se
 è identico
 </target>
 
+<source>File content</source>
+<target>Contenuto del file</target>
+
 <source>Symbolic Link handling</source>
 <target>Gestione Collegamenti</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Seleziona una variante:</target>
+<source><- Two way -></source>
+<target><- Due vie -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identifica e propaga modifiche su entrambi i lati usando un database. Cancellazioni, ridenominazioni e conflitti sono rilevati automaticamente.</target>
 
+<source>Mirror ->></source>
+<target>Mirror ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Backup mirror della cartella di sinistra. La cartella destra verrà modificata per corrispondere esattamente alla cartella di sinistra dopo la sincronizzazione.</target>
 
+<source>Update -></source>
+<target>Aggiorna -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Copia file nuovi o aggiornati nella cartella di destra.</target>
 
+<source>Custom</source>
+<target>Personalizza</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Configura le tue regole di sincronizzazione.</target>
 
@@ -654,8 +642,8 @@ I file sono considerati identici se
 <source>Recycle Bin</source>
 <target>Cestino</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Usa il Cestino quando si elimina o sovrascrive un file</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Utilizza il Cestino per file cancellati e sovrascritti</target>
 
 <source>Versioning</source>
 <target>Versione</target>
@@ -663,8 +651,8 @@ I file sono considerati identici se
 <source>Move time-stamped files into specified folder</source>
 <target>Sposta file con indicazione datata nella cartella specifica</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Limita numero massimo di versioni per ogni file</target>
+<source>Naming convention:</source>
+<target>Modalità di rinomina:</target>
 
 <source>Configuration</source>
 <target>Configurazione</target>
@@ -813,6 +801,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Overview</source>
 <target>Anteprima</target>
 
+<source>Filter files</source>
+<target>Filtro dei file</target>
+
 <source>Select view</source>
 <target>Seleziona vista</target>
 
@@ -864,9 +855,15 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source><Last session></source>
 <target><Ultima sessione></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Comparazione di cartelle e sincronizzazione</target>
+
 <source>Configuration saved!</source>
 <target>Configurazione salvata!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Non salvare mai le modifiche</target>
 
@@ -879,9 +876,6 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Configuration loaded!</source>
 <target>Configurazione caricata!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Comparazione di cartelle e sincronizzazione</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Nascondi i file esistenti solo a sinistra</target>
 
@@ -1038,6 +1032,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Comparing content...</source>
 <target>Comparazione contenuto...</target>
 
+<source>Copy</source>
+<target>Copia</target>
+
 <source>Paused</source>
 <target>In pausa</target>
 
@@ -1110,14 +1107,14 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>- folder part only</source>
 <target>- solo porzione cartella</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- l'altro lato e' equivalente a %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Controparte sull'altro lato a %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- l'altro lato e' equivalente a %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Controparte sull'altro lato a %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Vuoi rendere nuovamente visibili i dialoghi nascosti e i messaggi d'avviso?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Vuoi visualizzare nuovamente i dialoghi e avvisi nascosti?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1140,47 +1137,29 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Leave as unresolved conflict</source>
 <target>Lascia come conflitti irrisolti</target>
 
-<source>Files</source>
-<target>File</target>
+<source>Replace</source>
+<target>Sostituisci</target>
 
-<source>Percentage</source>
-<target>Percentuale</target>
+<source>Move files and replace if existing</source>
+<target>Sposta file e sostituisci se esistenti</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Accoda data e ora ad ogni nome di file</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Cartella</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>File</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>AAAA-MM-GG hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 ora</pluralform>
-<pluralform>%x ore</pluralform>
-</target>
+<source>Files</source>
+<target>File</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 giorno</pluralform>
-<pluralform>%x giorni</pluralform>
-</target>
+<source>Percentage</source>
+<target>Percentuale</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Impossibile monitorare la cartella %x.</target>
@@ -1230,6 +1209,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Cannot copy file %x to %y.</source>
 <target>Impossibile copiare file %x in %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Il tipo di oggetto %x non è supportato:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Impossibile aprire cartella %x.</target>
 
@@ -1239,6 +1221,42 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Detected endless directory recursion.</source>
 <target>Rilevato percorso ricorsivo senza fine.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 ora</pluralform>
+<pluralform>%x ore</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 giorno</pluralform>
+<pluralform>%x giorni</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Impossibile impostare privilegi %x.</target>
 
@@ -1369,7 +1387,7 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <target>Spostamento collegamento %x in %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>Rimozione di vecchie versioni...</target>
 
 <source>Creating file %x</source>
 <target>Creazione file %x</target>
@@ -1392,6 +1410,9 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Updating attributes of %x</source>
 <target>Aggiornamento attributi di %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>La cartella di destinazione %x è già esistente.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Il campo per la cartella di destinazione non può essere vuoto.</target>
 
@@ -1401,11 +1422,8 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>Source folder %x not found.</source>
 <target>Cartella sorgente %x non trovata.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Sono presenti conflitti irrisolti!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Puoi ignorare i conflitti e continuare la sincronizzazione.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>I seguenti oggetti hanno conflitti irrisolti e non saranno sincronizzati:</target>
 
 <source>Significant difference detected:</source>
 <target>Riscontrate differenze significative:</target>
@@ -1425,12 +1443,15 @@ Nota: I nomi dei file devono essere relativi alle cartelle di appartenenza!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Verrà modificata una cartella che è parte di molteplici coppie di cartelle. Controlla le impostazioni di sincronizzazione.</target>
 
+<source>Left</source>
+<target>Sinistra</target>
+
+<source>Right</source>
+<target>Destra</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Sincronizzazione della coppia di cartelle:</target>
 
-<source>Target folder %x already existing.</source>
-<target>La cartella di destinazione %x è già esistente.</target>
-
 <source>Generating database...</source>
 <target>Generazione database...</target>
 
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 6745cced..f5e7eb49 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>ユーザによる中断: 現在の処理を終了しています.. お待ちください...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>バージョン付けのタイムスタンプ作成に失敗:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>リアルタイム同期 - 自動同期</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>フィルター設定をクリア</target>
 
-<source>Create a batch job</source>
-<target>一括ジョブを作成</target>
+<source>Save as batch job</source>
+<target>一括ジョブで保存</target>
 
 <source>Comparison settings</source>
 <target>比較設定</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>全般的な設定</target>
 
-<source>Summary</source>
-<target>概要</target>
-
 <source>Find</source>
 <target>検索</target>
 
@@ -268,8 +268,8 @@
 <source>Select a folder</source>
 <target>フォルダを選択</target>
 
-<source>Delay [seconds]</source>
-<target>遅延[秒]</target>
+<source>Idle time [seconds]</source>
+<target>待機時間 [秒]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>最後にコマンドを実行してから、次に変更を検出するまでの待機時間</target>
@@ -318,38 +318,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>フォルダ入力欄が空白です.</target>
 
-<source>File time and size</source>
-<target>ファイル時刻とサイズ</target>
-
-<source>File content</source>
-<target>ファイルの内容</target>
-
-<source><Automatic></source>
-<target><自動></target>
-
-<source>Mirror ->></source>
-<target>ミラー >></target>
-
-<source>Update -></source>
-<target>更新 -></target>
-
-<source>Custom</source>
-<target>カスタム</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync 一括</target>
-
 <source>Synchronization aborted!</source>
 <target>同期処理を中断!</target>
 
 <source>Synchronization completed with errors!</source>
-<target>同期処理は、エラーで終了しています!</target>
+<target>同期処理はエラーで終了しています!</target>
+
+<source>Synchronization completed with warnings.</source>
+<target>同期処理は警告で終了しています</target>
 
 <source>Nothing to synchronize!</source>
 <target>同期対象がありません!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>同期処理はすべて正常に完了しました!</target>
+<source>Synchronization completed successfully.</source>
+<target>同期処理はすべてが正常に完了しました</target>
+
+<source>Saving log file %x...</source>
+<target>ログファイル %x を保存中...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>"切り替え"を押すと FreeFileSync ダイアログの問題を解決します.</target>
@@ -357,9 +342,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>FreeFileSync メインダイアログを切替中...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Sourceforge.net に接続できません!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>FreeFileSync の新しいバージョンが利用できます:</target>
 
@@ -372,6 +354,12 @@ The command is triggered if:
 <source>Information</source>
 <target>インフォメーション</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Sourceforge.net に接続できません!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>FreeFileSync の現在のバージョン番号を取得できませんでした! 手動で確認しますか?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>FreeFileSync の更新確認を毎週自動的に行いますか?</target>
 
@@ -435,27 +423,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>休止状態</target>
 
-<source>1. &Compare</source>
-<target>1. 比較(&C)</target>
-
-<source>2. &Synchronize</source>
-<target>2. 同期処理(&S)</target>
-
 <source>&New</source>
 <target>新規(&N)</target>
 
 <source>&Save</source>
 <target>保存(&S)</target>
 
+<source>Save as &batch job...</source>
+<target>一括ジョブで保存(&B)...</target>
+
+<source>1. &Compare</source>
+<target>1. 比較(&C)</target>
+
+<source>2. &Synchronize</source>
+<target>2. 同期処理(&S)</target>
+
 <source>&Language</source>
 <target>使用言語(&L)</target>
 
 <source>&Global settings...</source>
 <target>全般的な設定(&G)...</target>
 
-<source>&Create batch job...</source>
-<target>一括ジョブを作成(&C)...</target>
-
 <source>&Export file list...</source>
 <target>ファイル一覧をエクスポート(&E)...</target>
 
@@ -489,17 +477,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>パネルを入れ替え</target>
 
-<source>Load configuration from file</source>
-<target>外部ファイルから構成設定を読み込みます</target>
+<source>Open</source>
+<target>開く</target>
 
-<source>Save current configuration to file</source>
-<target>現在の設定をファイルに保存</target>
+<source>Save</source>
+<target>保存</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>前回使用した構成設定(DEL キーでリストから除去します)</target>
 
-<source>Show excluded items</source>
-<target>除外した項目を表示</target>
+<source>Hide excluded items</source>
+<target>除外対象項目を隠す</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>フィルター済、または一時除外ファイルを表示</target>
@@ -537,15 +525,6 @@ The command is triggered if:
 <source>Help</source>
 <target>ヘルプ</target>
 
-<source>Filter files</source>
-<target>ﾌｧｲﾙﾌｨﾙﾀｰ</target>
-
-<source>Left</source>
-<target>左側</target>
-
-<source>Right</source>
-<target>右側</target>
-
 <source>Error handling</source>
 <target>ハンドリングのエラー時:</target>
 
@@ -567,14 +546,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>最初のエラー発生時に同期を中断する</target>
 
-<source>On completion:</source>
-<target>完了時:</target>
+<source>On completion</source>
+<target>完了時の動作</target>
 
 <source>Show progress dialog</source>
 <target>進捗ダイアログを表示</target>
 
-<source>Generate log file</source>
-<target>ログファイルを生成</target>
+<source>Save log</source>
+<target>ログを保存</target>
 
 <source>Select folder to save log files</source>
 <target>ログファイル保存先フォルダを選択</target>
@@ -585,11 +564,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>ログファイルの最大数を制限</target>
 
-<source>Batch settings</source>
-<target>一括設定</target>
-
-<source>Compare by...</source>
-<target>比較対象...</target>
+<source>Select variant</source>
+<target>変数を選択</target>
 
 <source>
 Files are found equal if
@@ -604,6 +580,9 @@ are the same
 で判断する
 </target>
 
+<source>File time and size</source>
+<target>ファイル時刻とサイズ</target>
+
 <source>
 Files are found equal if
      - file content
@@ -615,24 +594,36 @@ is the same
 で判断する
 </target>
 
+<source>File content</source>
+<target>ファイルの内容</target>
+
 <source>Symbolic Link handling</source>
 <target>ｼﾝﾎﾞﾘｯｸ・ﾘﾝｸの取り扱い</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>変数を選択:</target>
+<source><- Two way -></source>
+<target><- 両方向 -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>両側の識別、プロパティの変更特定にデータベースを使用します。削除、リネーム及び競合などは自動的に検出されます</target>
 
+<source>Mirror ->></source>
+<target>ミラー >></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>左側に合わせてバックアップ. 右側のフォルダ内容が同期処理後に左側と同じになるようにします。</target>
 
+<source>Update -></source>
+<target>更新 -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>新しい(更新)ファイルを右フォルダにコピー</target>
 
+<source>Custom</source>
+<target>カスタム</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>あなたの設定した同期規則を使用します。</target>
 
@@ -648,7 +639,7 @@ is the same
 <source>Recycle Bin</source>
 <target>ゴミ箱に移動</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
+<source>Use Recycle Bin for deleted and overwritten files</source>
 <target>ファイルの削除、上書き時にゴミ箱を使用する</target>
 
 <source>Versioning</source>
@@ -657,8 +648,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>ファイルのタイムスタンプで指定フォルダに移動</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>ファイル当たりのバージョン番号制限</target>
+<source>Naming convention:</source>
+<target>命名規則:</target>
 
 <source>Configuration</source>
 <target>構成設定</target>
@@ -691,10 +682,10 @@ is the same
 <target>ソースコードは C++ で書かれています</target>
 
 <source>If you like FreeFileSync</source>
-<target>FreeFileSync が気に入った場合</target>
+<target>FreeFileSync を支援したい!</target>
 
 <source>Donate with PayPal</source>
-<target>PayPal から寄付する</target>
+<target>PayPal から寄付</target>
 
 <source>Many thanks for localization:</source>
 <target>ローカライズのご協力に感謝します:</target>
@@ -807,6 +798,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>概要</target>
 
+<source>Filter files</source>
+<target>ﾌｧｲﾙﾌｨﾙﾀｰ</target>
+
 <source>Select view</source>
 <target>表示選択</target>
 
@@ -858,9 +852,15 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><最後のセッション></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>フォルダの比較と同期</target>
+
 <source>Configuration saved!</source>
 <target>構成設定は保存されました!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync 一括</target>
+
 <source>Never save changes</source>
 <target>変更を保存しない</target>
 
@@ -873,9 +873,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>構成設定を読み込み中!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>フォルダの比較と同期</target>
-
 <source>Hide files that exist on left side only</source>
 <target>左側のみに存在するファイルを非表示</target>
 
@@ -1028,6 +1025,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>内容を比較中...</target>
 
+<source>Copy</source>
+<target>コピー</target>
+
 <source>Paused</source>
 <target>一時停止中</target>
 
@@ -1083,10 +1083,10 @@ Note: File names must be relative to base directories!
 <target>フィルター</target>
 
 <source>Direct</source>
-<target>方向</target>
+<target>ダイレクト</target>
 
 <source>Follow</source>
-<target>フォロー</target>
+<target>考慮する</target>
 
 <source>Copy NTFS permissions</source>
 <target>NTFS パーミッションをコピー</target>
@@ -1100,14 +1100,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- フォルダ部分のみ</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- %name の反対側の対象</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- %item_path% の反対側の対象</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- %dir の反対側の対象</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- %item_folder% の反対側の対象</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>現在隠されたダイアログと警告メッセージを再表示しますか?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>非表示にした警告ダイアログを再び表示しますか?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1128,44 +1128,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>未解決の競合はそのまま残す</target>
 
-<source>Files</source>
-<target>ファイル</target>
+<source>Replace</source>
+<target>置換</target>
 
-<source>Percentage</source>
-<target>パーセント</target>
+<source>Move files and replace if existing</source>
+<target>ファイルを移動、存在する場合は上書き</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>各ファイル名にタイムスタンプを追加</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>フォルダ</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>ファイル</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x 分.</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x 時間</pluralform>
-</target>
+<source>Files</source>
+<target>ファイル</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x 日</pluralform>
-</target>
+<source>Percentage</source>
+<target>パーセント</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>ディレクトリ %x を監視できません.</target>
@@ -1215,6 +1200,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>%x から %y にコピーできません.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>項目 %x には対応していません:</target>
+
 <source>Cannot open directory %x.</source>
 <target>ディレクトリ %x を開けません.</target>
 
@@ -1224,6 +1212,39 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>ディレクトリ再帰処理でループを検出</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x 分.</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x 時間</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x 日</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>%x の特権をセットできません.</target>
 
@@ -1353,6 +1374,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>シンボリックリンク %x を %y に移動中</target>
 
+<source>Removing old versions...</source>
+<target>旧バージョンを除去中...</target>
+
 <source>Creating file %x</source>
 <target>ファイル %x を作成中</target>
 
@@ -1374,6 +1398,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>%x の属性を更新</target>
 
+<source>Target folder %x already existing.</source>
+<target>対象フォルダ %x は既に存在します.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>対象フォルダ入力欄が空白になっています.</target>
 
@@ -1383,11 +1410,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>ソースフォルダ %x が見つかりません</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>未解決の不一致があります!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>この不一致を無視して同期を続行することが出来ます。</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>以下の項目は、未解決の競合が存在するため同期処理を実行できませんでした:</target>
 
 <source>Significant difference detected:</source>
 <target>重大な差異が検出されました:</target>
@@ -1407,12 +1431,15 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>複数フォルダペアの一部であるフォルダが変更されています. 同期設定を確認してください.</target>
 
+<source>Left</source>
+<target>左側</target>
+
+<source>Right</source>
+<target>右側</target>
+
 <source>Synchronizing folder pair:</source>
 <target>フォルダペアを同期処理中:</target>
 
-<source>Target folder %x already existing.</source>
-<target>対象フォルダ %x は既に存在します.</target>
-
 <source>Generating database...</source>
 <target>データベースを作成中...</target>
 
diff --git a/BUILD/Languages/korean.lng b/BUILD/Languages/korean.lng
index db2d73a6..501e38e6 100644
--- a/BUILD/Languages/korean.lng
+++ b/BUILD/Languages/korean.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>사용자에 의한 작업 중단 : 현재 작업 종료 대기 중...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>버저닝을 위한 타임 스탬프 생성 실패 :</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>실시간 동기화 - 자동 동기화</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>필터 설정 지우기</target>
 
-<source>Create a batch job</source>
-<target>일괄작업 생성</target>
+<source>Save as batch job</source>
+<target>일괄 작업으로 저장</target>
 
 <source>Comparison settings</source>
 <target>비교 설정</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>전체 설정</target>
 
-<source>Summary</source>
-<target>개요</target>
-
 <source>Find</source>
 <target>검색</target>
 
@@ -268,8 +268,8 @@
 <source>Select a folder</source>
 <target>폴더 선택</target>
 
-<source>Delay [seconds]</source>
-<target>지연 [초]</target>
+<source>Idle time [seconds]</source>
+<target>유휴시간 [초]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>마지막으로 감지된 변화와 명령 실행 간의 유휴 시간</target>
@@ -318,38 +318,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>폴더 입력 필드 하나가 비어 있습니다.</target>
 
-<source>File time and size</source>
-<target>파일 시간 및 크기</target>
-
-<source>File content</source>
-<target>파일 내용</target>
-
-<source><Automatic></source>
-<target><자동></target>
-
-<source>Mirror ->></source>
-<target>미러 ->></target>
-
-<source>Update -></source>
-<target>업데이트 -></target>
-
-<source>Custom</source>
-<target>개인 설정</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync 일괄처리(배치)</target>
-
 <source>Synchronization aborted!</source>
 <target>동기화 중단!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>동기화가 완료되긴 했으나, 오류가 있습니다!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>경고 메세지와 함께 동기화 완료</target>
+
 <source>Nothing to synchronize!</source>
 <target>동기화 할 항목이 없습니다!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>동기화가 성공적으로 완료 됐습니다!</target>
+<source>Synchronization completed successfully.</source>
+<target>동기화 완료 성공!</target>
+
+<source>Saving log file %x...</source>
+<target>로그 파일 %x 저장 중...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>FreeFileSync 메인 다이얼로그에서 문제 해결을 하려면 "Switch" [전환]을 누르십시오.</target>
@@ -357,9 +342,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>FreeFileSync 메인 다이얼로그로 전환 중...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Sourceforge.net에 접속할 수 없습니다!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>새로운 버전의 FreeFileSync가 나왔습니다 :</target>
 
@@ -372,6 +354,12 @@ The command is triggered if:
 <source>Information</source>
 <target>인포메이션 (정보)</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Sourceforge.net에 접속할 수 없습니다!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>현재 사용하고 계신 FreeFileSync 버전 번호를 온라인에서 찾을 수가 없습니다! 수동으로 확인하시겠습니까?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>FreeFileSync가 매주 자동으로 업데이트를 확인하도록 하시겠습니까?</target>
 
@@ -421,7 +409,7 @@ The command is triggered if:
 <target>드래그 && 드랍 (마우스로 파일 끌어다 놓기)</target>
 
 <source>Close progress dialog</source>
-<target>프로그레스 다이얼로그 (진행 창) 닫기</target>
+<target>프로그레스 다이얼로그 (진행 표시 창) 닫기</target>
 
 <source>Standby</source>
 <target>대기</target>
@@ -435,27 +423,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>최대절전모드</target>
 
-<source>1. &Compare</source>
-<target>1. 비교(&C)</target>
-
-<source>2. &Synchronize</source>
-<target>2. 동기화(&S)</target>
-
 <source>&New</source>
 <target>신규 작업(&N)</target>
 
 <source>&Save</source>
 <target>저장(&S)</target>
 
+<source>Save as &batch job...</source>
+<target>일괄 작업으로 저장(&b)</target>
+
+<source>1. &Compare</source>
+<target>1. 비교(&C)</target>
+
+<source>2. &Synchronize</source>
+<target>2. 동기화(&S)</target>
+
 <source>&Language</source>
 <target>언어 선택(&L)</target>
 
 <source>&Global settings...</source>
 <target>전체 설정(&G)</target>
 
-<source>&Create batch job...</source>
-<target>일괄작업 생성(&C)</target>
-
 <source>&Export file list...</source>
 <target>파일 리스트 내보내기(&E)</target>
 
@@ -489,17 +477,17 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>양측 위치 바꾸기</target>
 
-<source>Load configuration from file</source>
-<target>외부 파일로부터 설정 로드</target>
+<source>Open</source>
+<target>열기</target>
 
-<source>Save current configuration to file</source>
-<target>현재 설정을 파일로 저장</target>
+<source>Save</source>
+<target>저장</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>마지막으로 사용한 설정 (DEL 키를 누르면 리스트에서 삭제)</target>
 
-<source>Show excluded items</source>
-<target>제외 항목 보이기</target>
+<source>Hide excluded items</source>
+<target>제외 항목 숨기기</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>필터링 또는 일시적으로 제외된 파일 보이기</target>
@@ -537,15 +525,6 @@ The command is triggered if:
 <source>Help</source>
 <target>도움말</target>
 
-<source>Filter files</source>
-<target>파일 필터</target>
-
-<source>Left</source>
-<target>좌측</target>
-
-<source>Right</source>
-<target>우측</target>
-
 <source>Error handling</source>
 <target>오류 발생시 :</target>
 
@@ -567,14 +546,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>첫 번째 오류 시 동기화 중지</target>
 
-<source>On completion:</source>
-<target>완료 :</target>
+<source>On completion</source>
+<target>완료 시</target>
 
 <source>Show progress dialog</source>
-<target>프로그레스 다이얼로그 (진행 창) 보기</target>
+<target>프로그레스 다이얼로그 (진행 표시 창) 보기</target>
 
-<source>Generate log file</source>
-<target>로그 파일 생성</target>
+<source>Save log</source>
+<target>로그 저장</target>
 
 <source>Select folder to save log files</source>
 <target>로그 파일을 저장할 폴더 선택</target>
@@ -585,11 +564,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>로그 파일의 최대 개수 제한</target>
 
-<source>Batch settings</source>
-<target>일괄 설정</target>
-
-<source>Compare by...</source>
-<target>대상 별 비교...</target>
+<source>Select variant</source>
+<target>변형(베어리언트) 선택</target>
 
 <source>
 Files are found equal if
@@ -604,6 +580,9 @@ are the same
 동일한 파일로 간주됩니다.
 </target>
 
+<source>File time and size</source>
+<target>파일 시간 및 크기</target>
+
 <source>
 Files are found equal if
      - file content
@@ -615,24 +594,36 @@ is the same
 동일한 파일로 간주됩니다.
 </target>
 
+<source>File content</source>
+<target>파일 내용</target>
+
 <source>Symbolic Link handling</source>
 <target>심볼릭 링크 처리</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>옵션 선택 :</target>
+<source><- Two way -></source>
+<target><- 양방/양면 (Two Way) -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>데이터베이스를 활용하여 양측의 변경사항을 확인하고 반영합니다. 파일 삭제/명칭 변경/충돌은 자동으로 감지됩니다.</target>
 
+<source>Mirror ->></source>
+<target>미러 ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>좌측 폴더 백업 미러. 동기화 이후 우측 폴더는 좌측 폴더와 완전히 똑같이 매치 되도록 변경 됩니다.</target>
 
+<source>Update -></source>
+<target>업데이트 -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>신규 또는 업데이트 된 파일을 우측 폴더로 복사</target>
 
+<source>Custom</source>
+<target>개인 설정</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>개인 동기화 규칙 설정</target>
 
@@ -648,8 +639,8 @@ is the same
 <source>Recycle Bin</source>
 <target>휴지통</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>파일을 삭제하거나 덮어쓰기 할 때, 휴지통 사용</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>삭제 또는 덮어 써진 파일들은 휴지통으로 이동</target>
 
 <source>Versioning</source>
 <target>버저닝</target>
@@ -657,8 +648,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>타임스탬핑(생성시간 날인)된 파일을 지정된 폴더로 이동</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>파일 당 버전 최대 개수 제한</target>
+<source>Naming convention:</source>
+<target>이름 지정 :</target>
 
 <source>Configuration</source>
 <target>구성 설정</target>
@@ -769,7 +760,7 @@ Note: File names must be relative to base directories!
 <target>파일 및 폴더 사용 권한 전송 (관리자 권한 필요)</target>
 
 <source>Restore hidden dialogs</source>
-<target>숨겨진 대화 상자 복원</target>
+<target>숨겨진 대화 창 복원</target>
 
 <source>External applications</source>
 <target>외부 응용 프로그램</target>
@@ -778,13 +769,13 @@ Note: File names must be relative to base directories!
 <target>설명</target>
 
 <source>Variant</source>
-<target>옵션(변수)</target>
+<target>변형(베어리언트)</target>
 
 <source>Statistics</source>
 <target>통계</target>
 
 <source>Don't show this dialog again</source>
-<target>이 대화 상자를 다시 표시하지 않음</target>
+<target>이 대화 창을 다시 표시하지 않음</target>
 
 <source>Find what:</source>
 <target>검색어 :</target>
@@ -807,6 +798,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>개요</target>
 
+<source>Filter files</source>
+<target>파일 필터</target>
+
 <source>Select view</source>
 <target>보기 선택</target>
 
@@ -858,9 +852,15 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><마지막 세션></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>폴더 비교 및 동기화</target>
+
 <source>Configuration saved!</source>
 <target>설정 저장 완료!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync 일괄처리(배치)</target>
+
 <source>Never save changes</source>
 <target>변경사항 절대 저장 안 함.</target>
 
@@ -873,9 +873,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>설정 로드 완료!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>폴더 비교 및 동기화</target>
-
 <source>Hide files that exist on left side only</source>
 <target>좌측에만 존재하는 파일 숨기기</target>
 
@@ -1028,6 +1025,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>내용 비교 중...</target>
 
+<source>Copy</source>
+<target>복사</target>
+
 <source>Paused</source>
 <target>일시정지 중</target>
 
@@ -1100,14 +1100,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- 폴더 부분만</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- %name 의 반대측 대상</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>% 항목_경로 %의 반대편 대응부(카운터파트)</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- %dir 의 반대측 대상</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>% 항목_폴더 %의 반대편 대응부(카운터파트)</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>숨겨진 대화 상자나 경고 메세지를 다시 보이게 하시겠습니까?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>숨겨진 경고 창 또는 대화 창을 다시 보이게 하시겠습니까?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1128,44 +1128,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>해결되지 않은 충돌로 놔두기</target>
 
-<source>Files</source>
-<target>파일</target>
+<source>Replace</source>
+<target>대체</target>
 
-<source>Percentage</source>
-<target>백분율(%)</target>
+<source>Move files and replace if existing</source>
+<target>파일 이동 및 기존 파일 존재 시에는 대체</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>각 파일 이름마다 타임스탬프 추가</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>폴더</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>파일</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x분</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x시간</pluralform>
-</target>
+<source>Files</source>
+<target>파일</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x일</pluralform>
-</target>
+<source>Percentage</source>
+<target>백분율(%)</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>디렉토리 %x 을(를) 모니터링 할 수 없습니다.</target>
@@ -1215,6 +1200,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>파일 %x 을(를) %y (으)로 복사할 수 없습니다.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>항목 %x의 형식은 지원되지 않습니다 :</target>
+
 <source>Cannot open directory %x.</source>
 <target>디렉토리 %x 을(를) 열 수 없습니다.</target>
 
@@ -1224,6 +1212,39 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>삭제된 무한 디렉토리 재귀(반복)</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x분</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x시간</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x일</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>권한 %x 을(를) 설정할 수 없습니다.</target>
 
@@ -1353,6 +1374,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>심볼릭 링크 %x을(를) %y(으)로 이동 중</target>
 
+<source>Removing old versions...</source>
+<target>구 버전 삭제 중...</target>
+
 <source>Creating file %x</source>
 <target>파일 %x 생성 중</target>
 
@@ -1374,6 +1398,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>%x 속성 업데이트 중</target>
 
+<source>Target folder %x already existing.</source>
+<target>대상 폴더 %x이(가) 이미 존재함.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>대상 폴더 입력 필드가 비어 있어서는 안 됩니다.</target>
 
@@ -1383,11 +1410,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>소스 폴더 %x을(를) 찾을 수 없음.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>해결되지 않은 충돌이 있습니다!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>충돌을 무시하고 동기화를 계속할 수 있습니다.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>아래의 항목들은 해결치 못 한 충돌로 인해 동기화할 수 없습니다 :</target>
 
 <source>Significant difference detected:</source>
 <target>상당한 차이가 감지됐습니다 :</target>
@@ -1407,12 +1431,15 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>다중 폴더 페어의 일부인 폴더가 변경됩니다. 동기화 설정을 재검토하세요.</target>
 
+<source>Left</source>
+<target>좌측</target>
+
+<source>Right</source>
+<target>우측</target>
+
 <source>Synchronizing folder pair:</source>
 <target>폴더 페어(짝) 동기화 진행 중</target>
 
-<source>Target folder %x already existing.</source>
-<target>대상 폴더 %x이(가) 이미 존재함.</target>
-
 <source>Generating database...</source>
 <target>데이터베이스 생성 중...</target>
 
diff --git a/BUILD/Languages/lithuanian.lng b/BUILD/Languages/lithuanian.lng
index c4e82e6f..9180212b 100644
--- a/BUILD/Languages/lithuanian.lng
+++ b/BUILD/Languages/lithuanian.lng
@@ -32,7 +32,7 @@
 <target>Nutraukti: laukiama kol baigsis esama operacija...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>Nepavyo sukurti laiko žymės versijavimui:</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatizuotas sinchronizavimas</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Išvalyti filtro nustatymus</target>
 
-<source>Create a batch job</source>
-<target>Sukurti paketinę užduotį</target>
+<source>Save as batch job</source>
+<target>Išsaugoti kaip paketinį darbą</target>
 
 <source>Comparison settings</source>
 <target>Sulyginimo nustatymai</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Bendri nustatymai</target>
 
-<source>Summary</source>
-<target>Suvestinė</target>
-
 <source>Find</source>
 <target>Rasti</target>
 
@@ -126,7 +123,7 @@
 <pluralform>1 Baitas</pluralform>
 <pluralform>%x Baitai</pluralform>
 <pluralform>%x Baitų</pluralform>
-<pluralform>%x Baitai</pluralform>
+<pluralform>%x Baitas</pluralform>
 </target>
 
 <source>Database file %x is incompatible.</source>
@@ -196,7 +193,7 @@
 <pluralform>[1 Grėsmė]</pluralform>
 <pluralform>[%x Grėsmės]</pluralform>
 <pluralform>[%x Grėsmių]</pluralform>
-<pluralform>[%x Grėsmės]</pluralform>
+<pluralform>[%x Grėsmė]</pluralform>
 </target>
 
 <source>/sec</source>
@@ -280,8 +277,8 @@
 <source>Select a folder</source>
 <target>Pažymėti aplanką</target>
 
-<source>Delay [seconds]</source>
-<target>Atidėti [sekundės]</target>
+<source>Idle time [seconds]</source>
+<target>Neveiklus laikas [sek.]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Neveiklus laikas tarp paskutinio aptikto pokyčio ir komandos įvykdymo</target>
@@ -330,38 +327,23 @@ Komanda inicijuojama jei:
 <source>A folder input field is empty.</source>
 <target>Aplanko įvesties laukas yra tuščias.</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</source>
-<target>FreeFileSync paketinė užduotis</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronizavimas nutrauktas!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronizavimas baigtas su klaidomis!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Synchronizavimas baigtas su perspėjimais!</target>
+
 <source>Nothing to synchronize!</source>
 <target>Nėra ko sinchronizuoti!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synchronizavimas baigtas sėkmingai!</target>
+<source>Synchronization completed successfully.</source>
+<target>Synchronizavimas sėkmingai baigtas.</target>
+
+<source>Saving log file %x...</source>
+<target>Saugmas žurnalo failas %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Spauskite „Perjungti“, kad išspręsti problemas pagrindiniame FreeFileSync lange.</target>
@@ -369,9 +351,6 @@ Komanda inicijuojama jei:
 <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 new version of FreeFileSync is available:</source>
 <target>Yra nauja FreeFileSync versija:</target>
 
@@ -384,6 +363,12 @@ Komanda inicijuojama jei:
 <source>Information</source>
 <target>Informacija</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Nepavyksta prisijungti prie sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Šis FreeFileSync versijos numeris nerastas internete! Ar norite patikrinti rankiniu būdu?</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>
 
@@ -447,27 +432,27 @@ Komanda inicijuojama jei:
 <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>&Save</source>
 <target>&Išsaugoti</target>
 
+<source>Save as &batch job...</source>
+<target>Išsaugoti kaip &paketinę užduotį...</target>
+
+<source>1. &Compare</source>
+<target>1. &Sulyginti</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Sinchronizuoti</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>
 
@@ -501,17 +486,17 @@ Komanda inicijuojama jei:
 <source>Swap sides</source>
 <target>Sukeisti puses</target>
 
-<source>Load configuration from file</source>
-<target>Įkelti nustatymus iš failo</target>
+<source>Open</source>
+<target>Atverti</target>
 
-<source>Save current configuration to file</source>
-<target>Išsaugoti esamus nustatymus į failą</target>
+<source>Save</source>
+<target>Išsaugoti</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>Show excluded items</source>
-<target>Rodyti išskirtus elementus</target>
+<source>Hide excluded items</source>
+<target>Slėpti išskirtus elementus</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Rodyti išfiltruotus ar laikinai išskirtus failus</target>
@@ -549,15 +534,6 @@ Komanda inicijuojama jei:
 <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>Error handling</source>
 <target>Klaidų valdymas</target>
 
@@ -579,14 +555,14 @@ Komanda inicijuojama jei:
 <source>Abort synchronization on first error</source>
 <target>Nutraukti sinchronizavimą su pirma klaida</target>
 
-<source>On completion:</source>
-<target>Baigus:</target>
+<source>On completion</source>
+<target>Baigus</target>
 
 <source>Show progress dialog</source>
 <target>Rodyti eigos langą</target>
 
-<source>Generate log file</source>
-<target>Bendras ataskaitos failas</target>
+<source>Save log</source>
+<target>Saugoti žurnalus</target>
 
 <source>Select folder to save log files</source>
 <target>Pasirinkite aplanką ataskaitos failų saugojimui</target>
@@ -597,11 +573,8 @@ Komanda inicijuojama jei:
 <source>Limit maximum number of log files</source>
 <target>Apriboti ataskaitų failų skaičių</target>
 
-<source>Batch settings</source>
-<target>Paketinės užduoties nustatymai</target>
-
-<source>Compare by...</source>
-<target>Sulyginti pagal...</target>
+<source>Select variant</source>
+<target>Pasirinkti variantą</target>
 
 <source>
 Files are found equal if
@@ -616,6 +589,9 @@ Failai laikomi lygiais jei
 yra tokie patys
 </target>
 
+<source>File time and size</source>
+<target>Failo laiką ir dydį</target>
+
 <source>
 Files are found equal if
      - file content
@@ -627,24 +603,36 @@ Failai laikomi lygiais jei
 yra toks pats
 </target>
 
+<source>File content</source>
+<target>Failo turinį</target>
+
 <source>Symbolic Link handling</source>
 <target>Simbolinių nuorodų valdymas</target>
 
 <source>OK</source>
 <target>Gerai</target>
 
-<source>Select variant:</source>
-<target>Pažymėkite variantą:</target>
+<source><- Two way -></source>
+<target><- Dvipusis -></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 ->></source>
+<target>Veidrodis ->></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>Update -></source>
+<target>Atnaujinti -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopijuoti naujus ar atnaujintus failus į dešinyjį aplanką.</target>
 
+<source>Custom</source>
+<target>Savitas</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Nustatyti Jūsų pačių sinchronizavimo taisykles.</target>
 
@@ -660,8 +648,8 @@ yra toks pats
 <source>Recycle Bin</source>
 <target>Šiukšliadėžė</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Naudoti šiukšliadėžę kaii trinami ar perrašomi failai</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Naudoti šiukšliadėžę ištrintiems ir perrašytiems failams</target>
 
 <source>Versioning</source>
 <target>Versijavimas</target>
@@ -669,8 +657,8 @@ yra toks pats
 <source>Move time-stamped files into specified folder</source>
 <target>Perkelti su laiko žyme failus į nurodytą aplanką</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Apriboti versijų skaičių failui</target>
+<source>Naming convention:</source>
+<target>Pavadinimų taisyklės:</target>
 
 <source>Configuration</source>
 <target>Nustatymai</target>
@@ -819,6 +807,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Overview</source>
 <target>Apžvalga</target>
 
+<source>Filter files</source>
+<target>Filtruoti failus</target>
+
 <source>Select view</source>
 <target>Pasirinkti rodomus</target>
 
@@ -870,9 +861,15 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source><Last session></source>
 <target><Paskutinė sesija></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Aplankų sulyginimas ir sinchronizavimas</target>
+
 <source>Configuration saved!</source>
 <target>Nustatymai išsaugoti!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync paketinė užduotis</target>
+
 <source>Never save changes</source>
 <target>Niekada nesaugoti pakeitimų</target>
 
@@ -885,9 +882,6 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <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>
 
@@ -992,7 +986,7 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <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>
+<pluralform>%x objektas sėkmingai ištrintas!</pluralform>
 </target>
 
 <source>
@@ -1003,7 +997,7 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <pluralform>1 katalogas</pluralform>
 <pluralform>%x katalogai</pluralform>
 <pluralform>%x katalogų</pluralform>
-<pluralform>%x katalogai</pluralform>
+<pluralform>%x katalogas</pluralform>
 </target>
 
 <source>
@@ -1014,7 +1008,7 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <pluralform>1 failas</pluralform>
 <pluralform>%x failai</pluralform>
 <pluralform>%x failų</pluralform>
-<pluralform>%x failai</pluralform>
+<pluralform>%x failas</pluralform>
 </target>
 
 <source>
@@ -1025,7 +1019,7 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <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>
+<pluralform>%x iš %y eilės rodmenyje</pluralform>
 </target>
 
 <source>Ignore further errors</source>
@@ -1052,6 +1046,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Comparing content...</source>
 <target>Sulyginamas turinys...</target>
 
+<source>Copy</source>
+<target>Kopijuoti</target>
+
 <source>Paused</source>
 <target>Pristabdyta</target>
 
@@ -1124,14 +1121,14 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>- folder 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 %item_path%</source>
+<target>- Kitos pusės atitikmuo %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Kitos pusės atitikmuo %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Kitos pusės atitikmuo %item_folder%</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>Make hidden warnings and dialogs visible again?</source>
+<target>Ar vėl rodyti paslėptus perspėjimus ir langus?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1141,7 +1138,7 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <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>
+<pluralform>Ar tikrai norite perkelti sekančius %x objektą į šiukšliadėžę?</pluralform>
 </target>
 
 <source>
@@ -1152,59 +1149,35 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <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>
+<pluralform>Ar tikrai norite ištrinti sekantčius %x objektą?</pluralform>
 </target>
 
 <source>Leave as unresolved conflict</source>
 <target>Palikti kaip neišpręstą konfliktą</target>
 
-<source>Files</source>
-<target>Failai</target>
+<source>Replace</source>
+<target>Pakeisti</target>
 
-<source>Percentage</source>
-<target>Procentai</target>
+<source>Move files and replace if existing</source>
+<target>Perkelti failus ir pakeisti jei egzistuoja</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Pridėti laiko žymę kiekvieno failo pavadinime</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Aplankas</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Failas</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>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</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>Files</source>
+<target>Failai</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>Percentage</source>
+<target>Procentai</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Nepavyko stebėti katalogo %x.</target>
@@ -1254,6 +1227,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Cannot copy file %x to %y.</source>
 <target>Nepavyksta nukopijuoti failo %x į %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Element tipas %x nepalaikomas:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Nepavyksta atverti direktorijos %x.</target>
 
@@ -1263,6 +1239,48 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Detected endless directory recursion.</source>
 <target>Aptikri nesibaigiančią katalogo rekursiją.</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 valanda</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 diena</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Nepavyksta nustatyti privilegijos %x.</target>
 
@@ -1393,7 +1411,7 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <target>Perkeliama simbolinė nuoroda %x į %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>Šalinamos senos versijos...</target>
 
 <source>Creating file %x</source>
 <target>Kuriamas failas %x</target>
@@ -1416,6 +1434,9 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Updating attributes of %x</source>
 <target>Atnaujinami atributai %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Tikslo aplankas %x jau yra.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Tikslo aplanko įvesties laukas negali būti tuščias.</target>
 
@@ -1425,11 +1446,8 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>Source folder %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>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Šie elementai turi neišspręstų konfliktų ir nebus sinchronizuoti:</target>
 
 <source>Significant difference detected:</source>
 <target>Žymus skirtumas nustatytas:</target>
@@ -1449,12 +1467,15 @@ Pastaba: Failų pavadinimai privalo atitikti bazinius katalogus!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Aplankas, kuris yra dalis keletos aplankų porų, bus pakeistas. Prašome peržiūrėti sinchronizavimo nustatymus.</target>
 
+<source>Left</source>
+<target>Kairė</target>
+
+<source>Right</source>
+<target>Dešinė</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Sinchrinizuojama aplankų pora:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Tikslo aplankas %x jau yra.</target>
-
 <source>Generating database...</source>
 <target>Generuojama duomenų bazė...</target>
 
diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng
index 947406c8..8850a52b 100644
--- a/BUILD/Languages/norwegian.lng
+++ b/BUILD/Languages/norwegian.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Avbrytelse forespurt: Venter på at gjeldende handling avsluttes...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatisk synkronisering</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Nullstill filterinnstillinger</target>
 
-<source>Create a batch job</source>
-<target>Opprett en batch-jobb</target>
+<source>Save as batch job</source>
+<target></target>
 
 <source>Comparison settings</source>
 <target>Innstillinger for sammenligning</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Felles innstillinger</target>
 
-<source>Summary</source>
-<target>Oppsummering</target>
-
 <source>Find</source>
 <target>Søk</target>
 
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Velg en mappe</target>
 
-<source>Delay [seconds]</source>
-<target>Vent [sekunder]</target>
+<source>Idle time [seconds]</source>
+<target></target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Ventetid mellom forrige endring og utførelse av kommando</target>
@@ -321,38 +321,23 @@ Kommandoen utløses hvis:
 <source>A folder input field is empty.</source>
 <target>Et mappefelt er tomt.</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</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Synkronisering avbrutt!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synkronisering fullført med feil!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target></target>
+
 <source>Nothing to synchronize!</source>
 <target>Ikke noe å synkronisere!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synkronisering vellykket fullført!</target>
+<source>Synchronization completed successfully.</source>
+<target></target>
+
+<source>Saving log file %x...</source>
+<target></target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Trykk "Skift" for å løse problemer i FreeFileSync hovedvindu.</target>
@@ -360,9 +345,6 @@ Kommandoen utløses hvis:
 <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 new version of FreeFileSync is available:</source>
 <target>En ny versjon av FreeFileSync er tilgjengelig</target>
 
@@ -375,6 +357,12 @@ Kommandoen utløses hvis:
 <source>Information</source>
 <target>Informasjon</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Ikke i stand til å koble til sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target></target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Skal FreeFileSync automatisk se etter oppdateringer hver uke?</target>
 
@@ -438,27 +426,27 @@ Kommandoen utløses hvis:
 <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>&Save</source>
 <target>&Lagre</target>
 
+<source>Save as &batch job...</source>
+<target></target>
+
+<source>1. &Compare</source>
+<target>1. Sammen&lign</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synkroniser</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>
 
@@ -492,16 +480,16 @@ Kommandoen utløses hvis:
 <source>Swap sides</source>
 <target>Bytt sider</target>
 
-<source>Load configuration from file</source>
-<target>Last innstilling fra fil</target>
+<source>Open</source>
+<target></target>
 
-<source>Save current configuration to file</source>
-<target>Lagre gjeldende innstilling til fil</target>
+<source>Save</source>
+<target></target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Sist brukte innstillinger (trykk DEL for å fjerne fra liste)</target>
 
-<source>Show excluded items</source>
+<source>Hide excluded items</source>
 <target></target>
 
 <source>Show filtered or temporarily excluded files</source>
@@ -540,15 +528,6 @@ Kommandoen utløses hvis:
 <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>Error handling</source>
 <target>Feilhåndtering</target>
 
@@ -570,13 +549,13 @@ Kommandoen utløses hvis:
 <source>Abort synchronization on first error</source>
 <target></target>
 
-<source>On completion:</source>
-<target>Ved fullføring:</target>
+<source>On completion</source>
+<target></target>
 
 <source>Show progress dialog</source>
 <target>Vis dialogboks</target>
 
-<source>Generate log file</source>
+<source>Save log</source>
 <target></target>
 
 <source>Select folder to save log files</source>
@@ -588,11 +567,8 @@ Kommandoen utløses hvis:
 <source>Limit maximum number of log files</source>
 <target></target>
 
-<source>Batch settings</source>
-<target>Batch-innstillinger</target>
-
-<source>Compare by...</source>
-<target>Sammenlign etter...</target>
+<source>Select variant</source>
+<target></target>
 
 <source>
 Files are found equal if
@@ -607,6 +583,9 @@ Filer blir funnet like hvis
 er den samme
 </target>
 
+<source>File time and size</source>
+<target>Fildato og størrelse</target>
+
 <source>
 Files are found equal if
      - file content
@@ -618,24 +597,36 @@ Filer blir funnet like hvis
 er det samme
 </target>
 
+<source>File content</source>
+<target>Filinnhold</target>
+
 <source>Symbolic Link handling</source>
 <target>Symbolsk lenkehåndtering</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Velg variant:</target>
+<source><- Two way -></source>
+<target></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 ->></source>
+<target>Speile ->></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>Update -></source>
+<target>Oppdatere -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopier nye og endrede filer til høyre mappe.</target>
 
+<source>Custom</source>
+<target>Brukerdefinert</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Still inn dine egne synkroniseringsregler.</target>
 
@@ -651,8 +642,8 @@ er det samme
 <source>Recycle Bin</source>
 <target></target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Bruk papirkurv ved sletting eller filoverskrivning</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target></target>
 
 <source>Versioning</source>
 <target>Versjonshåndtering</target>
@@ -660,7 +651,7 @@ er det samme
 <source>Move time-stamped files into specified folder</source>
 <target></target>
 
-<source>Limit maximum number of versions per file</source>
+<source>Naming convention:</source>
 <target></target>
 
 <source>Configuration</source>
@@ -810,6 +801,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Overview</source>
 <target>Oversikt</target>
 
+<source>Filter files</source>
+<target>Filtrer filer</target>
+
 <source>Select view</source>
 <target>Velg visning</target>
 
@@ -861,9 +855,15 @@ Merk: Filnavn må være relative til basismapper!
 <source><Last session></source>
 <target><Siste økt></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Mappesammenligning og synkronisering</target>
+
 <source>Configuration saved!</source>
 <target>Innstilling lagret!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Aldri lagre endringer</target>
 
@@ -876,9 +876,6 @@ Merk: Filnavn må være relative til basismapper!
 <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>
 
@@ -1035,6 +1032,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Comparing content...</source>
 <target>Sammenligner innhold...</target>
 
+<source>Copy</source>
+<target></target>
+
 <source>Paused</source>
 <target>Pauset</target>
 
@@ -1107,14 +1107,14 @@ Merk: Filnavn må være relative til basismapper!
 <source>- folder part only</source>
 <target>- kun mapper</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Andre sides motstykke til %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target></target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Andre sides motstykke til %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target></target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Gjøre skjulte dialoger og advarselsmeldinger synlige igjen?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target></target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1137,47 +1137,29 @@ Merk: Filnavn må være relative til basismapper!
 <source>Leave as unresolved conflict</source>
 <target>Etterlat som uløste konflikter</target>
 
-<source>Files</source>
-<target>Filer</target>
+<source>Replace</source>
+<target></target>
 
-<source>Percentage</source>
-<target>Prosent</target>
+<source>Move files and replace if existing</source>
+<target></target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target></target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target></target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target></target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target></target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 time</pluralform>
-<pluralform>%x timer</pluralform>
-</target>
+<source>Files</source>
+<target>Filer</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dag</pluralform>
-<pluralform>%x dager</pluralform>
-</target>
+<source>Percentage</source>
+<target>Prosent</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Kan ikke overvåke mappen %x.</target>
@@ -1227,6 +1209,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Cannot copy file %x to %y.</source>
 <target>Kan ikke kopiere filen %x til %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target></target>
+
 <source>Cannot open directory %x.</source>
 <target></target>
 
@@ -1236,6 +1221,42 @@ Merk: Filnavn må være relative til basismapper!
 <source>Detected endless directory recursion.</source>
 <target>Fant uendelig dyp mappestruktur (lenker til mapper høyere opp i strukturen)</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 set privilege %x.</source>
 <target>Kan ikke sette privilegie %x.</target>
 
@@ -1365,6 +1386,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Moving symbolic link %x to %y</source>
 <target>Flytter symbolsk lenke %x til %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Oppretter fil %x</target>
 
@@ -1386,6 +1410,9 @@ Merk: Filnavn må være relative til basismapper!
 <source>Updating attributes of %x</source>
 <target>Oppdaterer attributter til %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Målmappe %x eksisterer allerede.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Feltet for målmappe kan ikke være tomt.</target>
 
@@ -1395,11 +1422,8 @@ Merk: Filnavn må være relative til basismapper!
 <source>Source folder %x not found.</source>
 <target>Kildemappe %x finnes ikke.</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>The following items have unresolved conflicts and will not be synchronized:</source>
+<target></target>
 
 <source>Significant difference detected:</source>
 <target>Betydelig forskjell oppdaget:</target>
@@ -1419,12 +1443,15 @@ Merk: Filnavn må være relative til basismapper!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>En mappe vil endres som er en del av flere mappepar. Se over innstillingene for synkronisering.</target>
 
+<source>Left</source>
+<target>Venstre</target>
+
+<source>Right</source>
+<target>Høyre</target>
+
 <source>Synchronizing folder pair:</source>
 <target></target>
 
-<source>Target folder %x already existing.</source>
-<target>Målmappe %x eksisterer allerede.</target>
-
 <source>Generating database...</source>
 <target>Oppretter database...</target>
 
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index d338f97a..cebe529b 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -20,7 +20,7 @@
 <target>Całkowity czas:</target>
 
 <source>Show in Explorer</source>
-<target>Wyświetl w Explorerze</target>
+<target>Wyświetl w Eksploratorze</target>
 
 <source>Open with default application</source>
 <target>Otwórz za pomocą domyślnej aplikacji</target>
@@ -29,7 +29,10 @@
 <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>
+<target>Żądanie przerwania: Oczekiwanie na koniec aktualnie wykonywanego zadania...</target>
+
+<source>Failure to create time stamp for versioning:</source>
+<target>Nie można utworzyć sygnatury czasu na potrzeby wersjonowania:</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatyczna Synchronizacja</target>
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Wyczyść ustawienia filtra</target>
 
-<source>Create a batch job</source>
-<target>Utwórz plik wsadowy</target>
+<source>Save as batch job</source>
+<target>Zapisz w trybie wsadowym</target>
 
 <source>Comparison settings</source>
 <target>Ustawienia porównywania</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Ustawienia programu</target>
 
-<source>Summary</source>
-<target>Podsumowanie</target>
-
 <source>Find</source>
 <target>Znajdź</target>
 
@@ -101,7 +101,7 @@
 <target>Błąd systemu Windows %x:</target>
 
 <source>Linux Error Code %x:</source>
-<target>Błąd systemu linux %x:</target>
+<target>Błąd systemu Linux %x:</target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>Nie można określić położenia dowiązania symbolicznego %x.</target>
@@ -162,7 +162,7 @@
 <target>Blokada katalogu (%x), oczekiwanie...</target>
 
 <source>Cannot set directory lock %x.</source>
-<target>Nie można zablokować katalogu %x do zapisu.</target>
+<target>Nie można utworzyć blokady katalogu %x.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -203,7 +203,7 @@
 <target>Plik %x nie zawiera prawidłowej konfiguracji</target>
 
 <source>Configuration file %x loaded partially only.</source>
-<target>Plik konfiguracyjny %x wczytany tylko częściowo.</target>
+<target>Plik konfiguracyjny %x został wczytany tylko częściowo.</target>
 
 <source>Cannot access Volume Shadow Copy Service.</source>
 <target>Nie można uzyskać dostępu do usługi Volume Shadow Copy.</target>
@@ -274,8 +274,8 @@
 <source>Select a folder</source>
 <target>Wybierz katalog</target>
 
-<source>Delay [seconds]</source>
-<target>Opóźnienie [sekundy]</target>
+<source>Idle time [seconds]</source>
+<target>Bezczynność [sekundy]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Czas pomiędzy ostatnią wykrytą zmianą, a uruchomieniem komendy</target>
@@ -324,38 +324,23 @@ Komenda jest wykonywana gdy:
 <source>A folder input field is empty.</source>
 <target>Pole katalog źródłowy jest puste.</target>
 
-<source>File time and size</source>
-<target>Czas modyfikacji i rozmiar</target>
-
-<source>File content</source>
-<target>Zawartość pliku</target>
-
-<source><Automatic></source>
-<target><Automatycznie></target>
-
-<source>Mirror ->></source>
-<target>Lustrzana ->></target>
-
-<source>Update -></source>
-<target>Uaktualnij -></target>
-
-<source>Custom</source>
-<target>Własne</target>
-
-<source>FreeFileSync batch</source>
-<target>Plik wsadowy FreeFileSync</target>
-
 <source>Synchronization aborted!</source>
 <target>Synchronizacja przerwana!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synchronizacja zakończona z błędami!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Synchronizacja zakończona z ostrzeżeniami!</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>Synchronization completed successfully.</source>
+<target>Synchronizacja zakończona pomyślnie.</target>
+
+<source>Saving log file %x...</source>
+<target>Zapisywanie pliku logów %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Kliknij "Przełącz" aby rozwiązać wszystkie problemy w głównym oknie FreeFileSync.</target>
@@ -363,9 +348,6 @@ Komenda jest wykonywana gdy:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Dostępna jest nowa wersja FreeFileSync:</target>
 
@@ -378,6 +360,12 @@ Komenda jest wykonywana gdy:
 <source>Information</source>
 <target>Informacja</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Nie można się połączyć z sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Aktualna wersja FreeFileSync nie została znaleziona! Czy chcesz to sprawdzić ręcznie?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Czy chcesz aby FreeFileSync sprawdzał aktualizacje co tydzień?</target>
 
@@ -441,27 +429,27 @@ Komenda jest wykonywana gdy:
 <source>Hibernate</source>
 <target>Przejdź w stan hibernacji</target>
 
-<source>1. &Compare</source>
-<target>1. &Porównaj</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synchronizuj</target>
-
 <source>&New</source>
 <target>&Nowy</target>
 
 <source>&Save</source>
 <target>&Zapisz</target>
 
+<source>Save as &batch job...</source>
+<target>Zapisz w trybie &wsadowym...</target>
+
+<source>1. &Compare</source>
+<target>1. &Porównaj</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synchronizuj</target>
+
 <source>&Language</source>
 <target>&Język</target>
 
 <source>&Global settings...</source>
 <target>&Ustawienia programu...</target>
 
-<source>&Create batch job...</source>
-<target>&Twórz plik wsadowy...</target>
-
 <source>&Export file list...</source>
 <target>&Eksportuj listę plików...</target>
 
@@ -495,17 +483,17 @@ Komenda jest wykonywana gdy:
 <source>Swap sides</source>
 <target>Zamień stronami</target>
 
-<source>Load configuration from file</source>
-<target>Wczytaj konfigurację z pliku</target>
+<source>Open</source>
+<target>Otwórz</target>
 
-<source>Save current configuration to file</source>
-<target>Zapisz konfiguracyję do pliku</target>
+<source>Save</source>
+<target>Zapisz</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Ostatnio użyta konfiguracja (naciśnij DEL żeby usunąć z listy)</target>
 
-<source>Show excluded items</source>
-<target>Pokaż wykluczone elementy</target>
+<source>Hide excluded items</source>
+<target>Ukryj wykluczone elementy</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Pokaż pliki wykluczone tymczasowo lub pliki wykluczone tymczasowo</target>
@@ -543,15 +531,6 @@ Komenda jest wykonywana gdy:
 <source>Help</source>
 <target>Pomoc</target>
 
-<source>Filter files</source>
-<target>Filtruj pliki</target>
-
-<source>Left</source>
-<target>Lewy</target>
-
-<source>Right</source>
-<target>Prawy</target>
-
 <source>Error handling</source>
 <target>Obsługa błędów</target>
 
@@ -573,14 +552,14 @@ Komenda jest wykonywana gdy:
 <source>Abort synchronization on first error</source>
 <target>Zakończ synchronizację przy pierwszym błędzie</target>
 
-<source>On completion:</source>
-<target>Po zakończeniu:</target>
+<source>On completion</source>
+<target>Po zakończeniu</target>
 
 <source>Show progress dialog</source>
 <target>Pokaż okno postępu</target>
 
-<source>Generate log file</source>
-<target>Twórz plik logów</target>
+<source>Save log</source>
+<target>Zapisz logi</target>
 
 <source>Select folder to save log files</source>
 <target>Określ katalog z logami</target>
@@ -591,11 +570,8 @@ Komenda jest wykonywana gdy:
 <source>Limit maximum number of log files</source>
 <target>Określ maksymalną liczbę plików z logami</target>
 
-<source>Batch settings</source>
-<target>Ustawienia trybu wsadowego</target>
-
-<source>Compare by...</source>
-<target>Porównaj przez...</target>
+<source>Select variant</source>
+<target>Określ wariant</target>
 
 <source>
 Files are found equal if
@@ -610,6 +586,9 @@ Pliki są równe jeżeli
 są równe
 </target>
 
+<source>File time and size</source>
+<target>Czas modyfikacji i rozmiar</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +600,36 @@ Pliki są jednakowe jeżeli
 jest identyczna
 </target>
 
+<source>File content</source>
+<target>Zawartość pliku</target>
+
 <source>Symbolic Link handling</source>
 <target>Obsługa dowiązań symbolicznych</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Wybierz wariant:</target>
+<source><- Two way -></source>
+<target><- Obustronna -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Znajdź i zastosuj zmiany po obu stronach przy pomocy bazy danych. Usunięnia, zmiany nazwy plików oraz konflikty są usuwane automatycznie.</target>
 
+<source>Mirror ->></source>
+<target>Lustrzana ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Lustrzana kopia lewego folderu. Prawy folder po synchronizacji jest lustrzaną kopią lewego folderu.</target>
 
+<source>Update -></source>
+<target>Uaktualnij -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopiuj nowe lub aktualniejsze pliki na prawą stronę.</target>
 
+<source>Custom</source>
+<target>Własne</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Skonfiguruj swoje własne reguły synchronizacji.</target>
 
@@ -654,8 +645,8 @@ jest identyczna
 <source>Recycle Bin</source>
 <target>Kosz</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Używaj Kosza podczas usuwania lub nadpisywania plików</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Użyj Kosza dla plików usuwanych i nadpisywanych</target>
 
 <source>Versioning</source>
 <target>Wersjonowanie</target>
@@ -663,8 +654,8 @@ jest identyczna
 <source>Move time-stamped files into specified folder</source>
 <target>Pliki wersji oznaczone datą przenieś do określonego katalogu</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Określ maksymalną liczbę wersji dla pliku</target>
+<source>Naming convention:</source>
+<target>Konwencja nazewnictwa:</target>
 
 <source>Configuration</source>
 <target>Konfiguracja</target>
@@ -813,6 +804,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Overview</source>
 <target>Przegląd</target>
 
+<source>Filter files</source>
+<target>Filtruj pliki</target>
+
 <source>Select view</source>
 <target>Określ widok</target>
 
@@ -864,9 +858,15 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source><Last session></source>
 <target><Ostatnia sesja></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Porównywanie i Synchronizacja folderów</target>
+
 <source>Configuration saved!</source>
 <target>Konfiguracja zapisana!</target>
 
+<source>FreeFileSync batch</source>
+<target>Plik wsadowy FreeFileSync</target>
+
 <source>Never save changes</source>
 <target>Nigdy nie zapisuj zmian</target>
 
@@ -879,9 +879,6 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Configuration loaded!</source>
 <target>Konfiguracja wczytana!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Porównywanie i Synchronizacja folderów</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Ukryj pliki, które istnieją tylko po lewej stronie</target>
 
@@ -1042,6 +1039,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Comparing content...</source>
 <target>Porównywanie zawartości...</target>
 
+<source>Copy</source>
+<target>Kopiuj</target>
+
 <source>Paused</source>
 <target>Pauza</target>
 
@@ -1114,14 +1114,14 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>- folder part only</source>
 <target>- tylko część katalogu</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Odpowiednik %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Odpowiednik %item_path% po drugiej stronie</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Odpowiednik %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Odpowiednik %item_folder% po drugiej stronie</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Czy chcesz ponownie aktywować ukryte powiadomienia i ostrzeżenia?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Przywrócić ukryte powiadomienia i dialogi?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1146,50 +1146,29 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Leave as unresolved conflict</source>
 <target>Zostaw jako nierozwiązany konflikt</target>
 
-<source>Files</source>
-<target>Pliki</target>
+<source>Replace</source>
+<target>Zamień</target>
 
-<source>Percentage</source>
-<target>Procentowo</target>
+<source>Move files and replace if existing</source>
+<target>Przenieś pliki i nadpisz jeżeli już istnieją</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Dołącz znacznik czasu do nazwy każdego pliku</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Katalog</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Plik</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 minuta</pluralform>
-<pluralform>%x minuty</pluralform>
-<pluralform>%x minut</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 godzina</pluralform>
-<pluralform>%x godziny</pluralform>
-<pluralform>%x godzin</pluralform>
-</target>
+<source>Files</source>
+<target>Pliki</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dzień</pluralform>
-<pluralform>%x dni</pluralform>
-<pluralform>%x dni</pluralform>
-</target>
+<source>Percentage</source>
+<target>Procentowo</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Nie można monitorować katalogu %x.</target>
@@ -1239,6 +1218,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Cannot copy file %x to %y.</source>
 <target>Nie można skopiować pliku %x do %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Element typu %x nie jest wspierany:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Nie można otworzyć katalogu %x.</target>
 
@@ -1248,6 +1230,45 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Detected endless directory recursion.</source>
 <target>Wykryto nieskończoną pętlę katalogów</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 minuta</pluralform>
+<pluralform>%x minuty</pluralform>
+<pluralform>%x minut</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 godzina</pluralform>
+<pluralform>%x godziny</pluralform>
+<pluralform>%x godzin</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dzień</pluralform>
+<pluralform>%x dni</pluralform>
+<pluralform>%x dni</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Nie można ustawić uprawnień %x.</target>
 
@@ -1377,6 +1398,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Moving symbolic link %x to %y</source>
 <target>Przenoszenie dowiązania symbolicznego %x do %y</target>
 
+<source>Removing old versions...</source>
+<target>Usuwanie starszych wersji...</target>
+
 <source>Creating file %x</source>
 <target>Tworzenie pliku %x</target>
 
@@ -1398,6 +1422,9 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Updating attributes of %x</source>
 <target>Aktualizowanie atrybutów %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Katalog docelowy %x już istnieje.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Pole katalog docelowy nie może być puste.</target>
 
@@ -1407,11 +1434,8 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>Source folder %x not found.</source>
 <target>Nie znaleziono katalogu docelowego %x.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Istnieją nierozwiązane konflikty!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Możesz je zignorować i kontynuować synchronizację.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Te elementy znajdują się w konflikcie, którego nie można rozwiązać. Pliki nie zostaną zsynchronizowane:</target>
 
 <source>Significant difference detected:</source>
 <target>Wykryto znaczące zmiany:</target>
@@ -1431,12 +1455,15 @@ Uwaga: Nazwy plików muszą być podane jako relatywne względem katalogu bazowe
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Katalog zostanie zmodyfikowany w związku z synchronizacją wielu katalogów. Zweryfikuj ustawienia synchronizacji.</target>
 
+<source>Left</source>
+<target>Lewy</target>
+
+<source>Right</source>
+<target>Prawy</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Synchronizacja katalgów:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Katalog docelowy %x już istnieje.</target>
-
 <source>Generating database...</source>
 <target>Generowanie bazy danych...</target>
 
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index d825097c..dfc29c43 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -32,7 +32,7 @@
 <target>Abortar pedido: À espera do fim da operação atual...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>Falha ao criar selo temporal para versões anteriores:</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automatizada</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Limpar opções do filtro</target>
 
-<source>Create a batch job</source>
-<target>Criar ficheiro batch</target>
+<source>Save as batch job</source>
+<target>Guardar como batch</target>
 
 <source>Comparison settings</source>
 <target>Opções de comparação</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Opções</target>
 
-<source>Summary</source>
-<target>Sumário</target>
-
 <source>Find</source>
 <target>Procurar</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>Selecione uma pasta</target>
 
-<source>Delay [seconds]</source>
-<target>Atraso [segundos]</target>
+<source>Idle time [seconds]</source>
+<target>Tempo de espera [segundos]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Tempo de espera entre a última alteração detetada e a execução do comando</target>
@@ -324,38 +321,23 @@ O comando é executado se:
 <source>A folder input field is empty.</source>
 <target>Um dos campos de directório para comparar está vazio.</target>
 
-<source>File time and size</source>
-<target>Data e tamanho do ficheiro</target>
-
-<source>File content</source>
-<target>Conteúdo do ficheiro</target>
-
-<source><Automatic></source>
-<target><Automático></target>
-
-<source>Mirror ->></source>
-<target>Espelhar ->></target>
-
-<source>Update -></source>
-<target>Actualizar -></target>
-
-<source>Custom</source>
-<target>Personalizado</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Sincronização abortada!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sincronização completa com erros!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Sincronização completa com avisos.</target>
+
 <source>Nothing to synchronize!</source>
 <target>Nada a sincronizar!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Sincronização completa com sucesso!</target>
+<source>Synchronization completed successfully.</source>
+<target>Sincronização completa com sucesso.</target>
+
+<source>Saving log file %x...</source>
+<target>A guardar ficheiro log %x...</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>
@@ -363,9 +345,6 @@ O comando é executado se:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Uma nova versão do FreeFileSync está disponível:</target>
 
@@ -378,6 +357,12 @@ O comando é executado se:
 <source>Information</source>
 <target>Informação</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Não é possível ligar a sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Não foi possível encontrar online a última versão do FreeFileSync! Quer verificar manualmente?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Deseja que o FreeFileSync procure automaticamente actualizações todas as semanas?</target>
 
@@ -441,27 +426,27 @@ O comando é executado se:
 <source>Hibernate</source>
 <target>Hibernar</target>
 
-<source>1. &Compare</source>
-<target>1. &Comparar</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Sincronizar</target>
-
 <source>&New</source>
 <target>&Novo</target>
 
 <source>&Save</source>
 <target>G&uardar</target>
 
+<source>Save as &batch job...</source>
+<target>Guardar como &batch...</target>
+
+<source>1. &Compare</source>
+<target>1. &Comparar</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Sincronizar</target>
+
 <source>&Language</source>
 <target>&Língua</target>
 
 <source>&Global settings...</source>
 <target>&Opções...</target>
 
-<source>&Create batch job...</source>
-<target>&Criar um ficheiro batch...</target>
-
 <source>&Export file list...</source>
 <target>&Exportar lista de ficheiros...</target>
 
@@ -495,17 +480,17 @@ O comando é executado se:
 <source>Swap sides</source>
 <target>Trocar lados</target>
 
-<source>Load configuration from file</source>
-<target>Carregar configuração do ficheiro</target>
+<source>Open</source>
+<target>Abrir</target>
 
-<source>Save current configuration to file</source>
-<target>Guardar configuração actual para ficheiro</target>
+<source>Save</source>
+<target>Guardar</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Última configuração utilizada (pressione DEL para remover da lista)</target>
 
-<source>Show excluded items</source>
-<target>Mostrar itens excluidos</target>
+<source>Hide excluded items</source>
+<target>Esconder itens excluídos</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Mostrar ficheiros filtrados ou temporariamente excluidos</target>
@@ -543,15 +528,6 @@ O comando é executado se:
 <source>Help</source>
 <target>Ajuda</target>
 
-<source>Filter files</source>
-<target>Filtrar ficheiros</target>
-
-<source>Left</source>
-<target>Esquerda</target>
-
-<source>Right</source>
-<target>Direita</target>
-
 <source>Error handling</source>
 <target>Controlador de erros</target>
 
@@ -573,14 +549,14 @@ O comando é executado se:
 <source>Abort synchronization on first error</source>
 <target>Abortar sincronização ao primeiro erro</target>
 
-<source>On completion:</source>
-<target>Ao concluir:</target>
+<source>On completion</source>
+<target>Ao terminar</target>
 
 <source>Show progress dialog</source>
 <target>Mostrar diálogo de progresso</target>
 
-<source>Generate log file</source>
-<target>Gerar ficheiro log</target>
+<source>Save log</source>
+<target>Guardar log</target>
 
 <source>Select folder to save log files</source>
 <target>Seleccionar pasta para guardar ficheiros log</target>
@@ -591,11 +567,8 @@ O comando é executado se:
 <source>Limit maximum number of log files</source>
 <target>Limitar o número máximo de ficheiros log</target>
 
-<source>Batch settings</source>
-<target>Opções do batch</target>
-
-<source>Compare by...</source>
-<target>Comparar por...</target>
+<source>Select variant</source>
+<target>Selecionar variante</target>
 
 <source>
 Files are found equal if
@@ -610,6 +583,9 @@ Ficheiros considerados iguais se
 são iguais
 </target>
 
+<source>File time and size</source>
+<target>Data e tamanho do ficheiro</target>
+
 <source>
 Files are found equal if
      - file content
@@ -620,24 +596,36 @@ Os ficheiros são considerados iguais se
      - o conteúdo é o mesmo
 </target>
 
+<source>File content</source>
+<target>Conteúdo do ficheiro</target>
+
 <source>Symbolic Link handling</source>
 <target>Tratamento de links simbólicos</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Selecione uma variante:</target>
+<source><- Two way -></source>
+<target><- Duas vias -></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. Itens eliminados, renomeados e conflitos são detetados automaticamente.</target>
 
+<source>Mirror ->></source>
+<target>Espelhar ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <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>
 
+<source>Update -></source>
+<target>Actualizar -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Copiar ficheiros novos ou actualizados para a direita</target>
 
+<source>Custom</source>
+<target>Personalizado</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Configure as suas regras de sincronização.</target>
 
@@ -653,8 +641,8 @@ Os ficheiros são considerados iguais se
 <source>Recycle Bin</source>
 <target>Reciclagem</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Utilizar Reciclagem ao apagar ou substituir ficheiros</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Usar Reciclagem para ficheiros eliminados ou substituidos</target>
 
 <source>Versioning</source>
 <target>Manter versões anteriores</target>
@@ -662,8 +650,8 @@ Os ficheiros são considerados iguais se
 <source>Move time-stamped files into specified folder</source>
 <target>Mover ficheiros datados para a pasta especificada</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Limitar número máximo de versões por ficheiro</target>
+<source>Naming convention:</source>
+<target>Convenção de nomes:</target>
 
 <source>Configuration</source>
 <target>Configuração</target>
@@ -812,6 +800,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Overview</source>
 <target>Vista</target>
 
+<source>Filter files</source>
+<target>Filtrar ficheiros</target>
+
 <source>Select view</source>
 <target>Selecionar vista</target>
 
@@ -863,9 +854,15 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source><Last session></source>
 <target><Última Sessão></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Comparação e Sincronização de Pastas</target>
+
 <source>Configuration saved!</source>
 <target>Configuração guardada!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Nunca guardar alterações</target>
 
@@ -878,9 +875,6 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Configuration loaded!</source>
 <target>Configuração carregada!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Comparação e Sincronização de Pastas</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Ocultar ficheiros existentes somente à esquerda</target>
 
@@ -1037,6 +1031,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Comparing content...</source>
 <target>A comparar...</target>
 
+<source>Copy</source>
+<target>Copiar</target>
+
 <source>Paused</source>
 <target>Em pausa</target>
 
@@ -1109,14 +1106,14 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>- folder part only</source>
 <target>- nome da pasta parcial</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Contrapartida de %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Contrapartida de %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Contrapartida de %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Contrapartida de %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Tornar visíveis diálogos e mensagens de aviso novamente?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Tornar visiveis os diálogos e avisos escondidos novamente?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1139,47 +1136,29 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Leave as unresolved conflict</source>
 <target>Deixar como conflito</target>
 
-<source>Files</source>
-<target>Ficheiros</target>
+<source>Replace</source>
+<target>Substituir</target>
 
-<source>Percentage</source>
-<target>Percentagem</target>
+<source>Move files and replace if existing</source>
+<target>Mover ficheiros e substituir se existirem</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Juntar selo temporal a cada nome de ficheiro</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Pasta</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Ficheiro</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x mins</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>AAAA-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hora</pluralform>
-<pluralform>%x horas</pluralform>
-</target>
+<source>Files</source>
+<target>Ficheiros</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dia</pluralform>
-<pluralform>%x dias</pluralform>
-</target>
+<source>Percentage</source>
+<target>Percentagem</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Não é possível monitorizar o directório %x.</target>
@@ -1229,6 +1208,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Cannot copy file %x to %y.</source>
 <target>Não é possível copiar o ficheiro %x para %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Tipo de item %x não é suportado:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Não é possível abrir o directório %x.</target>
 
@@ -1238,6 +1220,42 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Detected endless directory recursion.</source>
 <target>Recursão infinita detetada no directório</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x mins</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hora</pluralform>
+<pluralform>%x horas</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dia</pluralform>
+<pluralform>%x dias</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Não é possível definir o privilégio %x.</target>
 
@@ -1368,7 +1386,7 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <target>Mover link simbólico %x para %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>A remover versões antigas...</target>
 
 <source>Creating file %x</source>
 <target>Criar ficheiro %x</target>
@@ -1391,6 +1409,9 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Updating attributes of %x</source>
 <target>Actualizar atributos de %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Directório de destino %x já existe.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Campo de directório de destino não deve estar vazio.</target>
 
@@ -1400,11 +1421,8 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>Source folder %x not found.</source>
 <target>Directório %x não encontrado.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Existem conflitos por resolver!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Pode ignorar os conflitos e continuar a sincronização.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Os seguintes itens têm conflitos não resolvidos, e não serão sincronizados:</target>
 
 <source>Significant difference detected:</source>
 <target>Diferença significativa detectada:</target>
@@ -1424,12 +1442,15 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Uma pasta que faz parte de vários pares vai ser modificada. Por favor, reveja os parametros de sincronização.</target>
 
+<source>Left</source>
+<target>Esquerda</target>
+
+<source>Right</source>
+<target>Direita</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Sincronizar o par de pastas:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Directório de destino %x já existe.</target>
-
 <source>Generating database...</source>
 <target>A gerar base de dados...</target>
 
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index e64cdba5..3182c088 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -32,7 +32,7 @@
 <target>Cancelar solicitado: Esperando fim da operação...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>Erro ao criar estampa de tempo para controle de versão:</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronização Automatizada</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Limpar configurações do filtro</target>
 
-<source>Create a batch job</source>
-<target>Criar arquivo de lote</target>
+<source>Save as batch job</source>
+<target>Salvar como tarefa em lote</target>
 
 <source>Comparison settings</source>
 <target>Parâmetros de comparação</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Configurações</target>
 
-<source>Summary</source>
-<target>Resumo</target>
-
 <source>Find</source>
 <target>Localizar</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>Selecionar uma pasta</target>
 
-<source>Delay [seconds]</source>
-<target>Atraso [segundos]</target>
+<source>Idle time [seconds]</source>
+<target>Tempo de espera [segundos]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Tempo de espera entre última mudança detectada e execução do comando</target>
@@ -324,38 +321,23 @@ O comando é disparado se:
 <source>A folder input field is empty.</source>
 <target>Um campo de entrada de pasta está vazio.</target>
 
-<source>File time and size</source>
-<target>Data e tamanho do arquivo</target>
-
-<source>File content</source>
-<target>Conteúdo do arquivo</target>
-
-<source><Automatic></source>
-<target><Automático></target>
-
-<source>Mirror ->></source>
-<target>Espelhar ->></target>
-
-<source>Update -></source>
-<target>Atualizar -></target>
-
-<source>Custom</source>
-<target>Personalizado</target>
-
-<source>FreeFileSync batch</source>
-<target>Tarefa em lote do FreeFileSync</target>
-
 <source>Synchronization aborted!</source>
 <target>Sincronização cancelada!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sincronização finalizada com erros!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Sincronização finalizada com avisos.</target>
+
 <source>Nothing to synchronize!</source>
 <target>Nada para sincronizar!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Sincronização finalizada com sucesso!</target>
+<source>Synchronization completed successfully.</source>
+<target>Sincronização finalizada com sucesso.</target>
+
+<source>Saving log file %x...</source>
+<target>Salvando arquivo de log %x...</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>
@@ -363,9 +345,6 @@ O comando é disparado se:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Uma nova versão do FreeFileSync está disponível:</target>
 
@@ -378,6 +357,12 @@ O comando é disparado se:
 <source>Information</source>
 <target>Informação</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Não foi possível conectar a sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>A versão atual do FreeFileSync não foi encontra on-line! Deseja verificar manualmente?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Deseja que o FreeFileSync procure automaticamente novas versões todas as semanas?</target>
 
@@ -441,27 +426,27 @@ O comando é disparado se:
 <source>Hibernate</source>
 <target>Hibernar</target>
 
-<source>1. &Compare</source>
-<target>1. C&omparar</target>
-
-<source>2. &Synchronize</source>
-<target>2. S&incronizar</target>
-
 <source>&New</source>
 <target>&Novo</target>
 
 <source>&Save</source>
 <target>&Salvar</target>
 
+<source>Save as &batch job...</source>
+<target>Salvar como &tarefa em lote...</target>
+
+<source>1. &Compare</source>
+<target>1. C&omparar</target>
+
+<source>2. &Synchronize</source>
+<target>2. S&incronizar</target>
+
 <source>&Language</source>
 <target>&Idioma</target>
 
 <source>&Global settings...</source>
 <target>&Configurações...</target>
 
-<source>&Create batch job...</source>
-<target>C&riar um arquivo de lote...</target>
-
 <source>&Export file list...</source>
 <target>&Exportar lista de arquivos...</target>
 
@@ -495,17 +480,17 @@ O comando é disparado se:
 <source>Swap sides</source>
 <target>Inverter lados</target>
 
-<source>Load configuration from file</source>
-<target>Carregar configuração do arquivo</target>
+<source>Open</source>
+<target>Abrir</target>
 
-<source>Save current configuration to file</source>
-<target>Salvar configuração atual para arquivo</target>
+<source>Save</source>
+<target>Salvar</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Últimas configurações usadas (pressione DEL para remover da lista)</target>
 
-<source>Show excluded items</source>
-<target>Mostrar itens excluídos</target>
+<source>Hide excluded items</source>
+<target>Ocultar itens excluídos</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Mostra arquivos que foram filtrados ou excluídos temporariamente</target>
@@ -543,15 +528,6 @@ O comando é disparado se:
 <source>Help</source>
 <target>Ajuda</target>
 
-<source>Filter files</source>
-<target>Filtrar arquivos</target>
-
-<source>Left</source>
-<target>Esquerda</target>
-
-<source>Right</source>
-<target>Direita</target>
-
 <source>Error handling</source>
 <target>Tratamento de erros</target>
 
@@ -573,14 +549,14 @@ O comando é disparado se:
 <source>Abort synchronization on first error</source>
 <target>Cancela sincronização no primeiro erro</target>
 
-<source>On completion:</source>
-<target>Ao terminar:</target>
+<source>On completion</source>
+<target>Ao finalizar</target>
 
 <source>Show progress dialog</source>
 <target>Mostrar indicador de progresso</target>
 
-<source>Generate log file</source>
-<target>Gerar arquivo de log</target>
+<source>Save log</source>
+<target>Salvar log</target>
 
 <source>Select folder to save log files</source>
 <target>Seleciona pasta para salvar arquivos de log</target>
@@ -591,11 +567,8 @@ O comando é disparado se:
 <source>Limit maximum number of log files</source>
 <target>Limita número máximo de arquivos de log</target>
 
-<source>Batch settings</source>
-<target>Configurações da tarefa em lote</target>
-
-<source>Compare by...</source>
-<target>Comparar por...</target>
+<source>Select variant</source>
+<target>Selecionar modo</target>
 
 <source>
 Files are found equal if
@@ -610,6 +583,9 @@ Os arquivos são considerados iguais se
 são os mesmos
 </target>
 
+<source>File time and size</source>
+<target>Data e tamanho do arquivo</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +597,36 @@ Os arquivos são considerados iguais se
 é o mesmo
 </target>
 
+<source>File content</source>
+<target>Conteúdo do arquivo</target>
+
 <source>Symbolic Link handling</source>
 <target>Tratamento de Links Simbólicos</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Selecione um modo:</target>
+<source><- Two way -></source>
+<target><- Dois sentidos -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identifica e propaga as mudanças em ambos os lados usando um banco de dados. Arquivos apagados, renomeados e conflitantes são detectados automaticamente.</target>
 
+<source>Mirror ->></source>
+<target>Espelhar ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Backup espelho da pasta da esquerda. A pasta da direita será modificada para ficar exatamente igual à pasta da esquerda após a sincronização.</target>
+<target>Cópia espelho da pasta da esquerda. A pasta da direita será modificada para ficar exatamente igual à pasta da esquerda após a sincronização.</target>
+
+<source>Update -></source>
+<target>Atualizar -></target>
 
 <source>Copy new or updated files to right folder.</source>
 <target>Copia arquivos novos ou atualizados para a pasta da direita</target>
 
+<source>Custom</source>
+<target>Personalizado</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Configure as suas próprias regras de sincronização.</target>
 
@@ -654,8 +642,8 @@ Os arquivos são considerados iguais se
 <source>Recycle Bin</source>
 <target>Lixeira</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Usa a Lixeira quando apagar ou substituir arquivos</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Utilizar Lixeira para arquivos apagados ou sobrescritos</target>
 
 <source>Versioning</source>
 <target>Controle de versões</target>
@@ -663,8 +651,8 @@ Os arquivos são considerados iguais se
 <source>Move time-stamped files into specified folder</source>
 <target>Move os arquivos com estampa de tempo para uma pasta especificada</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Limita número máximo de versões por arquivo</target>
+<source>Naming convention:</source>
+<target>Convenção de nomenclatura:</target>
 
 <source>Configuration</source>
 <target>Configuração</target>
@@ -724,7 +712,7 @@ Os arquivos são considerados iguais se
 <target>Apagar em ambos os lados</target>
 
 <source>Delete on both sides even if the file is selected on one side only</source>
-<target>Apagar em ambos os lados mesmo se o arquivo está selecionado só em um lado</target>
+<target>Apaga em ambos os lados mesmo se o arquivo está selecionado só em um lado</target>
 
 <source>
 Only files that match all filter settings will be synchronized.
@@ -813,6 +801,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Overview</source>
 <target>Parâmetros</target>
 
+<source>Filter files</source>
+<target>Filtrar arquivos</target>
+
 <source>Select view</source>
 <target>Selecionar visualização</target>
 
@@ -864,9 +855,15 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source><Last session></source>
 <target><Última sessão></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Comparação e Sincronização de Pastas</target>
+
 <source>Configuration saved!</source>
 <target>Configuração salva!</target>
 
+<source>FreeFileSync batch</source>
+<target>Tarefa em lote do FreeFileSync</target>
+
 <source>Never save changes</source>
 <target>Nunca salvar alterações</target>
 
@@ -879,9 +876,6 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Configuration loaded!</source>
 <target>Configuração carregada!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Comparação e Sincronização de Pastas</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Ocultar arquivos que existem somente à esquerda</target>
 
@@ -1038,6 +1032,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Comparing content...</source>
 <target>Comparando conteúdo...</target>
 
+<source>Copy</source>
+<target>Copiar</target>
+
 <source>Paused</source>
 <target>Pausado</target>
 
@@ -1110,14 +1107,14 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>- folder part only</source>
 <target>- apenas parte da pasta</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Correspondente do outro lado a %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Contrapartida do outro lado para %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Correspondente do outro lado a %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Contrapartida do outro lado para %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Fazer com que os diálogos ocultados e mensagens de alerta fiquem visíveis novamente?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Tornar avisar e diálogos ocultados visíveis outra vez?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1140,47 +1137,29 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Leave as unresolved conflict</source>
 <target>Deixar como conflito não resolvido</target>
 
-<source>Files</source>
-<target>Arquivos</target>
+<source>Replace</source>
+<target>Substituir</target>
 
-<source>Percentage</source>
-<target>Percentual</target>
+<source>Move files and replace if existing</source>
+<target>Move arquivos e substitui se existente</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Atribuir uma estampa de tempo para cada nome de arquivo</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Pasta</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Arquivo</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x min</pluralform>
-<pluralform>%x mins</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>AAAA-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x hora</pluralform>
-<pluralform>%x horas</pluralform>
-</target>
+<source>Files</source>
+<target>Arquivos</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x dia</pluralform>
-<pluralform>%x dias</pluralform>
-</target>
+<source>Percentage</source>
+<target>Percentual</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Não foi possível monitorar o diretório %x.</target>
@@ -1189,7 +1168,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Erro de conversão:</target>
 
 <source>Cannot delete file %x.</source>
-<target>Não foi possível excluir o arquivo %x.</target>
+<target>Não foi possível apagar o arquivo %x.</target>
 
 <source>The file is locked by another process:</source>
 <target>O arquivo está bloqueado por outro processo:</target>
@@ -1198,7 +1177,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Não foi possível mover o arquivo %x para %y.</target>
 
 <source>Cannot delete directory %x.</source>
-<target>Não foi possível excluir o diretório %x.</target>
+<target>Não foi possível apagar o diretório %x.</target>
 
 <source>Cannot write file attributes of %x.</source>
 <target>Não foi possível escrever os atributos de arquivo de %x.</target>
@@ -1230,6 +1209,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Cannot copy file %x to %y.</source>
 <target>Não foi possível copiar o arquivo %x para %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Tipo de item %x não é suportado:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Não foi possível abrir o diretório %x.</target>
 
@@ -1239,6 +1221,42 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Detected endless directory recursion.</source>
 <target>Detectada recursão de diretório infinita.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x hora</pluralform>
+<pluralform>%x horas</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x dia</pluralform>
+<pluralform>%x dias</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Não foi possível estabelecer o privilégio %x.</target>
 
@@ -1312,10 +1330,10 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Copiar novo item para a direita</target>
 
 <source>Delete left item</source>
-<target>Deletar item à esquerda</target>
+<target>Apagar item à esquerda</target>
 
 <source>Delete right item</source>
-<target>Deletar item à direita</target>
+<target>Apagar item à direita</target>
 
 <source>Move file on left</source>
 <target>Mover arquivo à esquerda</target>
@@ -1369,7 +1387,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <target>Movendo link simbólico %x para %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>Removendo versões antigas...</target>
 
 <source>Creating file %x</source>
 <target>Criando arquivo %x</target>
@@ -1392,6 +1410,9 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Updating attributes of %x</source>
 <target>Atualizando atributos de %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Pasta de destino %x já existe.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Campo de entrada da pasta de destino não pode ficar vazio.</target>
 
@@ -1401,11 +1422,8 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>Source folder %x not found.</source>
 <target>Pasta de origem %x não foi encontrada.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Conflitos não resolvidos existentes!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Você pode ignorar os conflitos e continuar a sincronização.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Os seguintes itens possuem conflitos não resolvidos e não serão sincronizados:</target>
 
 <source>Significant difference detected:</source>
 <target>Diferença significativa detectada:</target>
@@ -1425,12 +1443,15 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Uma pasta que é parte de múltiplos pares de pasta será modificada. Por favor, revise as configurações de sincronização.</target>
 
+<source>Left</source>
+<target>Esquerda</target>
+
+<source>Right</source>
+<target>Direita</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Sincronizando par de pastas:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Pasta de destino %x já existe.</target>
-
 <source>Generating database...</source>
 <target>Gerando banco de dados...</target>
 
diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng
index 196d9393..c99a2d55 100644
--- a/BUILD/Languages/romanian.lng
+++ b/BUILD/Languages/romanian.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Abandonare solicitată: Se așteaptă terminarea operației în curs...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Crearea marcajului temporal pentru versionare a eșuat</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronizare Inteligentă</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Curăță Setările Filtrului</target>
 
-<source>Create a batch job</source>
-<target>Creează o Sarcină Set [Batch Job]</target>
+<source>Save as batch job</source>
+<target>Salvează ca Sarcină Set</target>
 
 <source>Comparison settings</source>
 <target>Setările Comparării</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Setări Globale</target>
 
-<source>Summary</source>
-<target>Sumar</target>
-
 <source>Find</source>
 <target>Găsește</target>
 
@@ -274,8 +274,8 @@
 <source>Select a folder</source>
 <target>Selectează un Dosar</target>
 
-<source>Delay [seconds]</source>
-<target>Întîrziere [secunde]</target>
+<source>Idle time [seconds]</source>
+<target>Timp de inactivitate [secunde]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Timpul de inactivitate între ultima schimbare detectată și executarea comenzii</target>
@@ -324,38 +324,23 @@ Comanda este declanșată dacă:
 <source>A folder input field is empty.</source>
 <target>Un cîmp de introducere a dosarului este gol.</target>
 
-<source>File time and size</source>
-<target>Timpul și Mărimea Filelor</target>
-
-<source>File content</source>
-<target>Conținutul Filelor</target>
-
-<source><Automatic></source>
-<target><Sincronizare Inteligentă></target>
-
-<source>Mirror ->></source>
-<target>Clonare =>></target>
-
-<source>Update -></source>
-<target>Actualizare =></target>
-
-<source>Custom</source>
-<target>Sincronizare Personalizată</target>
-
-<source>FreeFileSync batch</source>
-<target>Set FreeFileSync</target>
-
 <source>Synchronization aborted!</source>
 <target>Sincronizare abandonată!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Sincronizare terminată cu erori!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Sincronizare realizată, dar cu avertismente.</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>Synchronization completed successfully.</source>
+<target>Sincronizare realizată cu succes.</target>
+
+<source>Saving log file %x...</source>
+<target>Salvez fila jurnal %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Apasă "Comută" pentru a rezolva problemele din dialogul principal FreeFileSync.</target>
@@ -363,9 +348,6 @@ Comanda este declanșată dacă:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Este disponibilă o versiune nouă a softului:</target>
 
@@ -378,6 +360,12 @@ Comanda este declanșată dacă:
 <source>Information</source>
 <target>Informații</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Conectarea la situl sourceforge.net nu poate fi realizată!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Numărul versiunii curente de FreeFileSync nu a fost găsit pe internet! Vrei să verifici manual?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Vrei ca FreeFileSync să caute automat actualizări în fiecare săptămînă ?</target>
 
@@ -441,27 +429,27 @@ Comanda este declanșată dacă:
 <source>Hibernate</source>
 <target>Pune Calculatorul în Hibernare</target>
 
-<source>1. &Compare</source>
-<target>1. &Compară</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Sincronizează</target>
-
 <source>&New</source>
 <target>Configurație &Nouă</target>
 
 <source>&Save</source>
 <target>&Salvează</target>
 
+<source>Save as &batch job...</source>
+<target>Salvea&ză ca Sarcină Set...</target>
+
+<source>1. &Compare</source>
+<target>1. &Compară</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Sincronizează</target>
+
 <source>&Language</source>
 <target>&Limbă</target>
 
 <source>&Global settings...</source>
 <target>&Setări Globale...</target>
 
-<source>&Create batch job...</source>
-<target>&Creează o Sarcină Set...</target>
-
 <source>&Export file list...</source>
 <target>&Exportă Lista de File...</target>
 
@@ -495,17 +483,17 @@ Comanda este declanșată dacă:
 <source>Swap sides</source>
 <target>Schimbă compartimentele stîng și drept între ele</target>
 
-<source>Load configuration from file</source>
-<target>Deschide configurația dintr-o filă</target>
+<source>Open</source>
+<target>Deschide</target>
 
-<source>Save current configuration to file</source>
-<target>Salvează într-o filă modificările configurației curente</target>
+<source>Save</source>
+<target>Salvează</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Ultimele configurații utilizate (apasă tasta DEL pentru a înlătura din listă)</target>
 
-<source>Show excluded items</source>
-<target>Arată itemurile excluse</target>
+<source>Hide excluded items</source>
+<target>Ascunde elementele excluse</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Arată filele filtrate sau excluse temporar</target>
@@ -543,15 +531,6 @@ Comanda este declanșată dacă:
 <source>Help</source>
 <target>Ajutor</target>
 
-<source>Filter files</source>
-<target>Filtru</target>
-
-<source>Left</source>
-<target>Stînga</target>
-
-<source>Right</source>
-<target>Dreapta</target>
-
 <source>Error handling</source>
 <target>Gestionarea Erorilor</target>
 
@@ -568,19 +547,19 @@ Comanda este declanșată dacă:
 <target>În caz de erori sau avertizări este arătată o fereastră popîc [popup]</target>
 
 <source>Exit</source>
-<target>Ieși</target>
+<target>Ieșire</target>
 
 <source>Abort synchronization on first error</source>
-<target>Abandonează sincronizarea la prima eroare</target>
+<target>Sincronizarea e abandonată la prima eroare</target>
 
-<source>On completion:</source>
-<target>La Terminare:</target>
+<source>On completion</source>
+<target>La Terminare</target>
 
 <source>Show progress dialog</source>
 <target>Arată progresul sincronizării</target>
 
-<source>Generate log file</source>
-<target>Generează filă jurnal [log]</target>
+<source>Save log</source>
+<target>Salvează jurnalul acțiunilor</target>
 
 <source>Select folder to save log files</source>
 <target>Selectează dosarul cu filele jurnal</target>
@@ -591,11 +570,8 @@ Comanda este declanșată dacă:
 <source>Limit maximum number of log files</source>
 <target>Limitează numărul maxim de file jurnal</target>
 
-<source>Batch settings</source>
-<target>Setările Setului</target>
-
-<source>Compare by...</source>
-<target>Compară după:</target>
+<source>Select variant</source>
+<target>Selectează varianta dorită</target>
 
 <source>
 Files are found equal if
@@ -610,6 +586,9 @@ Filele sînt considerate identice dacă
 sînt aceleași
 </target>
 
+<source>File time and size</source>
+<target>Timpul și Mărimea Filelor</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +600,36 @@ Filele sînt considerate identice dacă
 este același
 </target>
 
+<source>File content</source>
+<target>Conținutul Filelor</target>
+
 <source>Symbolic Link handling</source>
 <target>Gestionarea Legăturilor Simbolice</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Selectează Varianta de Sincronizare:</target>
+<source><- Two way -></source>
+<target><= Bidirecțională =></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identificare și propagare a modificărilor din ambele părți folosind o bază de date. Ștergerile, renumirile și conflictele sînt detectate automat.</target>
 
+<source>Mirror ->></source>
+<target>Clonare =>></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Conservare [backup] în oglindă a dosarului stîng. Dosarul drept e modificat pentru a fi identic după sincronizare cu cel stîng.</target>
 
+<source>Update -></source>
+<target>Actualizare =></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Copiere în dosarul din dreapta a filelor actualizate sau noi.</target>
 
+<source>Custom</source>
+<target>Sincronizare Personalizată</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Reguli de sincronizare definite de utilizator pentru fiecare situație.</target>
 
@@ -654,7 +645,7 @@ este același
 <source>Recycle Bin</source>
 <target>Reciclator</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
+<source>Use Recycle Bin for deleted and overwritten files</source>
 <target>Filele șterse sau suprascrise sînt puse în Reciclator [Recycle Bin], de unde pot fi recuperate la nevoie</target>
 
 <source>Versioning</source>
@@ -663,8 +654,8 @@ este același
 <source>Move time-stamped files into specified folder</source>
 <target>Filelor le este adăugat un marcaj de timp și apoi sînt mutate în dosarul specificat</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Limitează numărul maxim de versiuni per filă</target>
+<source>Naming convention:</source>
+<target>Convenție de numire:</target>
 
 <source>Configuration</source>
 <target>Configurație</target>
@@ -706,7 +697,7 @@ este același
 <target>Multe mulțumiri pentru localizare:</target>
 
 <source>Feedback and suggestions are welcome</source>
-<target>Opiniile și sugestiile despre program sînt binevenite</target>
+<target>Opiniile și sugestiile despre program sînt binevenite.</target>
 
 <source>Homepage</source>
 <target>Situl Softului</target>
@@ -813,6 +804,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Overview</source>
 <target>Panoramă</target>
 
+<source>Filter files</source>
+<target>Filtru</target>
+
 <source>Select view</source>
 <target>Selectează Vederea</target>
 
@@ -864,9 +858,15 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source><Last session></source>
 <target><Ultima Sesiune></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Comparare și Sincronizare de Dosare</target>
+
 <source>Configuration saved!</source>
 <target>Configurație salvată !</target>
 
+<source>FreeFileSync batch</source>
+<target>Set FreeFileSync</target>
+
 <source>Never save changes</source>
 <target>Nu salva niciodată modificările</target>
 
@@ -879,9 +879,6 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Configuration loaded!</source>
 <target>Configurație deschisă !</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Comparare și Sincronizare de Dosare</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Ascunde filele care există doar în stînga</target>
 
@@ -1042,6 +1039,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Comparing content...</source>
 <target>Compar conținutul...</target>
 
+<source>Copy</source>
+<target>Copiază</target>
+
 <source>Paused</source>
 <target>Sincronizare Pauzată</target>
 
@@ -1114,13 +1114,13 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>- folder part only</source>
 <target>- doar pentru partea dosarului</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- corespondentul din partea opusă al lui %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- corespondentul din partea opusă al lui %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- corespondentul din partea opusă al lui %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- corespondentul din partea opusă al lui %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
+<source>Make hidden warnings and dialogs visible again?</source>
 <target>Vrei ca dialogurile ascunse și mesajele de avertizare să fie vizibile din nou?</target>
 
 <source>
@@ -1146,50 +1146,29 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Leave as unresolved conflict</source>
 <target>Lasă ca Conflict Nerezolvat</target>
 
-<source>Files</source>
-<target>File</target>
+<source>Replace</source>
+<target>Înlocuiește</target>
 
-<source>Percentage</source>
-<target>Procent</target>
+<source>Move files and replace if existing</source>
+<target>Mută filele și înlocuiește-le pe cele existente</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Adaugă un marcaj temporal la numele fiecărei file</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Dosar</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Filă</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-<pluralform>%x de min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>AAAA-LL-ZZ hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 oră</pluralform>
-<pluralform>%x ore</pluralform>
-<pluralform>%x de ore</pluralform>
-</target>
+<source>Files</source>
+<target>File</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 zi</pluralform>
-<pluralform>%x zile</pluralform>
-<pluralform>%x de zile</pluralform>
-</target>
+<source>Percentage</source>
+<target>Procent</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Nu pot monitoriza dosarul %x.</target>
@@ -1239,6 +1218,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Cannot copy file %x to %y.</source>
 <target>Nu pot copia fila %x în %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Tipul de element %x nu e suportat:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Nu pot deschide dosarul %x.</target>
 
@@ -1248,6 +1230,45 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Detected endless directory recursion.</source>
 <target>A fost detectată o recursivitate infinită a dosarului.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x de min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 oră</pluralform>
+<pluralform>%x ore</pluralform>
+<pluralform>%x de ore</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 zi</pluralform>
+<pluralform>%x zile</pluralform>
+<pluralform>%x de zile</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Nu pot seta privilegiul %x.</target>
 
@@ -1297,7 +1318,7 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <target>Filele %x au dată identică, dar mărime diferită!</target>
 
 <source>Items differ in attributes only</source>
-<target>Itemurile diferă doar prin atributele lor</target>
+<target>Elementele diferă doar prin atributele lor</target>
 
 <source>Symbolic links %x have the same date but a different target.</source>
 <target>Legăturile simbolice %x au aceeași dată, dar ținte diferite.</target>
@@ -1377,6 +1398,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Moving symbolic link %x to %y</source>
 <target>Mut legătura simbolică %x în %y</target>
 
+<source>Removing old versions...</source>
+<target>Înlătur versiunile vechi...</target>
+
 <source>Creating file %x</source>
 <target>Creez fila %x</target>
 
@@ -1398,6 +1422,9 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Updating attributes of %x</source>
 <target>Actualizez atributele lui %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Dosarul țintă %x există deja.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Cîmpul de introducere a dosarului țintă nu trebuie să fie gol.</target>
 
@@ -1407,11 +1434,8 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>Source folder %x not found.</source>
 <target>Dosarul sursă %x nu a fost găsit.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Există conflicte nerezolvate!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Poți ignora conflictele pentru a continua cu sincronizarea.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Elementele următoare au conflicte nerezolvate și nu vor fi sincronizate:</target>
 
 <source>Significant difference detected:</source>
 <target>Diferență semnificativă detectată:</target>
@@ -1431,12 +1455,15 @@ Notă: Numele filelor trebuie să fie relative la dosarele bază (rădăcină)!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Va fi modificat un dosar care face parte din mai multe perechi de dosare! Reverifică setările de sincronizare!</target>
 
+<source>Left</source>
+<target>Stînga</target>
+
+<source>Right</source>
+<target>Dreapta</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Sincronizez perechea de dosare:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Dosarul țintă %x există deja.</target>
-
 <source>Generating database...</source>
 <target>Generez baza de date...</target>
 
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 59740f22..0ffed7e4 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Запрос отмены: Ожидайте, пока текущая операция завершится...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Неспособность создать отметку времени для архивации файлов:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Автоматическая синхронизация</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Очистить настройки фильтра</target>
 
-<source>Create a batch job</source>
-<target>Создать пакетное задание</target>
+<source>Save as batch job</source>
+<target>Сохранить как пакетное задание</target>
 
 <source>Comparison settings</source>
 <target>Настройки сравнения</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Глобальные настройки</target>
 
-<source>Summary</source>
-<target>Сводка</target>
-
 <source>Find</source>
 <target>Найти</target>
 
@@ -274,8 +274,8 @@
 <source>Select a folder</source>
 <target>Выбрать папку</target>
 
-<source>Delay [seconds]</source>
-<target>Задержка [в секундах]</target>
+<source>Idle time [seconds]</source>
+<target>Время задержки [секунды]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Время задержки между последним обнаруженным изменением и выполнением командной строки в секундах</target>
@@ -324,38 +324,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>Поле ввода папки пустое.</target>
 
-<source>File time and size</source>
-<target>Дата и размер файла</target>
-
-<source>File content</source>
-<target>Содержимое файла</target>
-
-<source><Automatic></source>
-<target><Автоматический></target>
-
-<source>Mirror ->></source>
-<target>Зеркало ->></target>
-
-<source>Update -></source>
-<target>Обновить -></target>
-
-<source>Custom</source>
-<target>Выборочно</target>
-
-<source>FreeFileSync batch</source>
-<target>Пакетное задание FreeFileSync</target>
-
 <source>Synchronization aborted!</source>
 <target>Синхронизация отменена!</target>
 
 <source>Synchronization completed with errors!</source>
-<target>Синхронизация закончена с ошибками!</target>
+<target>Синхронизация завершена. В процессе синхронизации возникли ошибки!</target>
+
+<source>Synchronization completed with warnings.</source>
+<target>Синхронизация завершена. В процессе синхронизации возникли проблемы.</target>
 
 <source>Nothing to synchronize!</source>
 <target>Ничего нет для синхронизации!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Синхронизация прошла успешно!</target>
+<source>Synchronization completed successfully.</source>
+<target>Синхронизация завершена успешно.</target>
+
+<source>Saving log file %x...</source>
+<target>Сохранение лог-файла %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Нажмите "Переключить" для продолжения работы в главном окне FreeFileSync.</target>
@@ -363,9 +348,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Переключение на главное окно FreeFileSync...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Невозможно соединиться с sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Доступна новая версия FreeFileSync:</target>
 
@@ -378,6 +360,12 @@ The command is triggered if:
 <source>Information</source>
 <target>Информация</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Невозможно соединиться с sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Текущая версия FreeFileSync не была найдена онлайн! Вы хотите проверить вручную?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Вы хотите, чтобы FreeFileSync автоматически проверял наличие обновлений каждую неделю?</target>
 
@@ -441,27 +429,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>Гибернация</target>
 
-<source>1. &Compare</source>
-<target>1. С&равнить</target>
-
-<source>2. &Synchronize</source>
-<target>2. С&инхронизировать</target>
-
 <source>&New</source>
 <target>&Новая</target>
 
 <source>&Save</source>
 <target>&Сохранить</target>
 
+<source>Save as &batch job...</source>
+<target>Сохранить как &пакетное задание</target>
+
+<source>1. &Compare</source>
+<target>1. С&равнить</target>
+
+<source>2. &Synchronize</source>
+<target>2. С&инхронизировать</target>
+
 <source>&Language</source>
 <target>&Язык</target>
 
 <source>&Global settings...</source>
 <target>&Глобальные настройки...</target>
 
-<source>&Create batch job...</source>
-<target>&Создать пакетное задание...</target>
-
 <source>&Export file list...</source>
 <target>&Экспортировать список файлов...</target>
 
@@ -495,11 +483,11 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Поменять направление</target>
 
-<source>Load configuration from file</source>
-<target>Загрузить настройки синхронизации из файла</target>
+<source>Open</source>
+<target>Открыть</target>
 
-<source>Save current configuration to file</source>
-<target>Сохранить текущие настройки синхронизации в файл</target>
+<source>Save</source>
+<target>Сохранить</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>
@@ -507,8 +495,8 @@ The command is triggered if:
 (нажмите DEL для удаления из списка)
 </target>
 
-<source>Show excluded items</source>
-<target>Показать исключенные элементы</target>
+<source>Hide excluded items</source>
+<target>Скрыть исключенные элементы</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Показать отфильтрованные или временно исключенные файлы</target>
@@ -546,15 +534,6 @@ The command is triggered if:
 <source>Help</source>
 <target>Помощь</target>
 
-<source>Filter files</source>
-<target>Фильтр</target>
-
-<source>Left</source>
-<target>Слева</target>
-
-<source>Right</source>
-<target>Справа</target>
-
 <source>Error handling</source>
 <target>Обработка ошибок</target>
 
@@ -568,7 +547,7 @@ The command is triggered if:
 <target>Всплывающие окна</target>
 
 <source>Show pop-up on errors or warnings</source>
-<target>Показывать всплывающие окна при ошибках и замечаниях</target>
+<target>Показывать всплывающие окна при ошибках и предупреждениях</target>
 
 <source>Exit</source>
 <target>Выход</target>
@@ -576,14 +555,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>Отменить синхронизацию при первой ошибке</target>
 
-<source>On completion:</source>
-<target>По окончании работы</target>
+<source>On completion</source>
+<target>По завершению</target>
 
 <source>Show progress dialog</source>
 <target>Показать окно прогресса</target>
 
-<source>Generate log file</source>
-<target>Создавать лог-файлы</target>
+<source>Save log</source>
+<target>Сохранить лог-файл</target>
 
 <source>Select folder to save log files</source>
 <target>Выберите папку для сохранения лог-файлов</target>
@@ -594,11 +573,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>Ограничить максимальное количество лог-файлов</target>
 
-<source>Batch settings</source>
-<target>Настройки пакетного задания</target>
-
-<source>Compare by...</source>
-<target>Критерии сравнения</target>
+<source>Select variant</source>
+<target>Выберите вариант</target>
 
 <source>
 Files are found equal if
@@ -612,6 +588,9 @@ are the same
  - размер файла
 </target>
 
+<source>File time and size</source>
+<target>Дата и размер файла</target>
+
 <source>
 Files are found equal if
      - file content
@@ -619,24 +598,36 @@ is the same
 </source>
 <target>Файлы считаются равными, если содержание файлов одинаковое</target>
 
+<source>File content</source>
+<target>Содержимое файла</target>
+
 <source>Symbolic Link handling</source>
 <target>Обращение к символьной ссылке</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Варианты синхронизации</target>
+<source><- Two way -></source>
+<target><= В обе стороны =></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Выявление и распространение изменений на обе стороны, используя базу данных. Удаленные, переименованные и конфликтные файлы определяются автоматически.</target>
 
+<source>Mirror ->></source>
+<target>Зеркало =>></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Зеркальная (резервная) копия левой части. В результате синхронизации правая папка будет изменена до полного соответствия левой.</target>
 
+<source>Update -></source>
+<target>Обновить =></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Копировать новые или обновлять файлы на правой стороне.</target>
 
+<source>Custom</source>
+<target>Выборочно</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Настроить свои собственные правила синхронизации.</target>
 
@@ -644,25 +635,25 @@ is the same
 <target>Настройки удаления</target>
 
 <source>Permanent</source>
-<target>Безвозвратно</target>
+<target>Удалить безвозвратно</target>
 
 <source>Delete or overwrite files permanently</source>
 <target>Удалить или перезаписать файлы, не помещая в "Корзину"</target>
 
 <source>Recycle Bin</source>
-<target>В "Корзину"</target>
+<target>Переместить в "Корзину"</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Использовать "Корзину" при удалении или перезаписи файлов</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Использовать "Корзину" для удаленных и перезаписанных файлов</target>
 
 <source>Versioning</source>
-<target>Переместить старые версии файлов в заданную папку</target>
+<target>Архивировать</target>
 
 <source>Move time-stamped files into specified folder</source>
 <target>Переместить файлы с отметками времени в указанную папку</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Ограничить максимальное количество версий на файл</target>
+<source>Naming convention:</source>
+<target>Условие:</target>
 
 <source>Configuration</source>
 <target>Настройки</target>
@@ -811,6 +802,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Главная</target>
 
+<source>Filter files</source>
+<target>Фильтр</target>
+
 <source>Select view</source>
 <target>Вид списка файлов</target>
 
@@ -862,9 +856,15 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><Последняя сессия></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Сравнение и синхронизация</target>
+
 <source>Configuration saved!</source>
 <target>Настройки синхронизации сохранены!</target>
 
+<source>FreeFileSync batch</source>
+<target>Пакетное задание FreeFileSync</target>
+
 <source>Never save changes</source>
 <target>Никогда не сохранять изменения</target>
 
@@ -877,9 +877,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>Настройки синхронизации загружены!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Сравнение и синхронизация</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Скрыть файлы, существующие только слева</target>
 
@@ -1040,6 +1037,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Сравнение содержания...</target>
 
+<source>Copy</source>
+<target>Копировать</target>
+
 <source>Paused</source>
 <target>Пауза</target>
 
@@ -1115,14 +1115,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- часть пути папки</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- аналогичный файл с другой стороны</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- аналог %item_path% с другой стороны</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- аналогичная папка с другой стороны</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- аналог %item_folder% с другой стороны</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Сделать скрытые диалоги и предупреждения видимыми вновь?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Сделать скрытые предупреждения и диалоги видимыми снова?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1147,50 +1147,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Оставить как нерешенный конфликт</target>
 
-<source>Files</source>
-<target>Файлы</target>
+<source>Replace</source>
+<target>Переместить</target>
 
-<source>Percentage</source>
-<target>Проценты</target>
+<source>Move files and replace if existing</source>
+<target>Переместить файлы и заменить, если существуют</target>
 
-<source>%x TB</source>
-<target>%x ТБ</target>
+<source>Append a timestamp to each file name</source>
+<target>Добавить отметку времени для каждого имени файла</target>
 
-<source>%x PB</source>
-<target>%x ПБ</target>
+<source>Folder</source>
+<target>Папка</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Файл</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x минута</pluralform>
-<pluralform>%x минуты</pluralform>
-<pluralform>%x минут</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>ГГГГ-ММ-ДД ччммсс</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x час</pluralform>
-<pluralform>%x часа</pluralform>
-<pluralform>%x часов</pluralform>
-</target>
+<source>Files</source>
+<target>Файлы</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x день</pluralform>
-<pluralform>%x дня</pluralform>
-<pluralform>%x дней</pluralform>
-</target>
+<source>Percentage</source>
+<target>Проценты</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Не удается наблюдать папку %x.</target>
@@ -1240,6 +1219,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>Не удается скопировать файл %x в %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Тип элемента %x не поддерживается:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Невозможно открыть папку %x.</target>
 
@@ -1249,6 +1231,45 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>Обнаружена бесконечная рекурсия папок.</target>
 
+<source>%x TB</source>
+<target>%x ТБ</target>
+
+<source>%x PB</source>
+<target>%x ПБ</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x минута</pluralform>
+<pluralform>%x минуты</pluralform>
+<pluralform>%x минут</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x час</pluralform>
+<pluralform>%x часа</pluralform>
+<pluralform>%x часов</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x день</pluralform>
+<pluralform>%x дня</pluralform>
+<pluralform>%x дней</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Не удается установить привелегии %x.</target>
 
@@ -1381,6 +1402,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>Перемещение символьной ссылки %x в %y</target>
 
+<source>Removing old versions...</source>
+<target>Удаление старых версий...</target>
+
 <source>Creating file %x</source>
 <target>Создание файла %x</target>
 
@@ -1402,20 +1426,20 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Обновление атрибутов %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Целевая папка %x уже существует.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Поле ввода целевой папки не должно быть пустым.</target>
 
 <source>Folder input field for versioning must not be empty.</source>
-<target>Поле ввода папки для старых версий файлов не должно быть пустым.</target>
+<target>Поле ввода папки для архивации файлов не должно быть пустым.</target>
 
 <source>Source folder %x not found.</source>
 <target>Исходная папка %x не найдена.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Существуют нерешенные конфликты</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Вы можете проигнорировать их и продолжить синхронизацию.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Следующие элементы имеют неурегулированные конфликты и не будут синхронизированы:</target>
 
 <source>Significant difference detected:</source>
 <target>Обнаружено существенное различие:</target>
@@ -1435,12 +1459,15 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Папка, входящая в несколько пар папок, будет изменена. Пожалуйста, проверьте настройки синхронизации.</target>
 
+<source>Left</source>
+<target>Слева</target>
+
+<source>Right</source>
+<target>Справа</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Синхронизация пары папок:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Целевая папка %x уже существует.</target>
-
 <source>Generating database...</source>
 <target>Создание базы данных...</target>
 
diff --git a/BUILD/Languages/scottish_gaelic.lng b/BUILD/Languages/scottish_gaelic.lng
index 24551a41..3e49bc3b 100644
--- a/BUILD/Languages/scottish_gaelic.lng
+++ b/BUILD/Languages/scottish_gaelic.lng
@@ -26,11 +26,14 @@
 <target>Fosgail leis an aplacaid bhunaiteach</target>
 
 <source>Browse directory</source>
-<target>Rùraich an t-eòlaire</target>
+<target>Rùraich am pasgan</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Tha thu airson sgur dheth: A' feitheamh gus an crìochnaich an gnìomh làithreach...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Cha b' urrainn dhuinn stampa-ama a chruthachadh airson versioning:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sioncronachadh fèin-obrachail</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Falamhaich roghainnean na criathraige</target>
 
-<source>Create a batch job</source>
-<target>Cruthaich batch job</target>
+<source>Save as batch job</source>
+<target>Sàbhail mar obair baidse</target>
 
 <source>Comparison settings</source>
 <target>Roghainnean a' choimeasaidh</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Na roghainnean uile-choitcheann</target>
 
-<source>Summary</source>
-<target>Gearr-chunntas</target>
-
 <source>Find</source>
 <target>Lorg</target>
 
@@ -160,10 +160,10 @@
 <target>Chan urrainn dhuinn greim fhaighinn air fiosrachadh a' phròiseis.</target>
 
 <source>Waiting while directory is locked (%x)...</source>
-<target>A' feitheamh fhad 's a tha an t-eòlaire glaiste (%x)...</target>
+<target>A' feitheamh fhad 's a tha am pasgan glaiste (%x)...</target>
 
 <source>Cannot set directory lock %x.</source>
-<target>Cha ghabh glas an eòlaire %x a shuidheachadh.</target>
+<target>Cha ghabh glas a' phasgain %x a shuidheachadh.</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -277,8 +277,8 @@
 <source>Select a folder</source>
 <target>Tagh pasgan</target>
 
-<source>Delay [seconds]</source>
-<target>Dàil [diogan]</target>
+<source>Idle time [seconds]</source>
+<target>Ùine 'na thàmh [seconds]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>An tàmh eadar an t-atharrachadh mu dheireadh agus gnìomhachadh na h-àithne</target>
@@ -322,43 +322,28 @@ Thèid an loidhne-àithne a chur gu dol:
 <target>A' cumail sùil...</target>
 
 <source>Waiting for missing directories...</source>
-<target>A' feitheamh ris na h-eòlairean a tha a dhìth...</target>
+<target>A' feitheamh ris na pasgain a tha a dhìth...</target>
 
 <source>A folder input field is empty.</source>
 <target>Tha co-dhiù aon raon pasgain ann a tha falamh.</target>
 
-<source>File time and size</source>
-<target>Ceann-là is meud</target>
-
-<source>File content</source>
-<target>Susbaint an fhaidhle</target>
-
-<source><Automatic></source>
-<target><Fèin-obrachail></target>
-
-<source>Mirror ->></source>
-<target>Sgàthanaich ->></target>
-
-<source>Update -></source>
-<target>Ùraich -></target>
-
-<source>Custom</source>
-<target>Gnàthaichte</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Sguireadh dhen t-sioncronachadh!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Chaidh an sioncronachadh a choileanadh ach bha mearachdan ann!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Chaidh a shioncronachadh ach bha rabhaidhean ann.</target>
+
 <source>Nothing to synchronize!</source>
 <target>Chan eil dad ri shioncronachadh!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Chaidh an sioncronachadh a choileanadh!</target>
+<source>Synchronization completed successfully.</source>
+<target>Chaidh a shioncronachadh.</target>
+
+<source>Saving log file %x...</source>
+<target>A' sàbhaladh faidhle an loga %x...</target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Briog air "Gearr leum" gus duilgheadasan a rèiteachadh sa phrìomh-chòmhradh aig FreeFileSync.</target>
@@ -366,9 +351,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>A' gearradh leum gu prìomh-chòmhradh FreeFileSyncs...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Cha b' urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Tha tionndadh ùr de FreeFileSync ann:</target>
 
@@ -381,6 +363,12 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Information</source>
 <target>Fiosrachadh</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Cha b' urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Cha do lorg sinn àireamh an tionndaidh làithrich aig FreeFileSync air loidhne! A bheil thu airson a lorg a làimh?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>A bheil thu airson 's gun doir FreeFileSync sùil gach seachdain ach a bheil ùrachadh ann?</target>
 
@@ -439,32 +427,32 @@ Thèid an loidhne-àithne a chur gu dol:
 <target>Clàraich a-mach</target>
 
 <source>Shut down</source>
-<target>Dùin sìos</target>
+<target>Dùin sìos an siostam</target>
 
 <source>Hibernate</source>
 <target>Geamhraich</target>
 
-<source>1. &Compare</source>
-<target>1. &Dèan coimeas</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Dèan sioncronachadh</target>
-
 <source>&New</source>
 <target>Ù&r</target>
 
 <source>&Save</source>
 <target>&Sàbhail</target>
 
+<source>Save as &batch job...</source>
+<target>Sàbhail mar obair &baidse...</target>
+
+<source>1. &Compare</source>
+<target>1. &Dèan coimeas</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Dèan sioncronachadh</target>
+
 <source>&Language</source>
 <target>&Cànan</target>
 
 <source>&Global settings...</source>
 <target>&Na roghainnean uile-choitcheann...</target>
 
-<source>&Create batch job...</source>
-<target>Cr&uthaich batch job...</target>
-
 <source>&Export file list...</source>
 <target>Às-p&hortaich liosta nam faidhle...</target>
 
@@ -498,17 +486,17 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Swap sides</source>
 <target>Cuir an dà thaobh an àite a chèile</target>
 
-<source>Load configuration from file</source>
-<target>Luchdaich an rèiteachadh on fhaidhle</target>
+<source>Open</source>
+<target>Fosgail</target>
 
-<source>Save current configuration to file</source>
-<target>Sàbhail an rèiteachadh làithreach ann am faidhle</target>
+<source>Save</source>
+<target>Sàbhail</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>An rèiteachadh mu dheireadh a chaidh a chleachdadh (brùth DEL gus rudan a thoirt air falbh on liosta)</target>
 
-<source>Show excluded items</source>
-<target>Seall an fheadhainn a tha 'ga dhùnadh a-mach</target>
+<source>Hide excluded items</source>
+<target>Falaich nithean a chaidh a dhùnadh às</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Seall faidhlichean a tha 'gan dùnadh a-mach no air an criathradh a-mach an-dràsta fhèin</target>
@@ -538,7 +526,7 @@ Thèid an loidhne-àithne a chur gu dol:
 <target>An ùine a dh'fhalbh:</target>
 
 <source>Batch job</source>
-<target>Batch job</target>
+<target>Obair baidse</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
 <target>Cruthaich faidhle batch airson sioncronachadh fèin-obrachail. Dèan briogadh dùbailte air an fhaidhle seo no cuir e air sgeideal an t-siostaim agad: FreeFileSync.exe <Jobname>.ffs_batch.</target>
@@ -546,15 +534,6 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Help</source>
 <target>Cobhair</target>
 
-<source>Filter files</source>
-<target>Criathraich na faidhlichean</target>
-
-<source>Left</source>
-<target>Clì</target>
-
-<source>Right</source>
-<target>Deas</target>
-
 <source>Error handling</source>
 <target>Làimhseachadh mhearachdan</target>
 
@@ -576,14 +555,14 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Abort synchronization on first error</source>
 <target>Sguir dhen t-sioncronachadh nuair a thachras a' chiad mhearachd</target>
 
-<source>On completion:</source>
-<target>Nuair a bhios e deiseil:</target>
+<source>On completion</source>
+<target>Nuair a bhios e deiseil</target>
 
 <source>Show progress dialog</source>
 <target>Seall còmhradh an adhartais</target>
 
-<source>Generate log file</source>
-<target>Gin faidhle an loga</target>
+<source>Save log</source>
+<target>Sàbhail an loga</target>
 
 <source>Select folder to save log files</source>
 <target>Tagh pasgan far an dèid faidhlichean an loga a shàbhaladh</target>
@@ -594,11 +573,8 @@ Thèid an loidhne-àithne a chur gu dol:
 <source>Limit maximum number of log files</source>
 <target>Cuingich an àireamh as motha de dh'fhaidhlichean an loga</target>
 
-<source>Batch settings</source>
-<target>Roghainnean a' batch</target>
-
-<source>Compare by...</source>
-<target>Dèan coimeas a-rèir...</target>
+<source>Select variant</source>
+<target>Tagh fear</target>
 
 <source>
 Files are found equal if
@@ -613,6 +589,9 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 co-ionnann
 </target>
 
+<source>File time and size</source>
+<target>Ceann-là is meud</target>
+
 <source>
 Files are found equal if
      - file content
@@ -623,24 +602,36 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
      - susbaint an dà fhaidhle co-ionnann
 </target>
 
+<source>File content</source>
+<target>Susbaint an fhaidhle</target>
+
 <source>Symbolic Link handling</source>
 <target>Làimhseachadh nan symbolic links</target>
 
 <source>OK</source>
 <target>Ceart ma-thà</target>
 
-<source>Select variant:</source>
-<target>Tagh seòrsa:</target>
+<source><- Two way -></source>
+<target><- An dà chomhair -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Lorg is cuir an sàs atharraichean air an dà thaobh le stòr-dàta. Mothaichear do rudan a chaidh sguabadh às, a chaidh ainmean ùra a thoirt orra no còmhstrithean gu fèin-obrachail.</target>
 
+<source>Mirror ->></source>
+<target>Sgàthanaich ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Dèan lethbhreac-glèidhidh 's tu a' sgàthanadh a' phasgain air an taobh chlì. Thèid am pasgan air an taobh deas a chur air gleus ach am bi e gu tur co-ionnann ris a' phasgan air an taobh chlì as dèidh dha sioncronachadh.</target>
 
+<source>Update -></source>
+<target>Ùraich -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Cuir lethbhreac de dh'fhaidhlichean a tha ùr no ùraichte dhan phasgan air an taobh deas.</target>
 
+<source>Custom</source>
+<target>Gnàthaichte</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Sònraich riaghailtean sioncronachaidh thu fhèin.</target>
 
@@ -656,8 +647,8 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Recycle Bin</source>
 <target>Am biona ath-chuairteachaidh</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Cleachd am biona ath-chuairteachaidh nuair a thèid faidhlichean a sguabadh às no ma thèid sgrìobhadh thairis orra</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Cuir na chaidh a sguabadh as no sgrìobhadh thairis air sa bhiona ath-chuairteachaidh</target>
 
 <source>Versioning</source>
 <target>Versioning</target>
@@ -665,8 +656,8 @@ Bidh dà fhaidhle co-ionnann 'nar beachd-sa
 <source>Move time-stamped files into specified folder</source>
 <target>Gluais faidhlichean air a bheil stampa ama do phasgain shònraichte</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Cuingich an àireamh as motha de thionndaidhean airson gach faidhle</target>
+<source>Naming convention:</source>
+<target>Gnàthas nan ainmean:</target>
 
 <source>Configuration</source>
 <target>Rèiteachadh</target>
@@ -734,7 +725,7 @@ Note: File names must be relative to base directories!
 </source>
 <target>
 Cha dèid ach na faidhlichean a fhreagras ri gach roghainn na criathraige a shioncronachadh.
-An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairean aca!
+An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-phasgain aca!
 </target>
 
 <source>Include</source>
@@ -815,6 +806,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Overview</source>
 <target>Foir-shealladh</target>
 
+<source>Filter files</source>
+<target>Criathraich na faidhlichean</target>
+
 <source>Select view</source>
 <target>Tagh sealladh</target>
 
@@ -866,9 +860,15 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source><Last session></source>
 <target><An seisean mu dheireadh></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Coimeas eadar na pasgain is sioncronachadh</target>
+
 <source>Configuration saved!</source>
 <target>Chaidh an rèiteachadh a shàbhaladh!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Na sàbhail atharraichean idir</target>
 
@@ -881,9 +881,6 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Configuration loaded!</source>
 <target>Chaidh an rèiteachadh a luchdadh!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Coimeas eadar na pasgain is sioncronachadh</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Na falaich ach faidhlichean a tha air an taobh chlì a-mhàin</target>
 
@@ -996,10 +993,10 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <pluralform>%x directories</pluralform>
 </source>
 <target>
-<pluralform>%x eòlaire</pluralform>
-<pluralform>%x eòlaire</pluralform>
-<pluralform>%x eòlairean</pluralform>
-<pluralform>%x eòlaire</pluralform>
+<pluralform>%x phasgan</pluralform>
+<pluralform>%x phasgan</pluralform>
+<pluralform>%x pasgain</pluralform>
+<pluralform>%x pasgan</pluralform>
 </target>
 
 <source>
@@ -1048,6 +1045,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Comparing content...</source>
 <target>A' dèanamh coimeas eadar an cuid susbaint...</target>
 
+<source>Copy</source>
+<target>Dèan lethbhreac</target>
+
 <source>Paused</source>
 <target>'Na stad</target>
 
@@ -1120,14 +1120,14 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>- folder part only</source>
 <target>- cuid a' phasgain a-mhàin</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- seise %s an taoibh eile</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Seise %item_folder% aig a' choimpiutair eile</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- seise %dir an taoibh eile</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Seise %item_folder% aig a' choimpiutair eile</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>A bheil thu airson na còmhraidhean is rabhaidhean falaichte fhaicinn a-rithist?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>A bheil thus airson na rabhaidhean 's còmraidhean falaichte fhaicinn a-rithist?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1154,53 +1154,29 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Leave as unresolved conflict</source>
 <target>Fàg mar còmhstri gun rèiteachadh</target>
 
-<source>Files</source>
-<target>Faidhlichean</target>
+<source>Replace</source>
+<target>Cuir 'na àite</target>
 
-<source>Percentage</source>
-<target>Ceudad</target>
+<source>Move files and replace if existing</source>
+<target>Gluais na faidhlichean 's cuir iad an àite na feadhainn làithreach ma tha gin ann</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Cuir stampa-ama ris ainm gach faidhle</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Pasgan</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Faidhle</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x mhionaid</pluralform>
-<pluralform>%x mhionaid</pluralform>
-<pluralform>%x mionaidean</pluralform>
-<pluralform>%x mionaid</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>BBBB-MM-LL uummdd</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x uair a thìde</pluralform>
-<pluralform>%x uair a thìde</pluralform>
-<pluralform>%x uairean a thìde</pluralform>
-<pluralform>%x uair a thìde</pluralform>
-</target>
+<source>Files</source>
+<target>Faidhlichean</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x latha</pluralform>
-<pluralform>%x latha</pluralform>
-<pluralform>%x làithean</pluralform>
-<pluralform>%x latha</pluralform>
-</target>
+<source>Percentage</source>
+<target>Ceudad</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Chan urrainn dhuinn sùil a chumail air %x.</target>
@@ -1218,7 +1194,7 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <target>Cha ghabh am faidhle %x a ghluasad dha %y.</target>
 
 <source>Cannot delete directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x a sguabadh às.</target>
+<target>Cha ghabh am pasgan %x a sguabadh às.</target>
 
 <source>Cannot write file attributes of %x.</source>
 <target>Chan urrainn dhuinn buadhan an fhaidhle %x a sgrìobhadh.</target>
@@ -1242,7 +1218,7 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <target>Cha ghabh ceadan %x a sgrìobhadh.</target>
 
 <source>Cannot create directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x a chruthachadh.</target>
+<target>Cha ghabh am pasgan %x a chruthachadh.</target>
 
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>Chan ghabh lethbhreac dhen symbolic link %x a chur gu %y.</target>
@@ -1250,14 +1226,59 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Cannot copy file %x to %y.</source>
 <target>Cha ghabh lethbhreac an fhaidhle %x a chur gu %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Chan eil taic ri nì dhen t-seòrsa %x:</target>
+
 <source>Cannot open directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x fhosgladh.</target>
+<target>Cha ghabh am pasgan %x fhosgladh.</target>
 
 <source>Cannot enumerate directory %x.</source>
-<target>Cha ghabh an t-eòlaire %x àireamhachadh.</target>
+<target>Cha ghabh am pasgan %x àireamhachadh.</target>
 
 <source>Detected endless directory recursion.</source>
-<target>Mhothaich sinn dha ath-chùrsadh eòlaire gun chrìoch.</target>
+<target>Mhothaich sinn dha ath-chùrsadh phasgan gun chrìoch.</target>
+
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x mhionaid</pluralform>
+<pluralform>%x mhionaid</pluralform>
+<pluralform>%x mionaidean</pluralform>
+<pluralform>%x mionaid</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x uair a thìde</pluralform>
+<pluralform>%x uair a thìde</pluralform>
+<pluralform>%x uairean a thìde</pluralform>
+<pluralform>%x uair a thìde</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x latha</pluralform>
+<pluralform>%x latha</pluralform>
+<pluralform>%x làithean</pluralform>
+<pluralform>%x latha</pluralform>
+</target>
 
 <source>Cannot set privilege %x.</source>
 <target>Cha ghabh a' phribhleid %x a shuidheachadh.</target>
@@ -1290,7 +1311,7 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <target>Chan urrainn dhuinn am pasgan %x a lorg.</target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
-<target>Tha eòlairean an eisimeil a chèile! Bi faiceallach nuair a shuidhicheas tu na riaghailtean sioncronachaidh:</target>
+<target>Tha na pasgain an eisimeil a chèile! Bi faiceallach nuair a shuidhicheas tu na riaghailtean sioncronachaidh:</target>
 
 <source>Start comparison</source>
 <target>Dèan coimeas</target>
@@ -1388,6 +1409,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Moving symbolic link %x to %y</source>
 <target>A' gluasad an symbolic link %x gu %y</target>
 
+<source>Removing old versions...</source>
+<target>A' toirt air falbh nan seann tionndaidhean...</target>
+
 <source>Creating file %x</source>
 <target>A' cruthachadh an fhaidhle %x</target>
 
@@ -1409,6 +1433,9 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Updating attributes of %x</source>
 <target>Ag ùrachadh buadhan %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Tha am pasgan-uidhe %x ann mu thràth.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Chan fhaod raon a' phasgain a bhith falamh.</target>
 
@@ -1418,11 +1445,8 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>Source folder %x not found.</source>
 <target>Cha deach am pasgan tùsail %x a lorg.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Tha còmhstrithean gun rèiteachadh ann!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>'S urrainn dhut na còmhstrithean a leigeil seachad is leantainn air an t-sioncronachadh.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Tha còmstrithean aig na nithean a leanas fhathast is cha dèid an sioncronachadh:</target>
 
 <source>Significant difference detected:</source>
 <target>Chaidh diofar mòr a lorg:</target>
@@ -1442,12 +1466,15 @@ An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairea
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Thèid pasgan atharrachadh a tha 'na phàirt de dh'iomadh paidhir de phasgain. Nach doir thu sùil air roghainnean an t-sioncronachaidh?</target>
 
+<source>Left</source>
+<target>Clì</target>
+
+<source>Right</source>
+<target>Deas</target>
+
 <source>Synchronizing folder pair:</source>
 <target>A' sioncronachadh paidhir nam pasgan:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Tha am pasgan-uidhe %x ann mu thràth.</target>
-
 <source>Generating database...</source>
 <target>A' gintinn an stòir-dhàta...</target>
 
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index e831aeeb..3abe7273 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Zahtevana je bila prekinitev: čakam, da se zaključi trenutna operacija...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Napaka pri ustvarjanju časovne oznake pri ustvarjanju različic:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Avtomatizirana sinhronizacija</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Počisti nastavitve filtra</target>
 
-<source>Create a batch job</source>
-<target>Ustvari paketno opravilo</target>
+<source>Save as batch job</source>
+<target>Shrani kot paketno opravilo</target>
 
 <source>Comparison settings</source>
 <target>Nastavitve primerjanja</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Globalne nastavitve</target>
 
-<source>Summary</source>
-<target>Povzetek</target>
-
 <source>Find</source>
 <target>Najdi</target>
 
@@ -277,8 +277,8 @@
 <source>Select a folder</source>
 <target>Izberite mapo</target>
 
-<source>Delay [seconds]</source>
-<target>Zakasnitev [sekunde]</target>
+<source>Idle time [seconds]</source>
+<target>Čas nedejavnosti [sekunde]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Čas nedejavnosti med zadnjo zaznano spremembo in izvršitvijo ukaza</target>
@@ -327,38 +327,23 @@ Ukaz se sproži če:
 <source>A folder input field is empty.</source>
 <target>Vnosno polje za mapo je prazno.</target>
 
-<source>File time and size</source>
-<target>Čas in velikost datoteke</target>
-
-<source>File content</source>
-<target>Vsebini datoteke</target>
-
-<source><Automatic></source>
-<target><Samodejno></target>
-
-<source>Mirror ->></source>
-<target>Zrcalno ->></target>
-
-<source>Update -></source>
-<target>Posodobi -></target>
-
-<source>Custom</source>
-<target>Po meri</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync paket</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>Synchronization completed with warnings.</source>
+<target>Sinhronizacija se je končala z opozorili.</target>
+
 <source>Nothing to synchronize!</source>
 <target>Nič za sinhronizirati!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Sinhronizacija uspešno zaključena!</target>
+<source>Synchronization completed successfully.</source>
+<target>Sinhronizacija se je uspešno končala.</target>
+
+<source>Saving log file %x...</source>
+<target>Shranjujem datoteko beleženja %x...</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>
@@ -366,9 +351,6 @@ Ukaz se sproži če:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Nova različica FreeFileSync je na voljo:</target>
 
@@ -381,6 +363,12 @@ Ukaz se sproži če:
 <source>Information</source>
 <target>Informacije</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Ne morem se povezati na sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Trenutno različico FreeFileSync ni moč najti na spletu! Ali želite ročno preveriti?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Ali želite, da FreeFileSync samodejno preverja za posodobitve vsak teden?</target>
 
@@ -444,27 +432,27 @@ Ukaz se sproži če:
 <source>Hibernate</source>
 <target>Hibernacija</target>
 
-<source>1. &Compare</source>
-<target>1. &Primerjaj</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Sinhroniziraj</target>
-
 <source>&New</source>
 <target>&Novo</target>
 
 <source>&Save</source>
 <target>&Shrani</target>
 
+<source>Save as &batch job...</source>
+<target>Shrani kot paketno op&ravilo...</target>
+
+<source>1. &Compare</source>
+<target>1. &Primerjaj</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Sinhroniziraj</target>
+
 <source>&Language</source>
 <target>&Jezik</target>
 
 <source>&Global settings...</source>
 <target>&Globalne nastavitve...</target>
 
-<source>&Create batch job...</source>
-<target>&Ustvari paketno opravilo...</target>
-
 <source>&Export file list...</source>
 <target>&Izvozi seznam datotek...</target>
 
@@ -498,17 +486,17 @@ Ukaz se sproži če:
 <source>Swap sides</source>
 <target>Zamenjaj strani</target>
 
-<source>Load configuration from file</source>
-<target>Naloži konfiguracijo iz datoteke</target>
+<source>Open</source>
+<target>Odpri</target>
 
-<source>Save current configuration to file</source>
-<target>Shrani trenutno konfiguracijo v datoteko</target>
+<source>Save</source>
+<target>Shrani</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Zadnje uporabljene konfiguracije (pritisite DEL za odstranitev s seznama)</target>
 
-<source>Show excluded items</source>
-<target>Pokaži izključene elemente</target>
+<source>Hide excluded items</source>
+<target>Skrij izključene predmete</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Pokaži filtrirane ali začasno izključene datoteke</target>
@@ -546,15 +534,6 @@ Ukaz se sproži če:
 <source>Help</source>
 <target>Pomoč</target>
 
-<source>Filter files</source>
-<target>Filtriraj datoteke</target>
-
-<source>Left</source>
-<target>Levo</target>
-
-<source>Right</source>
-<target>Desno</target>
-
 <source>Error handling</source>
 <target>Napaka pri obravnavanju</target>
 
@@ -576,14 +555,14 @@ Ukaz se sproži če:
 <source>Abort synchronization on first error</source>
 <target>Prekini sinhronizacijo ob prvi napaki</target>
 
-<source>On completion:</source>
-<target>Ob zaključku:</target>
+<source>On completion</source>
+<target>Ob zaključku</target>
 
 <source>Show progress dialog</source>
 <target>Prikazuj pogovorno okno z napredkom</target>
 
-<source>Generate log file</source>
-<target>Ustvari datoteko beleženja</target>
+<source>Save log</source>
+<target>Shrani beleženje</target>
 
 <source>Select folder to save log files</source>
 <target>Izberite mapo za shranjevanje datotek beleženja</target>
@@ -594,11 +573,8 @@ Ukaz se sproži če:
 <source>Limit maximum number of log files</source>
 <target>Omeji maksimalno število datotek beleženja</target>
 
-<source>Batch settings</source>
-<target>Paketne nastavitve</target>
-
-<source>Compare by...</source>
-<target>Primerjaj po...</target>
+<source>Select variant</source>
+<target>Izberite varianto</target>
 
 <source>
 Files are found equal if
@@ -613,6 +589,9 @@ Datoteki sta enaki, če sta
 enaka
 </target>
 
+<source>File time and size</source>
+<target>Čas in velikost datoteke</target>
+
 <source>
 Files are found equal if
      - file content
@@ -624,24 +603,36 @@ Datoteki sta enaki, če
 enaka
 </target>
 
+<source>File content</source>
+<target>Vsebini datoteke</target>
+
 <source>Symbolic Link handling</source>
 <target>Rokovanje s simboličnimi povezavami</target>
 
 <source>OK</source>
 <target>V redu</target>
 
-<source>Select variant:</source>
-<target>Izberite varianto:</target>
+<source><- Two way -></source>
+<target><- Obojesmerno -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identificiraj in promoviraj spremembe na obeh straneh z uporabo podatkovne baze. Izbrisi, preimenovanja in spori so samodejno zaznani.</target>
 
+<source>Mirror ->></source>
+<target>Zrcalno ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Zrcalna varnostna kopija leve mape. Desna mapa bo spremenjena, da se bo natančno ujemala z levo mapo po sinhronizaciji.</target>
 
+<source>Update -></source>
+<target>Posodobi -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopiraj nove ali posodobljene datoteke v desno mapo.</target>
 
+<source>Custom</source>
+<target>Po meri</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Konfigurirajte vaša lastna sinhronizacijska pravila.</target>
 
@@ -657,8 +648,8 @@ enaka
 <source>Recycle Bin</source>
 <target>Koš</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Uporabi Koš pri brisanju ali prepisovanju datotek</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Uporabi Koš za izbrisane in prepisane datoteke</target>
 
 <source>Versioning</source>
 <target>Ustvarjanje različič</target>
@@ -666,8 +657,8 @@ enaka
 <source>Move time-stamped files into specified folder</source>
 <target>Premakni časovno-označene datoteke v določeno mapo</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Omejitev maksimalnega števila različic na datoteko</target>
+<source>Naming convention:</source>
+<target>Konvencija poimenovanja:</target>
 
 <source>Configuration</source>
 <target>Konfiguracija</target>
@@ -816,6 +807,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Overview</source>
 <target>Pregled</target>
 
+<source>Filter files</source>
+<target>Filtriraj datoteke</target>
+
 <source>Select view</source>
 <target>Izberite pogled</target>
 
@@ -867,9 +861,15 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source><Last session></source>
 <target><Zadnja seja></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Primerjava in sinhronizacija imenika</target>
+
 <source>Configuration saved!</source>
 <target>Konfiguracija shranjena!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync paket</target>
+
 <source>Never save changes</source>
 <target>Nikoli ne shrani sprememb</target>
 
@@ -882,9 +882,6 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Configuration loaded!</source>
 <target>Konfiguracija naložena!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Primerjava in sinhronizacija imenika</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Skrij datoteke, ki obstajajo samo na levi strani</target>
 
@@ -1049,6 +1046,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Comparing content...</source>
 <target>Primerjam vsebino...</target>
 
+<source>Copy</source>
+<target>Kopiraj</target>
+
 <source>Paused</source>
 <target>Na premoru</target>
 
@@ -1121,14 +1121,14 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>- folder part only</source>
 <target>- samo del glede mape</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Duplikat z druge strani od %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Na drugi strani nasprotno v %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Duplikat z druge strani od %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Na drugi strani nasprotno v %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Ponovno prikažem skrite pogovore in sporočila z opozorili?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Ponovno prikažem vsa skrita obvestila in pogovore?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1155,53 +1155,29 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Leave as unresolved conflict</source>
 <target>Pusti kot nerešeni spor</target>
 
-<source>Files</source>
-<target>Datoteke</target>
+<source>Replace</source>
+<target>Zamenjaj</target>
 
-<source>Percentage</source>
-<target>Odstotek</target>
+<source>Move files and replace if existing</source>
+<target>Premakne datoteke in jih zamenja, če obstajajo</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Dodaj časovno oznako k vsakemu imenu datoteke</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Mapa</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Datoteka</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>LLLL-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x ura</pluralform>
-<pluralform>%x uri</pluralform>
-<pluralform>%x ure</pluralform>
-<pluralform>%x ur</pluralform>
-</target>
+<source>Files</source>
+<target>Datoteke</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x dan</pluralform>
-<pluralform>%x dni</pluralform>
-<pluralform>%x dni</pluralform>
-<pluralform>%x dni</pluralform>
-</target>
+<source>Percentage</source>
+<target>Odstotek</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Ne morem nadzorovati imenika %x.</target>
@@ -1251,6 +1227,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Cannot copy file %x to %y.</source>
 <target>Ne morem kopirati datoteke %x v %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Predmet tipa %x ni podprt:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Ne morem odpreti imenika %x.</target>
 
@@ -1260,6 +1239,48 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Detected endless directory recursion.</source>
 <target>Zaznana neskončna imeniška rekurzija</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x ura</pluralform>
+<pluralform>%x uri</pluralform>
+<pluralform>%x ure</pluralform>
+<pluralform>%x ur</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x dan</pluralform>
+<pluralform>%x dni</pluralform>
+<pluralform>%x dni</pluralform>
+<pluralform>%x dni</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Ne morem nastaviti privilegija %x.</target>
 
@@ -1389,6 +1410,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Moving symbolic link %x to %y</source>
 <target>Premikam simbolično povezavo %x v %y</target>
 
+<source>Removing old versions...</source>
+<target>Odstranjujem stare različice...</target>
+
 <source>Creating file %x</source>
 <target>Ustvarjam datoteko %x</target>
 
@@ -1410,6 +1434,9 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Updating attributes of %x</source>
 <target>Posodabljam atribute od %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Ciljna mapa %x že obstaja.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Vnosno polje za ciljno mapo ne sme biti prazno.</target>
 
@@ -1419,11 +1446,8 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>Source folder %x not found.</source>
 <target>Izvorna mapa %x se ne najde.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Obstajajo nerešeni spori!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Lahko ignorirate spore in nadaljujete s sinhronizacijo.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Naslednji objekti imajo nerešene konflikte in ne bodo sinhronizirani:</target>
 
 <source>Significant difference detected:</source>
 <target>Zaznana je pomembna razlika:</target>
@@ -1443,12 +1467,15 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Spremenjena bo mapa, ki je del večkratnih parov map. Prosim preglejte nastavitve sinhronizacije.</target>
 
+<source>Left</source>
+<target>Levo</target>
+
+<source>Right</source>
+<target>Desno</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Sinhroniziram par map:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Ciljna mapa %x že obstaja.</target>
-
 <source>Generating database...</source>
 <target>Ustvarjam podatkovno bazo...</target>
 
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index 7d310860..7de02d01 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -32,7 +32,7 @@
 <target>Solicitud de aborto: Esperando a que la operación actual finalice...</target>
 
 <source>Failure to create time stamp for versioning:</source>
-<target></target>
+<target>Fallo al crear fecha y hora para el versionado:</target>
 
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Sincronización Automática</target>
@@ -58,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Limpiar opciones del filtrado</target>
 
-<source>Create a batch job</source>
-<target>Crear una tarea por lotes</target>
+<source>Save as batch job</source>
+<target>Salvar como tarea batch</target>
 
 <source>Comparison settings</source>
 <target>Opciones de comparación</target>
@@ -79,9 +79,6 @@
 <source>Global settings</source>
 <target>Opciones globales</target>
 
-<source>Summary</source>
-<target>Resumen</target>
-
 <source>Find</source>
 <target>Buscar</target>
 
@@ -274,8 +271,8 @@
 <source>Select a folder</source>
 <target>Seleccione una carpeta</target>
 
-<source>Delay [seconds]</source>
-<target>Retraso [segundos]</target>
+<source>Idle time [seconds]</source>
+<target>Tiempo de espera [segundos]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Tiempo ocioso entre el último cambio detectado y la ejecución del comando</target>
@@ -324,38 +321,23 @@ El comando es disparado si::
 <source>A folder input field is empty.</source>
 <target>Un campo de entrada de la carpeta está vacío.</target>
 
-<source>File time and size</source>
-<target>Fecha y tamaño del archivo</target>
-
-<source>File content</source>
-<target>Contenido del archivo</target>
-
-<source><Automatic></source>
-<target><Automático></target>
-
-<source>Mirror ->></source>
-<target>Espejo ->></target>
-
-<source>Update -></source>
-<target>Actualizar -></target>
-
-<source>Custom</source>
-<target>Personalizado</target>
-
-<source>FreeFileSync batch</source>
-<target>Batch de FreeFileSync</target>
-
 <source>Synchronization aborted!</source>
 <target>¡Sincronización abortada!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>¡Sincronización completada con errores!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Sincronización completada con avisos.</target>
+
 <source>Nothing to synchronize!</source>
 <target>¡Nada que sincronizar!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>¡Sincronización completada con éxito!</target>
+<source>Synchronization completed successfully.</source>
+<target>Sincronización completada satisfactoriamente.</target>
+
+<source>Saving log file %x...</source>
+<target>Guardando registro %x...</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>
@@ -363,9 +345,6 @@ El comando es disparado si::
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Una nueva versión de FreeFileSync está disponible:</target>
 
@@ -378,6 +357,12 @@ El comando es disparado si::
 <source>Information</source>
 <target>Información</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>¡Incapaz de conectar con sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>El numero de versión de FreeFileSync no se encontro en linea! ¿Desea comprobarlo manualmente?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>¿Quiere que FreeFileSync detecte automáticamente actualizaciones cada semana?</target>
 
@@ -441,27 +426,27 @@ El comando es disparado si::
 <source>Hibernate</source>
 <target>Hibernar</target>
 
-<source>1. &Compare</source>
-<target>1. &Comparar</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Sincronizar</target>
-
 <source>&New</source>
 <target>&Nuevo</target>
 
 <source>&Save</source>
 <target>&Guardar</target>
 
+<source>Save as &batch job...</source>
+<target>Guardar como trabajo &batch ...</target>
+
+<source>1. &Compare</source>
+<target>1. &Comparar</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Sincronizar</target>
+
 <source>&Language</source>
 <target>&Idioma</target>
 
 <source>&Global settings...</source>
 <target>&Opciones globales...</target>
 
-<source>&Create batch job...</source>
-<target>&Crear tarea por lotes...</target>
-
 <source>&Export file list...</source>
 <target>&Exportar lista de archivos...</target>
 
@@ -495,17 +480,17 @@ El comando es disparado si::
 <source>Swap sides</source>
 <target>Intercambiar lados</target>
 
-<source>Load configuration from file</source>
-<target>Cargar configuración desde archivo</target>
+<source>Open</source>
+<target>Abrir</target>
 
-<source>Save current configuration to file</source>
-<target>Guardar configuración actual en un archivo</target>
+<source>Save</source>
+<target>Guardar</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Últimas configuraciones usadas (Pulsar DEL para quitar de la lista)</target>
 
-<source>Show excluded items</source>
-<target>Mostrar elementos excluidos</target>
+<source>Hide excluded items</source>
+<target>Ocultar elementos excluidos</target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Mostrar archivos excluidos temporalmente o filtrados</target>
@@ -543,15 +528,6 @@ El comando es disparado si::
 <source>Help</source>
 <target>Ayuda</target>
 
-<source>Filter files</source>
-<target>Filtrar archivos</target>
-
-<source>Left</source>
-<target>Izquierda</target>
-
-<source>Right</source>
-<target>Derecha</target>
-
 <source>Error handling</source>
 <target>Gestión de errores</target>
 
@@ -573,14 +549,14 @@ El comando es disparado si::
 <source>Abort synchronization on first error</source>
 <target>Abortar sincronización al primer error</target>
 
-<source>On completion:</source>
-<target>Al completarse:</target>
+<source>On completion</source>
+<target>Al completar</target>
 
 <source>Show progress dialog</source>
 <target>Mostrar diálogo de progreso</target>
 
-<source>Generate log file</source>
-<target>Generar archivo de registro</target>
+<source>Save log</source>
+<target>Guardar registro</target>
 
 <source>Select folder to save log files</source>
 <target>Seleccionar una carpeta para salvar archivos de registro</target>
@@ -591,11 +567,8 @@ El comando es disparado si::
 <source>Limit maximum number of log files</source>
 <target>Limitar el número máximo de archivos de registro</target>
 
-<source>Batch settings</source>
-<target>Opciones de lotes</target>
-
-<source>Compare by...</source>
-<target>Comparar por...</target>
+<source>Select variant</source>
+<target>Seleccionar variante</target>
 
 <source>
 Files are found equal if
@@ -610,6 +583,9 @@ Los archivos serán considerados iguales si
 son iguales
 </target>
 
+<source>File time and size</source>
+<target>Fecha y tamaño del archivo</target>
+
 <source>
 Files are found equal if
      - file content
@@ -621,24 +597,36 @@ Los archivos serán considerados iguales si
 es el mismo
 </target>
 
+<source>File content</source>
+<target>Contenido del archivo</target>
+
 <source>Symbolic Link handling</source>
 <target>Gestión de enlaces simbólicos</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Seleccione un tipo:</target>
+<source><- Two way -></source>
+<target><- Dos formas -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Identificar y propagar cambios en ambos lados usando una base de datos. Borrados, renombraciones y conflictos son detectados automáticamente.</target>
 
+<source>Mirror ->></source>
+<target>Espejo ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Copia de seguridad en espejo de la carpeta izquierda. La carpeta derecha es modificada exactamente como la carpeta izquierda después de la sincronización.</target>
 
+<source>Update -></source>
+<target>Actualizar -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Copiar archivos nuevos o actualizados a la carpeta de la derecha.</target>
 
+<source>Custom</source>
+<target>Personalizado</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Configuración de sus propias reglas de sincronización.</target>
 
@@ -654,8 +642,8 @@ es el mismo
 <source>Recycle Bin</source>
 <target>Papelera de reciclaje</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Utilitzar Papelera de Reciclaje al eliminar o sobreescribir archivos</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Utilizar la papelera de reciclaje para archivos eliminados y sobreescritos</target>
 
 <source>Versioning</source>
 <target>Control de versiones</target>
@@ -663,8 +651,8 @@ es el mismo
 <source>Move time-stamped files into specified folder</source>
 <target>Mover archivos marcados a la carpeta especificada</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Limitar el número máximo de versiones por archivo</target>
+<source>Naming convention:</source>
+<target>Convención de nomenclatura:</target>
 
 <source>Configuration</source>
 <target>Configuración</target>
@@ -813,6 +801,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Overview</source>
 <target>Visión global</target>
 
+<source>Filter files</source>
+<target>Filtrar archivos</target>
+
 <source>Select view</source>
 <target>Seleccione vista</target>
 
@@ -864,9 +855,15 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source><Last session></source>
 <target><Última sesión></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Comparación y Sincronización de Carpetas</target>
+
 <source>Configuration saved!</source>
 <target>¡Configuración guardada!</target>
 
+<source>FreeFileSync batch</source>
+<target>Batch de FreeFileSync</target>
+
 <source>Never save changes</source>
 <target>Nunca guardar cambios</target>
 
@@ -879,9 +876,6 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Configuration loaded!</source>
 <target>¡Configuración cargada!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Comparación y Sincronización de Carpetas</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Ocultar archivos que existen sólo en el lado izquierdo</target>
 
@@ -1038,6 +1032,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Comparing content...</source>
 <target>Comparando contenido...</target>
 
+<source>Copy</source>
+<target>Copiar</target>
+
 <source>Paused</source>
 <target>Pausado</target>
 
@@ -1110,14 +1107,14 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>- folder part only</source>
 <target>- sólo parte de la carpeta</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- El otro lado equivale a %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- El otro lado de %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- El otro lado equivale a %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- El otro lado de %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Hacer visibles diálogos y mensajes de advertencia?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>¿Hacer visibles de nuevo los mensajes de alerta y diálogo?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1140,47 +1137,29 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Leave as unresolved conflict</source>
 <target>Dejar como conflicto sin resolver</target>
 
-<source>Files</source>
-<target>Archivos</target>
+<source>Replace</source>
+<target>Reemplazar</target>
 
-<source>Percentage</source>
-<target>Porcentaje</target>
+<source>Move files and replace if existing</source>
+<target>Mover archivos y reemplazar si ya existen</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Incluir fecha y hora a cada nombre de archivo</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Carpeta</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Archivo</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 minuto</pluralform>
-<pluralform>%x minutos</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 hora</pluralform>
-<pluralform>%x horas</pluralform>
-</target>
+<source>Files</source>
+<target>Archivos</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 día</pluralform>
-<pluralform>%x días</pluralform>
-</target>
+<source>Percentage</source>
+<target>Porcentaje</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>No se puede monitorizar el directorio %x.</target>
@@ -1230,6 +1209,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Cannot copy file %x to %y.</source>
 <target>No se puede copiar el archivo %x a %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>El tipo de objeto %x no esta soportado:</target>
+
 <source>Cannot open directory %x.</source>
 <target>No se puede abrir el directorio %x.</target>
 
@@ -1239,6 +1221,42 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Detected endless directory recursion.</source>
 <target>Detectada recursividad de directorios sin fin.</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 minuto</pluralform>
+<pluralform>%x minutos</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 hora</pluralform>
+<pluralform>%x horas</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 día</pluralform>
+<pluralform>%x días</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>No se puede asignar el privilegio %x.</target>
 
@@ -1369,7 +1387,7 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <target>Mover enlace simbólico de %x a %y</target>
 
 <source>Removing old versions...</source>
-<target></target>
+<target>Eliminando versiones antiguas...</target>
 
 <source>Creating file %x</source>
 <target>Creando archivo %x</target>
@@ -1392,6 +1410,9 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Updating attributes of %x</source>
 <target>Actualizar atributos de %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>La carpeta de destino %x ya existe.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>El campo de entrada de la carpeta de destino no debe estar vacío.</target>
 
@@ -1401,11 +1422,8 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>Source folder %x not found.</source>
 <target>El archivo de origen %x no ha sido encontrado.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>¡Existen conflictos sin resolver!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Puede ignorar conflictos y continuar con la sincronización.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Los siguientes elementos tienen conflictos sin resolver y no serán sincronizados:</target>
 
 <source>Significant difference detected:</source>
 <target>Diferencia significante detectada:</target>
@@ -1425,12 +1443,15 @@ Aviso: ¡Los nombres de archivos deben ser relativos a los directorios base!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Una carpeta, que es parte de múltiple pares de carpetas, será modificada. Por favor, revise las opciones de sincronización.</target>
 
+<source>Left</source>
+<target>Izquierda</target>
+
+<source>Right</source>
+<target>Derecha</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Sincronizando par de carpetas:</target>
 
-<source>Target folder %x already existing.</source>
-<target>La carpeta de destino %x ya existe.</target>
-
 <source>Generating database...</source>
 <target>Generando base de datos...</target>
 
diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng
index 37b3edf0..64a62e20 100644
--- a/BUILD/Languages/swedish.lng
+++ b/BUILD/Languages/swedish.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Avbryter: Väntar på att aktuell process skall slutföras...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Kunde inte skapa tidsstämpel för versionshantering</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Automatiserad synkronisering</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Rensa filterinställningar</target>
 
-<source>Create a batch job</source>
-<target>Skapa ett batch-jobb</target>
+<source>Save as batch job</source>
+<target>Spara som batch-fil</target>
 
 <source>Comparison settings</source>
 <target>Jämförelseinställningar</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Allmäna inställningar</target>
 
-<source>Summary</source>
-<target>Sammanställning</target>
-
 <source>Find</source>
 <target>Sök</target>
 
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Markera en mapp</target>
 
-<source>Delay [seconds]</source>
-<target>Fördröjning [sekunder]</target>
+<source>Idle time [seconds]</source>
+<target>Inaktivitet [sekunder]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Väntetid mellan senast upptäckta förändring och kommandoexekvering</target>
@@ -321,38 +321,23 @@ Kommandot triggas om:
 <source>A folder input field is empty.</source>
 <target>Ett inmatningsfält är tomt</target>
 
-<source>File time and size</source>
-<target>Tidsstämpling och storlek</target>
-
-<source>File content</source>
-<target>Filinnehåll</target>
-
-<source><Automatic></source>
-<target><Automatisk></target>
-
-<source>Mirror ->></source>
-<target>Spegla ->></target>
-
-<source>Update -></source>
-<target>Uppdatera -></target>
-
-<source>Custom</source>
-<target>Anpassat</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync batch</target>
-
 <source>Synchronization aborted!</source>
 <target>Synkronisering avbruten!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Synkronisering slutförd med fel!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target>Synkronisering slutförd med varningar.</target>
+
 <source>Nothing to synchronize!</source>
 <target>Det finns inget att synkronisera!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Synkronisering slutförd!</target>
+<source>Synchronization completed successfully.</source>
+<target>Synkronisering slutförd.</target>
+
+<source>Saving log file %x...</source>
+<target>Sparar loggfil %x...</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>
@@ -360,9 +345,6 @@ Kommandot triggas om:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Det finns en ny version av FreeFileSync</target>
 
@@ -375,6 +357,12 @@ Kommandot triggas om:
 <source>Information</source>
 <target>Information</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Kan inte ansluta sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>Aktuellt FreeFileSync versionsnummer kan inte hittas online! Vill du kontrollera manuellt?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Vill du att FreeFileSync skall söka efter uppdateringar varje vecka?</target>
 
@@ -438,27 +426,27 @@ Kommandot triggas om:
 <source>Hibernate</source>
 <target>Viloläge</target>
 
-<source>1. &Compare</source>
-<target>1. &Jämför</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Synkronisera</target>
-
 <source>&New</source>
 <target>&Nytt</target>
 
 <source>&Save</source>
 <target>&Spara</target>
 
+<source>Save as &batch job...</source>
+<target>Spara som &batch-fil...</target>
+
+<source>1. &Compare</source>
+<target>1. &Jämför</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Synkronisera</target>
+
 <source>&Language</source>
 <target>&Språk</target>
 
 <source>&Global settings...</source>
 <target>&Allmäna inställningar...</target>
 
-<source>&Create batch job...</source>
-<target>&Skapa batch-jobb...</target>
-
 <source>&Export file list...</source>
 <target>&Exportera fillista...</target>
 
@@ -492,20 +480,20 @@ Kommandot triggas om:
 <source>Swap sides</source>
 <target>Byt sida</target>
 
-<source>Load configuration from file</source>
-<target>Hämta inställningar från fil</target>
+<source>Open</source>
+<target>Öppna</target>
 
-<source>Save current configuration to file</source>
-<target>Spara aktuella inställningar till fil</target>
+<source>Save</source>
+<target>Spara</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>Senast använda konfigurationer (Tryck DEL för att ta bort)</target>
 
-<source>Show excluded items</source>
-<target>Visa undantagna poster</target>
+<source>Hide excluded items</source>
+<target>Dölj undantagna objekt</target>
 
 <source>Show filtered or temporarily excluded files</source>
-<target>Visa filtrerade eller temporärt undantagna filer</target>
+<target>Dölj filtrerade eller temporärt undantagna filer</target>
 
 <source>Number of files and folders that will be created</source>
 <target>Antal filer och mappar som kommer att skapas</target>
@@ -540,15 +528,6 @@ Kommandot triggas om:
 <source>Help</source>
 <target>Hjälp</target>
 
-<source>Filter files</source>
-<target>Undantag</target>
-
-<source>Left</source>
-<target>Vänster</target>
-
-<source>Right</source>
-<target>Höger</target>
-
 <source>Error handling</source>
 <target>Felhantering</target>
 
@@ -570,14 +549,14 @@ Kommandot triggas om:
 <source>Abort synchronization on first error</source>
 <target>Avbryt synkronisering vid första felet</target>
 
-<source>On completion:</source>
-<target>Vid slutfört:</target>
+<source>On completion</source>
+<target>Vid slutfört</target>
 
 <source>Show progress dialog</source>
 <target>Visa förloppsindikator</target>
 
-<source>Generate log file</source>
-<target>Skapa loggfil</target>
+<source>Save log</source>
+<target>Spara logg</target>
 
 <source>Select folder to save log files</source>
 <target>Väl en mapp att spara loggfiler i</target>
@@ -588,11 +567,8 @@ Kommandot triggas om:
 <source>Limit maximum number of log files</source>
 <target>Begränsa antalet loggfiler</target>
 
-<source>Batch settings</source>
-<target>Batch-inställningar</target>
-
-<source>Compare by...</source>
-<target>Jämför...</target>
+<source>Select variant</source>
+<target>Välj variant</target>
 
 <source>
 Files are found equal if
@@ -607,6 +583,9 @@ Filer betraktas som likvärdiga om
 är samma.
 </target>
 
+<source>File time and size</source>
+<target>Tidsstämpling och storlek</target>
+
 <source>
 Files are found equal if
      - file content
@@ -618,24 +597,36 @@ Filerna betecknas som lika om,
 är lika
 </target>
 
+<source>File content</source>
+<target>Filinnehåll</target>
+
 <source>Symbolic Link handling</source>
 <target>Hantering av Symboliska länkar</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Välj variant:</target>
+<source><- Two way -></source>
+<target><- Tvåvägs -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Använd en databas för att identifiera och sprida ändringar på båda sidor. Borttagning, namnbyte och konflikter upptäcks automatiskt</target>
 
+<source>Mirror ->></source>
+<target>Spegla ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Speglar säkerhetskopia av vänster mapp. Höger mapp ändras för att exakt matcha vänster efter synkroniseringen.</target>
 
+<source>Update -></source>
+<target>Uppdatera -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Kopiera nya och uppdaterade filer till höger mapp.</target>
 
+<source>Custom</source>
+<target>Anpassat</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Konfigurera dina egna synkroniseringsregler.</target>
 
@@ -651,8 +642,8 @@ Filerna betecknas som lika om,
 <source>Recycle Bin</source>
 <target>Papperskorgen</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Använd papperskorgen vid borttagning och överskrivning av filer</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Använd papperskorgen för borttagna och överskrivna filer</target>
 
 <source>Versioning</source>
 <target>Versionshantering</target>
@@ -660,8 +651,8 @@ Filerna betecknas som lika om,
 <source>Move time-stamped files into specified folder</source>
 <target>Flytta tidsstämplade filer till specificerad mapp</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Begränsa antalet versioner per fil</target>
+<source>Naming convention:</source>
+<target>Regler för namngivning</target>
 
 <source>Configuration</source>
 <target>Inställningar</target>
@@ -810,6 +801,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Overview</source>
 <target>Översikt</target>
 
+<source>Filter files</source>
+<target>Undantag</target>
+
 <source>Select view</source>
 <target>Välj vy</target>
 
@@ -861,9 +855,15 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source><Last session></source>
 <target><Senaste session></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Mappjämförelse och synkronisering</target>
+
 <source>Configuration saved!</source>
 <target>Inställningar sparade!</target>
 
+<source>FreeFileSync batch</source>
+<target>FreeFileSync batch</target>
+
 <source>Never save changes</source>
 <target>Spara aldrig ändringar</target>
 
@@ -876,9 +876,6 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Configuration loaded!</source>
 <target>Inställningar inlästa!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Mappjämförelse och synkronisering</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Visa inte filer som endast finns till vänster</target>
 
@@ -1035,6 +1032,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Comparing content...</source>
 <target>Jämför innehåll...</target>
 
+<source>Copy</source>
+<target>Kopiera</target>
+
 <source>Paused</source>
 <target>Pausad</target>
 
@@ -1107,14 +1107,14 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>- folder part only</source>
 <target>- endast mappdelen</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- Andra sidans motsvarighet till %name</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>- Andra sidans motsvarighet till %item_path%</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- Andra sidans motsvarighet till %dir</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>- Andra sidans motsvarighet till %item_folder%</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Vill du göra dolda dialoger och varningsmeddelanden synliga igen?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Vill du göra dolda varningar och dialoger, synliga igen?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1137,47 +1137,29 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Leave as unresolved conflict</source>
 <target>Ignorera konflikt</target>
 
-<source>Files</source>
-<target>Filer</target>
+<source>Replace</source>
+<target>Byt ut</target>
 
-<source>Percentage</source>
-<target>Procent</target>
+<source>Move files and replace if existing</source>
+<target>Flytta filer och byt ut om de redan finns</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Lägg till en tidsstämpel till varje filnamn</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Mapp</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Fil</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-MM-DD hhmmss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 timma</pluralform>
-<pluralform>%x timmar</pluralform>
-</target>
+<source>Files</source>
+<target>Filer</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 dag</pluralform>
-<pluralform>%x dagar</pluralform>
-</target>
+<source>Percentage</source>
+<target>Procent</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Mappen %x kan inte övervakas.</target>
@@ -1227,6 +1209,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Cannot copy file %x to %y.</source>
 <target>Kan inte kopiera filen %x till %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>Objekttyp %x stöds ej:</target>
+
 <source>Cannot open directory %x.</source>
 <target>Kan inte öppna %x.</target>
 
@@ -1236,6 +1221,42 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Detected endless directory recursion.</source>
 <target>Upptäckte ändlös mapprekursion</target>
 
+<source>%x TB</source>
+<target>%x TB</target>
+
+<source>%x PB</source>
+<target>%x PB</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 timma</pluralform>
+<pluralform>%x timmar</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 dag</pluralform>
+<pluralform>%x dagar</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Kan inte att ange behörigheten %x.</target>
 
@@ -1365,6 +1386,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Moving symbolic link %x to %y</source>
 <target>Flyttar den symboliska länken %x till %y</target>
 
+<source>Removing old versions...</source>
+<target>Tar bort gamla versioner...</target>
+
 <source>Creating file %x</source>
 <target>Skapar fil %x</target>
 
@@ -1386,6 +1410,9 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Updating attributes of %x</source>
 <target>Uppdaterar attribut för %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Målmappen %x finns redan.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Indatafältet för målmapp får inte vara tomt.</target>
 
@@ -1395,11 +1422,8 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>Source folder %x not found.</source>
 <target>Källmappen %x kan inte hittas.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Obehandlad konflikt upptäckt!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Du kan ignorera konflikter och fortsätta synkroniseringen.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Följande objekt har olösta konflikter, och kommer inte att synkroniseras:</target>
 
 <source>Significant difference detected:</source>
 <target>Betydande skillnad upptäckt:</target>
@@ -1419,12 +1443,15 @@ OBS! Filnamnen måste anges relativt till basmappar
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>En mapp som tillhör flera mapp-par är på väg att ändras. Kontrollera synkroniseringsinställningarna</target>
 
+<source>Left</source>
+<target>Vänster</target>
+
+<source>Right</source>
+<target>Höger</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Synkroniserar mapp-par:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Målmappen %x finns redan.</target>
-
 <source>Generating database...</source>
 <target>Skapar databas...</target>
 
diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng
index 0cf8d9ef..fdbd10b0 100644
--- a/BUILD/Languages/turkish.lng
+++ b/BUILD/Languages/turkish.lng
@@ -11,13 +11,13 @@
 <target>%s klasörü aranıyor...</target>
 
 <source>Items processed:</source>
-<target>İşlenen bileşenler:</target>
+<target>İşlenen öge:</target>
 
 <source>Items remaining:</source>
-<target>Kalan bileşenler:</target>
+<target>Kalan öge:</target>
 
 <source>Total time:</source>
-<target>Toplam zaman:</target>
+<target>Toplam süre:</target>
 
 <source>Show in Explorer</source>
 <target>Tarayıcıda Göster</target>
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Vazgeçildi: Yürürlükteki işlemin bitmesi bekleniyor...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target>Eski sürüm için zaman damgası oluşturulamadı:</target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Kendiliğinden Eşleştirme</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Süzgeç ayarlarını temizle</target>
 
-<source>Create a batch job</source>
-<target>Toplu iş oluştur</target>
+<source>Save as batch job</source>
+<target>Toplu iş olarak kaydet</target>
 
 <source>Comparison settings</source>
 <target>Karşılaştırma ayarları</target>
@@ -68,17 +71,14 @@
 <target>Hakkında</target>
 
 <source>Confirm</source>
-<target>Doğrula</target>
+<target>İşlemi onaylayın</target>
 
 <source>Configure filter</source>
-<target>Yapılandırma süzgeci</target>
+<target>Süzgeci ayarlayın</target>
 
 <source>Global settings</source>
 <target>Genel ayarlar</target>
 
-<source>Summary</source>
-<target>Özet</target>
-
 <source>Find</source>
 <target>Bul</target>
 
@@ -149,7 +149,7 @@
 <target>Veritabanı dosyaları ortak bir oturumu paylaşamaz.</target>
 
 <source>An exception occurred!</source>
-<target>Olağan dışı bir durum oluştu!</target>
+<target>Olağan dışı bir durumla karşılaşıldı!</target>
 
 <source>Cannot read file attributes of %x.</source>
 <target>%x dosyasının özellikleri okunamadı.</target>
@@ -197,10 +197,10 @@
 <target>%x dosyası bulunamadı.</target>
 
 <source>File %x does not contain a valid configuration.</source>
-<target>%x dosyası geçerli bir yapılandırma bilgisi içermiyor.</target>
+<target>%x dosyası geçerli ayar bilgilerini içermiyor.</target>
 
 <source>Configuration file %x loaded partially only.</source>
-<target>%x yapılandırma dosyası tamamen yüklenemedi.</target>
+<target>%x ayarlar dosyası kısmen yüklendi.</target>
 
 <source>Cannot access Volume Shadow Copy Service.</source>
 <target>Birim Gölge Kopya hizmetine erişilemedi.</target>
@@ -230,7 +230,7 @@
 <target>Çı&k</target>
 
 <source>&Program</source>
-<target>&Program</target>
+<target>&Dosya</target>
 
 <source>&Content</source>
 <target>İçe&rik</target>
@@ -271,8 +271,8 @@
 <source>Select a folder</source>
 <target>Bir klasör seçin</target>
 
-<source>Delay [seconds]</source>
-<target>Gecikme [saniye}</target>
+<source>Idle time [seconds]</source>
+<target>Boşta bekleme süresi {saniye]</target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Son algılanan değişiklik ile komutun yürütülmesi arasındaki bekleme süresi</target>
@@ -321,38 +321,23 @@ Komut şu durumlarda yürütülür:
 <source>A folder input field is empty.</source>
 <target>Bir klasör giriş alanı boş.</target>
 
-<source>File time and size</source>
-<target>Dosya tarih ve saati</target>
-
-<source>File content</source>
-<target>Dosya içeriği</target>
-
-<source><Automatic></source>
-<target><Kendiliğinden></target>
-
-<source>Mirror ->></source>
-<target>Yansı ->></target>
-
-<source>Update -></source>
-<target>Güncelle -></target>
-
-<source>Custom</source>
-<target>Özel</target>
-
-<source>FreeFileSync batch</source>
-<target>FreeFileSync toplu işi</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>Synchronization completed with warnings.</source>
+<target>Eşleştirme işlemi bazı uyarılarla 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>Synchronization completed successfully.</source>
+<target>Eşleştirme tamamlandı.</target>
+
+<source>Saving log file %x...</source>
+<target>%x günlük dosyası kaydediliyor...</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>
@@ -360,9 +345,6 @@ Komut şu durumlarda yürütülür:
 <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>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Yeni bir FreeFileSync sürümü yayınlanmış:</target>
 
@@ -375,6 +357,12 @@ Komut şu durumlarda yürütülür:
 <source>Information</source>
 <target>Bilgi</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>sourceforge.net sitesine bağlanılamıyor!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target>FreeFileSync sürüm numarası çevrimiçi olarak bulunamadı! El ile denetlemek ister misiniz?</target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>FreeFileSync güncellemelerinin her hafta denetlenmesini ister misiniz?</target>
 
@@ -418,10 +406,10 @@ Komut şu durumlarda yürütülür:
 <target>İşlem</target>
 
 <source>Category</source>
-<target>Kategori</target>
+<target>Öge tipi</target>
 
 <source>Drag && drop</source>
-<target>Klasör ya da dosyaları buraya sürükleyip bırakabilirsiniz</target>
+<target>Klasör ya da dosyaları sürükleyip buraya bırakabilirsiniz</target>
 
 <source>Close progress dialog</source>
 <target>İşlem penceresini kapat</target>
@@ -438,32 +426,32 @@ Komut şu durumlarda yürütülür:
 <source>Hibernate</source>
 <target>Hazırda beklet</target>
 
-<source>1. &Compare</source>
-<target>1. &Karşılaştır</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Eşleştir</target>
-
 <source>&New</source>
 <target>Ye&ni</target>
 
 <source>&Save</source>
 <target>&Kaydet</target>
 
+<source>Save as &batch job...</source>
+<target>&Toplu iş olarak kaydet...</target>
+
+<source>1. &Compare</source>
+<target>1. &Karşılaştır</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Eşleştir</target>
+
 <source>&Language</source>
 <target>Di&l</target>
 
 <source>&Global settings...</source>
 <target>&Genel ayarlar...</target>
 
-<source>&Create batch job...</source>
-<target>&Toplu iş oluştur...</target>
-
 <source>&Export file list...</source>
 <target>Dosya list&esini ver...</target>
 
 <source>&Advanced</source>
-<target>&Gelişmiş</target>
+<target>&Araçlar</target>
 
 <source>&Check for new version</source>
 <target>Yeni &sürüm denetimi</target>
@@ -472,7 +460,7 @@ Komut şu durumlarda yürütülür:
 <target>Karşılaştır</target>
 
 <source>Compare both sides</source>
-<target>İki tarafı da karşılaştır</target>
+<target>İki tarafı karşılaştırır</target>
 
 <source>&Abort</source>
 <target>V&azgeç</target>
@@ -481,7 +469,7 @@ Komut şu durumlarda yürütülür:
 <target>Eşleştir</target>
 
 <source>Start synchronization</source>
-<target>Eşleştirmeyi başlat</target>
+<target>Eşleştirmeyi başlatır</target>
 
 <source>Add folder pair</source>
 <target>Klasör çifti ekle</target>
@@ -490,25 +478,25 @@ Komut şu durumlarda yürütülür:
 <target>Klasör çiftini sil</target>
 
 <source>Swap sides</source>
-<target>Sağ ve sol yanı değiştir</target>
+<target>Sağ ve sol tarafları değiştir</target>
 
-<source>Load configuration from file</source>
-<target>Yapılandırma dosyasından ayarları alır</target>
+<source>Open</source>
+<target>Aç</target>
 
-<source>Save current configuration to file</source>
-<target>Geçerli yapılandırmayı dosyaya kaydeder</target>
+<source>Save</source>
+<target>Kaydet</target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
-<target>Son kullanılan yapılandırmalar (listeden silmek için DEL tuşuna basın)</target>
+<target>Son kullanılan ayarlar (listeden silmek için DEL tuşuna basın)</target>
 
-<source>Show excluded items</source>
-<target>Katılmayan ögeleri göster</target>
+<source>Hide excluded items</source>
+<target>Katılmayan ögeler görüntülensin</target>
 
 <source>Show filtered or temporarily excluded files</source>
-<target>Süzülmüş ya da geçici olarak katılmayan dosyaları göster</target>
+<target>Süzülmüş ya da geçici olarak katılmayan dosyalar görüntülenir</target>
 
 <source>Number of files and folders that will be created</source>
-<target>Oluşturulacak dosya ve klasör sayısı</target>
+<target>Eklenecek dosya ve klasör sayısı</target>
 
 <source>Number of files that will be overwritten</source>
 <target>Üzerine yazılacak dosya sayısı</target>
@@ -517,10 +505,10 @@ Komut şu durumlarda yürütülür:
 <target>Silinecek dosya ve klasör sayısı</target>
 
 <source>Total bytes to copy</source>
-<target>Toplam kopyalayanacak bayt</target>
+<target>Toplam kopyalanacak bayt</target>
 
 <source>Items found:</source>
-<target>Bulunan bileşenler:</target>
+<target>Bulunan öge:</target>
 
 <source>Speed:</source>
 <target>Hız:</target>
@@ -535,20 +523,11 @@ Komut şu durumlarda yürütülür:
 <target>Toplu iş</target>
 
 <source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>Eşleştirmeyi otomatikleştirmek için bir toplu iş komut dosyası oluşturun. Bu dosyaya çift tıklayarak ya da sisteminizdeki görev zamanlayıcıya: FreeFileSync.exe <görev adı>.ffs_batch şeklinde yazarak ekleyin</target>
+<target>Toplu iş dosyası ile otomatik eşleştirme yapılabilir. Dosya, çift tıklanarak ya da sisteminizdeki görev zamanlayıcıya; FreeFileSync.exe <görev adı>.ffs_batch şeklinde eklenerek yürütülebilir.</target>
 
 <source>Help</source>
 <target>Yardım</target>
 
-<source>Filter files</source>
-<target>Dosyaları süz</target>
-
-<source>Left</source>
-<target>Sol</target>
-
-<source>Right</source>
-<target>Sağ</target>
-
 <source>Error handling</source>
 <target>Hata olursa:</target>
 
@@ -556,43 +535,40 @@ Komut şu durumlarda yürütülür:
 <target>Yoksay</target>
 
 <source>Hide all error and warning messages</source>
-<target>Tüm hata ve uyarı iletilerini gizler</target>
+<target>Tüm hata ve uyarı iletileri gizlenir</target>
 
 <source>Pop-up</source>
-<target>Açılan pencere</target>
+<target>Görüntüle</target>
 
 <source>Show pop-up on errors or warnings</source>
-<target>Hata ya da uyarıları açılır pencerede gösterir</target>
+<target>Hata ya da uyarılar açılır pencerede gösterilir</target>
 
 <source>Exit</source>
 <target>Çık</target>
 
 <source>Abort synchronization on first error</source>
-<target>>Oluşacak ilk hatada eşleştirmeyi durdur</target>
+<target>Oluşacak ilk hatada eşleştirme durdurulur</target>
 
-<source>On completion:</source>
+<source>On completion</source>
 <target>İşlem tamamlandığında:</target>
 
 <source>Show progress dialog</source>
-<target>İşlem penceresini göster</target>
+<target>İşlem penceresini görüntüle</target>
 
-<source>Generate log file</source>
-<target>Günlük dosyası oluştur</target>
+<source>Save log</source>
+<target>Günlüğe kaydet</target>
 
 <source>Select folder to save log files</source>
 <target>Günlük dosyalarının kaydedileceği klasörü seçin</target>
 
 <source>Limit</source>
-<target>Sınır</target>
+<target>Sınırla</target>
 
 <source>Limit maximum number of log files</source>
-<target>Günlük dosyası sayısının üst sınırını belirle</target>
-
-<source>Batch settings</source>
-<target>İş ayarları</target>
+<target>Tutulacak en fazla günlük dosyası sayısı</target>
 
-<source>Compare by...</source>
-<target>Karşılaştırma ölçütünü seçin:</target>
+<source>Select variant</source>
+<target>İşlem tipini seçin:</target>
 
 <source>
 Files are found equal if
@@ -601,88 +577,103 @@ Files are found equal if
 are the same
 </source>
 <target>
-Dosyaların eşit sayılması için
-	 - son yazma tarih ve saati
-	 - dosya boyutu
+Dosyaların aynı sayılması için;
+	- son yazma tarih ve saatleri
+	- ve dosya boyutları
 aynı olmalıdır
 </target>
 
+<source>File time and size</source>
+<target>Tarih ve saate göre</target>
+
 <source>
 Files are found equal if
      - file content
 is the same
 </source>
 <target>
-Dosyaların eşit sayılması için
-     - dosya içeriği
+Dosyaların aynı sayılması için;
+     - dosya içerikleri
 aynı olmalıdır
 </target>
 
+<source>File content</source>
+<target>İçeriğe göre</target>
+
 <source>Symbolic Link handling</source>
-<target>Sembolik bağlantı işleme</target>
+<target>Sembolik bağlantılar:</target>
 
 <source>OK</source>
 <target>Tamam</target>
 
-<source>Select variant:</source>
-<target>Davranışı seçin:</target>
+<source><- Two way -></source>
+<target><- Çift yönlü -></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>İki yandaki değişiklikleri bir veritabanı kullanarak belirler ve sakla. Silme, yeniden adlandırma ve çakışma işlemleri kendiliğinden algılanır.</target>
+<target>İki taraftaki değişiklikler, bir veritabanı kullanarak belirlenir ve görüntülenir. Silme, yeniden adlandırma ve uyuşmazlık durumları kendiliğinden algılanır.</target>
+
+<source>Mirror ->></source>
+<target>Yansıt ->></target>
 
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
-<target>Sol klasörün yansı yedeği. Eşleştirmeden sonra sağ klasör, sol klasörün tamamen aynısı olur.</target>
+<target>Sol taraftaki klasör sağ tarafa yansıtılır. Eşleştirme sonrası sağ klasör, sol klasörün tamamen aynısı olur.</target>
+
+<source>Update -></source>
+<target>Güncelle -></target>
 
 <source>Copy new or updated files to right folder.</source>
-<target>Yalnız yeni ya da güncellenmiş dosyalar soldan sağa kopyalanır.</target>
+<target>Sol taraftaki yeni ya da güncellenmiş dosyalar sağ tarafa kopyalanır.</target>
+
+<source>Custom</source>
+<target>Özel</target>
 
 <source>Configure your own synchronization rules.</source>
-<target>Buradan kendi eşleştirme kurallarınızı yapılandırabilirsiniz.</target>
+<target>Eşleştirme kuralları istendiği şekilde ayarlanabilir.</target>
 
 <source>Deletion handling</source>
-<target>Silme eyleminde:</target>
+<target>Silinen dosyaları:</target>
 
 <source>Permanent</source>
-<target>Kalıcı</target>
+<target>Kalıcı olarak sil</target>
 
 <source>Delete or overwrite files permanently</source>
-<target>Dosyaları kalıcı olarak siler ya da üzerine yazar</target>
+<target>Dosyalar kalıcı olarak silinir ya da üzerine yazılır</target>
 
 <source>Recycle Bin</source>
-<target>Geri Dönüşüm Kutusu</target>
+<target>Geri dönüşüm kutusuna at</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Dosya silme ve üzerine yazma sırasında Geri Dönüşüm Kutusu'nu kullanır</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target>Silinen ve üzerine yazılan dosyalar Geri Dönüşüm Kutusuna atılır</target>
 
 <source>Versioning</source>
 <target>Eski sürüm olarak sakla</target>
 
 <source>Move time-stamped files into specified folder</source>
-<target>Zaman damgalanmış dosyaları belirtilen klasöre taşı</target>
+<target>Dosyalar, zaman damgası eklenerek belirtilen klasöre taşınır</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Her dosya için en fazla sürüm sayısını sınırla</target>
+<source>Naming convention:</source>
+<target>Adlandırma kuralı:</target>
 
 <source>Configuration</source>
-<target>Yapılandırma</target>
+<target>İşlemler</target>
 
 <source>Item exists on left side only</source>
-<target>Yalnız sol yanda bulunan ögeler</target>
+<target>Sol taraftaki ögeler</target>
 
 <source>Item exists on right side only</source>
-<target>Yalnız sağ yanda bulunan ögeler</target>
+<target>Sağ taraftaki ögeler</target>
 
 <source>Left side is newer</source>
-<target>Sol yan daha yeni</target>
+<target>Sol taraftaki daha yeni ögeler</target>
 
 <source>Right side is newer</source>
-<target>Sağ yan daha yeni</target>
+<target>Sağ taraftaki daha yeni ögeler</target>
 
 <source>Items have different content</source>
-<target>Ögelerin içeriği farklı</target>
+<target>İçeriği farklı ögeler</target>
 
 <source>Conflict/item cannot be categorized</source>
-<target>Uyuşmazlık/öge kategorize edilemiyor</target>
+<target>Uyuşmayan/sınıflanamayan ögeler</target>
 
 <source>Synchronizing...</source>
 <target>Eşleştiriliyor...</target>
@@ -706,7 +697,7 @@ aynı olmalıdır
 <target>Öneri ve geri bildirimlerinizi bekleriz</target>
 
 <source>Homepage</source>
-<target>Ana sayfa</target>
+<target>Web sitesi</target>
 
 <source>FreeFileSync at Sourceforge</source>
 <target>Sourceforge sitesinde FreeFileSync</target>
@@ -715,28 +706,28 @@ aynı olmalıdır
 <target>E-posta</target>
 
 <source>Published under the GNU General Public License</source>
-<target>GNU Genel Kamu Lisansı şartları altında yayınlanmıştır</target>
+<target>GNU Genel Kamu Lisansı koşulları altında yayınlanmıştır</target>
 
 <source>Delete on both sides</source>
-<target>Her iki yandakini de sil</target>
+<target>Her iki taraftakini de sil</target>
 
 <source>Delete on both sides even if the file is selected on one side only</source>
-<target>Dosya yalnız bir tarafta seçili olsa bile her iki yandakini de sil</target>
+<target>Dosya yalnız bir tarafta seçili olsa bile her iki taraftaki de silinir</target>
 
 <source>
 Only files that match all filter settings will be synchronized.
 Note: File names must be relative to base directories!
 </source>
 <target>
-Yalnız tüm süzgeç ayarlarına uyan dosyalar eşleştirilecek.
+Yalnız süzgeç ayarlarına tamamen uyan dosyalar eşleştirilir.
 Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 </target>
 
 <source>Include</source>
-<target>Katılacaklar:</target>
+<target>Katılsın:</target>
 
 <source>Exclude</source>
-<target>Dışlanacaklar:</target>
+<target>Katılmasın</target>
 
 <source>Time span</source>
 <target>Zaman aralığı</target>
@@ -754,25 +745,25 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>&Varsayılan</target>
 
 <source>Fail-safe file copy</source>
-<target>Hatasız dosya kopyalama</target>
+<target>Dosyalar hatasız kopyalansın</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>Kopyalama önce geçici bir dosyaya (*.ffs_tmp) yapılır. Sonra dosya yeniden adlandırılır. Böylece hatalara karşı daha sağlıklı bir durum sağlanır</target>
+<target>Kopyalama önce geçici bir dosyaya (*.ffs_tmp) yapılır. Sonra dosya yeniden adlandırılır. Böylece hatalara karşı daha sağlıklı bir ortam sağlanır.</target>
 
 <source>Copy locked files</source>
-<target>Kilitli dosyaları da kopyala</target>
+<target>Kilitli dosyalar da kopyalansın</target>
 
 <source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>Paylaşılan ya da kilitli dosyaları Gölge Kopya Hizmetini kullanarak kopyalar (Yönetici izinlerine gerek duyar)</target>
+<target>Paylaşılan ya da kilitli dosyalar, Gölge Kopya Hizmeti'ni kullanarak kopyalanır (yönetici izinleri gerekir).</target>
 
 <source>Copy file access permissions</source>
-<target>Dosya erişim izinlerini kopyala</target>
+<target>Dosya erişim izinleri de kopyalansın</target>
 
 <source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>Dosya ve klasör izinlerini de kopyala (Yönetici haklarına gerek duyar)</target>
+<target>Dosya ve klasör izinleri de kopyalanır (yönetici izinleri gerekir).</target>
 
 <source>Restore hidden dialogs</source>
-<target>Gizli iletileri göster</target>
+<target>Gizlenmiş iletiler yeniden görüntülensin</target>
 
 <source>External applications</source>
 <target>Dış uygulamalar</target>
@@ -781,13 +772,13 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Açıklama</target>
 
 <source>Variant</source>
-<target>Değişken</target>
+<target>İşlem tipi</target>
 
 <source>Statistics</source>
 <target>İstatistikler</target>
 
 <source>Don't show this dialog again</source>
-<target>Bu iletiyi artık gösterme</target>
+<target>Bu iletiyi bir daha gösterme</target>
 
 <source>Find what:</source>
 <target>Aranacak:</target>
@@ -810,14 +801,17 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Overview</source>
 <target>Genel</target>
 
+<source>Filter files</source>
+<target>Dosya süzgeci</target>
+
 <source>Select view</source>
-<target>Görünümü seçin</target>
+<target>Görünüm</target>
 
 <source>Set direction:</source>
 <target>Yönü seçin:</target>
 
 <source>Exclude temporarily</source>
-<target>Geçici olarak dışla</target>
+<target>Geçici olarak katma</target>
 
 <source>Include temporarily</source>
 <target>Geçici olarak kat</target>
@@ -835,7 +829,7 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Tümünü kat</target>
 
 <source>Exclude all</source>
-<target>Tümünü dışla</target>
+<target>Hiçbirini katma</target>
 
 <source>Show icons:</source>
 <target>Simgeleri göster:</target>
@@ -861,8 +855,14 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source><Last session></source>
 <target><Önceki oturum></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Klasör Karşılaştırma ve Eşleştirme</target>
+
 <source>Configuration saved!</source>
-<target>Yapılandırma kaydedildi!</target>
+<target>Ayarlar kaydedildi!</target>
+
+<source>FreeFileSync batch</source>
+<target>FreeFileSync toplu işi</target>
 
 <source>Never save changes</source>
 <target>Asla değişiklikleri kaydetme</target>
@@ -874,94 +874,91 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Kaydetme</target>
 
 <source>Configuration loaded!</source>
-<target>Yapılandırma yüklendi!</target>
-
-<source>Folder Comparison and Synchronization</source>
-<target>Klasör Karşılaştırma ve Eşleştirme</target>
+<target>Ayarlar yüklendi!</target>
 
 <source>Hide files that exist on left side only</source>
-<target>Yalnız sol yanda bulunan dosyaları gizle</target>
+<target>Yalnız sol tarafta bulunan dosyalar gizlensin</target>
 
 <source>Show files that exist on left side only</source>
-<target>Yalnız sol tarafta bulunan dosyaları göster</target>
+<target>Yalnız sol tarafta bulunan dosyalar görüntülensin</target>
 
 <source>Hide files that exist on right side only</source>
-<target>Yalnız sağ yanda bulunan dosyaları gizle</target>
+<target>Yalnız sağ tarafta bulunan dosyalar gizlensin</target>
 
 <source>Show files that exist on right side only</source>
-<target>Yalnız sağ tarafta bulunan dosyaları göster</target>
+<target>Yalnız sağ tarafta bulunan dosyalar görüntülensin</target>
 
 <source>Hide files that are newer on left</source>
-<target>Solda daha yeni olan dosyaları gizle</target>
+<target>Solda daha yeni olan dosyalar gizlensin</target>
 
 <source>Show files that are newer on left</source>
-<target>Solda daha yeni olan dosyaları göster</target>
+<target>Solda daha yeni olan dosyalar görüntülensin</target>
 
 <source>Hide files that are newer on right</source>
-<target>Sağda daha yeni olan dosyaları gizle</target>
+<target>Sağda daha yeni olan dosyalar gizlensin</target>
 
 <source>Show files that are newer on right</source>
-<target>Sağda daha yeni olan dosyaları göster</target>
+<target>Sağda daha yeni olan dosyalar görüntülensin</target>
 
 <source>Hide files that are equal</source>
-<target>Eşit olan dosyaları gizle</target>
+<target>Aynı olan dosyalar gizlensin</target>
 
 <source>Show files that are equal</source>
-<target>Eşit olan dosyaları göster</target>
+<target>Aynı olan dosyalar görüntülensin</target>
 
 <source>Hide files that are different</source>
-<target>Farklı olan dosyaları gizle</target>
+<target>Farklı olan dosyalar gizlensin</target>
 
 <source>Show files that are different</source>
-<target>Farklı olan dosyaları göster</target>
+<target>Farklı olan dosyalar görüntülensin</target>
 
 <source>Hide conflicts</source>
-<target>Çelişkileri gizle</target>
+<target>Uyuşmazlıklar gizlensin</target>
 
 <source>Show conflicts</source>
-<target>Çelişkileri göster</target>
+<target>Uyuşmazlıklar görüntülensin</target>
 
 <source>Hide files that will be created on the left side</source>
-<target>Sol yanda oluşturulacak dosyaları gizle</target>
+<target>Sol tarafa eklenecek dosyalar gizlensin</target>
 
 <source>Show files that will be created on the left side</source>
-<target>Yalnız sol tarafta oluşturulacak dosyaları göster</target>
+<target>Sol tarafa eklenecek dosyalar görüntülensin</target>
 
 <source>Hide files that will be created on the right side</source>
-<target>Sağ yanda oluşturulacak dosyaları gizle</target>
+<target>Sağ tarafa eklenecek dosyalar gizlensin</target>
 
 <source>Show files that will be created on the right side</source>
-<target>Yalnız sağ tarafta oluşturulacak dosyaları göster</target>
+<target>Sağ tarafa eklenecek dosyalar görüntülensin</target>
 
 <source>Hide files that will be deleted on the left side</source>
-<target>Sol yanda silinecek dosyaları gizle</target>
+<target>Sol tarafta silinecek dosyalar gizlensin</target>
 
 <source>Show files that will be deleted on the left side</source>
-<target>Yalnız sol tarafta silinecek dosyaları göster</target>
+<target>Sol tarafta silinecek dosyalar görüntülensin</target>
 
 <source>Hide files that will be deleted on the right side</source>
-<target>Sağ yanda silinecek dosyaları gizle</target>
+<target>Sağ tarafta silinecek dosyalar gizlensin</target>
 
 <source>Show files that will be deleted on the right side</source>
-<target>Yalnız sağ tarafta silinecek dosyaları göster</target>
+<target>Sağ tarafta silinecek dosyalar görüntülensin</target>
 
 <source>Hide files that will be overwritten on left side</source>
-<target>Sol yanda üzerine yazılacak dosyaları gizle</target>
+<target>Sol tarafta üzerine yazılacak dosyalar gizlensin</target>
 
 <source>Show files that will be overwritten on left side</source>
-<target>Yalnız sol tarafta üzerine yazılacak dosyaları göster</target>
+<target>Sol tarafta üzerine yazılacak dosyalar görüntülensin</target>
 
 <source>Hide files that will be overwritten on right side</source>
-<target>Sağ yanda üzerine yazılacak dosyaları gizle</target>
+<target>Sağ tarafta üzerine yazılacak dosyalar gizlensin</target>
 
 <source>Show files that will be overwritten on right side</source>
-<target>Yalnız sağ tarafta üzerine yazılacak dosyaları göster</target>
+<target>Sağ tarafta üzerine yazılacak dosyalar görüntülensin</target>
 
 <source>Hide files that won't be copied</source>
-<target>Kopyalanmayacak dosyaları gizle</target>
+<target>Kopyalanmayacak dosyalar gizlensin</target>
 
 <source>Show files that won't be copied</source>
-<target>Kopyalanmayacak dosyaları göster</target>
+<target>Kopyalanmayacak dosyalar görüntülensin</target>
 
 <source>All folders are in sync!</source>
 <target>Tüm klasörler eşleştirildi.</target>
@@ -1007,8 +1004,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <pluralform>%x of %y rows in view</pluralform>
 </source>
 <target>
-<pluralform>%x / 1 satır gösteriliyor</pluralform>
-<pluralform>%x / %y satır gösteriliyor</pluralform>
+<pluralform>%x / 1 satır görüntüleniyor</pluralform>
+<pluralform>%x / %y satır görüntüleniyor</pluralform>
 </target>
 
 <source>Ignore further errors</source>
@@ -1035,6 +1032,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Comparing content...</source>
 <target>İçerik karşılaştırılıyor...</target>
 
+<source>Copy</source>
+<target>Kopyala</target>
+
 <source>Paused</source>
 <target>Duraklatıldı</target>
 
@@ -1090,16 +1090,16 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Süzgeç</target>
 
 <source>Direct</source>
-<target>Doğrudan</target>
+<target>Doğrudan katılsın</target>
 
 <source>Follow</source>
-<target>İzle</target>
+<target>Hedefleri katılsın</target>
 
 <source>Copy NTFS permissions</source>
-<target>NTFS izinlerini de kopyala</target>
+<target>NTFS izinleri de kopyalansın</target>
 
 <source>Integrate external applications into context menu. The following macros are available:</source>
-<target>Dış uygulamaları sağ tuş menüsüne ekler. Şu makrolar kullanılabilir:</target>
+<target>Sağ tık menüsüne dış uygulamalar ekler. Şu etiketler kullanılabilir:</target>
 
 <source>- full file or folder name</source>
 <target>- tam dosya ya da klasör adı</target>
@@ -1107,14 +1107,14 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>- folder part only</source>
 <target>- yalnız klasör bölümü</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- %name diğer taraftaki karşılığı</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target>%item_path% ögesinin diğer taraftaki karşılığı</target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- %dir klasörünün diğer taraftaki karşılığı</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target>%item_folder% ögesinin diğer taraftaki karşılığı</target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Gizlenmiş anımsatma ve uyarı iletileri yeniden görünür olsun mu?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target>Gizlenmiş iletiler yeniden görüntülensin mi?</target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1135,49 +1135,31 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 </target>
 
 <source>Leave as unresolved conflict</source>
-<target>Çözülmemiş tutarsızlık olarak bırak</target>
+<target>Uyuşmazlık çözülmeden kalsın</target>
 
-<source>Files</source>
-<target>Dosyalar</target>
+<source>Replace</source>
+<target>Değiştir</target>
 
-<source>Percentage</source>
-<target>Yüzde</target>
+<source>Move files and replace if existing</source>
+<target>Dosyaları taşı ve varsa üzerine yaz</target>
 
-<source>%x TB</source>
-<target>%x TB</target>
+<source>Append a timestamp to each file name</source>
+<target>Dosya adlarına zaman damgası ekle</target>
 
-<source>%x PB</source>
-<target>%x PB</target>
+<source>Folder</source>
+<target>Klasör</target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target>Dosya</target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>1 dakika</pluralform>
-<pluralform>%x dakika</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target>YYYY-AA-GG SSddss</target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>1 saat</pluralform>
-<pluralform>%x saat</pluralform>
-</target>
+<source>Files</source>
+<target>Dosyalar</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>1 gün</pluralform>
-<pluralform>%x gün</pluralform>
-</target>
+<source>Percentage</source>
+<target>Yüzde</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>%x klasörü izlenemiyor.</target>
@@ -1219,7 +1201,7 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>%x izinleri yazılamadı.</target>
 
 <source>Cannot create directory %x.</source>
-<target>%x dosyası oluşturulamadı.</target>
+<target>%x klasörü eklenemedi.</target>
 
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>%x simgesel bağlantısı %y olarak kopyalanamadı.</target>
@@ -1227,6 +1209,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Cannot copy file %x to %y.</source>
 <target>%x dosyası %y olarak kopyalanamadı.</target>
 
+<source>Type of item %x is not supported:</source>
+<target>%x ögesi tipi desteklenmiyor:</target>
+
 <source>Cannot open directory %x.</source>
 <target>%x klasörü açılamadı.</target>
 
@@ -1236,6 +1221,42 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Detected endless directory recursion.</source>
 <target>Sonsuz klasör kısayol döngüsü algılandı.</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 dakika</pluralform>
+<pluralform>%x dakika</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>1 saat</pluralform>
+<pluralform>%x saat</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>1 gün</pluralform>
+<pluralform>%x gün</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>%x izni verilemedi.</target>
 
@@ -1243,13 +1264,13 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <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>
+<target>Son eşleştirmeden bu yana iki tarafın da içeriği değişmiş!</target>
 
 <source>Cannot determine sync-direction:</source>
 <target>Eşleştirme yönü belirlenemedi:</target>
 
 <source>No change since last synchronization!</source>
-<target>Son eşleştirmeden bu yana değişik olmamış!</target>
+<target>Son eşleştirmeden bu yana bir değişiklik olmamış!</target>
 
 <source>The corresponding database entries are not in sync considering current settings.</source>
 <target>Karşı düşen veritabanı kayıtları, geçerli ayarlar göz önüne alındığında eşleşmiyor.</target>
@@ -1261,7 +1282,7 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Şu yollar için geri dönüşüm kutusu kullanılamaz! Dosyalar anında ve tamamen silinir:</target>
 
 <source>You can ignore this error to consider the folder as empty.</source>
-<target>Klasörün boş olarak kabul edilmesi için bu hatayı yok sayanbilirsiniz.</target>
+<target>Bu hatayı yoksayarak, klasörün boş olarak kabul edilmesini sağlayabilirsiniz.</target>
 
 <source>Cannot find folder %x.</source>
 <target>%x klasörü bulunamıyor.</target>
@@ -1276,7 +1297,7 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Eşleştirmeye hazırlanıyor...</target>
 
 <source>Conflict detected:</source>
-<target>Çelişki bulundu:</target>
+<target>Uyuşmazlık bulundu:</target>
 
 <source>File %x has an invalid date!</source>
 <target>%x dosyasının tarihi geçersiz!</target>
@@ -1300,34 +1321,34 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <target>Dosya listesi oluşturuluyor...</target>
 
 <source>Both sides are equal</source>
-<target>İki tarafta aynı</target>
+<target>İki taraftada aynı</target>
 
 <source>Copy new item to left</source>
-<target>Yeni ögeyi sola kopyala</target>
+<target>Yeni öge sola kopyalansın</target>
 
 <source>Copy new item to right</source>
-<target>Yeni ögeyi sağa kopyala</target>
+<target>Yeni öge sağa kopyalansın</target>
 
 <source>Delete left item</source>
-<target>Soldaki ögeyi sil</target>
+<target>Soldaki öge silinsin</target>
 
 <source>Delete right item</source>
-<target>Sağdaki ögeyi sil</target>
+<target>Sağdaki öge silinsin</target>
 
 <source>Move file on left</source>
-<target>Soldaki dosyayı taşı</target>
+<target>Soldaki dosya taşınsın</target>
 
 <source>Move file on right</source>
-<target>Sağdaki dosyayı taşı</target>
+<target>Sağdaki dosya taşınsın</target>
 
 <source>Overwrite left item</source>
-<target>Soldaki ögenin üzerine yaz</target>
+<target>Soldaki ögenin üzerine yazılsın</target>
 
 <source>Overwrite right item</source>
-<target>Sağdaki ögenin üzerine yaz</target>
+<target>Sağdaki ögenin üzerine yazılsın</target>
 
 <source>Do nothing</source>
-<target>Hiçbir şey yapma</target>
+<target>Hiçbir işlem yapılmasın</target>
 
 <source>Update attributes on left</source>
 <target>Soldaki öznitelikleri güncelle</target>
@@ -1365,14 +1386,17 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Moving symbolic link %x to %y</source>
 <target>%x sembolik bağlantısı %y içine taşınıyor</target>
 
+<source>Removing old versions...</source>
+<target>Eski sürümler siliniyor...</target>
+
 <source>Creating file %x</source>
-<target>%x dosyası oluşturuluyor</target>
+<target>%x dosyası ekleniyor</target>
 
 <source>Creating symbolic link %x</source>
-<target>%x sembolik bağlantısı oluşturuluyor</target>
+<target>%x sembolik bağlantısı ekleniyor</target>
 
 <source>Creating folder %x</source>
-<target>%x klasörü oluşturuluyor</target>
+<target>%x klasörü ekleniyor</target>
 
 <source>Overwriting file %x</source>
 <target>%x dosyasının üzerine yazılıyor</target>
@@ -1386,6 +1410,9 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Updating attributes of %x</source>
 <target>%x öznitelikleri güncelleniyor</target>
 
+<source>Target folder %x already existing.</source>
+<target>%x hedef klasörü zaten var.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Hedef klasör giriş alanı boş olmamalı.</target>
 
@@ -1395,11 +1422,8 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>Source folder %x not found.</source>
 <target>%x kaynak klasörü bulunamadı.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Çözülmemiş tutarsızlıklar var!</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Çelişkileri yoksayıp eşleştirmeyi sürdürebilirsiniz.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target>Uyuşmazlığı çözülmemiş şu ögeler eşleştirilmeyecek:</target>
 
 <source>Significant difference detected:</source>
 <target>Önemli fark saptandı:</target>
@@ -1419,12 +1443,15 @@ Not: Dosya adları kök klasörlere göre bağıl olmalıdır!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Çoklu klasör çiftlerinin parçası olan bir klasör değiştirilecek. Lütfen eşleştirme ayarlarını gözden geçirin.</target>
 
+<source>Left</source>
+<target>Sol</target>
+
+<source>Right</source>
+<target>Sağ</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Eşleştirilen klasör çifti:</target>
 
-<source>Target folder %x already existing.</source>
-<target>%x hedef klasörü zaten var.</target>
-
 <source>Generating database...</source>
 <target>Veri tabanı oluşturuluyor...</target>
 
diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng
index 594fd28f..7c184097 100644
--- a/BUILD/Languages/ukrainian.lng
+++ b/BUILD/Languages/ukrainian.lng
@@ -31,6 +31,9 @@
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>Запит переривання: В очікуванні завершення поточної операції...</target>
 
+<source>Failure to create time stamp for versioning:</source>
+<target></target>
+
 <source>RealtimeSync - Automated Synchronization</source>
 <target>RealtimeSync - Автоматична синхронізація</target>
 
@@ -55,8 +58,8 @@
 <source>Clear filter settings</source>
 <target>Очистити налаштування фільтра</target>
 
-<source>Create a batch job</source>
-<target>Створити пакетне завдання</target>
+<source>Save as batch job</source>
+<target></target>
 
 <source>Comparison settings</source>
 <target>Налаштування порівнювання</target>
@@ -76,9 +79,6 @@
 <source>Global settings</source>
 <target>Глобальні налаштування</target>
 
-<source>Summary</source>
-<target>Підсумок</target>
-
 <source>Find</source>
 <target>Знайти</target>
 
@@ -274,8 +274,8 @@
 <source>Select a folder</source>
 <target>Вибрати папку</target>
 
-<source>Delay [seconds]</source>
-<target>Затримка [секунд]</target>
+<source>Idle time [seconds]</source>
+<target></target>
 
 <source>Idle time between last detected change and execution of command</source>
 <target>Час простою між виявленням останньої зміни та виконанням команди</target>
@@ -324,38 +324,23 @@ The command is triggered if:
 <source>A folder input field is empty.</source>
 <target>Порожнє поле папки.</target>
 
-<source>File time and size</source>
-<target>Дата та розмір файлу</target>
-
-<source>File content</source>
-<target>Вміст файлу</target>
-
-<source><Automatic></source>
-<target><Автоматичний></target>
-
-<source>Mirror ->></source>
-<target>Дзеркало ->></target>
-
-<source>Update -></source>
-<target>Оновити -></target>
-
-<source>Custom</source>
-<target>Вибірково</target>
-
-<source>FreeFileSync batch</source>
-<target>Командний файл FreeFileSync</target>
-
 <source>Synchronization aborted!</source>
 <target>Синхронізація припинена!</target>
 
 <source>Synchronization completed with errors!</source>
 <target>Синхронізація закінчилася з помилками!</target>
 
+<source>Synchronization completed with warnings.</source>
+<target></target>
+
 <source>Nothing to synchronize!</source>
 <target>Нічого синхронізувати!</target>
 
-<source>Synchronization completed successfully!</source>
-<target>Синхронізація пройшла успішно!</target>
+<source>Synchronization completed successfully.</source>
+<target></target>
+
+<source>Saving log file %x...</source>
+<target></target>
 
 <source>Press "Switch" to resolve issues in FreeFileSync main dialog.</source>
 <target>Натисніть "Змінити" для вирішення питань у головному вікні FreeFileSync.</target>
@@ -363,9 +348,6 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog...</source>
 <target>Перехід до головного діалогу FreeFileSync...</target>
 
-<source>Unable to connect to sourceforge.net!</source>
-<target>Не можна з’єднатися з sourceforge.net!</target>
-
 <source>A new version of FreeFileSync is available:</source>
 <target>Доступна нова версія FreeFileSync:</target>
 
@@ -378,6 +360,12 @@ The command is triggered if:
 <source>Information</source>
 <target>Інформація</target>
 
+<source>Unable to connect to sourceforge.net!</source>
+<target>Не можна з’єднатися з sourceforge.net!</target>
+
+<source>Current FreeFileSync version number was not found online! Do you want to check manually?</source>
+<target></target>
+
 <source>Do you want FreeFileSync to automatically check for updates every week?</source>
 <target>Ви хочете, щоб FreeFileSync автоматично перевіряв наявність оновлень щотижня?</target>
 
@@ -441,27 +429,27 @@ The command is triggered if:
 <source>Hibernate</source>
 <target>Гібернація</target>
 
-<source>1. &Compare</source>
-<target>1. &Порівняти</target>
-
-<source>2. &Synchronize</source>
-<target>2. &Синхронізувати</target>
-
 <source>&New</source>
 <target>Нова</target>
 
 <source>&Save</source>
 <target>Зберегти</target>
 
+<source>Save as &batch job...</source>
+<target></target>
+
+<source>1. &Compare</source>
+<target>1. &Порівняти</target>
+
+<source>2. &Synchronize</source>
+<target>2. &Синхронізувати</target>
+
 <source>&Language</source>
 <target>&Мова</target>
 
 <source>&Global settings...</source>
 <target>&Глобальні налаштування...</target>
 
-<source>&Create batch job...</source>
-<target>&Створити завдання...</target>
-
 <source>&Export file list...</source>
 <target>&Експортувати список файлів...</target>
 
@@ -495,11 +483,11 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>Поміняти місцями</target>
 
-<source>Load configuration from file</source>
-<target>Завантажити налаштування синхронізації з файлу</target>
+<source>Open</source>
+<target></target>
 
-<source>Save current configuration to file</source>
-<target>Зберегти активні налаштування в файлі</target>
+<source>Save</source>
+<target></target>
 
 <source>Last used configurations (press DEL to remove from list)</source>
 <target>
@@ -507,8 +495,8 @@ The command is triggered if:
 (тисніть DEL для вилучення зі списку)
 </target>
 
-<source>Show excluded items</source>
-<target>Показати виключені елементи</target>
+<source>Hide excluded items</source>
+<target></target>
 
 <source>Show filtered or temporarily excluded files</source>
 <target>Показати відфільтровані чи тимчасово виключені елементи</target>
@@ -546,15 +534,6 @@ The command is triggered if:
 <source>Help</source>
 <target>Допомога</target>
 
-<source>Filter files</source>
-<target>Фільтр файлів</target>
-
-<source>Left</source>
-<target>Ліворуч</target>
-
-<source>Right</source>
-<target>Праворуч</target>
-
 <source>Error handling</source>
 <target>Обробка помилок</target>
 
@@ -576,14 +555,14 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>Перервати синхронізацію при першій помилці</target>
 
-<source>On completion:</source>
-<target>Закінчивши:</target>
+<source>On completion</source>
+<target></target>
 
 <source>Show progress dialog</source>
 <target>Показувати вікно прогресу</target>
 
-<source>Generate log file</source>
-<target>Створити файл журналу</target>
+<source>Save log</source>
+<target></target>
 
 <source>Select folder to save log files</source>
 <target>Виберіть папку для файлів журналу</target>
@@ -594,11 +573,8 @@ The command is triggered if:
 <source>Limit maximum number of log files</source>
 <target>Обмежити максимальну кількість файлів журналу</target>
 
-<source>Batch settings</source>
-<target>Налаштування пакетного завдання</target>
-
-<source>Compare by...</source>
-<target>Критерії порівнювання</target>
+<source>Select variant</source>
+<target></target>
 
 <source>
 Files are found equal if
@@ -613,6 +589,9 @@ are the same
 співпадають
 </target>
 
+<source>File time and size</source>
+<target>Дата та розмір файлу</target>
+
 <source>
 Files are found equal if
      - file content
@@ -620,24 +599,36 @@ is the same
 </source>
 <target>Файли вважаються рівними, якщо вміст файлів однаковий</target>
 
+<source>File content</source>
+<target>Вміст файлу</target>
+
 <source>Symbolic Link handling</source>
 <target>Обробка символьного посилання</target>
 
 <source>OK</source>
 <target>OK</target>
 
-<source>Select variant:</source>
-<target>Виберіть варіант:</target>
+<source><- Two way -></source>
+<target></target>
 
 <source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
 <target>Виявити та поширити зміни на обидві сторони використовуючи базу даних. Видалення, перейменування та конфлікти визначаються автоматично.</target>
 
+<source>Mirror ->></source>
+<target>Дзеркало ->></target>
+
 <source>Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization.</source>
 <target>Дзеркальна (резервна) копія лівої частини. В результаті синхронізації права папка змінюється до повної відповідності лівій.</target>
 
+<source>Update -></source>
+<target>Оновити -></target>
+
 <source>Copy new or updated files to right folder.</source>
 <target>Копіювати нові чи оновлювати файли з правої сторони.</target>
 
+<source>Custom</source>
+<target>Вибірково</target>
+
 <source>Configure your own synchronization rules.</source>
 <target>Налаштувати власні правила синхронізації.</target>
 
@@ -653,8 +644,8 @@ is the same
 <source>Recycle Bin</source>
 <target>Корзина</target>
 
-<source>Use Recycle Bin when deleting or overwriting files</source>
-<target>Використовувати "Корзину" при вилученні чи перезаписі файлів</target>
+<source>Use Recycle Bin for deleted and overwritten files</source>
+<target></target>
 
 <source>Versioning</source>
 <target>Запис версій</target>
@@ -662,8 +653,8 @@ is the same
 <source>Move time-stamped files into specified folder</source>
 <target>Перемістити файли з часовою міткою у вказану папку</target>
 
-<source>Limit maximum number of versions per file</source>
-<target>Обмежити кількість версій файлу</target>
+<source>Naming convention:</source>
+<target></target>
 
 <source>Configuration</source>
 <target>Налаштування</target>
@@ -812,6 +803,9 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>Головна</target>
 
+<source>Filter files</source>
+<target>Фільтр файлів</target>
+
 <source>Select view</source>
 <target>Список файлів</target>
 
@@ -863,9 +857,15 @@ Note: File names must be relative to base directories!
 <source><Last session></source>
 <target><Остання сесія></target>
 
+<source>Folder Comparison and Synchronization</source>
+<target>Порівнювання та Синхронізація папок</target>
+
 <source>Configuration saved!</source>
 <target>Налаштування синхронізації збережено!</target>
 
+<source>FreeFileSync batch</source>
+<target>Командний файл FreeFileSync</target>
+
 <source>Never save changes</source>
 <target>Ніколи не зберігати змін</target>
 
@@ -878,9 +878,6 @@ Note: File names must be relative to base directories!
 <source>Configuration loaded!</source>
 <target>Налаштування синхронізації загружено!</target>
 
-<source>Folder Comparison and Synchronization</source>
-<target>Порівнювання та Синхронізація папок</target>
-
 <source>Hide files that exist on left side only</source>
 <target>Приховати файли, які є тільки ліворуч</target>
 
@@ -1041,6 +1038,9 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>Порівнювання вмісту...</target>
 
+<source>Copy</source>
+<target></target>
+
 <source>Paused</source>
 <target>Призупинено</target>
 
@@ -1113,14 +1113,14 @@ Note: File names must be relative to base directories!
 <source>- folder part only</source>
 <target>- тільки папка</target>
 
-<source>- Other side's counterpart to %name</source>
-<target>- файл-відповідник %name з протилежної сторони</target>
+<source>- Other side's counterpart to %item_path%</source>
+<target></target>
 
-<source>- Other side's counterpart to %dir</source>
-<target>- папка-відповідник %dir з протилежної сторони</target>
+<source>- Other side's counterpart to %item_folder%</source>
+<target></target>
 
-<source>Make hidden dialogs and warning messages visible again?</source>
-<target>Зробити приховані діалоги та попередження знову видимими?</target>
+<source>Make hidden warnings and dialogs visible again?</source>
+<target></target>
 
 <source>
 <pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
@@ -1145,50 +1145,29 @@ Note: File names must be relative to base directories!
 <source>Leave as unresolved conflict</source>
 <target>Залишити як невирішений конфлікт</target>
 
-<source>Files</source>
-<target>Файли</target>
+<source>Replace</source>
+<target></target>
 
-<source>Percentage</source>
-<target>Проценти</target>
+<source>Move files and replace if existing</source>
+<target></target>
 
-<source>%x TB</source>
-<target>%x ТБ</target>
+<source>Append a timestamp to each file name</source>
+<target></target>
 
-<source>%x PB</source>
-<target>%x ПБ</target>
+<source>Folder</source>
+<target></target>
 
-<source>%x%</source>
-<target>%x%</target>
+<source>File</source>
+<target></target>
 
-<source>
-<pluralform>1 min</pluralform>
-<pluralform>%x min</pluralform>
-</source>
-<target>
-<pluralform>%x хв</pluralform>
-<pluralform>%x хв</pluralform>
-<pluralform>%x хв</pluralform>
-</target>
+<source>YYYY-MM-DD hhmmss</source>
+<target></target>
 
-<source>
-<pluralform>1 hour</pluralform>
-<pluralform>%x hours</pluralform>
-</source>
-<target>
-<pluralform>%x година</pluralform>
-<pluralform>%x години</pluralform>
-<pluralform>%x годин</pluralform>
-</target>
+<source>Files</source>
+<target>Файли</target>
 
-<source>
-<pluralform>1 day</pluralform>
-<pluralform>%x days</pluralform>
-</source>
-<target>
-<pluralform>%x день</pluralform>
-<pluralform>%x дні</pluralform>
-<pluralform>%x днів</pluralform>
-</target>
+<source>Percentage</source>
+<target>Проценти</target>
 
 <source>Cannot monitor directory %x.</source>
 <target>Не вдається контролювати каталог %x.</target>
@@ -1238,6 +1217,9 @@ Note: File names must be relative to base directories!
 <source>Cannot copy file %x to %y.</source>
 <target>Не вдається зкопіювати файл %х до %y.</target>
 
+<source>Type of item %x is not supported:</source>
+<target></target>
+
 <source>Cannot open directory %x.</source>
 <target>Не вдається відкрити каталогу %x.</target>
 
@@ -1247,6 +1229,45 @@ Note: File names must be relative to base directories!
 <source>Detected endless directory recursion.</source>
 <target>Виявлено нескінченну рекурсію каталогів.</target>
 
+<source>%x TB</source>
+<target>%x ТБ</target>
+
+<source>%x PB</source>
+<target>%x ПБ</target>
+
+<source>%x%</source>
+<target>%x%</target>
+
+<source>
+<pluralform>1 min</pluralform>
+<pluralform>%x min</pluralform>
+</source>
+<target>
+<pluralform>%x хв</pluralform>
+<pluralform>%x хв</pluralform>
+<pluralform>%x хв</pluralform>
+</target>
+
+<source>
+<pluralform>1 hour</pluralform>
+<pluralform>%x hours</pluralform>
+</source>
+<target>
+<pluralform>%x година</pluralform>
+<pluralform>%x години</pluralform>
+<pluralform>%x годин</pluralform>
+</target>
+
+<source>
+<pluralform>1 day</pluralform>
+<pluralform>%x days</pluralform>
+</source>
+<target>
+<pluralform>%x день</pluralform>
+<pluralform>%x дні</pluralform>
+<pluralform>%x днів</pluralform>
+</target>
+
 <source>Cannot set privilege %x.</source>
 <target>Не вдається встановити привілеї %х.</target>
 
@@ -1379,6 +1400,9 @@ Note: File names must be relative to base directories!
 <source>Moving symbolic link %x to %y</source>
 <target>Переміщення символьного посилання %x до %y</target>
 
+<source>Removing old versions...</source>
+<target></target>
+
 <source>Creating file %x</source>
 <target>Створення файлу %x</target>
 
@@ -1400,6 +1424,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>Оновлення атрибутів %x</target>
 
+<source>Target folder %x already existing.</source>
+<target>Цільова папка %x вже існує.</target>
+
 <source>Target folder input field must not be empty.</source>
 <target>Поле цільової папки не повинно бути порожнім.</target>
 
@@ -1409,11 +1436,8 @@ Note: File names must be relative to base directories!
 <source>Source folder %x not found.</source>
 <target>Вихідний каталог %x не знайдено.</target>
 
-<source>Unresolved conflicts existing!</source>
-<target>Є невирішені конфлікти</target>
-
-<source>You can ignore conflicts and continue synchronization.</source>
-<target>Ви можете проігнорувати їх та продовжити синхронізацію.</target>
+<source>The following items have unresolved conflicts and will not be synchronized:</source>
+<target></target>
 
 <source>Significant difference detected:</source>
 <target>Виявлена істотна різниця:</target>
@@ -1433,12 +1457,15 @@ Note: File names must be relative to base directories!
 <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source>
 <target>Буде змінена папка, яка є частиною кількох пар папок. Будь ласка, перегляньте налаштування синхронізації.</target>
 
+<source>Left</source>
+<target>Ліворуч</target>
+
+<source>Right</source>
+<target>Праворуч</target>
+
 <source>Synchronizing folder pair:</source>
 <target>Синхронізація пари папок:</target>
 
-<source>Target folder %x already existing.</source>
-<target>Цільова папка %x вже існує.</target>
-
 <source>Generating database...</source>
 <target>Створення бази даних...</target>
author	Daniel Wilhelm <daniel@wili.li>	2014-04-18 17:22:36 +0200
committer	Daniel Wilhelm <daniel@wili.li>	2014-04-18 17:22:36 +0200
commit	ecb1524f8da7901338b263384fed3c612f117b4c (patch)
tree	e7e06423fe27ea5ab45f27fc4b39ae597ba72490 /BUILD/Languages
parent	5.10 (diff)
download	FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.gz FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.bz2 FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.zip