2.2

18 files changed, 2335 insertions, 650 deletions

diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index 18b836bb..fca7be5b 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -1,13 +1,41 @@
-FreeFileSync
-------------
+--------------
+|FreeFileSync|
+--------------
+
+Changelog v2.2
+---------------
+New user-defined recycle bin directory
+Possibility to create synchronization directories automatically (if not existing)
+Support for relative directory names (e.g. \foo, ..\bar) respecting current working directory
+New tooltip in middle grid showing detailed information (including conflicts)
+Status feedback and new abort button for manual deletion
+Options to add/remove folder pairs in batch dialog
+Added tooltip showing progress for silent batchmode
+New view filter buttons in synchronization preview
+Revisioned handling of symbolic links (Linux/Windows)
+GUI optimizations removing flicker
+Possibility to create new folders via browse folder dialog
+Open files with associated application by special command string
+Improved warning/error handling
+Auto-adjust columns automatically or manually with CTRL + '+'
+New makros for double-click commandline: %name, %dir, %nameCo, %dirCo
+Fixed runtime error when multiple folder pairs are used
+New tool 'RealtimeSync': Watch directories for changes and start synchronization automatically
+Improved XML parsing, fault tolerance and concept revisioned
+More detailed statistics before start of synchronization
+Removed superfluous border for bitmap buttons (Linux only)
+Added Czech translation
+Updated translation files
+
 
 Changelog v2.1
-----------------
+--------------
 Fixed bug that could cause FreeFileSync to crash after synchronization
+Compiled with MS Visual C++ 2008 using static runtime library
 
 
 Changelog v2.0
----------------
+--------------
 Copy locked files using Windows Volume Shadow Copy
 Load file icons asynchronously for maximum display performance
 Handle include filter correctly when comparing
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index a4cf8017..a33f3904 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -1,5 +1,5 @@
   MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
-
+  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
  Byte
  字节
  GB
@@ -20,14 +20,16 @@
  分
  sec
  秒
-!=	files are different\n
-!=	文件不同\n
+%x / %y objects deleted successfully
+%x / %y 个对象被成功删除
+%x Percent
+百分之%x
 %x directories
 %x 目录
 %x files,
 %x 文件,
 %x is not a valid FreeFileSync batch file!
-%x 无有效的 FreeFileSync 批处理文件
+%x 不是有效的 FreeFileSync 批处理文件
 %x of %y rows in view
 %x of %y 横向视图
 %x of 1 row in view
@@ -41,13 +43,15 @@
 &Apply
 应用(&Y)
 &Cancel
-撒消(&C)
+取消(&C)
 &Check for new version
 检查更新(&C)
 &Create batch job
 创建批处理作业(&C)
 &Default
 默认(&D)
+&Exit
+退出(&E)
 &Export file list
 导出文件列表(&E)
 &File
@@ -65,35 +69,39 @@
 &Load configuration
 加载配置(&L)
 &No
-
+否
 &OK
 确定(&O)
 &Pause
 暂停(&P)
 &Quit
 退出(&Q)
+&Restore
+恢复(&R)
 &Retry
 重试(&R)
 &Save
 保存(&S)
 &Yes
-
+是
 ,
 .
--	do not copy\n
-
 - conflict
-
+- 冲突
 - conflict (same date, different size)
-
+- 冲突(相同日期,不同大小)
 - different
 - 不同
+- directory part only
+- 只对目录部分
 - equal
 - 相同
 - exists left only
 - 仅左侧存在的
 - exists right only
 - 仅右侧存在的
+- full file or directory name
+- 完整的文件名或目录名
 - left
 - 左侧
 - left newer
@@ -102,8 +110,10 @@
 - 右侧
 - right newer
 - 右侧较新
-->	copy to right side\n
-
+- sibling of %dir
+- 与 %dir 同级
+- sibling of %name
+- 与 %name 同级
 -Open-Source file synchronization-
 -开源文件同步器-
 .
@@ -117,29 +127,19 @@
 1. &Compare
 1. 比较(&C)
 1. Enter relative file or directory names separated by ';' or a new line.
-
+1. 输入相对文件或文件夹名称,用';'或空行分隔.
 2. &Synchronize...
 2. 同步(&S)...
 2. Use wildcard characters '*' and '?'.
-2. 使用通配符"*"和"?".
+2. 使用通配符‘*’和‘?’.
 3. Exclude files directly on main grid via context menu.
-3. 直接通过上下文菜单的主要网格排除文件.
-<-	copy to left side\n
-
-<<	left file is newer\n
-<<	左侧文件较新\n
+3. 通过右键菜单在主网格排除文件.
 <Directory>
 <目录>
 <Last session>
 <最后会话>
 <multiple selection>
 <多选>
-<|	file on left side only\n
-<|	仅左侧文件\n
-==	files are equal\n
-
->>	right file is newer\n
->>	右侧文件较新\n
 A newer version of FreeFileSync is available:
 FreeFileSync 有新版可用:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 关于
 Action
 动作
+Add folder
+添加文件夹
 Add folder pair
 添加成对文件夹
 All items have been synchronized!
@@ -157,11 +159,13 @@ All items have been synchronized!
 An exception occured!
 发生异常!
 As a result the files are separated into the following categories:
-由该文件分为以下几类:
+其结果是文件分为以下几类:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
-顾名思义,这两个文件共享相同的名称被标记为相同当且仅当它们具有相同的内容。\n此选项是有用的一致性检查，而不是备份行动.因此,文件时间没有被考虑到. \n\n通过此选项使决策树较小:
+顾名思义,两个相同文件名的文件当且仅当它们具有相同的内容时会被认为是相同的。\n此选项对于一致性检查比较有用，而不是备份操作. 因此,文件时间没有被考虑到. \n\n通过此选项使决策树较小:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
-装配一个批处理文件自动同步.开始只是通过批处理模式的文件的名称为FreeFileSync可执行:FreeFileSync.exe <batchfile> .这也可以安排在您的操作系统的工作规划.
+装配一个批处理文件用于自动同步. 要开始批处理模式只需简单地将批处理文件名传送给FreeFileSync可执行文件:FreeFileSync.exe <batchfile>. 这个也可以安排在您的操作系统的计划任务中.
+Auto-adjust columns
+自动调整栏宽
 Batch execution
 批处理执行
 Batch file created successfully!
@@ -177,17 +181,21 @@ Build:
 Cancel
 取消
 Change direction
-
+改变方向
 Check all
-检查所有
+全选
 Choose to hide filtered files/directories from list
-从列表中选择隐藏过滤文件/文件夹
+从列表中选择隐藏被过滤的文件/文件夹
 Comma separated list
 逗号分隔的列表
+Commandline
+命令行
+Commandline is empty!
+命令行为空!
 Compare
-
+比较
 Compare both sides
-两侧比较
+比较两侧
 Compare by \"File content\"
 通过文件内容比较
 Compare by \"File size and date\"
@@ -197,11 +205,13 @@ Compare by...
 Comparing content
 正在比较内容
 Comparing content of files %x
-正在比较档案内容的百分比 %x
+正在比较文件内容的百分比 %x
 Comparing content...
-
+正在比较文件内容...
 Comparison Result
-
+比较结果
+Comparison settings
+比较设置
 Completed
 完成
 Configuration
@@ -217,11 +227,11 @@ Configure filter
 Configure filter...
 设置过滤...
 Configure your own synchronization rules.
-配置自己的同步规则.
+配置你自己的同步规则.
 Confirm
 确认
 Conflict detected:
-
+检测到冲突:
 Continue
 继续
 Conversion error:
@@ -237,17 +247,19 @@ Copy from right to left overwriting
 Copy new or updated files to right folder.
 复制新的或修改过的文件到右侧文件夹
 Copy to clipboard\tCTRL+C
-复制到剪贴板\t使用CTRL+C键
+复制到剪贴板\tCTRL+C
 Copying file %x to %y
 正复制文件 %x 到 %y
 Copying file %x to %y overwriting target
 复制文件 %x 并覆盖到目标 %y
 Could not determine volume name for file:
+不能确定此文件的卷名称:
+Could not initialize directory monitoring:
+不能初始化目录监视:
+Could not read values for the following XML nodes:
 
-Could not set working directory:
-无法设置工作目录:
 Create a batch job
-创建一个批工作
+创建一个批处理作业
 Creating folder %x
 正创建文件夹 %x
 Current operation:
@@ -255,29 +267,43 @@ Current operation:
 Custom
 自定义
 Customize columns
-自定义行
+自定义栏
+Customize...
+自定义...
 DECISION TREE
 决策树
 Data remaining:
 剩余数据:
 Date
 日期
+Delay
+延时
+Delay between two invocations of the commandline
+两个命令行调用之间的延时
 Delete files/folders existing on left side only
-仅从左侧中删除文件/方件夹
+删除仅在左侧存在的文件/文件夹
 Delete files/folders existing on right side only
-仅从左侧中删除文件/方件夹
+删除仅在右侧存在的文件/文件夹
 Delete files\tDEL
-删除文件\t使用DEL键
+删除文件\tDEL
 Delete on both sides
-删除两侧
+从两侧删除
 Delete on both sides even if the file is selected on one side only
-删除两侧(仅对在一侧已选择文件)
+从两侧删除(即使仅在一侧选择文件)
+Delete or overwrite files permanently.
+永久性删除或覆盖文件。
+Delete permanently
+永久性删除
 Deleting file %x
 正删除文件 %x
 Deleting folder %x
 正删除文件夹 %x
+Deletion handling
+删除处理
 Directories are dependent! Be careful when setting up synchronization rules:
-目录有依赖性！注意设立同步的规则:
+目录有依赖性！在设立同步规则时请小心:
+Directories to watch
+要监视的目录
 Directory
 目录
 Directory does not exist:
@@ -285,17 +311,17 @@ Directory does not exist:
 Do not display visual status information but write to a logfile instead
 不显示视觉状态信息,使用写入日志文件代替。
 Do not show this dialog again
-
+不要再显示此对话框
 Do nothing
 保持不动
 Do you really want to delete the following objects(s)?
-你确定要删除下列项目吗?
+你确定要删除下列对象吗?
 Do you really want to move the following objects(s) to the Recycle Bin?
-你确定要移动下列项目到回收站吗?
+你确定要移动下列对象到回收站吗?
 Do you want FreeFileSync to automatically check for updates every week?
 要让 FreeFileSync 保持每周检查一次更新吗?>
 Don't ask me again
-
+不要再问我
 Donate with PayPal
 通过PayPal捐赠
 Download now?
@@ -305,15 +331,17 @@ Drag && drop
 Email
 邮箱
 Enable filter to exclude files from synchronization
-启用同步时使用过滤排除文件。
+同步时使用过滤排除文件。
+Endless loop when traversing directory:
+遍历目录时出现无限循环:
 Error
 错误
 Error changing modification time:
-修改时间出错:
+改变修改时间时出错:
 Error copying file:
 复制文件出错:
 Error copying locked file %x!
-
+复制已锁定的文件时出错 %x!
 Error creating directory:
 创建目录出错:
 Error deleting directory:
@@ -324,48 +352,52 @@ Error handling
 错误处理
 Error loading library function:
 加载库函数出错:
+Error moving directory:
+移动目录时出错:
+Error moving file:
+移动文件时出错:
 Error moving to Recycle Bin:
-移到到回收站出错:
+移动到回收站出错:
 Error opening file:
 打开文件出错:
 Error parsing configuration file:
 分析配置文件出错:
 Error reading file attributes:
-读文件属性出错:
+读取文件属性出错:
 Error reading file:
 读取文件出错:
 Error resolving symbolic link:
-解决字符链接出错:
-Error retrieving full path:
-获取完整路径时出错:
+解决符号链接出错:
 Error starting Volume Shadow Copy Service!
-
+启动卷影复制服务时出错!
 Error traversing directory:
 遍历目录出错:
+Error when monitoring directories.
+监视目录时出错.
 Error writing file attributes:
 写文件属性出错:
 Error writing file:
 写入文件出错:
 Error: Source directory does not exist anymore:
-错误:源目录根本不存在:
+错误:源目录已经不存在:
 Example
 例如
 Exclude
-例外
+排除
 Exclude temporarily
-暂时除外
+暂时排除
 Exclude via filter:
 通过过滤器排除:
 Exit immediately and set returncode < 0
-立即退出，并传回
+立即退出，并设置返回码 <0
 Exit with RC < 0
-带参数退出
+退出并设置返回码 <0
 Feedback and suggestions are welcome at:
 欢迎在下面提出反馈意见和建议:
 File %x has an invalid date!
-
+文件 %x 的日期非法!
 File Manager integration:
-文件管理集成器:
+文件管理器集成:
 File Time tolerance (seconds):
 文件时间容错(秒):
 File already exists. Overwrite?
@@ -375,41 +407,41 @@ File content
 File does not exist:
 文件不存在:
 File list exported!
-文件清单已经列出!
+文件清单已经导出!
 File size and date
 文件大小和日期
 File times that differ by up to the specified number of seconds are still handled as having same time.
-文件相差最多指定秒数但仍然具有相同的处理时间.
+文件相差最多指定秒数但仍然按相同时间的处理.
 Filename
 文件名
 Files %x have a file time difference of less than 1 hour! It's not safe to decide which one is newer due to Daylight Saving Time issues.
-
+文件 %x 的时间差异小于1小时！由于夏令时的问题因此不能安全地判断哪一个比较新.
 Files %x have the same date but a different size!
-
+文件 %x 日期相同但大小不同!
 Files are found equal if\n     - file content\nis the same.
 如果文件内容相同则认为两者相同
 Files are found equal if\n     - filesize\n     - last write time and date\nare the same.
 如果文件大小和最后修改时间和日期相同则认为两者相同.
 Files remaining:
-其余档案:
+剩余文件:
 Files that exist on both sides and have different content
-两侧都有但内容不同的文件
+两侧都有并且内容不同的文件
 Files that exist on both sides, left one is newer
-两侧都有但左侧较新的文件
+两侧都有,左侧较新的文件
 Files that exist on both sides, right one is newer
-两侧都有但右侧较新的文件
+两侧都有,右侧较新的文件
 Files/folders remaining:
-档案/文件夹剩余:
+文件/文件夹剩余:
 Files/folders scanned:
-档案/文件夹已扫描:
+文件/文件夹已扫描:
 Files/folders that exist on left side only
-仅在左侧存在的档案/文件夹
+仅在左侧存在的文件/文件夹
 Files/folders that exist on right side only
-仅在左侧存在的档案/文件夹
+仅在右侧存在的文件/文件夹
 Filter
 过滤
 Filter active: Press again to deactivate
-过滤激活: 请按键以关闭激活
+过滤激活: 再按一次可关闭激活
 Filter files
 过滤文件
 Filter view
@@ -431,7 +463,7 @@ FreeFileSync 配置
 FreeFileSync is up to date!
 FreeFileSync 已是最新!
 Full path
-
+完整路径
 Generating file list...
 生成文件列表...
 Global settings
@@ -441,31 +473,37 @@ Help
 Hide all error and warning messages
 隐藏所有错误与警告信息
 Hide conflicts
-
+隐藏冲突
 Hide files that are different
-隐藏不同的档案
+隐藏不同的文件
 Hide files that are equal
-隐藏相同的档案
+隐藏相同的文件
 Hide files that are newer on left
-隐藏左侧较新的档案
+隐藏左侧较新的文件
 Hide files that are newer on right
-隐藏右侧较新的档案
+隐藏右侧较新的文件
 Hide files that exist on left side only
-仅隐藏在左侧的档案
+隐藏仅在左侧的文件
 Hide files that exist on right side only
-仅隐藏在右侧的档案
+隐藏仅在右侧的文件
 Hide files that will be copied to the left side
-
+隐藏将被复制到左侧的文件
 Hide files that will be copied to the right side
-
+隐藏将被复制到右侧的文件
+Hide files that will be created on the left side
+隐藏将在左侧被建立的文件
+Hide files that will be created on the right side
+隐藏将在右侧被建立的文件
+Hide files that will be deleted on the left side
+隐藏将在左侧被删除的文件
+Hide files that will be deleted on the right side
+隐藏将在右侧被删除的文件
 Hide files that won't be copied
-
+隐藏将不会被复制的文件
 Hide filtered items
 隐藏已过滤的项目
 Hide further error messages during the current process
-在当前進程中隐藏下一步的错误信息
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-隐藏同步时的错误信息：在结束进程时收集和显示的清单
+在当前进程中隐藏进一步的错误信息
 Hints:
 提示:
 Homepage
@@ -473,7 +511,7 @@ Homepage
 If you like FFS
 如果你喜欢 FFS
 Ignore 1-hour file time difference
-
+忽略1小时文件时间差异
 Ignore errors
 忽略错误
 Ignore subsequent errors
@@ -485,9 +523,9 @@ Ignore this error, retry or abort?
 Include
 包括
 Include temporarily
-包括暂时的
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-
+暂时包括
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+包括: *.doc;*.zip;*.exe\n排除temp\\*
 Info
 信息
 Information
@@ -495,9 +533,9 @@ Information
 Initialization of Recycle Bin failed!
 初始化回收站失败!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
-初始化回收站是不大可能了!估计你使用的不是Windows系统.如果你想未来在此系统上应用请联系作者. :)
-Left:
-左侧:
+初始化回收站是不大可能了!\n\n估计你使用的不是Windows系统.\n如果你想包含此特性,请联系作者. :)
+Left
+左侧
 Load configuration from file
 从文件加载配置
 Load configuration history (press DEL to delete items)
@@ -509,19 +547,25 @@ Logging
 Mirror ->>
 镜像 ->>
 Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronization.
-左侧文件夹镜像备份: 同步后右侧文件夹将被覆盖(完全匹配左边的文件夹).
+左侧文件夹镜像备份: 同步后右侧文件夹将被覆盖并且完全匹配左边的文件夹.
 More than 50% of the total number of files will be copied or deleted!
-超过总数的 50% 以上的文件要被删除或复制
+超过总数 50% 以上的文件要被复制或删除!
 Move column down
-移动下一行
+下移一行
 Move column up
-移动上一行
+上移一行
+Move files to a custom directory.
+将文件移动于自定义目录.
+Move to custom directory
+移动至自定义目录
 Moving %x to Recycle Bin
-
+移动 %x 到回收站
+Moving %x to custom directory
+移动 %x 至自定义目录
 Not all items have been synchronized! Have a look at the list.
-
+并非所有项目都已同步!请看此列表.
 Not enough free disk space available in:
-无足够的可用空间于:
+没有足够的可用磁盘空间用于:
 Nothing to synchronize according to configuration!
 根据配置没有任何同步!
 Number of files and directories that will be created
@@ -533,9 +577,9 @@ Number of files that will be overwritten
 OK
 确定
 Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the synchronization directories.
-
+只有通过过滤的文件/文件夹会被选择用于同步.过滤中的路径将做为同步文件夹的相关路径.
 Open with File Manager\tD-Click
-在资源管理器中打开
+在资源管理器中打开\t双击
 Operation aborted!
 操作已取消!
 Operation:
@@ -547,37 +591,47 @@ Pause
 Paused
 已暂停
 Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) into the FreeFileSync installation directory to enable this feature.
-
+请复制适当的\"Shadow.dll\"(位于\"Shadow.zip\"压缩包中)到FreeFileSync安装目录以启用此特性.
 Please fill all empty directory fields.
 请填满所有空的目录区域.
+Please specify alternate directory for deletion!
+请指定用于删除的替换目录!
 Press button to activate filter
 请按键以激活过滤
 Published under the GNU General Public License:
 在GNU通用公共许可下发布:
 Question
-
+问题
 Quit
 退出
+RealtimeSync - Automated Synchronization
+实时同步 - 自动同步
+RealtimeSync configuration
+实时同步配置
 Relative path
 相对路径
+Remove folder
+删除文件夹
 Remove folder pair
 删除文件夹对
+Report translation error
+报告翻译错误
 Reset
 重置
 Reset all warning messages
-
+重置所有警告信息
 Reset all warning messages?
 重置所有警告信息?
 Result
 结果
-Right:
-右侧:
+Right
+右侧
 S&ave configuration
 保存配置(&A)
 S&witch view
-
+切换视图(&W)
 Save changes to current configuration?
-
+保存更改到当前配置?
 Save current configuration to file
 保存当前配置到文件
 Scanning...
@@ -591,9 +645,9 @@ Select logfile directory:
 Select variant:
 选择变化的:
 Show conflicts
-
+显示冲突
 Show file icons
-
+显示文件图标
 Show files that are different
 显示不同的文件
 Show files that are equal
@@ -607,15 +661,23 @@ Show files that exist on left side only
 Show files that exist on right side only
 显示仅存在右侧的文件
 Show files that will be copied to the left side
-
+显示将被复制到左侧的文件
 Show files that will be copied to the right side
-
+显示将被复制到右侧的文件
+Show files that will be created on the left side
+显示将在左侧被建立的文件
+Show files that will be created on the right side
+显示将在右侧被建立的文件
+Show files that will be deleted on the left side
+显示将在左侧被删除的文件
+Show files that will be deleted on the right side
+显示将在右侧被删除的文件
 Show files that won't be copied
-
+显示将不被复制的文件
 Show popup
-查看弹出
+显示弹出窗口
 Show popup on errors or warnings
-查看弹出的错误或警告
+在错误或警告时显示弹出窗口
 Significant difference detected:
 已侦测到显著不同:
 Silent mode
@@ -625,7 +687,7 @@ Size
 Sorting file list...
 排序文件列表...
 Source code written completely in C++ utilizing:
-使用C++编写的源代码已完全写好:
+源代码完全使用C++工具编写:
 Speed:
 速度:
 Start
@@ -633,13 +695,13 @@ Start
 Start synchronization
 开始同步
 Statistics
-
+统计
 Stop
 停止
 Swap sides
-
+两侧互换
 Synchronization Preview
-
+同步预览
 Synchronization aborted!
 同步已放弃!
 Synchronization completed successfully!
@@ -651,23 +713,25 @@ Synchronization settings
 Synchronization status
 同步状态
 Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\".
-
+同步所有 .doc, .zip和 .exe 文件, 除了\"temp\"中的一切.
 Synchronize both sides simultaneously: Copy new or updated files in both directions.
-同时同步两侧:  复制新的或更新的文件在两个方向.
+同时同步两侧:  双向复制新的或更新的文件.
 Synchronize...
-
+同步...
 Synchronizing...
 同步中...
 System out of memory!
-系统内在溢出!
+系统内存溢出!
+Target directory already existing!
+目标目录已经存在!
 Target file already existing!
 目标文件已经存在!
 The file does not contain a valid configuration:
 该文件不包含有效的配置:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-这一指令将被执行，每次你双击一个文件名。 %name作为预留位置选定的文件。
+This commandline will be executed on each doubleclick. The following macros are available:
+此命令行会在每次双击时被执行. 如下宏命令可用:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
-这两个同样变异评估命名文件时,在同等条件下,\n他们有同样的文件大小相同的最后收件日期和时间.
+此变化评估两个文件名相同的文件,只有当他们有同样的文件大小并且最后修改日期和时间也相同\n时才认为它们是相同的.
 Time
 时间
 Time elapsed:
@@ -681,9 +745,9 @@ Total required free disk space:
 Total time:
 总共时间:
 Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes.
-
+对文件时间差异在精确的+/-1小时的文件认为是相同的,小于1小时的认为是冲突以此来处理夏令时的变化.
 Two way <->
-两侧 <->
+双向 <->
 Unable to connect to sourceforge.net!
 无法链接到 Sourceforge.net!
 Unable to create logfile!
@@ -693,17 +757,19 @@ Unable to initialize Recycle Bin!
 Uncheck all
 全部取消选中
 Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchronization.
-
+存在不可解决的冲突!\n\n你可忽略冲突并继续同步.
 Update ->
 升级 ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+用法: 选择要监视的目录并输入一命令行. 每次目录(或子目录)中的文件被修改时此命令行就会执行.
 Use Recycle Bin
 使用回收站
-Use Recycle Bin when deleting or overwriting files during synchronization
-当同步时使用回收站删除或覆盖档案
+Use Recycle Bin when deleting or overwriting files.
+当删除或覆盖文件时使用回收站.
 Variant
-
+变化
 Volume name %x not part of filename %y!
-
+卷名 %x 并非文件名 %y 的一部分!
 Warning
 警告
 Warning: Synchronization failed for %x item(s):
@@ -711,16 +777,14 @@ Warning: Synchronization failed for %x item(s):
 Warnings:
 警告:
 When the comparison is started with this option set the following decision tree is processed:
-当比较是开始使用此选项设置以下处理决定树:
+当以此选项开始比较时以下决定树被处理:
+You can ignore the error to consider not existing directories as empty.
+您可忽略此错误而将不存在的目录视为空.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
-您可能会尝试再次同步,其余的项目(而不必再比较)!
+您可能会尝试再次同步剩余的项目(而不必重新比较)!
 different
 不同
 file exists on both sides
-两侧文件已存在
-flash	conflict\n
-
+文件在两侧均已存在
 on one side only
 仅在一侧
-|>	file on right side only\n
-|>	仅右侧文件\n
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
new file mode 100644
index 00000000..f1178b94
--- /dev/null
+++ b/BUILD/Languages/czech.lng
@@ -0,0 +1,790 @@
+  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
+  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
+ Byte
+ Byte
+ GB
+ GB
+ MB
+ MB
+ PB
+ PB
+ TB
+ TB
+ day(s)
+ d
+ hour(s)
+ hod
+ kB
+ kB
+ min
+ min
+ sec
+ s
+%x / %y objects deleted successfully
+%x / %y objektů úspěšně smazáno
+%x Percent
+%x procent
+%x directories
+adresářů: %x
+%x files,
+souborů: %x;
+%x is not a valid FreeFileSync batch file!
+%x není platným dávkovým souborem programu FreeFileSync!
+%x of %y rows in view
+%x z %y řádků
+%x of 1 row in view
+%x z 1 řádku
+&Abort
+&Přerušit
+&About...
+&O Programu...
+&Advanced
+&Upřesnit
+&Apply
+&Použít
+&Cancel
+&Zrušit
+&Check for new version
+Zkontrolovat &aktualizace
+&Create batch job
+&Vytvořit dávku
+&Default
+&Předdefinované
+&Exit
+&Konec
+&Export file list
+&Exportovat seznam souborů
+&File
+&Soubor
+&Global settings
+&Nastavení
+&Help
+&Pomoc
+&Ignore
+&Ignorovat
+&Language
+&Jazyk
+&Load
+&Načíst
+&Load configuration
+&Načíst konfiguraci
+&No
+&Ne
+&OK
+&OK
+&Pause
+&Pauza
+&Quit
+U&končit
+&Restore
+&Obnovit
+&Retry
+&Znovu
+&Save
+&Uložit
+&Yes
+&Ano
+,
+ 
+- conflict
+- konflikt
+- conflict (same date, different size)
+- konflikt (stejné datum, jiná velikost)
+- different
+- rozdílné
+- directory part only
+- pouze cesta
+- equal
+- stejné
+- exists left only
+- existuje pouze na levé straně
+- exists right only
+- existuje pouze na pravé straně
+- full file or directory name
+- celá cesta nebo jméno souboru
+- left
+- vlevo
+- left newer
+- vlevo novější
+- right
+- vpravo
+- right newer
+- vpravo novější
+- sibling of %dir
+- pouze cesta z protistrany
+- sibling of %name
+- celá cesta nebo jméno souboru z protistrany
+-Open-Source file synchronization-
+-synchronizace souborů Open-Source-
+.
+,
+/sec
+/s
+1 directory
+adresář: 1
+1 file,
+soubor: 1;
+1. &Compare
+1. &Porovnat
+1. Enter relative file or directory names separated by ';' or a new line.
+1. Můžete použít relativní cesty k souboru nebo adresáři oddělené ';' nebo řádkem.
+2. &Synchronize...
+2. &Synchronizovat...
+2. Use wildcard characters '*' and '?'.
+2. Můžete použít zástupné znaky (wildcard) '*' a '?'.
+3. Exclude files directly on main grid via context menu.
+3. Můžete použít pro vynechávání souborů přímo kontextového menu.
+<Directory>
+<Adresář>
+<Last session>
+<Poslední>
+<multiple selection>
+<vícenásobný výběr>
+A newer version of FreeFileSync is available:
+je dostupná novější verze FreeFileSync:
+Abort requested: Waiting for current operation to finish...
+Požadavek na přerušení: Čekání na ukončení aktuální operace...
+Aborted
+Přerušeno
+About
+O Programu
+Action
+Akce
+Add folder
+Přidat adresář
+Add folder pair
+Přidat adresář pro porovnání
+All items have been synchronized!
+Všechny položky byly aktualizovány!
+An exception occured!
+Vyskytla se chyba!
+As a result the files are separated into the following categories:
+Jako výsledek jsou soubory rozděleny do následujících kategorií:
+As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
+Jak název napovídá, dva soubory mající stejné jméno jsou označeny za shodné jen a pouze pokud mají shodný obsah. Toto nastavení je vhodné spíše pro sledování konzistence než pro zálohování. Proto nejsou data změn souborů brána vůbec v potaz.\n\nPokud vyberete toto nastavení bude schéma rozhodování kratší:
+Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
+Vytvoření dávkového souboru pro automatický provoz. Ke spuštění dávky jednoduše její jméno zadejte jako parametr při spuštění FreeFileSync: FreeFileSync.exe <batchfile>.
+Auto-adjust columns
+Automaticky přizpůsobit šířku
+Batch execution
+Spuštění dávky
+Batch file created successfully!
+Dávka úspěšně vytvořena!
+Batch job
+Dávkový soubor
+Big thanks for localizing FreeFileSync goes out to:
+Poděkování za překlad FreeFileSync:
+Browse
+Procházet
+Build:
+Build:
+Cancel
+Zrušit
+Change direction
+Změnit akci
+Check all
+Označit vše
+Choose to hide filtered files/directories from list
+Vyberte pro skrytí filtrovaných souborů/adresářů ze seznamu
+Comma separated list
+Text oddělený čárkami
+Commandline
+Příkazová řádka
+Commandline is empty!
+Příkazová řádka je prázdná!
+Compare
+Porovnat
+Compare both sides
+Porovnat obě strany
+Compare by \"File content\"
+Porovnat \"podle obsahu souboru\"
+Compare by \"File size and date\"
+Porovnat \"podle velikosti a data souboru\"
+Compare by...
+Porovnat ...
+Comparing content
+Porovnání obsahu
+Comparing content of files %x
+Porovnávání obsahu souborů %x
+Comparing content...
+Porovnávání obsahu...
+Comparison Result
+Výsledek porovnání
+Comparison settings
+Nastavení porovnání
+Completed
+Hotovo
+Configuration
+Konfigurace
+Configuration loaded!
+Konfigurace načtena.
+Configuration overview:
+Přehled konfigurace:
+Configuration saved!
+Konfigurace uložena.
+Configure filter
+Nastavení filtru
+Configure filter...
+Nastavení filtru...
+Configure your own synchronization rules.
+Nastavení vlastních pravidel synchronizace.
+Confirm
+Potvrdit
+Conflict detected:
+Zaznamenán konflikt:
+Continue
+Pokračovat
+Conversion error:
+Chyba konverze:
+Copy from left to right
+Kopírovat z leva do prava
+Copy from left to right overwriting
+Kopírovat z leva do prava přepisem
+Copy from right to left
+Kopírovat z prava do leva
+Copy from right to left overwriting
+Kopírovat z prava do leva přepisem
+Copy new or updated files to right folder.
+Kopírovat nové nebo aktualizované soubory do adresáře vpravo.
+Copy to clipboard\tCTRL+C
+Vložit do schránky\tCTRL+C
+Copying file %x to %y
+Kopírování souboru %x do %y
+Copying file %x to %y overwriting target
+Přepis souboru %y souborem %x
+Could not determine volume name for file:
+Není možné zjistit jméno jednotky souboru:
+Could not initialize directory monitoring:
+Nelze nastavit monitorování adresáře:
+Could not read values for the following XML nodes:
+
+Create a batch job
+Vytvořit dávku
+Creating folder %x
+Vytváření adresáře %x
+Current operation:
+Aktuální operace:
+Custom
+Vlastní
+Customize columns
+Vlastní sloupce
+Customize...
+Vlastní....
+DECISION TREE
+ROZHODOVÁNÍ
+Data remaining:
+Zbývá dat:
+Date
+Datum
+Delay
+Zpoždění
+Delay between two invocations of the commandline
+Zpoždění mezi dvěma příkazovými řádky
+Delete files/folders existing on left side only
+Smazat soubory/adresáře existující pouze na levé straně
+Delete files/folders existing on right side only
+Smazat soubory/adresáře existující pouze na pravé straně
+Delete files\tDEL
+Smazat soubory\tDEL
+Delete on both sides
+Smazat z obou stran
+Delete on both sides even if the file is selected on one side only
+Smazat na obou stranách i když je soubor vybrán pouze na jedné z nich
+Delete or overwrite files permanently.
+Smazat nebo přepsat soubory trvale.
+Delete permanently
+Odstranit trvale
+Deleting file %x
+Mazání souboru %x
+Deleting folder %x
+Mazání adresáře %x
+Deletion handling
+Nastavení mazání
+Directories are dependent! Be careful when setting up synchronization rules:
+Adresáře jsou závislé! Buďte opatrní s definicí synchronizačních pravidel:
+Directories to watch
+Sledované adresáře
+Directory
+Adresář
+Directory does not exist:
+Adresář neexistuje:
+Do not display visual status information but write to a logfile instead
+Nezobrazovat informace o stavu ale zapisovat přímo do souboru záznamů
+Do not show this dialog again
+tento dialog již nezobrazovat
+Do nothing
+Nic nedělat
+Do you really want to delete the following objects(s)?
+Opravdu chcete smazat následující objekty?
+Do you really want to move the following objects(s) to the Recycle Bin?
+Opravdu chcete přesunout následující objekty do koše?
+Do you want FreeFileSync to automatically check for updates every week?
+Chcete aby FreeFileSync automaticky zjišťoval aktualizace každý týden?
+Don't ask me again
+Již se znovu neptat
+Donate with PayPal
+Přispět pomocí PayPal
+Download now?
+Stáhnout nyní?
+Drag && drop
+Drag && Drop
+Email
+Email
+Enable filter to exclude files from synchronization
+Povolit filtr pro vynechání souborů ze synchronizace
+Endless loop when traversing directory:
+Zacyklení při procházení adresáře:
+Error
+Chyba
+Error changing modification time:
+Chyba nastavení času změny:
+Error copying file:
+Chyba kopírování souboru:
+Error copying locked file %x!
+Chyba kopírování zamčeného souboru %x!
+Error creating directory:
+Chyba vytvoření adresáře:
+Error deleting directory:
+Chyba mazání adresáře:
+Error deleting file:
+Chyba mazání souboru:
+Error handling
+Zpracování chyb
+Error loading library function:
+Chyba načtení knihovny funkcí:
+Error moving directory:
+Chyba přesouvání adresáře:
+Error moving file:
+Chyba přesouvání souboru:
+Error moving to Recycle Bin:
+Chyba přesunu do Koše:
+Error opening file:
+Chyba otevření souboru:
+Error parsing configuration file:
+Chyba zpracování konfigurace:
+Error reading file attributes:
+Chyba čtení atributů souboru:
+Error reading file:
+Chyba čtení souboru:
+Error resolving symbolic link:
+Chyba odkazu zástupce:
+Error starting Volume Shadow Copy Service!
+Chyba spuštění služby Volume Shadow Copy Service!
+Error traversing directory:
+Chyba procházení adresáře:
+Error when monitoring directories.
+Chyba při sledování adresářů.
+Error writing file attributes:
+Chyba zápisu atributů souboru:
+Error writing file:
+Chyba zápisu souboru:
+Error: Source directory does not exist anymore:
+Chyba: Zdrojový adresář již neexistuje:
+Example
+Příklad
+Exclude
+Vynechat
+Exclude temporarily
+Vynechat dočasně
+Exclude via filter:
+Vynechat pomocí filtru:
+Exit immediately and set returncode < 0
+Ukočit okamžitě a nastavit návratový kód < 0
+Exit with RC < 0
+Ukočit s RC < 0
+Feedback and suggestions are welcome at:
+Komentáře a náměty zasílejte na:
+File %x has an invalid date!
+Soubor %x má chybné datum!
+File Manager integration:
+Integrace do průzkumníka:
+File Time tolerance (seconds):
+Tolerance času souboru (sekundy):
+File already exists. Overwrite?
+Soubor již existuje. Přepsat?
+File content
+Podle obsahu souboru
+File does not exist:
+Soubor neexistuje:
+File list exported!
+Seznam souborů exportován!
+File size and date
+Podle velikosti a data souboru
+File times that differ by up to the specified number of seconds are still handled as having same time.
+Soubory jejichž čas se neliší o více než zadaný počet sekund jsou brány jako se stejným časem.
+Filename
+Jméno
+Files %x have a file time difference of less than 1 hour! It's not safe to decide which one is newer due to Daylight Saving Time issues.
+Soubory %x se liší o méně než 1 hodinu. není možné bezpečně rozhodnout, který z nich je novější kvůli používání Letního času.
+Files %x have the same date but a different size!
+Soubory %x mají stejné datum a čas ale rozdílnou velikost!
+Files are found equal if\n     - file content\nis the same.
+Soubory jsou shodné jestliže\n     - obsah souboru\nje stejný.
+Files are found equal if\n     - filesize\n     - last write time and date\nare the same.
+Soubory jsou shodné jestliže\n     - velikost souboru\n     - datum i čas poslední změny\njsou stejné.
+Files remaining:
+Zbývá souborů:
+Files that exist on both sides and have different content
+Soubory, ketré existují na obou stranách a liší se obsahem
+Files that exist on both sides, left one is newer
+Soubory, které existují na obou stranách, z nichž vlevo je novější
+Files that exist on both sides, right one is newer
+Soubory, které existujé na obou stranách, z nichž vpravo je novější
+Files/folders remaining:
+Zbývá souborů/adresářů:
+Files/folders scanned:
+Zpracované soubory/adresáře:
+Files/folders that exist on left side only
+Soubory/adresáře, které existují pouze vlevo
+Files/folders that exist on right side only
+Soubory/adresáře, které existují pouze vpravo
+Filter
+Filtr
+Filter active: Press again to deactivate
+Filtr aktivní: Klikni znovu pro deaktivaci
+Filter files
+Filtrovat soubory
+Filter view
+Filtrovat seznam
+Folder Comparison and Synchronization
+Porovnání a Synchronizace adresářů
+Folder pair
+Dvojice adresářů
+FreeFileSync - Folder Comparison and Synchronization
+FreeFileSync - Porovnání a Synchronizace adresářů
+FreeFileSync Batch Job
+FreeFileSync Dávkové zpracování
+FreeFileSync at Sourceforge
+FreeFileSync na Sourceforge
+FreeFileSync batch file
+FreeFileSync dávkový soubor
+FreeFileSync configuration
+Konfigurace FreeFileSync
+FreeFileSync is up to date!
+FreeFileSync je aktuální!
+Full path
+Plná cesta
+Generating file list...
+Vytváření seznamu souborů...
+Global settings
+Nastavení programu
+Help
+Nápověda
+Hide all error and warning messages
+Skrýt všechny chyby a varování
+Hide conflicts
+Skrýt konflikty
+Hide files that are different
+Skrýt rozdílné soubory
+Hide files that are equal
+Skrýt shodné soubory
+Hide files that are newer on left
+Skrýt novější zleva
+Hide files that are newer on right
+Skrýt novější zprava
+Hide files that exist on left side only
+Skrýt soubory existující pouze vlevo
+Hide files that exist on right side only
+Skrýt soubory existující pouze vpravo
+Hide files that will be copied to the left side
+Skrýt soubory, které budou kopírovány vlevo
+Hide files that will be copied to the right side
+Skrýt soubory, které budou kopírovány vpravo
+Hide files that will be created on the left side
+Skrýt soubory, které budou vlevo vytvořeny
+Hide files that will be created on the right side
+Skrýt soubory, které budou vpravo vytvořeny
+Hide files that will be deleted on the left side
+Skrýt soubory, které budou vlevo smazány
+Hide files that will be deleted on the right side
+Skrýt soubory, které budou vpravo smazány
+Hide files that won't be copied
+Skrýt soubory, které nebudou kopírovány
+Hide filtered items
+Skrýt filtrované soubory
+Hide further error messages during the current process
+Nezobrazovat další chybová hlášení během zpracování
+Hints:
+Nápověda:
+Homepage
+Homepage
+If you like FFS
+Pokud se Vám FSS líbí
+Ignore 1-hour file time difference
+Ignorovat 1 hodinu rozdílu v čase mezi soubory
+Ignore errors
+Ignorovat chyby
+Ignore subsequent errors
+Ignorovat další chyby
+Ignore this error, retry or abort synchronization?
+Ignorovat chybu, opakovat nebo přerušit synchronizaci.
+Ignore this error, retry or abort?
+Ignorovat chybu, opakovat nebo přerušit?
+Include
+Přidat
+Include temporarily
+Přidat dočasně
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Přidat: *.doc;*.zip;*.exe\nVynechat: temp\\*
+Info
+Info
+Information
+Informace
+Initialization of Recycle Bin failed!
+Chyba inicializace Koše!
+It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
+Nebylo možné inicializovat Koš!\n\nPravděpodobně nepoužíváte Windows.\nPokud chcete tuto vlastnost využívat, kontaktujte autora. :)
+Left
+Levý
+Load configuration from file
+Načíst konfiguraci ze souboru
+Load configuration history (press DEL to delete items)
+Načíst historii konfigurace (pomocí DEL můžete položku smazat)
+Log-messages:
+Záznamy:
+Logging
+Zaznamenávání
+Mirror ->>
+Zrcadlení ->>
+Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronization.
+Zrcadlení levého adresáře: Pravý adresář bude přepsán a po synchronizaci bude totožný s levým.
+More than 50% of the total number of files will be copied or deleted!
+Více než 50% souborů bude kopírovaných nebo mazaných!
+Move column down
+Přesunout sloupec dolů
+Move column up
+Přesunout sloupec nahoru
+Move files to a custom directory.
+Přesunout soubory do nastaveného adresáře.
+Move to custom directory
+Přesunout do adresáře
+Moving %x to Recycle Bin
+Přesouvání %x do Koše.
+Moving %x to custom directory
+Přesouvání %x do nastaveného adresáře.
+Not all items have been synchronized! Have a look at the list.
+Ne všechny položky byly sesynchronizovány! Podívejte se na seznam.
+Not enough free disk space available in:
+Nedostatek místa na disku:
+Nothing to synchronize according to configuration!
+Podle dané konfigurace není co synchronizovat!
+Number of files and directories that will be created
+Počet souborů a adresářů k vytvoření
+Number of files and directories that will be deleted
+Počet souborů a adresářů ke smazání
+Number of files that will be overwritten
+Počet souborů a adresářů k přepsání
+OK
+OK
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the synchronization directories.
+Pouze soubory/adresáře odpovídající nastavenému filtru budou vybrány pro synchronizaci. Filtr je aplikován relativně(!) k cestě synchronizovaných adresářů.
+Open with File Manager\tD-Click
+Otevřít\tDvojklikem
+Operation aborted!
+Operace zrušena!
+Operation:
+Operace:
+Overview
+Přehled
+Pause
+Pauza
+Paused
+Pauza
+Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) into the FreeFileSync installation directory to enable this feature.
+Prosím zkopírujte odpovídající \"Shadow.dll\" (umístěný v \"Shadow.zip\") do instalačního adresáře FreeFileSync, aby bylo možné použít tuto funkci.
+Please fill all empty directory fields.
+Zadejte adresáře pro synchronizaci.
+Please specify alternate directory for deletion!
+Zadejte cílový adresář pro mazání! 
+Press button to activate filter
+Kliknutím aktivujete filtr
+Published under the GNU General Public License:
+Vydáno podl GNU General Public License (GPL):
+Question
+Otázky
+Quit
+Konec
+RealtimeSync - Automated Synchronization
+RealtimeSync - Automatická synchronizace
+RealtimeSync configuration
+Konfigurace RealtimeSync
+Relative path
+Relativní cesta
+Remove folder
+Odstranit adresář
+Remove folder pair
+Odtsranit dvojici adresářů
+Report translation error
+Hlásit chyby překladu
+Reset
+Resetovat
+Reset all warning messages
+Resetovat všechna varovná hlášení
+Reset all warning messages?
+Resetovat všechna varovná hlášení?
+Result
+Výsledek
+Right
+Pravý
+S&ave configuration
+&Uložení konfigurace
+S&witch view
+&Změnit zobrazení
+Save changes to current configuration?
+Uložit změny do aktuální konfigurace?
+Save current configuration to file
+Uložit změny do konfiguračního souboru
+Scanning...
+Zpracovávání...
+Scanning:
+Zpracováváno:
+Select a folder
+Vyberte adresář
+Select logfile directory:
+Vyberte adresář pro záznamy:
+Select variant:
+Vyberte variantu:
+Show conflicts
+Zobrazit konflikty
+Show file icons
+Zobrazit ikony souborů
+Show files that are different
+Zobrazit rozdílené soubory
+Show files that are equal
+Zobrazit shodné soubory
+Show files that are newer on left
+Zobrazit soubory novější vlevo
+Show files that are newer on right
+Zobrazit soubory novější vpravo
+Show files that exist on left side only
+Zobrazit soubory existující pouze vlevo
+Show files that exist on right side only
+Zobrazit soubory existující pouze vpravo
+Show files that will be copied to the left side
+Zobrazit soubory pro kopírování doleva
+Show files that will be copied to the right side
+Zobrazit soubory pro kopírování doprava
+Show files that will be created on the left side
+Zobrazit soubory, které budou vlevo vytvořeny
+Show files that will be created on the right side
+Zobrazit soubory, které budou vpravo vytvořeny
+Show files that will be deleted on the left side
+Zobrazit soubory, které budou vlevo smazány
+Show files that will be deleted on the right side
+Zobrazit soubory, které budou vpravo smazány
+Show files that won't be copied
+Zobrazit soubory, které nebudou kopírovány
+Show popup
+Zobrazit okno
+Show popup on errors or warnings
+Zobrazit hlášení při chybě nebo varování
+Significant difference detected:
+Nalezeny významné změny:
+Silent mode
+Tichý mód
+Size
+Velikost
+Sorting file list...
+Setřídění seznamu...
+Source code written completely in C++ utilizing:
+Zdrojový kód byl napsán kompletně v C++ s pomocí:
+Speed:
+Rychlost:
+Start
+Start
+Start synchronization
+Start synchronizace
+Statistics
+Statistika
+Stop
+Stop
+Swap sides
+Změna stran
+Synchronization Preview
+Náhled synchronizace
+Synchronization aborted!
+Synchronizace zrušena!
+Synchronization completed successfully!
+Synchronizace dokončena úspěšně!
+Synchronization completed with errors!
+Synchronizace dokončena s chybami.
+Synchronization settings
+Nastavení synchronizace
+Synchronization status
+Stav synchronizace
+Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\".
+Synchronizuj všechny soubory .doc, .zip a .exe s výjimkou všeho v podadresáři \"temp\"
+Synchronize both sides simultaneously: Copy new or updated files in both directions.
+Synchronizuj obě strany zároveň: Kopíruj nové nebo aktualizované soubory z obou adresářů.
+Synchronize...
+Synchronizace...
+Synchronizing...
+Synchronizuji...
+System out of memory!
+Nedostatek paměti!
+Target directory already existing!
+
+Target file already existing!
+Cílový soubor již existuje!
+The file does not contain a valid configuration:
+Soubor neobsahuje platnou konfiguraci:
+This commandline will be executed on each doubleclick. The following macros are available:
+Tento příkaz bude spuštěn vždy, když poklikáte na název souboru. K dispozici jsou následující proměnné:
+This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
+Tato variantra vyhodnotí dva stejně pojmenované soubory jako shodné pokud mají i stejnou velikost A ZÁROVEŇ i datum a čas poslední změny.
+Time
+Čas
+Time elapsed:
+Uplynulý čas:
+Time remaining:
+Zbývající čas:
+Total amount of data that will be transferred
+Celkový objem dat, který bude přenesen
+Total required free disk space:
+Požadované volné místo na disku:
+Total time:
+Celkový čas:
+Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes.
+Považovat čas souboru lišící se přesně o +/- 1 hodinu jako shodný, méně než 1 hodinu jako konflikt, kvůli zpracování a přechodům na Letní čas.
+Two way <->
+Obousměrná <->
+Unable to connect to sourceforge.net!
+Není možné se připojit k sourceforge.net!
+Unable to create logfile!
+není možné vytvořit záznamový soubor!
+Unable to initialize Recycle Bin!
+Není možné použít Koš!
+Uncheck all
+Odznačit vše
+Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchronization.
+Nevyřešené konflikty! \n\nJe možné konflikt ignorovat a pokračovat v synchronizaci.
+Update ->
+Aktualizuj ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Použití: Vyberte adresáře, které mají být monitorovány a vložte příkaz. Pokaždé, když dojde ke změně v těchto adresářích (nebo podadresářích), bude příkaz spuštěn.
+Use Recycle Bin
+Použít Koš
+Use Recycle Bin when deleting or overwriting files.
+Použít Koš při mazání nebo přepisu souborů.
+Variant
+Varianta
+Volume name %x not part of filename %y!
+Disk %x není součástí jména souboru %y!
+Warning
+Varování
+Warning: Synchronization failed for %x item(s):
+Varování: Synchornizace se nepovedla pro \"%x\" položek:
+Warnings:
+Varování:
+When the comparison is started with this option set the following decision tree is processed:
+Když je zahájeno porovnávání s tímto nastavením, je použito následující schéma rozhodování:
+You can ignore the error to consider not existing directories as empty.
+Chybu považovaní neexistující adresářů jako prázdných můžete ignorovat.
+You may try to synchronize remaining items again (WITHOUT having to re-compare)!
+Můžete se pokusit synchronizovat zbývající položky (BEZ nutnosti znovuporovnávání)!
+different
+rozdílný
+file exists on both sides
+soubor existuje na obou stranách
+on one side only
+pouze na jedné straně
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 00a08d65..3484395a 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -20,8 +20,10 @@
  min
  sec
  sec
-!=	files are different\n
-!=	Bestanden zijn verschillend\n
+%x / %y objects deleted successfully
+%x / %y objecten succesvol verwijderd
+%x Percent
+%x procent
 %x directories
 %x paden
 %x files,
@@ -48,6 +50,8 @@
 &Creëer batchjob
 &Default
 &Standaard
+&Exit
+&Afsluiten
 &Export file list
 &Exporteer bestandslijst
 &File
@@ -72,6 +76,8 @@
 &Pause
 &Quit
 &Afsluiten
+&Restore
+&Herstellen
 &Retry
 &Opnieuw proberen
 &Save
@@ -80,20 +86,22 @@
 &Ja
 ,
 .
--	do not copy\n
--	niet kopiëren\n
 - conflict
 - conflict
 - conflict (same date, different size)
 - conflict (zelfde datum, verschillende grootte)
 - different
 - verschillend
+- directory part only
+- alleen de map
 - equal
 - gelijk
 - exists left only
 - bestaat alleen links
 - exists right only
 - bestaat alleen rechts
+- full file or directory name
+- volledige map of bestandsnaam
 - left
 - links
 - left newer
@@ -102,8 +110,10 @@
 - rechts
 - right newer
 - rechts is nieuwer
-->	copy to right side\n
-->	kopieer naar de rechterkant\n
+- sibling of %dir
+- verwant aan %dir
+- sibling of %name
+- verwant aan &name
 -Open-Source file synchronization-
 -Open-Source bestandssynchronisatie-
 .
@@ -124,22 +134,12 @@
 2. U kunt gebruik maken van wildcard karakters zoals '*' en '?'.
 3. Exclude files directly on main grid via context menu.
 3. Sluit bestanden direct uit in het hoofscherm via een contextmenu
-<-	copy to left side\n
-<-	kopieer naar de linkerkant\n
-<<	left file is newer\n
-<<	linker bestand is nieuwer\n
 <Directory>
 <Pad>
 <Last session>
 <Laatste sessie>
 <multiple selection>
 <veelvoudige selectie>
-<|	file on left side only\n
-<|	bestand bestaat alleen links\n
-==	files are equal\n
-==	bestanden zijn gelijk\n
->>	right file is newer\n
->>	rechter bestand is nieuwer\n
 A newer version of FreeFileSync is available:
 Een nieuwe versie van FreeFileSync is beschikbaar:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 Informatie
 Action
 Actie
+Add folder
+Map toevoegen
 Add folder pair
 Voeg 1 paar gekoppelde mappen toe
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Zoals de naam suggereert, worden twee bestanden met dezelfde naam alleen gemarkeerd als gelijk, als ze precies dezelfde inhoud hebben. Deze optie is handig voor een consistentiecontrole in plaats van back-up handelingen. Daarom worden de tijdstempels niet bekeken.\n\n Met deze optie aan is de beslissingsboom korter:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Assembleer een batchbestand voor automatische synchronisatie. Om te starten in batchmodus is het voldoende om de bestandsnaam achter de FreeFileSync toepassing te zetten: FreeFileSync.exe <batchbestand>. Het is mogelijk dit in te plannen in de systeemplanner.
+Auto-adjust columns
+Kolommen automatisch aanpassen
 Batch execution
 Batch taak uitvoeren
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Gefilterde bestanden niet/wel weergeven
 Comma separated list
 Komma gescheiden lijst
+Commandline
+Opdrachtregel
+Commandline is empty!
+Opdrachtregel is leeg!
 Compare
 Vergelijk
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 Inhoud vergelijken...
 Comparison Result
 Resultaat vergelijken
+Comparison settings
+Vergelijk instellingen
 Completed
 Volbracht
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 Aan het overschrijven van bestand %x naar %y
 Could not determine volume name for file:
 Kon de schijfnaam niet vaststellen van bestand:
-Could not set working directory:
-Kan het pad in gebruik niet instellen:
+Could not initialize directory monitoring:
+Initaliseren van locatie-controle niet mogelijk:
+Could not read values for the following XML nodes:
+
 Create a batch job
 Creëer batchjob
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Eigen regels
 Customize columns
 Aanpassen kolommen
+Customize...
+Aanpassen...
 DECISION TREE
 BESLISSINGSBOOM
 Data remaining:
 Resterende data:
 Date
 Datum
+Delay
+Vertraging
+Delay between two invocations of the commandline
+Vertraging tussen het aanroepen van twee opdrachten van de opdrachtregel
 Delete files/folders existing on left side only
 Verwijder bestanden/folders die alleen links bestaan
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Verwijder aan beide kanten
 Delete on both sides even if the file is selected on one side only
 Verwijder aan beide kanten ookal is het bestand maar aan één kant geselecteerd
+Delete or overwrite files permanently.
+Verwijder of overschrijf bestanden onomkeerbaar. 
+Delete permanently
+Verwijder onomkeerbaar
 Deleting file %x
 Bestand %x wordt verwijderd
 Deleting folder %x
 Map %x wordt verwijderd
+Deletion handling
+Verwijder-afhandeling
 Directories are dependent! Be careful when setting up synchronization rules:
 Mappen zijn afhankelijk van elkaar! Wees voorzichtig met het maken van synchronisatieregels:
+Directories to watch
+Locaties om te controleren
 Directory
 Map
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 E-mail
 Enable filter to exclude files from synchronization
 Filter gebruiken om bestanden uit te sluiten van synchronisatie
+Endless loop when traversing directory:
+Oneindige lus bij het nalopen van locatie:
 Error
 Fout
 Error changing modification time:
@@ -324,6 +352,10 @@ Error handling
 Fout afhandeling
 Error loading library function:
 Er is een fout opgetreden bij het laden van de 'library function':
+Error moving directory:
+Er is een fout opgetreden bij het verplaatsen van locatie:
+Error moving file:
+Er is een fout opgetreden bij het verplaatsen van bestand:
 Error moving to Recycle Bin:
 Er is een fout opgetreden bij het verplaatsen naar de prullenbak:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 Er is een fout opgetreden bij het lezen van het bestand:
 Error resolving symbolic link:
 Er is een fout opgetreden bij het ophalen van een symbolische koppeling:
-Error retrieving full path:
-Er is een fout opgetreden bij het achterhalen van de volledige bestandslocatie:
 Error starting Volume Shadow Copy Service!
 Er is een fout opgetreden bij het starten van de Volume Schadow Copy Service! 
 Error traversing directory:
 Er is een fout opgetreden bij het doorzoeken van map:
+Error when monitoring directories.
+Er is een fout opgetreden bij het controleren van locaties.
 Error writing file attributes:
 Er is een fout opgetreden bij het schrijven van de bestands-eigenschappen:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Verberg bestanden die naar de linkerkant zullen worden gekopieerd
 Hide files that will be copied to the right side
 Verberg bestanden die naar de rechterkant zullen worden gekopieerd
+Hide files that will be created on the left side
+Verberg bestanden die zullen worden aangemaakt aan de linkerkant
+Hide files that will be created on the right side
+Verberg bestanden die zullen worden aangemaakt aan de rechterkant
+Hide files that will be deleted on the left side
+Verberg bestanden die zullen worden verwijderd aan de linkerkant
+Hide files that will be deleted on the right side
+Verberg bestanden die zullen worden verwijderd aan de rechterkant
 Hide files that won't be copied
 Verberg bestanden die niet zullen worden gekopieerd
 Hide filtered items
 Verberg gefilterde items
 Hide further error messages during the current process
 Volgende foutmeldingen niet meer weergeven tijdens de huidige handeling
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Verbergt foutmeldingen tijdens het synchroniseren:\nze worden verzameld en op het eind in een lijst getoond
 Hints:
 Tips:
 Homepage
@@ -486,8 +524,8 @@ Include
 Gebruiken
 Include temporarily
 Tijdelijk bijsluiten
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Bijsluiten: *.doc;*.zip;*.exe\nUitsluiten: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Bijsluiten: *.doc;*.zip;*.exe\nUitsluiten: temp\\*
 Info
 Info
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Initialiseren van de prullenbak is mislukt.
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Het was niet mogelijk de prullenbak te initialiseren!\n\nHet is waarschijnlijk dat u niet Windows gebruikt.\nAls u deze optie wel wilt, neem dan alstublieft contact op met de auteur. :)
-Left:
-Links:
+Left
+Links
 Load configuration from file
 Laad configuratie uit bestand
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Verplaats kolom naar beneden
 Move column up
 Verplaats kolom naar boven
+Move files to a custom directory.
+Verplaats bestanden naar een te kiezen locatie.
+Move to custom directory
+Verplaats naar een te kiezen locatie
 Moving %x to Recycle Bin
 %x aan het verplaatsen naar de Prullenbak
+Moving %x to custom directory
+Verplaatsen van %x naar gekozen locatie
 Not all items have been synchronized! Have a look at the list.
 Niet alle bestanden zijn gesynchroniseerd! Bekijk de lijst.
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Kopiëer alstublieft \"Shadow.dll\" (locatie in \"Shadow.zip\" archief) naar de FreeFileSync installatiemap om het gebruik van deze optie mogelijk te maken
 Please fill all empty directory fields.
 Vul alstublieft aan beide kanten een pad in.
+Please specify alternate directory for deletion!
+Specificeer alstublieft een alternatieve locatie om te verwijderen!
 Press button to activate filter
 Druk op de knop om het filter te activeren.
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Vraag
 Quit
 Afsluiten
+RealtimeSync - Automated Synchronization
+RealtimeSync - Automatische Synchronisatie
+RealtimeSync configuration
+RealtimeSync configuratie
 Relative path
 Relatieve pad
+Remove folder
+Verwijder map
 Remove folder pair
 Verwijder 1 paar gekoppelde mappen
+Report translation error
+Rapporteer een fout in de vertaling
 Reset
 Reset
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Reset alle waarschuwingen?
 Result
 Resultaat
-Right:
-Rechts:
+Right
+Rechts
 S&ave configuration
 S&la de instellingen op
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Geef bestanden weer die naar de linkerkant worden gekopieerd
 Show files that will be copied to the right side
 Geef bestanden weer die naar de rechterkant worden gekopieerd
+Show files that will be created on the left side
+Geef bestanden weer die zullen worden aangemaakt aan de linkerkant
+Show files that will be created on the right side
+Geef bestanden weer die zullen worden aangemaakt aan de rechterkant
+Show files that will be deleted on the left side
+Geef bestanden weer die zullen worden verwijderd aan de linkerkant
+Show files that will be deleted on the right side
+Geef bestanden weer die zullen worden verwijderd aan de rechterkant
 Show files that won't be copied
 Geef bestanden weer die niet zullen worden gekopieerd
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Aan het synchroniseren...
 System out of memory!
 Systeem heeft te weinig geheugen
+Target directory already existing!
+
 Target file already existing!
 Doelbestand bestaat al!
 The file does not contain a valid configuration:
 Het bestand bevat geen geldige configuratie:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Deze opdrachtregel wordt bij elke dubbelklik op een bestandsnaam uitgevoerd. %name doet dienst als plaatshouder voor het betreffende bestand.
+This commandline will be executed on each doubleclick. The following macros are available:
+Deze opdrachtregel zal worden uitgevoerd bij elke dubbele klik. De volgende macros zijn beschikbaar:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Deze variant ziet twee gelijknamige bestanden als gelijk wanneer ze dezelfde bestandsgrootte EN tijdstempel hebben.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Er bestaan onopgeloste conflicten! \n\nU kunt de conflicten negeren en doorgaan met synchroniseren.
 Update ->
 Overschrijven ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Uitleg: Selecteer locaties om te controleren en type een opdrachtregel. Elke keer dat bestanden worden aangepast binnen die locaties (en/of sublocaties) wordt de opdrachtregel uitgevoerd.
 Use Recycle Bin
 Gebruik de prullenbak
-Use Recycle Bin when deleting or overwriting files during synchronization
-Gebruik de prullenbak wanneer bestanden worden verwijderd of overschreven tijdens het synchroniseren
+Use Recycle Bin when deleting or overwriting files.
+Gebruik de prullenbak bij verwijderen of overschrijven van bestanden
 Variant
 Variant
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Waarschuwingen:
 When the comparison is started with this option set the following decision tree is processed:
 Wanneer met deze optie aan de vergelijking wordt gestart zal de volgende vergelijkingsboom worden gebruikt:
+You can ignore the error to consider not existing directories as empty.
+U kunt de fout negeren om niet bestaande locaties als leeg te beschouwen.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 U kunt proberen om de resterende bestanden opnieuw te synchroniseren (ZONDER opnieuw te hoeven vergelijken)!
 different
 verschillend
 file exists on both sides
 Bestand bestaat aan beide zijde
-flash	conflict\n
-knipperen	conflict\n
 on one side only
 alleen aan één kant
-|>	file on right side only\n
-|>	Bestand bestaat alleen aan de rechter kant\n
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 94824d5b..47ce556d 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -20,8 +20,10 @@
  min
  sec
  sec
-!=	files are different\n
-!=	les fichiers sont différents\n
+%x / %y objects deleted successfully
+%x / %y objets détruits avec succès
+%x Percent
+%x Pourcents
 %x directories
 %x dossiers
 %x files,
@@ -48,6 +50,8 @@
 &Créer un fichier de commandes
 &Default
 &Défaut
+&Exit
+&Quitter
 &Export file list
 &Exportation de la liste des fichiers
 &File
@@ -72,6 +76,8 @@
 &Pause
 &Quit
 &Quitter
+&Restore
+&Restaurer
 &Retry
 &Réessayer
 &Save
@@ -80,20 +86,22 @@
 &Oui
 ,
  
--	do not copy\n
--	ne pas copier\n
 - conflict
 - conflit
 - conflict (same date, different size)
 - conflit (même date, taille différente)
 - different
 - fichiers différents
+- directory part only
+- seulement les répertoires
 - equal
 - fichiers identiques
 - exists left only
 - le fichier existe seulement à gauche
 - exists right only
 - le fichier existe seulement à droite
+- full file or directory name
+- nom complet du fichier ou du dossier
 - left
 - à gauche
 - left newer
@@ -102,8 +110,10 @@
 - à droite
 - right newer
 - fichier de droite plus récent
-->	copy to right side\n
-->	copier à droite\n
+- sibling of %dir
+- correspondance de %dir
+- sibling of %name
+- correspondance de %name
 -Open-Source file synchronization-
 -Synchronisation de fichiers Open-Source-
 .
@@ -124,22 +134,12 @@
 2. Les caractères génériques '*' et '?' sont acceptés.
 3. Exclude files directly on main grid via context menu.
 3. Exclure les fichiers directement sur le tableau principal à l'aide du menu contextuel.
-<-	copy to left side\n
-<-	copier à gauche\n
-<<	left file is newer\n
-<<	le fichier de gauche est plus récent\n
 <Directory>
 <Répertoire>
 <Last session>
 <Dernière session>
 <multiple selection>
 <sélection multiple>
-<|	file on left side only\n
-<|	Le fichier existe seulement à gauche\n
-==	files are equal\n
-==	les fichiers sont identiques\n
->>	right file is newer\n
->>	le fichier de droite est plus récent\n
 A newer version of FreeFileSync is available:
 Une version plus récente de FreeFileSync est disponible :
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 A propos de
 Action
 Action
+Add folder
+Ajout d'un dossier
 Add folder pair
 Ajout d'un couple de dossiers
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Comme le nom le suggère, deux fichiers qui ont le même nom sont considérés comme identiques si, et seulement si, leur contenu est identique. Cette option est utile pour les contrôles de cohérence plutôt que pour les opérations de sauvegarde. Toutefois, les dates et heures ne sont pas du tout prises en compte.\n\nAvec cette option, l'arbre de décision est plus simple :
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Créer un fichier de commandespour une synchronisation automatique. Pour démarrer en mode batch, indiquer le nom du fichier à l'exécutable FreeFileSync : freefilesync.exe <fichier de commandes>. Ceci peut aussi être programmé dans le plannificateur de tâches.
+Auto-adjust columns
+Auto-ajustement des colonnes
 Batch execution
 Exécution du fichier de commandes
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Masquer les fichiers/répertoires filtrés
 Comma separated list
 Liste d'éléments séparés par une virgule
+Commandline
+Ligne de commande
+Commandline is empty!
+ligne de commande vide
 Compare
 Comparer
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 Comparaison du contenu...
 Comparison Result
 Résultat de la comparaison
+Comparison settings
+Paramètres de comparaison
 Completed
 Terminé
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 Copie le fichier %x vers %y avec écrasement
 Could not determine volume name for file:
 Impossible de trouver le nom de volume pour le fichier :
-Could not set working directory:
-Impossible de définir le répertoire de travail :
+Could not initialize directory monitoring:
+Impossible d'initialiser la surveillance des dossiers:
+Could not read values for the following XML nodes:
+
 Create a batch job
 Création du fichier de commandes
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Personnaliser
 Customize columns
 Personnaliser les colonnes
+Customize...
+Personnaliser...
 DECISION TREE
 ARBRE DE DECISION
 Data remaining:
 Données restantes :
 Date
 Date
+Delay
+délai
+Delay between two invocations of the commandline
+délai entre deux requêtes de la ligne de commande
 Delete files/folders existing on left side only
 Suppression des fichiers/répertoires n'existant que sur le côté gauche
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Suppression des deux côtés
 Delete on both sides even if the file is selected on one side only
 Suppression des deux côtés même si le fichier est sélectionné d'un seul côté
+Delete or overwrite files permanently.
+Supprimer ou écraser les fichiers définitivement.
+Delete permanently
+Suppression définitive
 Deleting file %x
 Suppression du fichier %x
 Deleting folder %x
 Suppression du dossier %x
+Deletion handling
+Festion des suppressions
 Directories are dependent! Be careful when setting up synchronization rules:
 Les dossiers sont imbriqués ! Attention à la mise à jour des règles de synchronisation :
+Directories to watch
+Dossiers à surveiller
 Directory
 Répertoire
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 Email
 Enable filter to exclude files from synchronization
 Activer le filtrage pour exclure les fichiers de la synchronisation
+Endless loop when traversing directory:
+Boucle sans fin lors de la sucration du dossier
 Error
 Erreur
 Error changing modification time:
@@ -324,6 +352,10 @@ Error handling
 Erreur de gestion de fichiers
 Error loading library function:
 Erreur lors du chargement de la bibliothèque de fonctions :
+Error moving directory:
+Erreur lors du déplacement du dossier :
+Error moving file:
+Erreur lors du déplacement du fichier :
 Error moving to Recycle Bin:
 Erreur lors du déplacement dans la corbeille :
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 Erreur lors de la lecture du fichier :
 Error resolving symbolic link:
 Erreur lors de la résolution du lien symbolique :
-Error retrieving full path:
-Erreur lors de la recherche du chemin :
 Error starting Volume Shadow Copy Service!
 Erreur lors du démarrage du service 'Volume Shadow Copy' !
 Error traversing directory:
 Erreur lors du parcours du répertoire :
+Error when monitoring directories.
+Erreur lors de la surveillance des dossiers.
 Error writing file attributes:
 Erreur lors de l'écriture des attributs du fichier :
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Masquer les fichiers qui seront copiés à gauche
 Hide files that will be copied to the right side
 Masquer les fichiers qui seront copiés à droite
+Hide files that will be created on the left side
+Masquer les fichiers qui seront créés à gauche
+Hide files that will be created on the right side
+Masquer les fichiers qui seront créés à droite
+Hide files that will be deleted on the left side
+Masquer les fichiers qui seront supprimés à gauche
+Hide files that will be deleted on the right side
+Masquer les fichiers qui seront supprimés à droite
 Hide files that won't be copied
 Masquer les fichiers qui ne seront pas copiés
 Hide filtered items
 Masquer les éléments filtrés
 Hide further error messages during the current process
 Masquer les messages d'erreur suivants pendant le traitement
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Masquer les messages d'erreur pendant la synchronisation :\nIls sont collationnés et listés à la fin de l'opération
 Hints:
 Conseils :
 Homepage
@@ -486,8 +524,8 @@ Include
 Inclure
 Include temporarily
 Inclure temporairement
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Inclure : *.doc;*.zip;*.exe\nExclure : \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Inclure : *.doc;*.zip;*.exe\nExclure : temp\\*
 Info
 Info
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Erreur lors de l'initialisation de la corbeille !
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Impossible d'accéder à la corbeille !\n\nIl est probable que vous n'utilisez pas Windows.\nSi vous désirez utilisee cette fonctionnalité, veuillez contacter l'auteur. :)
-Left:
-Gauche :
+Left
+Gauche
 Load configuration from file
 Charger la configuration à partir du fichier
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Déplacer la colonne vers le bas
 Move column up
 Déplacer la colonne vers le haut
+Move files to a custom directory.
+Déplacer les fichiers dans un dossier personnel
+Move to custom directory
+Déplacer dans un dossier personnel
 Moving %x to Recycle Bin
 Déplacement de %x vers la Corbeille
+Moving %x to custom directory
+Déplacement de %x dans un dossier personnel
 Not all items have been synchronized! Have a look at the list.
 Tout n'a pas été synchronisé ! Vérifiez la liste.
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Veuillez copier le fichier \"Shadow.dll\" (situé dans l'archive \"Shadow.zip\") vers le répertoire d'installation de FreeFileSync pour utiliser cette fonctionnalité.
 Please fill all empty directory fields.
 Veuillez remplir tous les champs vides du répertoire.
+Please specify alternate directory for deletion!
+Spécifiez un autre dossier pour les suppressions !
 Press button to activate filter
 Cliquez pour activer le filtrage
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Question
 Quit
 Quitter
+RealtimeSync - Automated Synchronization
+RealtimeSync - Synchronisation Automatisée
+RealtimeSync configuration
+RealtimeSync configuration
 Relative path
 Chemin
+Remove folder
+Supprimer le dossier
 Remove folder pair
 Supprimer le couple de dossiers
+Report translation error
+Etat d'erreurs de transfert
 Reset
 Réinitialiser
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Réinitialiser tous les avertissements ?
 Result
 Situation
-Right:
-Droite :
+Right
+Droite
 S&ave configuration
 S&auvegarder la configuration
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Afficher les ficgier qui seront copiés à gauche
 Show files that will be copied to the right side
 Afficher les ficgier qui seront copiés à droite
+Show files that will be created on the left side
+Afficher les ficgier qui seront créés à gauche
+Show files that will be created on the right side
+Afficher les ficgier qui seront créés à droite
+Show files that will be deleted on the left side
+Afficher les ficgier qui seront supprimiés à gauche
+Show files that will be deleted on the right side
+Afficher les ficgier qui seront supprimiés à droite
 Show files that won't be copied
 Afficher les ficgier qui ne seront pas copiés
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Synchronisation en cours...
 System out of memory!
 Erreur mémoire système !
+Target directory already existing!
+
 Target file already existing!
 Le fichier de destination existe déjà !
 The file does not contain a valid configuration:
 Le fichier ne contient pas de configuration valide :
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Cette ligne de commandes sera exécutée chaque fois que vous double-cliquerez sur un fichier. %name sert d'emplacement pour le fichier sélectionné.
+This commandline will be executed on each doubleclick. The following macros are available:
+Cette ligne de commande sera éxécutée sur chaque double clic. Les macros suivnates sont valides :
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Cette variante définit comme identiques deux fichiers de même nom lorsqu'ils ont la même taille et le même date et heure de modification.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Il y a des conflits non résolus !\n\nVous pouvez ignorer ces conflits et continuer la synchronisation.
 Update ->
 Mise à Jour ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Utilisation : Choisir un dossier et entrer une ligne de commande. A chaque fois qu'un fichier est modifié dans ces dossiers (ou sous-dossiers), la ligne de commande est éxécutée.
 Use Recycle Bin
 Utilisation de la corbeille
-Use Recycle Bin when deleting or overwriting files during synchronization
-Utilisation de la corbeille lors de la suppression ou du remplacement des fichiers pendant la synchronisation
+Use Recycle Bin when deleting or overwriting files.
+Utiliser la Corbeille lors de la suppression ou du remplacement d'un fichier.
 Variant
 Variante
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Avertissements :
 When the comparison is started with this option set the following decision tree is processed:
 Lorsque la comparaison démarre avec cette option, l'arbre de décision suivant est exécuté :
+You can ignore the error to consider not existing directories as empty.
+Vous pouvez ignorer l'erreur considérant qu'un dossier inexistant est vide.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Vous pouvez essayer de synchroniser à nouveau les éléments restants (SANS avoir à les re-comparer) !
 different
 fichiers différents
 file exists on both sides
 Le fichier existe des deux côtés
-flash	conflict\n
-flash	conflit\n
 on one side only
 Le fichier existe sur un seul côté seulement
-|>	file on right side only\n
-|>	Le fichier existe seulement à droite\n
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 08ceea4b..3e801fc0 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -20,8 +20,10 @@
  Min.
  sec
  Sek.
-!=	files are different\n
-!=	Dateien sind verschieden\n
+%x / %y objects deleted successfully
+%x von %y Objekten erfolgreich gelöscht
+%x Percent
+%x Prozent
 %x directories
 %x Verzeichnisse
 %x files,
@@ -48,6 +50,8 @@
 &Batch-Job erstellen
 &Default
 &Standard
+&Exit
+&Beenden
 &Export file list
 Dateiliste e&xportieren
 &File
@@ -72,6 +76,8 @@ Konfiguration &laden
 &Pause
 &Quit
 &Beenden
+&Restore
+&Wiederherstellen
 &Retry
 &Wiederholen
 &Save
@@ -80,20 +86,22 @@ Konfiguration &laden
 &Ja
 ,
 .
--	do not copy\n
--	nicht kopieren\n
 - conflict
 - Konflikt
 - conflict (same date, different size)
 - Konflikt (gleiches Datum, unterschiedliche Größe)
 - different
 - verschieden
+- directory part only
+- nur Verzeichnisanteil
 - equal
 - gleich
 - exists left only
 - existiert nur links
 - exists right only
 - existiert nur rechts
+- full file or directory name
+- kompletter Datei oder Verzeichnisname
 - left
 - links
 - left newer
@@ -102,8 +110,10 @@ Konfiguration &laden
 - rechts
 - right newer
 - rechts neuer
-->	copy to right side\n
-->	nach rechts kopieren\n
+- sibling of %dir
+- Gegenstück zu %dir
+- sibling of %name
+- Gegenstück zu %name
 -Open-Source file synchronization-
 -Open-Source Datei-Synchronisation-
 .
@@ -124,22 +134,12 @@ Konfiguration &laden
 2. Die Platzhalter '*' und '?' werden unterstützt.
 3. Exclude files directly on main grid via context menu.
 3. Dateien können direkt über das Kontextmenü im Hauptfenster ausgeschlossen werden.
-<-	copy to left side\n
-->	nach links kopieren\n
-<<	left file is newer\n
-<<	Linke Datei ist neuer\n
 <Directory>
 <Verzeichnis>
 <Last session>
 <Letzte Sitzung>
 <multiple selection>
 <Mehrfachauswahl>
-<|	file on left side only\n
-<|	Datei existiert nur links\n
-==	files are equal\n
-==	Dateien sind gleich\n
->>	right file is newer\n
->>	Rechte Datei ist neuer\n
 A newer version of FreeFileSync is available:
 Eine neuere Version von FreeFileSync ist verfügbar:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 Über
 Action
 Aktion
+Add folder
+Verzeichnis hinzufügen
 Add folder pair
 Verzeichnispaar hinzufügen
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Wie der Name andeutet, werden zwei Dateien mit gleichem Namen genau dann als gleich angesehen, wenn sie den gleichen Dateiinhalt haben. Diese Einstellung ist eher für Konsistenzprüfungen geeignet als für Backup-Operationen. Aus diesem Grund wird der Zeitpunkt der letzten Änderung der Dateien nicht berücksichtigt.\n\nDer Entscheidungsbaum ist in diesem Fall kleiner:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Erzeuge eine Batchdatei für die automatisierte Synchronisation. Um den Batch-Modus zu starten, muss nur der Dateiname an die Programmdatei übergeben werden: FreeFileSync.exe <Batchdatei>. Dies kann auch in den Taskplaner des Betriebssystems eingetragen werden.
+Auto-adjust columns
+Spalten automatisch anpassen
 Batch execution
 Batchlauf
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Gefilterte Dateien bzw. Verzeichnisse ein-/ausblenden
 Comma separated list
 Kommagetrennte Liste
+Commandline
+Kommandozeile
+Commandline is empty!
+Die Kommandozeile ist leer!
 Compare
 Vergleichen
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 Vergleiche Dateiinhalt...
 Comparison Result
 Ergebnis des Vergleichs
+Comparison settings
+Vergleichseinstellungen
 Completed
 Fertig
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 Kopiere Datei %x nach %y und überschreibe Ziel
 Could not determine volume name for file:
 Der Laufwerksname für folgende Datei konnte nicht ermittelt werden:
-Could not set working directory:
-Das Arbeitsverzeichnis konnte nicht gesetzt werden:
+Could not initialize directory monitoring:
+Die Verzeichnisüberwachung konnte nicht gestartet werden:
+Could not read values for the following XML nodes:
+Die folgenden XML Knoten konnten nicht gelesen werden:
 Create a batch job
 Batch-Job erstellen
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Eigene
 Customize columns
 Spalten anpassen
+Customize...
+Anpassen...
 DECISION TREE
 ENTSCHEIDUNGSBAUM
 Data remaining:
 Verbliebene Daten:
 Date
 Datum
+Delay
+Verzögerung
+Delay between two invocations of the commandline
+Verzögerung zwischen zwei Aufrufen der Kommandozeile
 Delete files/folders existing on left side only
 Nur links existierende Dateien/Verzeichnisse löschen
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Auf beiden Seiten löschen
 Delete on both sides even if the file is selected on one side only
 Lösche auf beiden Seiten, auch wenn die Datei nur auf einer Seite markiert ist
+Delete or overwrite files permanently.
+Dateien endgültig löschen oder überschreiben.
+Delete permanently
+Endgültig löschen
 Deleting file %x
 Lösche Datei %x
 Deleting folder %x
 Lösche Verzeichnis %x
+Deletion handling
+Behandlung von Löschungen
 Directories are dependent! Be careful when setting up synchronization rules:
 Die Verzeichnisse sind voneinander abhängig! Achtung beim Festlegen der Synchronisationseinstellungen:
+Directories to watch
+Zu überwachende Verzeichnisse
 Directory
 Verzeichnis
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 Email
 Enable filter to exclude files from synchronization
 Aktiviere Filter, um Dateien von der Synchronisation auszuschließen
+Endless loop when traversing directory:
+Endlosschleife beim Lesen des Verzeichnisses:
 Error
 Fehler
 Error changing modification time:
@@ -324,24 +352,28 @@ Error handling
 Fehlerbehandlung
 Error loading library function:
 Fehler beim Laden der Bibliotheksfunktion:
+Error moving directory:
+Fehler beim Verschieben des Verzeichnisses:
+Error moving file:
+Fehler beim Verschieben der Datei:
 Error moving to Recycle Bin:
 Fehler beim Verschieben in den Papierkorb:
 Error opening file:
 Fehler beim Öffnen der Datei:
 Error parsing configuration file:
-Fehler beim Lesen der Konfigurationsdatei:
+Fehler beim Auswerten der Konfigurationsdatei:
 Error reading file attributes:
 Fehler beim Lesen der Dateiattribute:
 Error reading file:
 Fehler beim Lesen der Datei:
 Error resolving symbolic link:
 Fehler beim Auflösen des Symbolischen Links:
-Error retrieving full path:
-Fehler beim Ermitteln des kompletten Pfades:
 Error starting Volume Shadow Copy Service!
 Fehler beim Starten des Volume Shadow Copy Service!
 Error traversing directory:
 Fehler beim Durchsuchen des Verzeichnisses:
+Error when monitoring directories.
+Fehler beim Überwachen der Verzeichnisse.
 Error writing file attributes:
 Fehler beim Schreiben der Dateiattribute:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Dateien die nach links kopiert werden ausblenden
 Hide files that will be copied to the right side
 Dateien die nach rechts kopiert werden ausblenden
+Hide files that will be created on the left side
+Dateien die links erstellt werden ausblenden
+Hide files that will be created on the right side
+Dateien die rechts erstellt werden ausblenden
+Hide files that will be deleted on the left side
+Dateien die links gelöscht werden ausblenden
+Hide files that will be deleted on the right side
+Dateien die rechts gelöscht werden ausblenden
 Hide files that won't be copied
 Dateien die nicht kopiert werden ausblenden
 Hide filtered items
 Gefilterte Elemente ausblenden
 Hide further error messages during the current process
 Weitere Fehlermeldungen während des laufenden Prozesses ausblenden
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Verhindert das Anzeigen von Fehlermeldungen während der Synchronisation:\nSie werden jedoch gesammelt und am Ende als Liste angezeigt
 Hints:
 Tipps:
 Homepage
@@ -486,8 +524,8 @@ Include
 Einschließen
 Include temporarily
 Temporär einschließen
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Einschließen: *.doc;*.zip;*.exe\nAusschließen: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Einschließen: *.doc;*.zip;*.exe\nAusschließen: temp\\*
 Info
 Info
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Die Initialisierung des Papierkorbs ist fehlgeschlagen!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Die Papierkorbfunktion steht nicht zur Verfügung!\n\nWahrscheinlich benutzen Sie nicht Microsoft Windows.\nWenn Sie diese Funktion wirklich benötigen, kontaktieren Sie bitte den Autor. :)
-Left:
-Links:
+Left
+Links
 Load configuration from file
 Konfiguration aus Datei laden
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Spalte nach unten verschieben
 Move column up
 Spalte nach oben verschieben
+Move files to a custom directory.
+Verschiebe Dateien in ein benutzerdefiniertes Verzeichnis.
+Move to custom directory
+In eigenes Verzeichnis verschieben
 Moving %x to Recycle Bin
 Verschiebe %x in den Papierkorb
+Moving %x to custom directory
+Verschiebe %x in eigenes Verzeichnis
 Not all items have been synchronized! Have a look at the list.
 Nicht alle Elemente wurden synchronisiert! Siehe verbliebene Elemente im Hauptfenster.
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Um diese Funktionalität zu aktivieren, bitte die entsprechende Datei \"Shadow.dll\" (siehe Archiv \"Shadow.zip\") in das FreeFileSync Installationsverzeichnis kopieren.
 Please fill all empty directory fields.
 Bitte die leeren Verzeichnisfelder füllen.
+Please specify alternate directory for deletion!
+Bitte ein alternatives Löschverzeichnis angeben!
 Press button to activate filter
 Taste drücken, um Filter zu aktivieren
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Frage
 Quit
 Beenden
+RealtimeSync - Automated Synchronization
+RealtimeSync - Automatisierte Synchronisation
+RealtimeSync configuration
+RealtimeSync Konfiguration
 Relative path
 Relativer Pfad
+Remove folder
+Verzeichnis entfernen
 Remove folder pair
 Verzeichnispaar entfernen
+Report translation error
+Übersetzungsfehler melden
 Reset
 Zurücksetzen
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Sollen alle Warnmeldungen zurückgesetzt werden?
 Result
 Ergebnis
-Right:
-Rechts:
+Right
+Rechts
 S&ave configuration
 Konfiguration s&peichern 
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Dateien die nach links kopiert werden anzeigen
 Show files that will be copied to the right side
 Dateien die nach rechts kopiert werden anzeigen
+Show files that will be created on the left side
+Dateien die links erstellt werden anzeigen
+Show files that will be created on the right side
+Dateien die rechts erstellt werden anzeigen
+Show files that will be deleted on the left side
+Dateien die links gelöscht werden anzeigen
+Show files that will be deleted on the right side
+Dateien die rechts gelöscht werden anzeigen
 Show files that won't be copied
 Dateien die nicht kopiert werden anzeigen
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Synchronisiere...
 System out of memory!
 Zu wenig freier Arbeitsspeicher!
+Target directory already existing!
+Zielverzeichnis existiert bereits!
 Target file already existing!
 Die Zieldatei existiert bereits!
 The file does not contain a valid configuration:
 Die Datei enthält keine gültige Konfiguration:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Diese Kommandozeile wird bei jedem Doppelklick auf einen Dateinamen ausgeführt. %name dient dabei als Platzhalter für die ausgewählte Datei.
+This commandline will be executed on each doubleclick. The following macros are available:
+Diese Befehlszeile wird bei jeden Doppelklick ausgeführt. Dabei stehen die folgenden Makros zur Verfügung:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Diese Variante identifiziert zwei gleichnamige Dateien als gleich, wenn sie die gleiche Dateigröße haben UND der Zeitpunkt der letzten Änderung derselbe ist.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Es existieren ungelöste Konflikte! \n\nDie Konflikte können ignoriert und die Synchronisation fortgesetzt werden.
 Update ->
 Aktualisieren ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Verwendung: Die zu überwachenden Verzeichnisse auswählen und eine Kommandozeile angeben. Jedesmal wenn Dateien innerhalb dieser Verzeichnisse (oder Unterverzeichnisse) verändert werden, wird die Kommandozeile ausgeführt.
 Use Recycle Bin
 Papierkorb verwenden
-Use Recycle Bin when deleting or overwriting files during synchronization
-Papierkorb für zu löschende oder zu überschreibende Dateien nutzen
+Use Recycle Bin when deleting or overwriting files.
+Papierkorb für zu löschende oder zu überschreibende Dateien nutzen.
 Variant
 Variante
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Warnungen:
 When the comparison is started with this option set the following decision tree is processed:
 Wenn der Vergleich mit dieser Option gestartet wurde, wird folgender Entscheidungsbaum abgearbeitet:
+You can ignore the error to consider not existing directories as empty.
+Dieser Fehler kann ignoriert werden, um nicht existierende Verzeichnisse als leer anzusehen.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Verbliebene Elemente können nochmals synchronisiert werden (OHNE dass ein erneuter Vergleich notwendig ist)!
 different
 verschieden
 file exists on both sides
 Datei existiert auf beiden Seiten
-flash	conflict\n
-Blitz	Konflikt\n
 on one side only
 nur auf einer Seite
-|>	file on right side only\n
-|>	Datei existiert nur rechts\n
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index 6cf67623..0c1926c6 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -20,8 +20,10 @@
  perc
  sec
  másodperc
-!=	files are different\n
-!=	a fájlok különböznek\n
+%x / %y objects deleted successfully
+%X / %Y objektum sikeresen törölve
+%x Percent
+%x százalék
 %x directories
 %x mappa
 %x files,
@@ -33,7 +35,7 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 %x of 1 row in view
 %x sor látható az 1 sorból
 &Abort
-&Megszakítás
+&Megszakít
 &About...
 &A programról...
 &Advanced
@@ -48,6 +50,8 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 &Kötegelt feladat létrehozása
 &Default
 &Alapértelmezett
+&Exit
+&Kilépés
 &Export file list
 &Fájllista exportálása
 &File
@@ -72,6 +76,8 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 &Szünet
 &Quit
 &Kilépés
+&Restore
+&Visszaállítás
 &Retry
 &Ismét
 &Save
@@ -80,20 +86,22 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 &Igen
 ,
 .
--	do not copy\n
--	nem másolni\n
 - conflict
 - ütközés
 - conflict (same date, different size)
 - ütközés (ugyanaz a dátum, különböző méret)
 - different
 - különböző
+- directory part only
+- csak a mappa részét
 - equal
 - egyezik
 - exists left only
 - csak a bal oldalon létezik
 - exists right only
 - csak a jobb oldalon létezik
+- full file or directory name
+- teljes fájl- vagy mappanév
 - left
 - bal oldali
 - left newer
@@ -102,8 +110,10 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 - jobb oldali
 - right newer
 - a jobb oldali újabb
-->	copy to right side\n
-->	másolni a jobb oldalra\n
+- sibling of %dir
+- a %dir gyermeke
+- sibling of %name
+- a %name gyermeke
 -Open-Source file synchronization-
 -Nyílt forráskódú fájlszinkronizálás-
 .
@@ -124,22 +134,12 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 2. A csillag ('*') és a kérdőjel ('?') helyettesítő karakterek megengedettek.
 3. Exclude files directly on main grid via context menu.
 3. Fájlok közvetlen kizárása a fő listából helyi menü segítségével.
-<-	copy to left side\n
-<-	másolni a bal oldalra\n
-<<	left file is newer\n
-<<	a bal oldali fájl újabb\n
 <Directory>
 <Mappa>
 <Last session>
 <Utolsó munkamenet>
 <multiple selection>
 <többszörös kijelölés>
-<|	file on left side only\n
-<|	csak a bal oldalon lévő fájl\n
-==	files are equal\n
-==	egyező fájlok\n
->>	right file is newer\n
->>	a jobb oldali fájl újabb\n
 A newer version of FreeFileSync is available:
 Elérhető a FreeFileSync egy újabb verziója:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 A programról
 Action
 Művelet
+Add folder
+Mappa hozzáadása
 Add folder pair
 Mappa pár megadása
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Ahogy a neve is mutatja, két fájl, melyeknek ugyanaz a nevük, akkor és csakis akkor lesz egyezőként jelölve, ha a tartalmuk megegyezik. Ez az opció leginkább a konzisztencia-viszgálatokhoz jó, mintsem a biztonsági mentésekhez. Így a fájlok dátuma nem számít semmit.\n\nEnnek az opciónak az engedélyezésével a döntési fa kisebb lesz:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Egy kötegelt feladat fájl létrehozása az automatizált szinkronizációhoz. Kötegelt feladat módban való indításhoz egyszerűen meg kell adni a fájl nevét a FreeFileSync.exe-nek: FreeFileSync.exe <kötegelt feladat fájl>. Ezt ütemezni is lehet az operációs rendszer feladatkezelőjével.
+Auto-adjust columns
+Oszlopok automatikus igazítása
 Batch execution
 Kötegelt végrehajtás
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Szűrt fájlok/mappák elrejtése a listában
 Comma separated list
 Comma separated values
+Commandline
+Parancssor
+Commandline is empty!
+A parancssor üres!
 Compare
 Összehasonlítás
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 Tartalom összehasonlítása...
 Comparison Result
 Az összehasonlítás eredménye
+Comparison settings
+Összehasonlítási beállítások
 Completed
 Befejezve
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 A(z) %x fájl másolása a(z) %y fájlba fölülírva a célt
 Could not determine volume name for file:
 A következő fájlnak nem lehet meghatározni a kötetnevét:
-Could not set working directory:
-Munkamappa beállítása sikertelen:
+Could not initialize directory monitoring:
+A mappafigyelés inicializálása sikertelen:
+Could not read values for the following XML nodes:
+
 Create a batch job
 Kötegelt feladat létrehozása
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Egyedi
 Customize columns
 Oszlopok testreszabása
+Customize...
+Testreszabás...
 DECISION TREE
 DÖNTÉSI FA
 Data remaining:
 Hátralévő adat:
 Date
 Dátum
+Delay
+Várakozás
+Delay between two invocations of the commandline
+Két parancssor meghívása közötti várakozás
 Delete files/folders existing on left side only
 Csak a bal oldalon létező fájlok/mappák törlése
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Törlés mindkét oldalon
 Delete on both sides even if the file is selected on one side only
 Törlés mindkét oldalon, még akkor is, ha csak egyik oldalon lett kijelölve
+Delete or overwrite files permanently.
+A fájlok folyamatos törlése vagy felülírása.
+Delete permanently
+Folyamatosan törölni
 Deleting file %x
 Fájl törlése %x
 Deleting folder %x
 Mappa törlése %x
+Deletion handling
+Törlések kezelése
 Directories are dependent! Be careful when setting up synchronization rules:
 A mappák függenek egymástól! Legyen óvatos, amikor megadja a szinkronizálási szabályokat:
+Directories to watch
+Figyelendő mappák
 Directory
 Mappa
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 E-mail
 Enable filter to exclude files from synchronization
 Szűrő engedélyezése fájlok a szinkronizációból való kizárásához
+Endless loop when traversing directory:
+Végtelen hurok a mappák bejárásakor:
 Error
 Hiba
 Error changing modification time:
@@ -324,6 +352,10 @@ Error handling
 Hibakezelés
 Error loading library function:
 A könyvtári funkció betöltése sikertelen:
+Error moving directory:
+Hiba a mappa mozgatásakor:
+Error moving file:
+Hiba a fájl mozgatásakor:
 Error moving to Recycle Bin:
 A Lomtárba (Recycle Bin) mozgatás sikertelen:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 A fájl olvasása sikertelen:
 Error resolving symbolic link:
 A szimbolikus link feloldása sikertelen:
-Error retrieving full path:
-A teljes elérési útvonal meghatározása sikertelen:
 Error starting Volume Shadow Copy Service!
 Hiba történt a Volume Shadow Copy szolgáltatás indítása közben!
 Error traversing directory:
 A mappa átnézése sikertelen:
+Error when monitoring directories.
+Hiba történt a mappák figyelése közben.
 Error writing file attributes:
 A fájl attribútumainak írása sikertelen:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 A bal oldalra másolandó fájlok elrejtése
 Hide files that will be copied to the right side
 A jobb oldalra másolandó fájlok elrejtése
+Hide files that will be created on the left side
+A bal oldalon létrehozandó fájlok elrejtése.
+Hide files that will be created on the right side
+A jobb oldalon létrehozandó fájlok elrejtése.
+Hide files that will be deleted on the left side
+A bal oldalon törlendő fájlok elrejtése.
+Hide files that will be deleted on the right side
+A jobb oldalon törlendő fájlok elrejtése.
 Hide files that won't be copied
 A nem másolandó fájlok elrejtése
 Hide filtered items
 A szűrt elemek elrejtése
 Hide further error messages during the current process
 A további hibaüzenetek elrejtése az aktuális folyamat során
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Hibaüzenetek elrejtése szinkronizálás közben:\nÖssze lesznek gyűjtve és a folyamat végén meg lesznek jelenítve egy listában
 Hints:
 Tippek:
 Homepage
@@ -486,8 +524,8 @@ Include
 Csatol
 Include temporarily
 Ideiglenesen tartalmaz
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Csatol: *.doc;*.zip;*.exe\nKizár: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Csatol: *.doc;*.zip;*.exe\nKizár: temp\\*
 Info
 Információ
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 A Lomtár (Recycle Bin) inicializálása sikertelen!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Lehetetlen a Lomtár (Recycle Bin) inicializálása!\n\nValószínűleg azért, mert nem Windost használ.\nHa szeretné ezt a funkciót használni, kérjük, lépjen kapcsolatba a szerzővel. :)
-Left:
-Bal oldal:
+Left
+Bal oldal
 Load configuration from file
 Beállítások betöltése fájlból
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Oszlop mozgatása lefelé
 Move column up
 Oszlop mozgatása felfelé
+Move files to a custom directory.
+Fájlok mozgatása egyedi mappába.
+Move to custom directory
+Mozgatás egyedi mappába
 Moving %x to Recycle Bin
 %x mozgatása a Lomtárba
+Moving %x to custom directory
+%x mozgatása egyedi mappába
 Not all items have been synchronized! Have a look at the list.
 Nem minden elem szinkronizálódott! Tekintsd meg a listát.
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Ennek a funkciónak a használatához, kérjük, másold a megfelelő \"Shadow.dll\" fájlt (megtalálható a \"Shadow.zip\" archívumban) abba a mappába, amelybe a FreeFileSync-et telepítetted.
 Please fill all empty directory fields.
 Kérjük, töltse ki az összes üres mappa mezőt.
+Please specify alternate directory for deletion!
+Kérjük, adjon meg egy alternatív mappát a törléshez!
 Press button to activate filter
 Nyomja meg a gombot a szűrő aktiválásához
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Kérdés
 Quit
 Kilépés
+RealtimeSync - Automated Synchronization
+RealtimeSync - Automatikus szinkronizálás
+RealtimeSync configuration
+RealtimeSync beállítások
 Relative path
 Relatív útvonal
+Remove folder
+Mappa eltávolítása
 Remove folder pair
 Mappa párok eltávolítása
+Report translation error
+Fordítói hiba bejelentése
 Reset
 Helyreállítás
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Helyreállítja az összes figyelmeztető üzenetet?
 Result
 Eredmény
-Right:
-Jobb oldal:
+Right
+Jobb oldal
 S&ave configuration
 Beállítások mentés&e
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 A bal oldalra másolandó fájlok mutatása
 Show files that will be copied to the right side
 A jobb oldalra másolandó fájlok mutatása
+Show files that will be created on the left side
+A bal oldalon létrehozandó fájlok mutatása.
+Show files that will be created on the right side
+A jobb oldalon létrehozandó fájlok mutatása.
+Show files that will be deleted on the left side
+A bal oldalon törlendő fájlok mutatása.
+Show files that will be deleted on the right side
+A jobb oldalon törlendő fájlok mutatása.
 Show files that won't be copied
 A nem másolandó fájlok mutatása
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Szinkronizálás folyamatban...
 System out of memory!
 Nincs elég rendszermemória!
+Target directory already existing!
+
 Target file already existing!
 A célként megadott fájl már létezik!
 The file does not contain a valid configuration:
 A következő fájl nem tartalmaz érvényes beállításokat:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Ez a parancssor lesz végrehajtva minden fájlnéven történő dupla kattintás esetében. %name helyettesíti a kiválasztott fájlt.
+This commandline will be executed on each doubleclick. The following macros are available:
+Ez a parancssor fog végrehajtódni minden dupla kattintásnál. A következő makrók elérhetőek:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Ez a változat akkor tekint egyezőnek két azonos nevű fájlt, ha azok mérete ÉS az utolsó módosításuk ideje azonos.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Feloldatlan ütközések vannak! \n\nFigyelmen kívül hagyhatod az ütközéseket és folytathatod a szinkronizálást.
 Update ->
 Frissítés ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Használat: Válassza ki a figyelendő mappákat és adjon meg egy parancssort. Minden alkalommal, amikor az adott mappákon (vagy almappákon) belül megváltoznak a fájlok, a parancssor végrehajtásra kerül.
 Use Recycle Bin
 Lomtár (Recycle Bin) használata
-Use Recycle Bin when deleting or overwriting files during synchronization
-A Lomtár (Recycle Bin) használata fájlok szinkronizálása közbeni törlésnél vagy felülírásnál
+Use Recycle Bin when deleting or overwriting files.
+A Lomtár használata fájlok törlésénél vagy felülírásánál.
 Variant
 Variáns
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Figyelem:
 When the comparison is started with this option set the following decision tree is processed:
 Ha az összehasonlítás ezekkel a beállításokkal lesz elindítva, akkor a következő döntési fa érvényesül:
+You can ignore the error to consider not existing directories as empty.
+Figyelmen kívül hagyhatja a hibákat a nem létező mappákat üresnek tekintve.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Meg lehet próbálni újra a megmaradt elemek szinkronizálását (az összehasonlítás újbóli elvégzése NÉLKÜL)!
 different
 különböző
 file exists on both sides
 mindkét oldalon létező fájlok
-flash	conflict\n
-jelzés	ütközés\n
 on one side only
 csak az egy oldalon létező fájlok
-|>	file on right side only\n
-|>	csak a jobb oldali fájl\n
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 8a1f1332..472a17cf 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -20,8 +20,10 @@
  min
  sec
  sec
-!=	files are different\n
-!=	i file sono diversi\n
+%x / %y objects deleted successfully
+%x / %y oggetti cancellati con successo
+%x Percent
+%x Percento
 %x directories
 %x cartelle
 %x files,
@@ -48,6 +50,8 @@
 &Crea un job in batch
 &Default
 &Default
+&Exit
+&Esci
 &Export file list
 &Esporta la lista dei file
 &File
@@ -72,6 +76,8 @@
 &Pausa
 &Quit
 &Esci
+&Restore
+&Ripristina
 &Retry
 &Riprova
 &Save
@@ -80,20 +86,22 @@
 &Si
 ,
 , 
--	do not copy\n
--	non copiare\n
 - conflict
 - conflitto
 - conflict (same date, different size)
 - conflitto (stessa data, dimensione diversa)
 - different
 - file diversi
+- directory part only
+- solo parte di directory
 - equal
 - file identici
 - exists left only
 - il file esiste solo a sinistra
 - exists right only
 - il file esiste solo a destra
+- full file or directory name
+- file completo o nome directory
 - left
 - a sinistra
 - left newer
@@ -102,8 +110,10 @@
 - a destra
 - right newer
 - file di destra più recente
-->	copy to right side\n
-->	copia sul lato destro\n
+- sibling of %dir
+- fratello di %dir
+- sibling of %name
+- fratello di %name
 -Open-Source file synchronization-
 -Sincronizzazione Open-Source-
 .
@@ -124,22 +134,12 @@
 2. Sono ammessi i caratteri generici '*' e '?'.
 3. Exclude files directly on main grid via context menu.
 3. Escludi i file direttamente sulla griglia principale tramite il menu contestuale.
-<-	copy to left side\n
-<-	copia sul lato sinistro\n
-<<	left file is newer\n
-<<	il file di sinistra è più recente\n
 <Directory>
 <Directory>
 <Last session>
 <Ultima sessione>
 <multiple selection>
 <selezione multipla>
-<|	file on left side only\n
-<|	il file esiste solo a sinistra\n
-==	files are equal\n
-==	i file sono uguali\n
->>	right file is newer\n
->>	il file di destra è più recente\n
 A newer version of FreeFileSync is available:
 E' disponibile una nuova versione di FreeFileSync:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 A proposito di
 Action
 Azioni
+Add folder
+Aggiungi cartella
 Add folder pair
 Aggiungi una coppia di cartelle
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Come suggerisce il nome, due file con lo stesso nome sono considerati come identici se, e solamente se, il loro contenuto è identico. Questa opzione è utile sia per i contrlli di coerenza che per le operazioni di backup. Tuttavia, data e ora vengono ignorate.\n\nAbilitando questa opzione l'albero delle decisioni è semplificato:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Componi un file batch per la sincronia automatica. Per partire in modalità batch fai semplicemente seguire il nome del file all'eseguibile di FreeFileSync: FreeFileSync.exe <nomefilebatch>. Puoi anche schedulare l'operazione nelle operazioni pianificate del sistema operativo.
+Auto-adjust columns
+Larghezza automatica colonne
 Batch execution
 Esecuzione in batch
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Nascondi i files/directories dalla lista
 Comma separated list
 Lista di elementi separati da virgola
+Commandline
+Linea di comando
+Commandline is empty!
+La linea di comando è vuota!
 Compare
 Compara
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 Comparazione contenuto...
 Comparison Result
 Risultato della comparazione
+Comparison settings
+Impostazioni di comparazione
 Completed
 Completato
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 Copia file %x su %y sovrascrivendo la destinazione
 Could not determine volume name for file:
 Impossibile determinare il nome volume per il file:
-Could not set working directory:
-Impossibile definire la directory di lavoro:
+Could not initialize directory monitoring:
+Monitoraggio directory non inizializzabile:
+Could not read values for the following XML nodes:
+
 Create a batch job
 Creazione di un job batch
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Personalizza
 Customize columns
 Personalizza colonne
+Customize...
+Personalizza...
 DECISION TREE
 ALBERO DELLE DECISIONI
 Data remaining:
 Dati rimanenti:
 Date
 Data
+Delay
+Ritardo
+Delay between two invocations of the commandline
+Ritardo tra due richieste nella lina di comando
 Delete files/folders existing on left side only
 Elimina files/cartelle esistenti solo a sinistra
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Cancella su entrambi i lati
 Delete on both sides even if the file is selected on one side only
 Cancella su entrambi i lati anche se il file è selezionato su un solo lato.
+Delete or overwrite files permanently.
+Cancella o sovrascrivi file definitivamente.
+Delete permanently
+Cancella definitivamente
 Deleting file %x
 Eliminazione file %x
 Deleting folder %x
 Eliminazione cartella %x
+Deletion handling
+Gestione cancellazione
 Directories are dependent! Be careful when setting up synchronization rules:
 Le directory sono dipendenti! Fai attenzione quando configuri le regole di sincronizzazione:
+Directories to watch
+Directory da controllare
 Directory
 Directory
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 Email
 Enable filter to exclude files from synchronization
 Abilita il filtro per escludere files dalla sincronizzazione
+Endless loop when traversing directory:
+Loop senza fine attraverso le directory:
 Error
 Errore
 Error changing modification time:
@@ -321,9 +349,13 @@ Errore durante l'eliminazione delle directory:
 Error deleting file:
 Errore durante l'eliminazione del file:
 Error handling
-Errore nella gestione
+Gestione degli errori
 Error loading library function:
 Errore nel caricamento della funzione libreria:
+Error moving directory:
+Errore nello spostamento directory:
+Error moving file:
+Errore nello spostamento file:
 Error moving to Recycle Bin:
 Errore durante lo spostamento nel Cestino:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 Errore durante la lettura del file:
 Error resolving symbolic link:
 Errore nella risoluzione di collegamento simbolico:
-Error retrieving full path:
-Errore nel reperire il percorso completo:
 Error starting Volume Shadow Copy Service!
 Errore in avvio del Servizio Volume Shadow Copy!
 Error traversing directory:
 Errore nel percorso della directory:
+Error when monitoring directories.
+Errore durante il monitoraggio directory.
 Error writing file attributes:
 Errore nella scrittura degli attributi file:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Nascondi i file da copiare sul lato sinistro
 Hide files that will be copied to the right side
 Nascondi i file da copiare sul lato destro
+Hide files that will be created on the left side
+Nascondi i file che verranno creati sul lato sinistro
+Hide files that will be created on the right side
+Nascondi i file che verranno creati sul lato destro
+Hide files that will be deleted on the left side
+Nascondi i file che verranno cancellati sul lato sinistro
+Hide files that will be deleted on the right side
+Nascondi i file che verranno cancellati sul lato destro
 Hide files that won't be copied
 Nascondi i file che non saranno copiati
 Hide filtered items
 Nascondi gli elementi filtrati
 Hide further error messages during the current process
 Non mostrare i successivi messaggi d'errore durante il processo corrente
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Non mostrare i messaggi d'errore durante la sincronizzazione:\nVerranno raccolti e mostrati alla fine del processo
 Hints:
 Consigli:
 Homepage
@@ -486,8 +524,8 @@ Include
 Includi
 Include temporarily
 Includi temporaneamente
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Includi: *.doc;*.zip;*.exe\nEscludi: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Includi: *.doc;*.zip;*.exe\nEscludi: temp\\*
 Info
 Info
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Inizializzazione del Cestino fallita!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Impossibile inizializzare il Cestino!\n\nE'probabile che non si stia utilizzando Windows.\nSe si vuole usare questa funzionalità, contattare l'autore. :)
-Left:
-Sinistra:
+Left
+Sinistra
 Load configuration from file
 Carica configurazione da file
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Sposta colonna giu'
 Move column up
 Sposta colonna su'
+Move files to a custom directory.
+Sposta i file in una directory personalizzata.
+Move to custom directory
+Sposta in una directory personalizzata
 Moving %x to Recycle Bin
 Spostamento di %x nel Cestino
+Moving %x to custom directory
+Spostamento di %x in diretcory personalizzata
 Not all items have been synchronized! Have a look at the list.
 Non tutti gli oggetti sono stati sincronizzati! Controlla la lista.
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Per abilitare questa funzione è necessario copiare l'appropriata \"Shadow.dll\" (che si trova nell'archivio \"Shadow.zip\") nella directory di installazione di FreeFileSync.
 Please fill all empty directory fields.
 Compilare tutti i campi di directory vuoti.
+Please specify alternate directory for deletion!
+Prego specificare una directory alternativa per la cancellazione!
 Press button to activate filter
 Cliccare per attivare il filtro
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Domanda
 Quit
 Esci
+RealtimeSync - Automated Synchronization
+RealtimeSync - Sincronizzazione Automatizzata
+RealtimeSync configuration
+Configurazione di RealtimeSync
 Relative path
 Percorso relativo
+Remove folder
+Rimuovi cartella
 Remove folder pair
 Elimina la coppia di cartelle
+Report translation error
+Segnala errori di traduzione
 Reset
 Reset
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Resettare tutti i messaggi d'avviso?
 Result
 Risultato
-Right:
-Destra:
+Right
+Destra
 S&ave configuration
 S&alva la configurazione
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Mostra file da copiare sul lato sinistro
 Show files that will be copied to the right side
 Mostra file da copiare sul lato destro
+Show files that will be created on the left side
+Mostra file che verranno creati sul lato sinistro
+Show files that will be created on the right side
+Mostra file che verranno creati sul lato destro
+Show files that will be deleted on the left side
+Mostra file che verranno cancellati sul lato sinistro
+Show files that will be deleted on the right side
+Mostra file che verranno cancellati sul lato destro
 Show files that won't be copied
 Mostra file che non saranno copiati
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Sincronizzazione in corso...
 System out of memory!
 Memoria di sistema esaurita!
+Target directory already existing!
+Directory di destinazione già esistente!
 Target file already existing!
 File destinazione già esistente!
 The file does not contain a valid configuration:
 Il file non contiene una configurazione valida
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Questa riga di comando verrà eseguita ad ogni doppio click sul nome di un file. %name é lo spazio riservato per il file selezionato.
+This commandline will be executed on each doubleclick. The following macros are available:
+Questa linea di comando verrà eseguita ad ogni doppio-click. Sono disponibili le seguenti macro:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Questa variante definisce identici due file con lo stesso nome quando hanno la stessa dimensione E la stessa data e ora.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Sono presenti conflitti irrisolti! \n\nPuoi ignorare i conflitti e continuare la sincronizzazione.
 Update ->
 Aggiorna ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Uso: Seleziona le directory da monitorare e inserisci una linea di comando. Ogni volta che i file vengono modificati in queste directory (o sotto-directory) la linea di comando verrà eseguita.
 Use Recycle Bin
 Usa il Cestino
-Use Recycle Bin when deleting or overwriting files during synchronization
-Usa il Cestino quando si cancella o sovrascrivono file durante la sincronizzazione
+Use Recycle Bin when deleting or overwriting files.
+Usa il Cestino quando si cancella o sovrascrive un file.
 Variant
 Variante
 Volume name %x not part of filename %y!
@@ -709,18 +775,16 @@ Attenzione
 Warning: Synchronization failed for %x item(s):
 Attenzione: Sincronizzazione fallita per %x elementi:
 Warnings:
-Attenzione:
+Avvisi:
 When the comparison is started with this option set the following decision tree is processed:
 Quando questo set di opzioni viene selezionato per la comparazione viene processato il seguente albero di decisioni:
+You can ignore the error to consider not existing directories as empty.
+Puoi ignorare l'errore per considerare directory inesistenti come vuote.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Puoi provare a sincronizzare di nuovo gli elementi restanti (SENZA doverli ri-comparare) !
 different
 file differenti
 file exists on both sides
 file esistente su entrambi i lati
-flash	conflict\n
-conflitto flash\n
 on one side only
 file esistente su un solo lato
-|>	file on right side only\n
-|>	Il file esiste solo sul lato destro\n
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 6ac7f498..0d473b8c 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -20,8 +20,10 @@
  分
  sec
  秒
-!=	files are different\n
-!=	ファイルに差異あり\n
+%x / %y objects deleted successfully
+%x / %y のオブジェクトを削除しました
+%x Percent
+%x パーセント
 %x directories
 %x ディレクトリ
 %x files,
@@ -48,6 +50,8 @@
 一括ジョブを作成(&C)
 &Default
 デフォルト(&D)
+&Exit
+終了(&E)
 &Export file list
 ファイル一覧をエクスポート(&E)
 &File
@@ -72,6 +76,8 @@
 一時停止(&P)
 &Quit
 終了(&Q)
+&Restore
+修復(&R)
 &Retry
 再試行(&R)
 &Save
@@ -80,20 +86,22 @@
 はい(&Y)
 ,
 .
--	do not copy\n
--	コピーしない\n
 - conflict
 - 不一致
 - conflict (same date, different size)
 - 不一致 (同じ日付, 異なるサイズ)
 - different
 - 差異あり
+- directory part only
+- ディレクトリ部のみ
 - equal
 - 同一
 - exists left only
 - 左側にのみ存在
 - exists right only
 - 右側にのみ存在
+- full file or directory name
+- 完全なファイル/フォルダ名
 - left
 - 左側
 - left newer
@@ -102,8 +110,10 @@
 - 右側
 - right newer
 - 右側の方が新しい
-->	copy to right side\n
-->	右側にコピー\n
+- sibling of %dir
+- %dir の兄弟
+- sibling of %name
+- %name の兄弟
 -Open-Source file synchronization-
 -Open-Source ファイル同期ツール-
 .
@@ -124,22 +134,12 @@
 2. ワイルドカードに ' * ' と ' ? ' を使用出来ます。
 3. Exclude files directly on main grid via context menu.
 3. コンテキストメニューから直接ファイルを除外出来ます。
-<-	copy to left side\n
-<-	左側にコピー\n
-<<	left file is newer\n
-<<	左側の方が新しい\n
 <Directory>
 <ディレクトリ>
 <Last session>
 <最後のセッション>
 <multiple selection>
 <複数選択>
-<|	file on left side only\n
-<|	左側のみに存在\n
-==	files are equal\n
-==	同様のファイル\n
->>	right file is newer\n
->>	右側の方が新しい\n
 A newer version of FreeFileSync is available:
 FreeFileSync の新しいバージョンが利用可能です:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 情報
 Action
 操作
+Add folder
+フォルダを追加
 Add folder pair
 フォルダのペアを追加
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 このオプションでは、同じ名前を共有するファイルで内容が同じ場合は、同一として扱われます。  バックアップ操作より、むしろ整合性のチェックを行う時に役立つオプションです。  従ってファイルの日時については全く考慮されていません。\n\n設定が有効な時は、ツリー表示が小さくなります。
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 一括で同期処理を行うためのバッチファイルを作成します。 一括モードを開始するときは、ファイルのパス名を実行ファイル\n< FreeFileSync.exe> \nにバッチファイルで渡すだけです。 また、この操作はOSのタスクスケジューラから実行することができます。
+Auto-adjust columns
+列の自動調整
 Batch execution
 一括処理を実行
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 リストから除外したいファイル/ディレクトリを選択
 Comma separated list
 カンマ区切り
+Commandline
+コマンドライン
+Commandline is empty!
+コマンドラインが空白です!
 Compare
 比較
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 内容を比較中...
 Comparison Result
 比較結果
+Comparison settings
+比較設定
 Completed
 完了しました
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 ファイル %x をコピー、%y に上書き中
 Could not determine volume name for file:
 ファイルのボリューム名が決定されていません:
-Could not set working directory:
-作業ディレクトリが設定できません:
+Could not initialize directory monitoring:
+監視するディレクトリを初期化できません:
+Could not read values for the following XML nodes:
+
 Create a batch job
 一括ジョブを作成
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 カスタム
 Customize columns
 列の調整
+Customize...
+カスタマイズ...
 DECISION TREE
 [判定ツリー]
 Data remaining:
 残りのデータ:
 Date
 データ
+Delay
+遅延時間
+Delay between two invocations of the commandline
+2 つのコマンドラインを実行する時の遅延時間
 Delete files/folders existing on left side only
 左側のみに存在するファイル/フォルダを削除
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 両方を削除
 Delete on both sides even if the file is selected on one side only
 片側のペインのみ選択されている場合でも両方を削除する
+Delete or overwrite files permanently.
+ファイルを上書き、または完全に削除
+Delete permanently
+完全に削除
 Deleting file %x
 ファイル %x を削除中
 Deleting folder %x
 フォルダ %x を削除中
+Deletion handling
+削除の取り扱い
 Directories are dependent! Be careful when setting up synchronization rules:
 ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:
+Directories to watch
+ディレクトリを監視
 Directory
 ディレクトリ
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 E-メール
 Enable filter to exclude files from synchronization
 同期処理の際、除外ファイルフィルターを有効にする。
+Endless loop when traversing directory:
+ディレクトリ移動中に無限ループが発生:
 Error
 エラー
 Error changing modification time:
@@ -324,6 +352,10 @@ Error handling
 ハンドリングのエラー
 Error loading library function:
 ライブラリ読み込みエラー:
+Error moving directory:
+ディレクトリ移動に失敗:
+Error moving file:
+ファイルの移動に失敗:
 Error moving to Recycle Bin:
 ゴミ箱への移動に失敗:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 ファイル読み込みエラー:
 Error resolving symbolic link:
 シンボリックリンクの解決に失敗:
-Error retrieving full path:
-フルパスの取得に失敗:
 Error starting Volume Shadow Copy Service!
 ボリュームシャドウコピーの開始に失敗!
 Error traversing directory:
 ディレクトリの移動エラー:
+Error when monitoring directories.
+ディレクトリの監視エラー
 Error writing file attributes:
 ファイル属性の書き込みエラー:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 左側にコピーしたファイルを非表示にする
 Hide files that will be copied to the right side
 右側にコピーしたファイルを非表示にする
+Hide files that will be created on the left side
+左側で作成されたファイルを非表示にする
+Hide files that will be created on the right side
+右側で作成されたファイルを非表示にする
+Hide files that will be deleted on the left side
+左側で削除されたファイルを非表示にする
+Hide files that will be deleted on the right side
+右側で削除されたファイルを非表示にする
 Hide files that won't be copied
 コピーしなかったファイルを隠す
 Hide filtered items
 適合するアイテムを非表示にする
 Hide further error messages during the current process
 現在の処理中は以降のエラーメッセージを表示しない
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-同期処理中のエラーメッセージを非表示にする:\n非表示にしたメッセージは、処理の終了後に一覧表示されます。
 Hints:
 ヒント:
 Homepage
@@ -486,8 +524,8 @@ Include
 含める
 Include temporarily
 一時フォルダを含める
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-含める: *.doc;*.zip;*.exe\n除外: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+含める: *.doc;*.zip;*.exe\n除外: temp\\*
 Info
 情報
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 ゴミ箱の初期化に失敗しました!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 ゴミ箱を初期化することが出来ませんでした!\n\n使用している OS が、Windows 以外の OS です。\nこの機能を使用したい場合は、作者までご連絡ください :)
-Left:
-左側:
+Left
+左側
 Load configuration from file
 外部ファイルから構成設定を読み込みます
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 列を下に移動
 Move column up
 列を上に移動
+Move files to a custom directory.
+ファイルを指定ディレクトリに移動
+Move to custom directory
+指定ディレクトリに移動
 Moving %x to Recycle Bin
 %x をゴミ箱に移動中
+Moving %x to custom directory
+%x を指定ディレクトリに移動中
 Not all items have been synchronized! Have a look at the list.
 すべてのアイテムは同期されていません、リストを確認してください
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
  \"Shadow.dll\" (\"Shadow.zip\" アーカイブ内) を、FreeFileSync インストールフォルダにコピーすることで、この機能を利用できるようになります。
 Please fill all empty directory fields.
 アイテムが選択されていません!
+Please specify alternate directory for deletion!
+削除に使用する代替ディレクトリを指定してください!
 Press button to activate filter
 ボタンをクリックで有効化
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 質問
 Quit
 終了
+RealtimeSync - Automated Synchronization
+リアルタイム同期 - 自動同期
+RealtimeSync configuration
+リアルタイム同期の構成設定
 Relative path
 相対パス
+Remove folder
+フォルダ除去
 Remove folder pair
 フォルダペアを除去
+Report translation error
+翻訳エラーの詳細
 Reset
 リセット
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 すべての警告をリセットしますか?
 Result
 結果
-Right:
-右側:
+Right
+右側
 S&ave configuration
 構成設定を保存(&A)
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 左側にコピーされたファイルを表示
 Show files that will be copied to the right side
 右側にコピーされたファイルを表示
+Show files that will be created on the left side
+左側で作成されたファイルを表示
+Show files that will be created on the right side
+右側で作成されたファイルを表示
+Show files that will be deleted on the left side
+左側で削除されたファイルを表示
+Show files that will be deleted on the right side
+右側で削除されたファイルを表示
 Show files that won't be copied
 コピーされなかったファイルを表示
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 同期処理中...
 System out of memory!
 メモリが不足しています!
+Target directory already existing!
+対象ディレクトリはすでに存在します!
 Target file already existing!
 対象ファイルは既に存在します!
 The file does not contain a valid configuration:
 このファイルには有効な構成が含まれていません:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-ファイル名をダブルクリックする度に、このコマンドが実行されます。 %name は選択ファイルのプレースフォルダとして機能します。
+This commandline will be executed on each doubleclick. The following macros are available:
+このコマンドラインはダブルクリックで実行されます。また、以下のマクロを利用可能です:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 この変数では、ふたつの同名ファイルが存在した場合、 それぞれのファイルサイズと最終更新日付/時間を比較します。
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 未解決の不一致があります! \n\nこの不一致を無視して同期を続行することが出来ます。
 Update ->
 更新 ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+使用方法: 監視するディレクトリを選択して、コマンドを入力します。 選択されたディレクトリ(サブディレクトリ)内のファイルが変更される度に、入力したコマンドが実行されます。
 Use Recycle Bin
 ゴミ箱を使用
-Use Recycle Bin when deleting or overwriting files during synchronization
-同期処理の間、ファイルの上書き/削除をする時にゴミ箱を使用
+Use Recycle Bin when deleting or overwriting files.
+ファイルの削除、上書き時にゴミ箱を使用する
 Variant
 変化
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 警告:
 When the comparison is started with this option set the following decision tree is processed:
 このオプションで比較を開始した場合は、以下のツリーに従って処理が行われます:
+You can ignore the error to consider not existing directories as empty.
+既存のディレクトリが空ではないというエラーは無視できます。
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 残っているファイルは、再び同期することができます (再比較とは別の動作)!
 different
 差異あり
 file exists on both sides
 両側に存在するファイル
-flash	conflict\n
-不一致を点滅
 on one side only
 片側のみ
-|>	file on right side only\n
-|>	右側のみに存在\n
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index fae04f18..0a8b7f08 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -20,8 +20,10 @@
  minuty
  sec
  sekundy
-!=	files are different\n
-!=	pliki są różne\n
+%x / %y objects deleted successfully
+%x / %y usuniętych obiektów
+%x Percent
+%x Procent
 %x directories
 %x katalogi
 %x files,
@@ -43,11 +45,13 @@
 &Cancel
 &Anuluj
 &Check for new version
-&Sprawdź aktualizacje
+&Aktualizuj
 &Create batch job
-&Twórz zadanie batch
+&Twórz plik wsadowy
 &Default
 &Domyślne
+&Exit
+&Wyjście
 &Export file list
 &Eksportuj listę plików
 &File
@@ -63,7 +67,7 @@
 &Load
 &Wczytaj
 &Load configuration
-&Ładuj konfigurację
+&Wczytaj konfigurację
 &No
 &Nie
 &OK
@@ -72,6 +76,8 @@
 &Pauza
 &Quit
 &Zamknij
+&Restore
+&Przywróć
 &Retry
 &Powtórz
 &Save
@@ -80,20 +86,22 @@
 &Tak
 ,
 .
--	do not copy\n
--	nie kopiuj\n
 - conflict
 - konflikt
 - conflict (same date, different size)
 - konflikt (ta sama data, różny rozmiar)
 - different
 - różny
+- directory part only
+- tylko struktura katalogu
 - equal
 - równy
 - exists left only
 - istnieje tylko po lewej stronie
 - exists right only
 - istnieje tylko po prawej stronie
+- full file or directory name
+- pełna nazwa pliku lub katalogu
 - left
 - lewy
 - left newer
@@ -102,8 +110,10 @@
 - prawy
 - right newer
 - prawy jest nowszy
-->	copy to right side\n
-->	kopiuj na prawą stronę
+- sibling of %dir
+- brat %dir
+- sibling of %name
+- brat %name
 -Open-Source file synchronization-
 -synchronizacja plików Open-Source-
 .
@@ -124,22 +134,12 @@
 2. Użyj wieloznacznika (wildcard) '*' i '?'.
 3. Exclude files directly on main grid via context menu.
 3. Wyklucz pliki i foldery używając prawego przycisku myszki.
-<-	copy to left side\n
-<-	kopiuje na lewą stronę\n
-<<	left file is newer\n
-<<	lewy plik jest nowszy\n
 <Directory>
 <Katalog>
 <Last session>
 <Ostatnia sesja>
 <multiple selection>
 <zaznaczone elementy>
-<|	file on left side only\n
-<|	istnieje tylko po lewej stronie\n
-==	files are equal\n
-==	pliki są równe\n
->>	right file is newer\n
->>	prawy plik jest nowszy\n
 A newer version of FreeFileSync is available:
 Dostępna jest nowa wersja FreeFileSync:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 O Programie
 Action
 Akcja
+Add folder
+Dodaj folder
 Add folder pair
 Dodaj foldery do porównania
 All items have been synchronized!
@@ -161,13 +163,15 @@ W rezultacie pliki zostały podzielone na następujące kategorie:
 As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:
 Jak wskazuje nazwa, dwa pliki o tej samej nazwie są równe tylko i wyłącznie jeżeli ich zawartość jest jednakowa. Czas modyfikacji nie jest brany pod uwagę. Ta opcja jest raczej użyteczna do sprawdzania spójności plików niż zadań kopii zapasowej.\n\nDrzewko decyzyjne dla tej opcji jest mniejsze:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
-Twórz zadanie batch dla automatyzacji procesu. By rozpocząć prace w tym trybie zwyczajnie uruchom plik z zadaniem batch lub dodaj go do zadań zaplanowanych Twojego systemu. Plik batch może być również przekazywany jako parametr do programu w postaci: FreeFileSync.exe <batchfile>.
+Twórz plik wsadowy dla automatyzacji procesu. By rozpocząć prace w tym trybie zwyczajnie uruchom plik klikając dwa razy lub dodaj go do zadań zaplanowanych Twojego systemu. Plik wsadowy może być również przekazywany jako parametr do programu w postaci: FreeFileSync.exe <plikwsadowy>.
+Auto-adjust columns
+Autodopasowanie kolumn
 Batch execution
-Zadanie Batch
+Uruchomienie pliku wsadowego
 Batch file created successfully!
-Plik Batch utworzony pomyślnie!
+Plik wsadowy utworzony pomyślnie!
 Batch job
-Zadanie batch
+Plik wsadowy
 Big thanks for localizing FreeFileSync goes out to:
 Podziękowania za tłumaczenie FreeFileSync:
 Browse
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Zaznacz aby ukryć przefiltrowane pliki/katalogi z listy
 Comma separated list
 Lista oddzielona przecinkami
+Commandline
+Wiersz poleceń
+Commandline is empty!
+Wiersz poleceń jest pusty!
 Compare
 Porównaj
 Compare both sides
@@ -202,12 +210,14 @@ Comparing content...
 Porównywanie zawartości...
 Comparison Result
 Rezultat porównywania
+Comparison settings
+Ustawienia porównywania
 Completed
 Zakończono
 Configuration
 Konfiguracja
 Configuration loaded!
-Konfiguracja załadowana!
+Konfiguracja wczytana!
 Configuration overview:
 Przegląd konfiguracji:
 Configuration saved!
@@ -244,10 +254,12 @@ Copying file %x to %y overwriting target
 Nadpisywanie pliku %y plikiem %x
 Could not determine volume name for file:
 Nie można określić nazwy dysku dla pliku:
-Could not set working directory:
-Nie można ustawić poprawnego folderu:
+Could not initialize directory monitoring:
+Nie można uruchomić monitora katalogów:
+Could not read values for the following XML nodes:
+
 Create a batch job
-Twórz zadanie Batch
+Twórz plik wsadowy
 Creating folder %x
 Tworzenie folderu %x
 Current operation:
@@ -256,12 +268,18 @@ Custom
 Własne
 Customize columns
 Dostosuj kolumny
+Customize...
+Dostosuj...
 DECISION TREE
 DRZEWO DECYZYJNE
 Data remaining:
 Pozostałe dane:
 Date
 Data
+Delay
+Opóźnienie
+Delay between two invocations of the commandline
+Opóźnienie pomiędzy wywołaniem dwóch komend
 Delete files/folders existing on left side only
 Usuń pliki/foldery istniejące tylko po lewej stronie
 Delete files/folders existing on right side only
@@ -272,18 +290,26 @@ Delete on both sides
 Usuń po obu stronach
 Delete on both sides even if the file is selected on one side only
 Usuń po obu stronach nawet jeżeli plik zaznaczony jest tylko po jednej stronie
+Delete or overwrite files permanently.
+Usuń lub nadpisz pliki na stałe.
+Delete permanently
+Usuń na stałe
 Deleting file %x
 Usuwanie pliku %x
 Deleting folder %x
 Usuwanie folderu %x
+Deletion handling
+Obsługa usuwania
 Directories are dependent! Be careful when setting up synchronization rules:
 Katalogi są zależne! Pamiętaj o tym podczas ustawiania zasad synchronizacji:
+Directories to watch
+Katalogi do obserwacji
 Directory
 Katalog
 Directory does not exist:
 Katalog nie istnieje:
 Do not display visual status information but write to a logfile instead
-Nie wyświetla informacji o statusie, ale tworzy plik z logami
+Nie wyświetla graficznej informacji o statusie, ale tworzy plik z logami
 Do not show this dialog again
 Nie pokazuj tego okna ponownie
 Do nothing
@@ -306,6 +332,8 @@ Email
 Poczta
 Enable filter to exclude files from synchronization
 Włącz filtr aby wykluczyć pliki z procesu synchronizacji
+Endless loop when traversing directory:
+Zapętlenie podczas przeglądania katalogu:
 Error
 Błąd
 Error changing modification time:
@@ -324,6 +352,10 @@ Error handling
 Obsługa błędów
 Error loading library function:
 Błąd wczytywania funkcji:
+Error moving directory:
+Błąd podczas przenoszenia katalogu:
+Error moving file:
+Błąd podczas przenoszenia pliku:
 Error moving to Recycle Bin:
 Błąd podczas przenoszenia do kosza:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 Błąd odczytu pliku:
 Error resolving symbolic link:
 Błąd odczytu dowiązania symbolicznego:
-Error retrieving full path:
-Błąd odzyskiwania pełnej ścieżki:
 Error starting Volume Shadow Copy Service!
 Błąd podczas uruchamianiu usługi Shadow Copy!
 Error traversing directory:
 Błąd podczas odczytywania katalogu:
+Error when monitoring directories.
+Błąd podczas monitorowania katalogów.
 Error writing file attributes:
 Błąd zapisu atrybutów pliku:
 Error writing file:
@@ -421,11 +453,11 @@ Para folderów
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Porównywanie i Synchronizacja folderów
 FreeFileSync Batch Job
-FreeFileSync Batch
+FreeFileSync plik wsadowy
 FreeFileSync at Sourceforge
 FreeFileSync na Sourceforge
 FreeFileSync batch file
-FreeFileSync plik batch
+FreeFileSync plik wsadowy
 FreeFileSync configuration
 Konfiguracja FreeFileSync
 FreeFileSync is up to date!
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Ukryj pliki, które będą kopiowane na lewą stronę
 Hide files that will be copied to the right side
 Ukryj pliki, które będą kopiowane na prawą stronę
+Hide files that will be created on the left side
+Ukryj pliki, które będą utworzone po lewej stronie
+Hide files that will be created on the right side
+Ukryj pliki, które będą utworzone po prawej stronie
+Hide files that will be deleted on the left side
+Ukryj pliki, które będą usunięte po lewej stronie
+Hide files that will be deleted on the right side
+Ukryj pliki, które będą usunięte po lewej stronie
 Hide files that won't be copied
 Ukryj pliki, które nie będą kopiowane
 Hide filtered items
 Ukryj elementy przefiltrowane
 Hide further error messages during the current process
 Ukryj kolejne informacje o błędach dla tego zadania
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Ukryj informacje o błędach podczas synchronizacji:\nZostaną wyświetlone pod koniec procesu
 Hints:
 Wskazówki:
 Homepage
@@ -486,8 +524,8 @@ Include
 Dołącz
 Include temporarily
 Dołącz tymczasowo
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Dołącz: *.doc;*.zip;*.exe\nWyklucz: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Dołącz: *.doc;*.zip;*.exe\nWyklucz: temp\\*
 Info
 Info
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Niepowodzenie inicjalizacji Kosza!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Inicjalizacja Kosza nie była możliwa!\n\nPrawdopodobnie nie używasz Windowsa.\nJeżeli chcesz dołączyć tą cechę, skontaktuj się z autorem. :)
-Left:
-Lewy:
+Left
+Lewy
 Load configuration from file
 Wczytaj konfigurację z pliku
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Przesuń kolumnę w dół
 Move column up
 Przesuń kolumnę do góry
+Move files to a custom directory.
+Przenieś plik do niestandardowego katalogu.
+Move to custom directory
+Przenieś do niestandardowego katalogu
 Moving %x to Recycle Bin
 Przenoszenie %x do kosza.
+Moving %x to custom directory
+Przenoszenie %x to niestandardowego katalogu
 Not all items have been synchronized! Have a look at the list.
 Nie wszystkie elementy zostały zsynchronizowane! Zobacz tą listę.
 Not enough free disk space available in:
@@ -533,7 +577,7 @@ Liczba plików, które zostaną nadpisane
 OK
 OK
 Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the synchronization directories.
-Tylko pliki/katalogi, które nie zostaną odrzucone przez filtr zostaną dodane do procesu synchronizacji. Filtr działa tylko dla nazw wprowadzonych relatywnie(!)
+Tylko pliki/katalogi, które nie zostaną odrzucone przez filtr dodane będą do procesu synchronizacji. Filtr działa tylko dla nazw wprowadzonych relatywnie(!)
 Open with File Manager\tD-Click
 Exploruj
 Operation aborted!
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Skopiuj odpowiedni plik \"Shadow.dll\" (ulokowany w \"Shadow.zip\") do folderu z instalacją FreeFileSync aby uaktywnić tą opcję.
 Please fill all empty directory fields.
 Podaj foldery do synchronizacji.
+Please specify alternate directory for deletion!
+Proszę określić inny katalog jako kosz!
 Press button to activate filter
 Kliknij aby aktywować filtr
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Pytanie
 Quit
 Zakończ
+RealtimeSync - Automated Synchronization
+RealtimeSync - Automatyczna Synchronizacja
+RealtimeSync configuration
+RealtimeSync konfiguracja
 Relative path
 Relatywna ścieżka
+Remove folder
+Usuń folder
 Remove folder pair
 Usuń parę folderów
+Report translation error
+Zgłoś błąd w tłumaczeniu
 Reset
 Resetuj
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Zresetować wszystkie ostrzeżenia?
 Result
 Rezultat
-Right:
-Prawy:
+Right
+Prawy
 S&ave configuration
 Z&apisz konfigurację
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Pokaż pliki, które będą kopiowane na lewą stronę
 Show files that will be copied to the right side
 Pokaż pliki, które będą kopiowane na prawą stronę
+Show files that will be created on the left side
+Pokaż pliki, które będą utworzone po lewej stronie
+Show files that will be created on the right side
+Pokaż pliki, które będą utworzone po prawej stronie
+Show files that will be deleted on the left side
+Pokaż pliki, które będą usunięte po lewej stronie
+Show files that will be deleted on the right side
+Pokaż pliki, które będą usunięte po prawej stronie
 Show files that won't be copied
 Pokaż pliki, które nie będą kopiowane
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Synchronizuję...
 System out of memory!
 Brak pamięci!
+Target directory already existing!
+Katalog docelowy już istnieje!
 Target file already existing!
 Plik docelowy już istnieje!
 The file does not contain a valid configuration:
 Nieprawidłowy format pliku:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Ta komenda będzie wykonywana za każdym razem jak klikniesz dwa razy na dany plik. %name jest wskaźnikiem na katalog zaznaczonego pliku.
+This commandline will be executed on each doubleclick. The following macros are available:
+Ta komenda będzie wykonana przy każdym podwójnym kliknięciu. Dostępne są następujące makra:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Ten wariant traktuje dwa pliki jako równe w przypadku gdy mają jednakowy rozmiar oraz tą samą datę i czas ostatniej modyfikacji.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Istnieją nierozwiązane konflikty! \n\nMożesz je zignorować i kontynułować synchronizację.
 Update ->
 Uaktualnij ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Użycie: Wybierz katalogi do monitorowania i wprowadź komendę. Gdy któryś z plików zostanie zmodyfikowany, w obrębie katalogów, zostanie uruchomiona podana komenda.
 Use Recycle Bin
 Użyj kosza
-Use Recycle Bin when deleting or overwriting files during synchronization
-Użyj Kosza podczas usuwania bądź nadpisywania plików w trakcie synchronizacji
+Use Recycle Bin when deleting or overwriting files.
+Używaj Kosza podczas usuwania lub nadpisywania plików.
 Variant
 Wariant
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Ostrzeżenia:
 When the comparison is started with this option set the following decision tree is processed:
 Gdy porównywanie z zaznaczoną opcją jest w toku, podejmowane są następujące dezyje:
+You can ignore the error to consider not existing directories as empty.
+Możesz zignorować ten błąd i uznać nieistniejący katalog za pusty.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Możesz spróbować synchronizować pozostałe elementy ponownie (bez konieczności ponownego porównywania)!
 different
 różny
 file exists on both sides
 plik istnieje po obu stronach
-flash	conflict\n
-konflikt\n
 on one side only
 tylko po jednej stronie
-|>	file on right side only\n
-|>	istnieje tylko po prawej stronie\n
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index 04002221..e250315d 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -20,8 +20,10 @@
  min
  sec
  seg
-!=	files are different\n
-!=	ficheiros diferentes\n
+%x / %y objects deleted successfully
+%x / %y objectos eliminados com sucesso
+%x Percent
+%x Por cento
 %x directories
 %x pastas
 %x files,
@@ -48,6 +50,8 @@
 &Criar um ficheiro batch
 &Default
 &Config. Iniciais
+&Exit
+&Sair
 &Export file list
 &Exportar lista de ficheiros
 &File
@@ -72,6 +76,8 @@
 &Pausa
 &Quit
 &Sair
+&Restore
+&Restaurar
 &Retry
 &Tentar de Novo
 &Save
@@ -80,20 +86,22 @@
 &Sim
 ,
  
--	do not copy\n
--	não copiar\n
 - conflict
 - conflito
 - conflict (same date, different size)
 - conflito (mesma data, tamanho diferente)
 - different
 - ficheiros diferentes
+- directory part only
+- apenas parte do directório
 - equal
 - ficheiros iguais
 - exists left only
 - existe apenas à esquerda
 - exists right only
 - existe apenas à direita
+- full file or directory name
+- nome completo do ficheiro ou directório
 - left
 - esquerda
 - left newer
@@ -102,8 +110,10 @@
 - direita
 - right newer
 - mais novo à direita
-->	copy to right side\n
-->	copiar para a direita\n
+- sibling of %dir
+- irmão de %dir
+- sibling of %name
+- irmão de %name
 -Open-Source file synchronization-
 -Sincronização de ficheiros Open-Source-
 .
@@ -124,22 +134,12 @@
 2. Usar '*' e '?' como caracteres de procura.
 3. Exclude files directly on main grid via context menu.
 3. Excluir ficheiros directamente da grelha através do menu de contexto.
-<-	copy to left side\n
-<-	copiar para a esquerda\n
-<<	left file is newer\n
-<<	ficheiro à esquerda mais recente\n
 <Directory>
 <Directório>
 <Last session>
 <Última Sessão>
 <multiple selection>
 <Selecção Múltipla>
-<|	file on left side only\n
-<|	ficheiro apenas à esquerda\n
-==	files are equal\n
-==	ficheiros iguais\n
->>	right file is newer\n
->>	ficheiro à direita mais recente\n
 A newer version of FreeFileSync is available:
 Mais recente versão do FreeFileSync disponível:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 Sobre
 Action
 Acção
+Add folder
+Adicionar pasta
 Add folder pair
 Adicionar um par de pastas
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Como o nome sugere, dois ficheiros com o mesmo nome são assinalados iguais se e só se o seu conteúdo for idêntico. Esta opção é útil para controles de consistência mais do que para efeitos de backup. Portanto, a data dos ficheiros não é tomada em conta.\n\nCom esta opção, a arvoré de decisão é menor:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Criar um batch para sincronização automática. Para iniciar o modo batch, passar o nome do ficheiro para o executável do FreeFileSync: FreeFileSync.exe <ficheiro batch>. Também pode ser calendarizado no programador de tarefas.
+Auto-adjust columns
+Auto ajustar colunas
 Batch execution
 Execução do batch
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Ocultar itens filtrados da lista
 Comma separated list
 Lista de itens separados por virgula
+Commandline
+Linha de comandos
+Commandline is empty!
+Linha de comandos vazia!
 Compare
 Comparar
 Compare both sides
@@ -201,7 +209,9 @@ A comparar o conteúdo do ficheiro %x
 Comparing content...
 A comparar...
 Comparison Result
-Resultado comparação
+Resultados da Comparação
+Comparison settings
+Opções de Comparação
 Completed
 Terminado
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 Copiar ficheiro %x para %y substituindo
 Could not determine volume name for file:
 Não é possível determinar o nome do volume para o ficheiro:
-Could not set working directory:
-Não pode definir pasta de trabalho:
+Could not initialize directory monitoring:
+Não é possível iniciar monitorização do directório:
+Could not read values for the following XML nodes:
+
 Create a batch job
 Criar ficheiro batch
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Personalizado
 Customize columns
 Personalizar colunas
+Customize...
+Personalizar...
 DECISION TREE
 ÁRVORE DE DECISÃO
 Data remaining:
 Dados em falta:
 Date
 Data
+Delay
+Atraso
+Delay between two invocations of the commandline
+Atraso entre duas chamadas da linha de comandos
 Delete files/folders existing on left side only
 Eliminar itens existentes apenas no lado esquerdo
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Eliminar em ambos os lados
 Delete on both sides even if the file is selected on one side only
 Eliminar em ambos os lados mesmo se o ficheiro só está seleccionado num lado
+Delete or overwrite files permanently.
+Apagar ou substituir ficheiros permanentemente.
+Delete permanently
+Apagar permanentemente
 Deleting file %x
 Apagar ficheiro %x
 Deleting folder %x
 Apagar pasta %x
+Deletion handling
+Controlo eliminação
 Directories are dependent! Be careful when setting up synchronization rules:
 Directórios são dependentes! Cuidado ao definir as regras de sincronização:
+Directories to watch
+Directórios a observar
 Directory
 Directório
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 Email
 Enable filter to exclude files from synchronization
 Ligar filtro para excluir ficheiros da sincronização
+Endless loop when traversing directory:
+Loop infinito ao percorrer directório:
 Error
 Erro
 Error changing modification time:
@@ -324,8 +352,12 @@ Error handling
 Controlador de erros
 Error loading library function:
 Erro ao carregar a livraria:
+Error moving directory:
+Erro ao mover o directório:
+Error moving file:
+Erro ao mover o ficheiro:
 Error moving to Recycle Bin:
-Erro ao mover para Reciclagem:
+Erro ao mover para a Reciclagem:
 Error opening file:
 Erro ao abrir ficheiro:
 Error parsing configuration file:
@@ -336,12 +368,12 @@ Error reading file:
 Erro de leitura de ficheiro:
 Error resolving symbolic link:
 Erro na resolução do link simbólico:
-Error retrieving full path:
-Erro no retorno do caminho:
 Error starting Volume Shadow Copy Service!
 Erro ao iniciar o serviço Volume Shadow Copy!
 Error traversing directory:
 Erro ao percorrer a pasta:
+Error when monitoring directories.
+Erro ao monitorizar os directórios.
 Error writing file attributes:
 Erro na escrita dos atributos do ficheiro:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Ocultar ficheiros a copiar para a esquerda
 Hide files that will be copied to the right side
 Ocultar ficheiros a copiar para a direita
+Hide files that will be created on the left side
+Ocultar ficheiros a ser criados à esquerda
+Hide files that will be created on the right side
+Ocultar ficheiros a ser criados à direita
+Hide files that will be deleted on the left side
+Ocultar ficheiros a ser apagados à esquerda
+Hide files that will be deleted on the right side
+Ocultar ficheiros a ser apagados à direita
 Hide files that won't be copied
 Ocultar ficheiros que não serão copiados
 Hide filtered items
 Ocultar itens filtrados
 Hide further error messages during the current process
 Ocultar próximas mensagens de erro durante este processo
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Ocultar mensagens de erro durante a sincronização:\nSerão coleccionadas e mostradas numa lista no fim do processo
 Hints:
 Dicas:
 Homepage
@@ -486,8 +524,8 @@ Include
 Incluir
 Include temporarily
 Incluir temporariamente
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Incluir: *.doc;*.zip;*.exe\nExcluir: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Incluir: *.doc;*.zip;*.exe\nExcluir: temp\\*
 Info
 Info
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Início da Reciclagem falhou!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Não é possível aceder à Reciclagem!\n\nÉ possível que não esteja a utilizar Windows.\nSe desejar esta opção incluída, é favor contactar o autor. :)
-Left:
-Esquerda:
+Left
+Esquerda
 Load configuration from file
 Carregar configuração do ficheiro
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Mover coluna para baixo
 Move column up
 Mover coluna para cima
+Move files to a custom directory.
+Mover ficheiros para uma pasta própria.
+Move to custom directory
+Mover para pasta própria
 Moving %x to Recycle Bin
 Mover %x para a Reciclagem
+Moving %x to custom directory
+Mover %x para pasta própria
 Not all items have been synchronized! Have a look at the list.
 Nem todos os ficheiros foram sincronizados! Verifique a lista.
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Por favor copie o \"Shadow.dll\" correcto (localizado no arquivo \"Shadow.zip\") para a pasta da instalação do FreeFileSync para activar esta opção.
 Please fill all empty directory fields.
 Por favor, preencha todos os campos vazios.
+Please specify alternate directory for deletion!
+Por favor especifique directório alternativo para eliminação!
 Press button to activate filter
 Pressione para activar o filtro
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Questão
 Quit
 Sair
+RealtimeSync - Automated Synchronization
+RealtimeSync - Sincronização Automática
+RealtimeSync configuration
+Configuração do RealtimeSync
 Relative path
 Caminho
+Remove folder
+Remover pasta(s)
 Remove folder pair
 Remover o par de pastas
+Report translation error
+Informar um erro de tradução
 Reset
 Reiniciar
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Reiniciar todas mensagens de aviso?
 Result
 Resultado
-Right:
-Direita:
+Right
+Direita
 S&ave configuration
 G&uardar a configuração
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Mostrar ficheiros a copiar para a esquerda
 Show files that will be copied to the right side
 Mostrar ficheiros a copiar para a direita
+Show files that will be created on the left side
+Mostrar ficheiros a ser criados à esquerda
+Show files that will be created on the right side
+Mostrar ficheiros a ser criados à direita
+Show files that will be deleted on the left side
+Mostrar ficheiros a ser apagados à esquerda
+Show files that will be deleted on the right side
+Mostrar ficheiros a ser apagados à direita
 Show files that won't be copied
 Mostrar ficheiros que não serão copiados
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 A sincronizar...
 System out of memory!
 Sistema sem memória!
+Target directory already existing!
+Directório de destino já existe!
 Target file already existing!
-Ficheiro destino já existe!
+Ficheiro de destino já existe!
 The file does not contain a valid configuration:
 O ficheiro não contém uma configuração válida:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Esta linha de comandos será executada cada vez que fizer duplo click num ficheiro. %name serve para reservar o lugar do ficheiro seleccionado.
+This commandline will be executed on each doubleclick. The following macros are available:
+Esta linha de comandos será executada a cada duplo clique. As seguintes macros estão disponíveis:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Esta variante avalia dois ficheiros de nome igual como iguais quando têm o mesmo tamanho e a mesma data e hora de modificação.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Existem conflitos não resolvidos! \n\nPode ignorá-los e continuar a sincronização.
 Update ->
 Actualizar ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Uso: Selecionar directórios a monitorizar e escrever uma linha de comando. Cada vez que um ficheiro for alterado nestes directórios (ou subdirectórios) a linha de comando será executada.
 Use Recycle Bin
 Utilizar Reciclagem
-Use Recycle Bin when deleting or overwriting files during synchronization
-Utilizar a Reciclagem ao eliminar ou substituir ficheiros durante a sincronização
+Use Recycle Bin when deleting or overwriting files.
+Utilizar Reciclagem ao apagar ou substituir ficheiros.
 Variant
 Variável
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Avisos:
 When the comparison is started with this option set the following decision tree is processed:
 Usar a seguinte árvore de decisão quando inicia com estas opções de comparação:
+You can ignore the error to consider not existing directories as empty.
+Pode ignorar o erro para considerar directórios não existentes como vazios.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Pode tentar sincronizar os restantes elementos outra vez (SEM TER QUE comparar de novo) !
 different
 ficheiros diferentes
 file exists on both sides
 ficheiro existente em ambos os lados
-flash	conflict\n
-relâmpago	conflito\n
 on one side only
 ficheiro existente apenas num lado
-|>	file on right side only\n
-|>	ficheiro apenas à direita\n
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 359b22d1..5d6060b3 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -20,8 +20,10 @@
  min
  sec
  seg
-!=	files are different\n
-!=	arquivos são diferentes\n
+%x / %y objects deleted successfully
+%x / %y objetos apagados com sucesso
+%x Percent
+%x Porcento
 %x directories
 %x diretórios
 %x files,
@@ -48,6 +50,8 @@
 &Criar um arquivo batch
 &Default
 &Config. Padrão
+&Exit
+&Sair
 &Export file list
 &Exportar lista de arquivos
 &File
@@ -72,6 +76,8 @@
 &Pausa
 &Quit
 &Sair
+&Restore
+&Restaurar
 &Retry
 &Tentar de Novo
 &Save
@@ -80,20 +86,22 @@
 &Sim
 ,
 .
--	do not copy\n
--	não copiar\n
 - conflict
 - conflito
 - conflict (same date, different size)
 - conflito (mesma data, tamanho diferente)
 - different
 - diferente
+- directory part only
+- apenas a parte do diretório
 - equal
 - igual
 - exists left only
 - existe apenas à esquerda
 - exists right only
 - existe apenas à direita
+- full file or directory name
+- nome completo do arquivo ou diretório
 - left
 - esquerda
 - left newer
@@ -102,8 +110,10 @@
 - direita
 - right newer
 - mais recente à direita
-->	copy to right side\n
-->	copiar para o lado direito\n
+- sibling of %dir
+- equivalente de %dir
+- sibling of %name
+- equivalente de %name
 -Open-Source file synchronization-
 -Sincronização de Arquivos Open-Source-
 .
@@ -124,22 +134,12 @@
 2. Usar '*' e '?' como caracteres coringa.
 3. Exclude files directly on main grid via context menu.
 3. Excluir arquivos diretamente do grid principal através do menu de contexto.
-<-	copy to left side\n
-<-	copiar para o lado esquerdo\n
-<<	left file is newer\n
-<<	arquivo à esquerda é mais recente\n
 <Directory>
 <Diretório>
 <Last session>
 <Última Sessão>
 <multiple selection>
 <seleção múltipla>
-<|	file on left side only\n
-<|	arquivo apenas à esquerda\n
-==	files are equal\n
-==	arquivos são iguais\n
->>	right file is newer\n
->>	arquivo à direita é mais recente\n
 A newer version of FreeFileSync is available:
 Uma nova versão do FreeFileSync foi encontrada:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 Sobre
 Action
 Ação
+Add folder
+Adicionar pasta
 Add folder pair
 Adicionar par de pastas
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Como o nome sugere, dois arquivos com o mesmo nome são assinalados como iguais se e somente se o seu conteúdo for idêntico. Esta opção é útil para controles de consistência mais do que para efeitos de backup. Portanto, a data dos arquivos não é levada em consideração.\n\nCom esta opção, a árvore de decisão é menor:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Criar um arquivo batch para sincronização automatizada. Para iniciar o modo batch, passar o nome do arquivo para o executável do FreeFileSync: FreeFileSync.exe <arquivo batch>. Também pode ser programado no Agendador de Tarefas do sistema operacional.
+Auto-adjust columns
+Autoajustar colunas
 Batch execution
 Execução do batch
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Ocultar arquivos/diretórios filtrados da lista
 Comma separated list
 Lista de itens separada por vírgula
+Commandline
+Linha de comando
+Commandline is empty!
+A linha de comando está vazia!
 Compare
 Comparar
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 Comparando conteúdo...
 Comparison Result
 Resultado da Comparação
+Comparison settings
+Configurações da comparação
 Completed
 Finalizado
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 Copiando arquivo %x para %y substituindo destino
 Could not determine volume name for file:
 Não foi possível determinar o nome do volume para o arquivo:
-Could not set working directory:
-Não se pode definir pasta de trabalho:
+Could not initialize directory monitoring:
+Não foi possível inicializar o monitoramento de diretórios:
+Could not read values for the following XML nodes:
+
 Create a batch job
 Criar arquivo batch
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Personalizado
 Customize columns
 Personalizar colunas
+Customize...
+Personalizar...
 DECISION TREE
 ÁRVORE DE DECISÃO
 Data remaining:
 Dados faltantes:
 Date
 Data
+Delay
+Atraso
+Delay between two invocations of the commandline
+Atraso entre duas chamadas de linhas de comando
 Delete files/folders existing on left side only
 Apagar arquivos/pastas existentes apenas no lado esquerdo
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Apagar em ambos os lados
 Delete on both sides even if the file is selected on one side only
 Apagar em ambos os lados mesmo se o arquivo está selecionado só em um lado
+Delete or overwrite files permanently.
+Apagar ou sobrescrever arquivos permanentemente.
+Delete permanently
+Apagar permanentemente
 Deleting file %x
 Apagando arquivo %x
 Deleting folder %x
 Apagando pasta %x
+Deletion handling
+Tratamento da exclusão
 Directories are dependent! Be careful when setting up synchronization rules:
 Diretórios são dependentes! Cuidado ao definir as regras de sincronização:
+Directories to watch
+Diretórios para monitorar
 Directory
 Diretório
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 Email
 Enable filter to exclude files from synchronization
 Habilitar filtro para excluir arquivos da sincronização
+Endless loop when traversing directory:
+Loop infinito quando percorrendo diretório:
 Error
 Erro
 Error changing modification time:
@@ -321,9 +349,13 @@ Erro ao apagar diretório:
 Error deleting file:
 Erro ao apagar arquivo:
 Error handling
-Controlador de erros
+Tratamento de erros
 Error loading library function:
 Erro ao carregar a biblioteca de funções:
+Error moving directory:
+Erro movendo diretório:
+Error moving file:
+Erro movendo arquivo:
 Error moving to Recycle Bin:
 Erro ao mover para a Lixeira:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 Erro ao ler arquivo:
 Error resolving symbolic link:
 Erro na resolução de link simbólico:
-Error retrieving full path:
-Erro ao obter caminho completo:
 Error starting Volume Shadow Copy Service!
 Erro ao inicializar o Serviço de Cópias de Sombra de Volume!
 Error traversing directory:
 Erro ao percorrer diretório:
+Error when monitoring directories.
+Erro monitorando diretórios.
 Error writing file attributes:
 Erro ao escrever atributos do arquivo:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Ocultar arquivos que serão copiados para o lado esquerdo
 Hide files that will be copied to the right side
 Ocultar arquivos que serão copiados para o lado direito
+Hide files that will be created on the left side
+Ocultar arquivos que serão criados no lado esquerdo
+Hide files that will be created on the right side
+Ocultar arquivos que serão criados no lado direito
+Hide files that will be deleted on the left side
+Ocultar arquivos que serão apagados no lado esquerdo
+Hide files that will be deleted on the right side
+Ocultar arquivos que serão apagados no lado direito
 Hide files that won't be copied
 Ocultar arquivos que não serão copiados
 Hide filtered items
 Ocultar itens filtrados
 Hide further error messages during the current process
 Ocultar próximas mensagens de erro durante este processo
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Ocultar mensagens de erro durante a sincronização:\nElas serão armazenadas e mostradas em uma lista ao final do processo
 Hints:
 Dicas:
 Homepage
@@ -486,8 +524,8 @@ Include
 Incluir
 Include temporarily
 Incluir temporariamente
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Incluir: *.doc;*.zip;*.exe\nExcluir: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Incluir: *.doc;*.zip;*.exe\nExcluir: temp\\*
 Info
 Info
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Inicialização da Lixeira falhou!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Não foi possível acessar a Lixeira!\n\nÉ possível que não esteja utilizando Windows.\nSe desejar esta opção incluída, favor contatar o autor. :)
-Left:
-Esquerda:
+Left
+Esquerda
 Load configuration from file
 Carregar configuração do arquivo
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Mover coluna para baixo
 Move column up
 Mover coluna para cima
+Move files to a custom directory.
+Mover arquivos para um diretório escolhido.
+Move to custom directory
+Mover para um diretório escolhido
 Moving %x to Recycle Bin
 Movendo %x para a Lixeira
+Moving %x to custom directory
+Movendo %x para o diretório escolhido
 Not all items have been synchronized! Have a look at the list.
 Nem todos os itens foram sincronizados! Olhe a lista.
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Por favor, copie o \"Shadow.dll\" apropriado (localizado no arquivo \"Shadow.zip\") no diretório de instalação do FreeFileSync para habilitar essa funcionalidade.
 Please fill all empty directory fields.
 Por favor, preencha todos os campos de diretórios vazios.
+Please specify alternate directory for deletion!
+Por favor, especifique diretório alternativo para exclusão!
 Press button to activate filter
 Pressione para ativar o filtro
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Questão
 Quit
 Sair
+RealtimeSync - Automated Synchronization
+RealtimeSync - Sincronização Automátizada
+RealtimeSync configuration
+Configuração do RealtimeSync
 Relative path
 Caminho relativo
+Remove folder
+Remover pasta
 Remove folder pair
 Remover par de pastas
+Report translation error
+Reportar erro de tradução
 Reset
 Reiniciar
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Resetar todas as mensagens de aviso?
 Result
 Resultado
-Right:
-Direita:    
+Right
+Direita
 S&ave configuration
 S&alvar configuração
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Mostrar arquivos que serão copiados para o lado esquerdo
 Show files that will be copied to the right side
 Mostrar arquivos que serão copiados para o lado direito
+Show files that will be created on the left side
+Mostrar arquivos que serão criados no lado esquerdo
+Show files that will be created on the right side
+Mostrar arquivos que serão criados no lado direito
+Show files that will be deleted on the left side
+Mostrar arquivos que serão apagados no lado esquerdo
+Show files that will be deleted on the right side
+Mostrar arquivos que serão apagados no lado direito
 Show files that won't be copied
 Mostrar arquivos que não serão copiados
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Sincronizando...
 System out of memory!
 Sistema sem memória!
+Target directory already existing!
+Diretório de destino já existe!
 Target file already existing!
 Arquivo de destino já existe!
 The file does not contain a valid configuration:
 O arquivo não contém uma configuração válida:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Esta linha de comandos será executada cada vez que fizer duplo click em um arquivo. %name serve para reservar o lugar do arquivo selecionado.
+This commandline will be executed on each doubleclick. The following macros are available:
+Esta linha de comando será executada em cada click-duplo. As seguintes macros estão disponíveis:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Esta variante avalia dois arquivos de nomes equivalentes como sendo iguais quando têm o mesmo tamanho E a mesma data e hora de modificação.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Conflitos não resolvidos existentes! \n\nVocê pode ignorar conflitos e continuar a sincronização.
 Update ->
 Atualizar ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Uso: Selecionar diretórios para monitoração e entre com uma linha de comando. Cada vez que os arquivos são modificados nesses diretórios (ou subdiretórios) a linha de comando é executada.
 Use Recycle Bin
 Utilizar Lixeira
-Use Recycle Bin when deleting or overwriting files during synchronization
-Utilizar a Lixeira ao apagar ou substituir arquivos durante a sincronização
+Use Recycle Bin when deleting or overwriting files.
+Usar a Lixeira quando apagar ou sobrescrever arquivos.
 Variant
 Variante
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Avisos:
 When the comparison is started with this option set the following decision tree is processed:
 Quando a comparação é iniciada com esta opção, a seguinte árvore de decisão é processada:
+You can ignore the error to consider not existing directories as empty.
+Você pode ignorar o erro para considerar como diretórios não existente como vazios.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
-Pode tentar sincronizar os elementos restantes outra vez (SEM ter que comparar novamente)!
+Você pode tentar sincronizar os elementos restantes outra vez (SEM ter que comparar novamente)!
 different
 diferente
 file exists on both sides
 arquivo existe em ambos os lados
-flash	conflict\n
-raio	conflito\n
 on one side only
 existente apenas em um lado
-|>	file on right side only\n
-|>	arquivo apenas do lado direito\n
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 2e3aa21e..231757e3 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -20,8 +20,10 @@
  мин.
  sec
  сек.
-!=	files are different\n
-!=	файлы разные\n
+%x / %y objects deleted successfully
+%x / %y объектов удалено удачно
+%x Percent
+%x %
 %x directories
 %x папки
 %x files,
@@ -45,15 +47,17 @@
 &Check for new version
 &Проверить наличие новой версии
 &Create batch job
-&Создать задание
+&Создать задание...
 &Default
 &По-умолчанию
+&Exit
+&Выход
 &Export file list
-&Экспортировать список файлов
+&Экспортировать список файлов...
 &File
 &Файл
 &Global settings
-&Глобальные настройки
+&Глобальные настройки...
 &Help
 &Помощь
 &Ignore
@@ -63,7 +67,7 @@
 &Load
 &Загрузить
 &Load configuration
-&Загрузить конфигурацию
+&Загрузить конфигурацию...
 &No
 &Нет
 &OK
@@ -72,6 +76,8 @@
 &Пауза
 &Quit
 &Выход
+&Restore
+&Восстановить
 &Retry
 &Повторить
 &Save
@@ -80,30 +86,34 @@
 &Да
 ,
 .
--	do not copy\n
-	не копировать\n
 - conflict
-	конфликт
+- конфликт
 - conflict (same date, different size)
-конфликт (даты совпадают, размеры разные)
+- конфликт (даты совпадают, размеры разные)
 - different
-разные
+- разные
+- directory part only
+- папка
 - equal
-одинаковые
+- одинаковые
 - exists left only
-только левые существуют
+- только левые существуют
 - exists right only
-только правые существуют
+- только правые существуют
+- full file or directory name
+- файл
 - left
-левые
+- левые
 - left newer
-левые новее
+- левые новее
 - right
-правые
+- правые
 - right newer
-правые новее
-->	copy to right side\n
-->	скопировать на правую сторону\n
+- правые новее
+- sibling of %dir
+- аналогичная папка с другой стороны
+- sibling of %name
+- аналогичный файл с другой стороны
 -Open-Source file synchronization-
 Синхронизатор файлов с открытым исходным кодом
 .
@@ -124,22 +134,12 @@
 2. Используйте символы '*' и '?' для замены неизвестных.
 3. Exclude files directly on main grid via context menu.
 3. Исключите файлы прямо в главном окне через контекстное меню.
-<-	copy to left side\n
-<-	скопировать на левую сторону\n
-<<	left file is newer\n
-<<	файл слева новее\n
 <Directory>
 <Папка>
 <Last session>
 <Последняя сессия>
 <multiple selection>
 <групповое выделение>
-<|	file on left side only\n
-<|	файлы только слева\n
-==	files are equal\n
-==	файлы одинаковые\n
->>	right file is newer\n
->>	файлы справа новее\n
 A newer version of FreeFileSync is available:
 Доступна новая версия FreeFileSync:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 О программе
 Action
 Действие
+Add folder
+Добавить папку
 Add folder pair
 Добавить папку
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Как написано в названии, два файла с одинаковым именем отмечаются равными, только если они имеют то же самое содержание. Эта опция полезна для проверки согласованности, а не операции резервного копирования. Поэтому даты файлов не учитываются вообще.\n\nС этой опцией алгоритм короче:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Создайте файл задания для автоматизированной синхронизации. Чтобы запустить программу в этом режиме просто передайте название файла на выполнение FreeFileSync: FreeFileSync.exe <batchfile>. Это также может быть записано в планировщике задач Вашей операционной системы.
+Auto-adjust columns
+Автовыравнивание ширины колонок
 Batch execution
 Выполнение пакетного задания
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Выберите для скрытия отфильтрованных файлов/папок из списка
 Comma separated list
 Список, разделяемый запятыми
+Commandline
+Командная строка
+Commandline is empty!
+Командная строка пуста!
 Compare
 Сравнить
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 Сравнение содержания...
 Comparison Result
 Результаты сравнения
+Comparison settings
+Настройки сравнения
 Completed
 Завершено
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 Копирование файла %x в %y с заменой
 Could not determine volume name for file:
 Не удалось определить название тома для файла:
-Could not set working directory:
-Не удалось установить рабочую папку:
+Could not initialize directory monitoring:
+Не удалось инициализировать папку для мониторинга:
+Could not read values for the following XML nodes:
+Не удалось прочитать значения для следующих XML записей:
 Create a batch job
 Создать пакетное задание
 Creating folder %x
@@ -256,28 +268,42 @@ Custom
 Выборочно
 Customize columns
 Выбор колонок
+Customize...
+Выбрать колонки...
 DECISION TREE
 Древо решений
 Data remaining:
 Осталось:
 Date
 Дата
+Delay
+Задержка
+Delay between two invocations of the commandline
+Задержка между двумя обращениями к командной строке
 Delete files/folders existing on left side only
-Удалить файлы/папки, существующие только на левой стороне
+Удалять файлы/папки, существующие только на левой стороне
 Delete files/folders existing on right side only
-Удалить файлы/папки, существующие только на правой стороне
+Удалять файлы/папки, существующие только на правой стороне
 Delete files\tDEL
-Удалить файлы\tDEL
+Удалить файл(ы)...\tDEL
 Delete on both sides
-Удалить на обоих сторонах
+Удалить с обеих сторон
 Delete on both sides even if the file is selected on one side only
-Удалить на обоих сторонах, если даже файл выделен только на одной стороне
+Удалить с обеих сторон, если даже файл выделен только на одной стороне
+Delete or overwrite files permanently.
+Удалять или перезаписать файлы, не помещая в Корзину
+Delete permanently
+Удалять, не помещая в "Корзину"
 Deleting file %x
 Удаление файла %x
 Deleting folder %x
 Удаление папки %x
+Deletion handling
+Настройки удаления
 Directories are dependent! Be careful when setting up synchronization rules:
 Зависимые папки! Будьте внимательны при настройке правил синхронизации:
+Directories to watch
+Папки для наблюдения
 Directory
 Папка
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 Почта
 Enable filter to exclude files from synchronization
 Применить фильтр, чтобы исключить файлы из задания на синхронизацию
+Endless loop when traversing directory:
+Зацикливание при встрече пересекающихся путей:
 Error
 Ошибка
 Error changing modification time:
@@ -324,6 +352,10 @@ Error handling
 Обработка ошибок
 Error loading library function:
 Ошибка при загрузке функции библиотеки:
+Error moving directory:
+Ошибка перемещения папки:
+Error moving file:
+Ошибка перемещения файла:
 Error moving to Recycle Bin:
 Ошибка при отправке в Корзину:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 Ошибка при чтении файла:
 Error resolving symbolic link:
 Ошибка при решении символической ссылки:
-Error retrieving full path:
-Ошибка при получении полного пути:
 Error starting Volume Shadow Copy Service!
 Ошибка при запуске Службы Теневого Копирования Тома!
 Error traversing directory:
 Ошибка при пересечении папок:
+Error when monitoring directories.
+Ошибка при мониторинге папок.
 Error writing file attributes:
 Ошибка при записи параметров файла:
 Error writing file:
@@ -387,7 +419,7 @@ Files %x have a file time difference of less than 1 hour! It's not safe to decid
 Files %x have the same date but a different size!
 Файлы %x имеют одинаковую дату, но различаются по размеру!
 Files are found equal if\n     - file content\nis the same.
-Файлы считаются равными, если\n - содержание файлов одинаковое
+Файлы считаются равными, если содержание файлов одинаковое
 Files are found equal if\n     - filesize\n     - last write time and date\nare the same.
 Файлы считаются равными, если одинаковые\n - размер файла\n - дата и время последнего изменения
 Files remaining:
@@ -399,7 +431,7 @@ Files that exist on both sides, left one is newer
 Files that exist on both sides, right one is newer
 Файлы, существующие на обоих сторонах, правый новее
 Files/folders remaining:
-Файлов/папко осталось:
+Файлов/папок осталось:
 Files/folders scanned:
 Файлов/папок просканировано:
 Files/folders that exist on left side only
@@ -427,9 +459,9 @@ FreeFileSync на Sourceforge
 FreeFileSync batch file
 Файл задания FreeFileSync
 FreeFileSync configuration
-FreeFileSync настройка
+Настройка FreeFileSync
 FreeFileSync is up to date!
-У Вас самый последний FreeFileSync!
+У Вас самая последняя версия FreeFileSync!
 Full path
 Полный путь
 Generating file list...
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Скрыть файлы, которые будут скопированы на левую сторону
 Hide files that will be copied to the right side
 Скрыть файлы, которые будут скопированы на правую сторону
+Hide files that will be created on the left side
+Скрыть файлы, которые будут созданы на левой стороне
+Hide files that will be created on the right side
+Скрыть файлы, которые будут созданы на правой стороне
+Hide files that will be deleted on the left side
+Скрыть файлы, которые будут удалены на левой стороне
+Hide files that will be deleted on the right side
+Скрыть файлы, которые будут удалены на правой стороне
 Hide files that won't be copied
 Скрыть файлы, которые не будут скопированы
 Hide filtered items
 Скрыть отфильтрованные
 Hide further error messages during the current process
 Скрыть последующие ошибки во время текущего процесса
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Скрыть сообщения об ошибках во время синхронизации:\nони накапливаются и показываются как список в конце процесса
 Hints:
 Подсказка:
 Homepage
@@ -486,8 +524,8 @@ Include
 Включая
 Include temporarily
 Включая временные
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Включая: *.doc;*.zip;*.exe\nИсключая: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Включая: *.doc;*.zip;*.exe\nИсключая: temp\\*
 Info
 Информация
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Инициализация Корзины провалена!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Невозможно инициализировать Корзину!\n\nВероятно, что Вы не используете Windows.\nЕсли Вы хотите, чтобы эта функция была, пожалуйста свяжитесь с автором.:)
-Left:
-Слева:
+Left
+Слева
 Load configuration from file
 Загрузить конфигурацию из файла
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Переместить вниз
 Move column up
 Переместить вверх
+Move files to a custom directory.
+Перемещать файлы в выбранную папку
+Move to custom directory
+Перемещать в выбранную папку
 Moving %x to Recycle Bin
 Отправка %x в Корзину
+Moving %x to custom directory
+Переместить %x в выбранную папку
 Not all items have been synchronized! Have a look at the list.
 Не все пункты были синхронизированы! Посмотрите список.
 Not enough free disk space available in:
@@ -535,7 +579,7 @@ OK
 Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the synchronization directories.
 Только файлы/папки, которые проходят фильтрацию, будут отобраны для синхронизации. Этот фильтр будет применяться к пути папки.
 Open with File Manager\tD-Click
-Открыть файловым менеджером\tD-Click
+Открыть в Проводнике...\tD-Click
 Operation aborted!
 Операция отменена!
 Operation:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Пожалуйста, скопируйте соответствующий \"Shadow.dll\" (находящийся в архиве \"Shadow.zip\") в папку установки FreeFileSync для включения этой функции.
 Please fill all empty directory fields.
 Пожалуйста, заполните все пустые поля папок
+Please specify alternate directory for deletion!
+Просьба указать альтернативную папку для удаленых файлов!
 Press button to activate filter
 Включить фильтр
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Вопрос
 Quit
 Выход
+RealtimeSync - Automated Synchronization
+RealtimeSync - Автоматическая синхронизация
+RealtimeSync configuration
+Настройка RealtimeSync
 Relative path
 Относительный путь
+Remove folder
+Удалить папку
 Remove folder pair
 Удалить папку
+Report translation error
+Сообщить об ошибке перевода
 Reset
 Сбросить
 Reset all warning messages
@@ -570,10 +624,10 @@ Reset all warning messages?
 Сбросить все сообщения с предупреждениями?
 Result
 Описание
-Right:
-Справа:
+Right
+Справа
 S&ave configuration
-Сохранить конфигурацию
+Сохранить конфигурацию...
 S&witch view
 Переключить вид
 Save changes to current configuration?
@@ -585,7 +639,7 @@ Scanning...
 Scanning:
 Сканирую:
 Select a folder
-Выделить папку
+Выбрать папку
 Select logfile directory:
 Выберите папку для лог-файлов:
 Select variant:
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Показать файлы, которые будут скопированы на левую сторону
 Show files that will be copied to the right side
 Показать файлы, которые будут скопированы на правую сторону
+Show files that will be created on the left side
+Показать файлы, которые будут созданы на левой стороне
+Show files that will be created on the right side
+Показать файлы, которые будут созданы на правой стороне
+Show files that will be deleted on the left side
+Показать файлы, которые будут удалены на левой стороне
+Show files that will be deleted on the right side
+Показать файлы, которые будут удалены на правой стороне
 Show files that won't be copied
 Показать файлы, которые не будут скопированы
 Show popup
@@ -637,7 +699,7 @@ Statistics
 Stop
 Стоп
 Swap sides
-
+Поменять направление
 Synchronization Preview
 Предпросмотр синхронизации
 Synchronization aborted!
@@ -660,12 +722,14 @@ Synchronizing...
 Синхронизация...
 System out of memory!
 Нехватка памяти!
+Target directory already existing!
+Конечная папка уже существует!
 Target file already existing!
 Конечный файл уже существует!
 The file does not contain a valid configuration:
 Файл не содержит действительную конфигурацию:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Эта командная строка будет выполняться каждый раз, когда Вы дважды кликните на имени файла. %name служит указателем места для выбранного файла.
+This commandline will be executed on each doubleclick. The following macros are available:
+Эта командная строка будет выполняться при каждом двойном клике. Следующие макросы доступны:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Этот вариант сравнивает два файла с одинаковыми именами и считает их равными, если они имеют одинаковый размер файла и одинаковую дату и время последнего изменения.
 Time
@@ -681,7 +745,7 @@ Total required free disk space:
 Total time:
 Общее время:
 Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes.
-Обрабатывать файлы, которые отличаются по времени на 1 час, как равные, менее чем на 1 час, как конфликтные, чтобы справиться с переходом на летнее время.
+Учитывать файлы, которые отличаются по времени на 1 час, как равные, менее чем на 1 час, как конфликтные, чтобы учесть переход на летнее время.
 Two way <->
 В обоих направлениях <->
 Unable to connect to sourceforge.net!
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Существуют нерешенные конфликты \n\nВы можете проигнорировать их и продолжить синхронизацию.
 Update ->
 Обновить ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Выберите папки для мониторинга и введите командную строку. Каждый раз при обновлении этих папок (или их подпапок) командная строка будет выполняться.
 Use Recycle Bin
 Использовать "Корзину"
-Use Recycle Bin when deleting or overwriting files during synchronization
-Использовать "Корзину" при удалении или перезаписи во время синхронизации
+Use Recycle Bin when deleting or overwriting files.
+Использовать "Корзину" при удалении или перезаписи файлов
 Variant
 Вариант
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Предупреждения:
 When the comparison is started with this option set the following decision tree is processed:
 Когда сравнение запущено с этими критериями, алгоритм следующий:
+You can ignore the error to consider not existing directories as empty.
+Вы можете проигнорировать ошибку, приняв несуществующие папки за пустые.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Вы можете попытаться синхронизировать оставшиеся пункты снова (без повторного сравнения)!
 different
 разные
 file exists on both sides
 файлы существуют на обоих сторонах
-flash	conflict\n
-молния	конфликт\n
 on one side only
 файлы существуют только на одной стороне
-|>	file on right side only\n
-|>	файлы только на правой стороне\n
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 90ecd55c..5e77766b 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.lng
@@ -20,8 +20,10 @@
  min
  sec
  sek
-!=	files are different\n
-!=	datoteki sta različni\n
+%x / %y objects deleted successfully
+%x / %y objektov uspešno izbrisanih
+%x Percent
+%x Procentov
 %x directories
 %x imeniki
 %x files,
@@ -48,6 +50,8 @@
 &Ustvari batch opravilo
 &Default
 &Privzeto
+&Exit
+&Izhod
 &Export file list
 &Izvozi seznam datotek
 &File
@@ -72,6 +76,8 @@ Na&loži konfiguracijo
 &Pavza
 &Quit
 &Zapri
+&Restore
+&Obnovi
 &Retry
 &Ponovi
 &Save
@@ -80,20 +86,22 @@ Na&loži konfiguracijo
 &Da
 ,
 , 
--	do not copy\n
--	ne kopiraj\n
 - conflict
 - spor
 - conflict (same date, different size)
 - spor (isti datum, različna velikost)
 - different
 - različni
+- directory part only
+- del, ki zajema samo imenike
 - equal
 - enaki
 - exists left only
 - obstaja samo na levi
 - exists right only
 - obstaja samo na desni
+- full file or directory name
+- polno ime datoteke ali imenika
 - left
 - levo
 - left newer
@@ -102,8 +110,10 @@ Na&loži konfiguracijo
 - desno
 - right newer
 - desna novejša
-->	copy to right side\n
-->	kopiraj na desno stran\n
+- sibling of %dir
+- v sorodu z %dir
+- sibling of %name
+- v sorodu z %name
 -Open-Source file synchronization-
 -Odprto-kodna sinhronizacija datotek-
 .
@@ -124,22 +134,12 @@ Na&loži konfiguracijo
 2. Uporabite lahko tudi znake '*' in '?'.
 3. Exclude files directly on main grid via context menu.
 3. Izključite datoteke neposredno na glavni mreži s kontekstnim menujem.
-<-	copy to left side\n
-<-	kopiraj na levo stran\n
-<<	left file is newer\n
-<<	leva datoteka je novejša\n
 <Directory>
 <Imenik>
 <Last session>
 <Zadnja seja>
 <multiple selection>
 <mnogokratna izbira>
-<|	file on left side only\n
-<|	datoteka obstaja samo na levi\n
-==	files are equal\n
-==	datoteki sta enaki\n
->>	right file is newer\n
->>	desna datoteka je novejša\n
 A newer version of FreeFileSync is available:
 Na voljo je nova različica FreeFileSync:
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 O programu(1)
 Action
 Ukrep
+Add folder
+Dodaj mapo
 Add folder pair
 Dodaj par imenikov
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Kot že samo ime pove, sta dve datoteki označeni kot enaki samo takrat, ko imata enako vsebino. Ta možnost je bolj uporabna za preverjanje doslednosti kot za operacije varnostnega shranjevanja. Zaradi tega se časi datotek ne upoštevajo.\n\nZ omogočeno to možnostjo je drevo odločanja manjše:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Sestavi batch datoteko za samodejno sinhronizacijo. Da začnete v batch načinu, preprosto podajte ime datoteke k FreeFileSync izvršilni datoteki: FreeFileSync.exe <imedatotekebatch>. To se lahko tudi nastavi v urniku opravil vašega operacijskega sistema.
+Auto-adjust columns
+Samo-prilagodi stolpce
 Batch execution
 Batch izvajanje
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Skrij filtrirane datoteke/imenike iz seznama
 Comma separated list
 Seznam ločen z vejico
+Commandline
+Ukazna vrstica
+Commandline is empty!
+Ukazna vrstica je prazna!
 Compare
 Primerjaj
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 Primerjam vsebino...
 Comparison Result
 Rezultati primerjave
+Comparison settings
+Nastavitve primerjanja
 Completed
 Zaključeno
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 Kopiram datoteko %x v %y s prepisovanjem cilja
 Could not determine volume name for file:
 Ne morem določiti imena volumna za datoteko:
-Could not set working directory:
-Ne morem nastaviti delovnega imenika:
+Could not initialize directory monitoring:
+Ne morem začeti nadzorovanja imenikov:
+Could not read values for the following XML nodes:
+
 Create a batch job
 Ustvari batch opravilo
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Po meri
 Customize columns
 Stolpce prikroji po meri
+Customize...
+Prilagodi...
 DECISION TREE
 DREVO ODLOČITEV
 Data remaining:
 Preostanek podatkov:
 Date
 Datum
+Delay
+Zakasnitev
+Delay between two invocations of the commandline
+Zakasnitev med dvema pozivoma ukazne vrstice
 Delete files/folders existing on left side only
 Izbriši datoteke/mape, ki obstajajo samo na levi strani
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Izbriši na obeh straneh
 Delete on both sides even if the file is selected on one side only
 Izbriši na obeh straneh, četudi je datoteka izbrana na samo eni strani
+Delete or overwrite files permanently.
+Trajno izbriši ali prepiši datoteke.
+Delete permanently
+Trajno izbriši
 Deleting file %x
 Brisanje datoteke %x
 Deleting folder %x
 Brisanje mape %x
+Deletion handling
+Postopanje pri brisanju
 Directories are dependent! Be careful when setting up synchronization rules:
 Imeniki so v odvisnosti! Bodite pozorni, ko nastavljate sinhronizacijska pravila:
+Directories to watch
+Imenika za nadzorovanje
 Directory
 Imenik
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 Email
 Enable filter to exclude files from synchronization
 Omogoči filter, da se datoteke izključi iz sinhronizacije
+Endless loop when traversing directory:
+Neskončna zanka pri prehodu imenika:
 Error
 Napaka
 Error changing modification time:
@@ -324,6 +352,10 @@ Error handling
 Napaka pri obravnavanju
 Error loading library function:
 Napaka pri nalaganju funkcije iz knjižnice:
+Error moving directory:
+Napaka pri premikanju imenika:
+Error moving file:
+Napaka pri premikanju datoteke:
 Error moving to Recycle Bin:
 Napaka pri premikanju v Koš:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 Napaka pri branju datoteke:
 Error resolving symbolic link:
 Napaka pri razreševanju simbolične povezave:
-Error retrieving full path:
-Napaka pri pridobivanju polne poti:
 Error starting Volume Shadow Copy Service!
 Napaka pri zagonu servisa Volume Shadow Copy!
 Error traversing directory:
 Napaka pri prehajanju imenika:
+Error when monitoring directories.
+Napaka pri nadzorovanju imenikov.
 Error writing file attributes:
 Napaka pri pisanju atributov datoteke:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 Skrij datoteke, ki bodo kopirane na levo stran
 Hide files that will be copied to the right side
 Skrij datoteke, ki bodo kopirane na desno stran
+Hide files that will be created on the left side
+Skrij datoteke, ki bodo ustvarjene na levi strani
+Hide files that will be created on the right side
+Skrij datoteke, ki bodo ustvarjene na desni strani
+Hide files that will be deleted on the left side
+Skrij datoteke, ki bodo izbrisane na levi strani
+Hide files that will be deleted on the right side
+Skrij datoteke, ki bodo izbrisane na desni strani
 Hide files that won't be copied
 Skrij datoteke, ki ne bodo kopirane
 Hide filtered items
 Skrij filtrirane predmete
 Hide further error messages during the current process
 Skrijte nadaljnja obvestila o napakah med trenutnim procesom
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Skrij obvestila o napakah med sinhronizacijo:\nObvestila se zbirajo in se prikažejo kot seznam na koncu procesa
 Hints:
 Namigi:
 Homepage
@@ -486,8 +524,8 @@ Include
 Vključi
 Include temporarily
 Trenutno vključi
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
-Vključi: *.doc;*.zip;*.exe\nIzključi: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+Vključi: *.doc;*.zip;*.exe\nIzključi: temp\\*
 Info
 Info
 Information
@@ -496,8 +534,8 @@ Initialization of Recycle Bin failed!
 Inicializacija Koša ni uspela!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 Ni bilo mogoče inicializirati Koša!\n\nZgleda, da ne uporabljate Windowsov.\nČe želite imeti vključeno to lastnost, prosimo kontaktirajte avtorja. :)
-Left:
-Levo:
+Left
+Levo
 Load configuration from file
 Naloži konfiguracijo iz datoteke
 Load configuration history (press DEL to delete items)
@@ -516,8 +554,14 @@ Move column down
 Premakni stolpec dol
 Move column up
 Premakni stolpec gor
+Move files to a custom directory.
+Premakni datoteke v imenik po meri.
+Move to custom directory
+Premakni v imenik po meri
 Moving %x to Recycle Bin
 Premikam %x v Koš
+Moving %x to custom directory
+Premikam %x v imenik po meri
 Not all items have been synchronized! Have a look at the list.
 Vse stvari niso bile sinhronizirane! Preglejte seznam.
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 Prosim prekopirajte ustrezno \"Shadow.dll\" (ki se nahaja v \"Shadow.zip\" arhivu) v FreeFileSync namestitveni imenik, da omogočite to lastnost.
 Please fill all empty directory fields.
 Prosim izpolnite vse imenike s praznimi polji.
+Please specify alternate directory for deletion!
+Prosim navedite alternativen imenik za brisanje!
 Press button to activate filter
 Kliknite za aktivacijo filtra
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 Vprašanje
 Quit
 Zapusti
+RealtimeSync - Automated Synchronization
+RealtimeSync - Avtomatizirana sinhronizacija
+RealtimeSync configuration
+RealtimeSync nastavitve
 Relative path
 Relativna pot
+Remove folder
+Odstrani v mapo
 Remove folder pair
 Odstrani par imenikov
+Report translation error
+Poročaj o napaki prevoda
 Reset
 Ponastavi
 Reset all warning messages
@@ -570,8 +624,8 @@ Reset all warning messages?
 Ponastavim vsa obvestila z opozorili?
 Result
 Rezultat
-Right:
-Desno:
+Right
+Desno
 S&ave configuration
 Shr&ani konfiguracijo
 S&witch view
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 Prikaži datoteke, ki bodo kopirane na levo stran
 Show files that will be copied to the right side
 Prikaži datoteke, ki bodo kopirane na desno stran
+Show files that will be created on the left side
+Prikaži datoteke, ki bodo ustvarjene na levi strani
+Show files that will be created on the right side
+Prikaži datoteke, ki bodo ustvarjene na desni strani
+Show files that will be deleted on the left side
+Prikaži datoteke, ki bodo izbrisane na levi strani
+Show files that will be deleted on the right side
+Prikaži datoteke, ki bodo izbrisane na desni strani
 Show files that won't be copied
 Prikaži datoteke, ki ne bodo kopirane
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Sinhroniziram...
 System out of memory!
 Sistemu je zmanjkalo pomnilnika!
+Target directory already existing!
+
 Target file already existing!
 Ciljna datoteka že obstaja!
 The file does not contain a valid configuration:
 Datoteka ne vsebuje veljavne konfiguracije:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Ta ukaz bo izveden vsakič, ko boste dvokliknili na ime datoteke. %name služi kot rezerviran prostor za izbrano datoteko.
+This commandline will be executed on each doubleclick. The following macros are available:
+Ta ukazna vrstica bo izvedena ob vsakem dvokliku. Na voljo so naslednji makri:
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Ta varianta oceni dve datoteki z enakim imenom kot enaki, ko imata enako velikost IN enak datum ter čas zadnjega spreminjanja.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 Obstajajo nerešeni spori! \n\nLahko ignorirate spore in nadaljujete s sinhronizacijo.
 Update ->
 Posodobi ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+Uporaba: Izberite imenike za nadzorovanje in vnesite ukazno vrstico. Vsakič ko se spremenijo datoteke znotraj teh imenikov (ali podimenikov) se izvrši ukazna vrstica.
 Use Recycle Bin
 Uporabi Koš
-Use Recycle Bin when deleting or overwriting files during synchronization
-Uporabi Koš, ko se briše ali prepisuje datoteke med sinhronizacijo
+Use Recycle Bin when deleting or overwriting files.
+Uporabi Koš pri brisanju ali prepisovanju datotek.
 Variant
 Različica
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Opozorila:
 When the comparison is started with this option set the following decision tree is processed:
 Ko se primerjava zažene s tem setom možnosti, se obdela naslednje drevo odločitev:
+You can ignore the error to consider not existing directories as empty.
+Ignoriraj napako za smatranje neobstoječih imenikv kot praznih.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Naslednje predmete lahko ponovno poskusite sinhronizirati (BREZ ponovne primerjave) !
 different
 različni
 file exists on both sides
 datoteka obstaja na obeh straneh
-flash	conflict\n
-strela	spor\n
 on one side only
 samo na eni strani
-|>	file on right side only\n
-|>	datoteka obstaja samo na desni\n
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index 5db32640..c3029efc 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -20,8 +20,10 @@
 
  sec
 
-!=	files are different\n
-!=	los ficheros son diferentes\n
+%x / %y objects deleted successfully
+
+%x Percent
+
 %x directories
 %x directorios
 %x files,
@@ -48,6 +50,8 @@
 &Crear un fichero batch
 &Default
 &Config. por defecto
+&Exit
+
 &Export file list
 &Exportar lista de ficheros
 &File
@@ -72,6 +76,8 @@
 &Pausa
 &Quit
 &Salir
+&Restore
+
 &Retry
 &Reintentar
 &Save
@@ -80,20 +86,22 @@
 
 ,
 , 
--	do not copy\n
-
 - conflict
 
 - conflict (same date, different size)
 
 - different
 - ficheros diferentes
+- directory part only
+
 - equal
 - ficheros iguales
 - exists left only
 - existe sólo en la izquierda
 - exists right only
 - existe sólo en la derecha
+- full file or directory name
+
 - left
 - izquierda
 - left newer
@@ -102,7 +110,9 @@
 - derecha
 - right newer
 - el más nuevo en la derecha
-->	copy to right side\n
+- sibling of %dir
+
+- sibling of %name
 
 -Open-Source file synchronization-
 -Sincronización de ficheros Open-Source-
@@ -124,22 +134,12 @@
 2. Usar '*' y '?' como caracteres comodín.
 3. Exclude files directly on main grid via context menu.
 3. Excluir directamente ficheros sobre la rejilla a través del menu de contexto.
-<-	copy to left side\n
-
-<<	left file is newer\n
-<<	el fichero de la izquierda es el más nuevo\n
 <Directory>
 <Directorio>
 <Last session>
 <Última sesión>
 <multiple selection>
 <Selección múltiple>
-<|	file on left side only\n
-<|	sólamente el fichero del lado izquierdo\n
-==	files are equal\n
-
->>	right file is newer\n
->>	el fichero de la derecha es el más nuevo\n
 A newer version of FreeFileSync is available:
 
 Abort requested: Waiting for current operation to finish...
@@ -150,6 +150,8 @@ About
 Sobre
 Action
 Acción
+Add folder
+
 Add folder pair
 Añadir un par de carpetas
 All items have been synchronized!
@@ -162,6 +164,8 @@ As the name suggests, two files which share the same name are marked as equal if
 Como el nombre sugiere, dos ficheros que comparten el mismo nombre son marcados como iguales sólo si tienen el mismo contenido. Esta opción es útil para los chequeos de consistencia más que en operaciones de "backup". Por tanto, las fechas de los ficheros no se tienen en cuenta de ningún modo.\n\nCon esta opción habilitada el árbol de decisiones es más pequeño:
 Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner.
 Crear un fichero "batch" para una sincronización automática. Para empezar en modo "batch" simplemente pasar el nombre del fichero al ejecutable FreeFileSyinc en la ventana de comandos (CMD): FreeFileSync.exe <nombre de fichero batch>. También puede ser planificada en el Administrador de Tareas programadas.
+Auto-adjust columns
+
 Batch execution
 Ejecución del "batch"
 Batch file created successfully!
@@ -184,6 +188,10 @@ Choose to hide filtered files/directories from list
 Ocultar en la lista ficheros/directorios filtrados
 Comma separated list
 Lista de "items" separados por coma
+Commandline
+
+Commandline is empty!
+
 Compare
 
 Compare both sides
@@ -202,6 +210,8 @@ Comparing content...
 
 Comparison Result
 
+Comparison settings
+
 Completed
 Terminado
 Configuration
@@ -244,8 +254,10 @@ Copying file %x to %y overwriting target
 
 Could not determine volume name for file:
 
-Could not set working directory:
-No se pudo definir el directorio de trabajo:
+Could not initialize directory monitoring:
+
+Could not read values for the following XML nodes:
+
 Create a batch job
 Crear una tarea "batch"
 Creating folder %x
@@ -256,12 +268,18 @@ Custom
 Personalizado
 Customize columns
 Personalizar columnas
+Customize...
+
 DECISION TREE
 ÁRBOL DE DECISIÓN
 Data remaining:
 Datos que faltan:
 Date
 Fecha
+Delay
+
+Delay between two invocations of the commandline
+
 Delete files/folders existing on left side only
 Eliminar sólo ficheros/carpetas existentes en el lado izquierdo
 Delete files/folders existing on right side only
@@ -272,12 +290,20 @@ Delete on both sides
 Eliminar en ambos lados lados
 Delete on both sides even if the file is selected on one side only
 Eliminar en ambos lados incluso si el fichero es seleccionado en un solo lado
+Delete or overwrite files permanently.
+
+Delete permanently
+
 Deleting file %x
 Borrar fichero %x
 Deleting folder %x
 Borrar carpeta %x
+Deletion handling
+
 Directories are dependent! Be careful when setting up synchronization rules:
 ¡Los directorios son dependientes! Cuidado al establecer las reglas de sincronización:
+Directories to watch
+
 Directory
 
 Directory does not exist:
@@ -306,6 +332,8 @@ Email
 Email
 Enable filter to exclude files from synchronization
 
+Endless loop when traversing directory:
+
 Error
 Error
 Error changing modification time:
@@ -324,6 +352,10 @@ Error handling
 Controlador de errores
 Error loading library function:
 Error al descargar función de biblioteca:
+Error moving directory:
+
+Error moving file:
+
 Error moving to Recycle Bin:
 Error al mover a la Papelera:
 Error opening file:
@@ -336,12 +368,12 @@ Error reading file:
 Error al leer el fichero:
 Error resolving symbolic link:
 Error al resolver enlace simbólico:
-Error retrieving full path:
-
 Error starting Volume Shadow Copy Service!
 
 Error traversing directory:
 Error al trasladar directorio:
+Error when monitoring directories.
+
 Error writing file attributes:
 Error al escribir atributos del fichero:
 Error writing file:
@@ -458,14 +490,20 @@ Hide files that will be copied to the left side
 
 Hide files that will be copied to the right side
 
+Hide files that will be created on the left side
+
+Hide files that will be created on the right side
+
+Hide files that will be deleted on the left side
+
+Hide files that will be deleted on the right side
+
 Hide files that won't be copied
 
 Hide filtered items
 Ocultar items filtrados
 Hide further error messages during the current process
 Ocultar próximos mensajes de error durante este processo
-Hides error messages during synchronization:\nThey are collected and shown as a list at the end of the process
-Ocultar mensajes de error durante la sincronización:\nSerán recopilados y mostrados como una lista al final del proceso
 Hints:
 Consejos:
 Homepage
@@ -486,7 +524,7 @@ Include
 Incluir
 Include temporarily
 Incluir temporalmente
-Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
 
 Info
 Info
@@ -496,7 +534,7 @@ Initialization of Recycle Bin failed!
 ¡El inicio de la Papelera falló!
 It was not possible to initialize the Recycle Bin!\n\nIt's likely that you are not using Windows.\nIf you want this feature included, please contact the author. :)
 ¡No fue posible iniciar la Papelera!\n\nEs probable que no esté usando Windows.\nSi quiere que este hecho sea considerado, por favor, contactate con el autor :)
-Left:
+Left
 
 Load configuration from file
 Cargar configuración desde fichero
@@ -516,8 +554,14 @@ Move column down
 Mover columna abajo
 Move column up
 Mover columna arriba
+Move files to a custom directory.
+
+Move to custom directory
+
 Moving %x to Recycle Bin
 
+Moving %x to custom directory
+
 Not all items have been synchronized! Have a look at the list.
 
 Not enough free disk space available in:
@@ -550,6 +594,8 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 
 Please fill all empty directory fields.
 Por favor, rellene todos los campos del directorio vacíos.
+Please specify alternate directory for deletion!
+
 Press button to activate filter
 Presione el botón para activar el filtro
 Published under the GNU General Public License:
@@ -558,10 +604,18 @@ Question
 
 Quit
 Salir
+RealtimeSync - Automated Synchronization
+
+RealtimeSync configuration
+
 Relative path
 Camino relativo
+Remove folder
+
 Remove folder pair
 Eliminar par de carpetas
+Report translation error
+
 Reset
 Reiniciar
 Reset all warning messages
@@ -570,7 +624,7 @@ Reset all warning messages?
 ¿Reiniciar todos los mensajes de aviso?
 Result
 Resultado
-Right:
+Right
 
 S&ave configuration
 G&uardar configuración
@@ -610,6 +664,14 @@ Show files that will be copied to the left side
 
 Show files that will be copied to the right side
 
+Show files that will be created on the left side
+
+Show files that will be created on the right side
+
+Show files that will be deleted on the left side
+
+Show files that will be deleted on the right side
+
 Show files that won't be copied
 
 Show popup
@@ -660,12 +722,14 @@ Synchronizing...
 Sincronizando...
 System out of memory!
 Sistema sin memoria!
+Target directory already existing!
+
 Target file already existing!
 ¡El fichero objetivo existe ya!
 The file does not contain a valid configuration:
 El fichero no contiene una configuración válida:
-This commandline will be executed each time you doubleclick on a filename. %name serves as a placeholder for the selected file.
-Esta línea de comandos será ejecutada cada vez que haga doble click sobre un nombre de fichero. %name es el espacio reservado del fichero seleccionado.
+This commandline will be executed on each doubleclick. The following macros are available:
+
 This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time.
 Esta variante evalúa dos ficheros con el mismo nombre como iguales cuando tienen el mismo tamaño Y la misma fecha de modificación.
 Time
@@ -696,10 +760,12 @@ Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchro
 
 Update ->
 Actualizar ->
+Usage: Select directories for monitoring and enter a commandline. Each time files are modified within these directories (or subdirectories) the commandline is executed.
+
 Use Recycle Bin
 Utilizar la Papelera
-Use Recycle Bin when deleting or overwriting files during synchronization
-Utilizar la papelera en el borrado o sustitución de ficheros durante la sincronización.
+Use Recycle Bin when deleting or overwriting files.
+
 Variant
 
 Volume name %x not part of filename %y!
@@ -712,15 +778,13 @@ Warnings:
 Avisos:
 When the comparison is started with this option set the following decision tree is processed:
 Cuando la comparación se inicia con este conjunto de opciones, se procesa el siguiente árbol de decisiones:
+You can ignore the error to consider not existing directories as empty.
+
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Puede intentar sincronizar los elementos restantes otra vez (SIN tener que volver a comparar)
 different
 ficheros diferentes
 file exists on both sides
 el fichero existe en ambos lados
-flash	conflict\n
-
 on one side only
 fichero sólo en un lado
-|>	file on right side only\n
-|>	fichero en lado derecho sólo\n
diff --git a/BUILD/Readme.txt b/BUILD/Readme.txt
index 4bdd29f7..0e359fc5 100644
--- a/BUILD/Readme.txt
+++ b/BUILD/Readme.txt
@@ -1,14 +1,18 @@
-FreeFileSync v2.1
-------------------
+FreeFileSync v2.2
+-----------------
+
+---------
+| Usage |
+---------
 
-Usage
------
 1. Choose left and right directories and "Compare" them.
-2. Select "Synchronize..." to specify settings and begin synchronization.
+2. Select synchronization settings and press "Synchronize..." to begin synchronization.
 
 
-Key Features
-------------
+----------------
+| Key Features |
+----------------
+
 1. Compare files (bytewise or by date) and synchronize them.
 2. No limitations: An arbitrary number of files can be synchronized.
 3. Unicode support.
@@ -50,8 +54,10 @@ Key Features
 28. Load file icons asynchronously for maximum display performance.
 
 
-Advanced topics
----------------
+-------------------
+| Advanced topics |
+-------------------
+
 1.) Synchronize in Batch Mode and send error notification via email:
 
 - Create a FreeFileSync batch file using "silent mode".
@@ -85,9 +91,9 @@ You can: - drag & drop any directory onto the main window to set the directory f
          - drag & drop *.ffs_batch files onto the batch dialog to display and edit the batch configuration
 
 		 
-4.) Synchronize two folders but exclude all subfolders from synchronization
+4.) Exclude all subfolders from synchronization
 
-Assuming you plan to synchronize two folders "C:\Source" and "D:\Target", you'll want to setup a filter like this:
+Assuming you plan to synchronize two folders "C:\Source" and "D:\Target", simply set up a filter like this:
 
 	Include: *
 	Exclude: *\*
@@ -104,15 +110,38 @@ Example: Use the free utility NetDrive (http://www.netdrive.net/)
 - Use the newly created drive as if it were a regular hard disk.
 
 
-Links
-------
-FreeFileSync on SourceForge:
+6.) Start associated program on double-click
+
+FreeFileSync's default is to show files in the operating system's standard file browser on double-click e.g. by invoking "explorer /select, %name" on Windows.
+If the file shall be started with its associated application instead, all you have to do is the following:
+On main dialog navigate to:  Menu -> Advanced -> Global settings: File Manager integration. Then replace the command string by
+
+	cmd /c start "" "%name"
+
+	
+7. Synchronize USB sticks with variable drive letter
+
+USB sticks often have different volume names assigned to them when plugged into two distinct computers. In order to handle this flexibility FreeFileSync is able to process directory names relative to the current working directory. Thus the following workflow is possible:
+	
+	- Replace the absolute USB directory name (variable) in your configuration by a relative one: E.g. "E:\SyncDir" -> "\SyncDir"
+	- Save and copy synchronization settings to the USB stick: "E:\settings.ffs_gui"
+	- Start FreeFileSync by double-clicking on "E:\settings.ffs_gui"
+
+=> Working directory automatically is set to "E:\" by the operating system so that "\SyncDir" is interpreted as "E:\SyncDir". Now start synchronization as usual.
+
 
+---------
+| Links |
+---------
+
+FreeFileSync on SourceForge: 
 http://sourceforge.net/projects/freefilesync/
 
 
-Contact 
--------
+------------
+| Contact  |
+------------
+
 For feedback, suggestions or bug-reports you can write an email to:
 zhnmju123 [at] gmx [dot] de
 
diff --git a/BUILD/Resources.dat b/BUILD/Resources.dat
index 48d36964..b3d3376a 100644
--- a/BUILD/Resources.dat
+++ b/BUILD/Resources.dat
diff --git a/BUILD/styles.rc b/BUILD/styles.rc
new file mode 100644
index 00000000..0b7f0b20
--- /dev/null
+++ b/BUILD/styles.rc
@@ -0,0 +1,6 @@
+style "no-inner-border"
+{
+   GtkButton::inner-border = {0, 0, 0, 0}
+}
+
+class "GtkButton" style "no-inner-border"