2.3

21 files changed, 1874 insertions, 802 deletions

diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index fca7be5b..826950b0 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -2,8 +2,33 @@
 |FreeFileSync|
 --------------
 
+Changelog v2.3
+--------------
+New filter and sync configuration at folder pair level
+Improved sorting: sort across multiple folder pairs
+				  stable sorting in middle grid
+				  consolidated sorting of sync-direction
+Open external applications via context menu(customizable)
+Removed performance penalty when using include filters
+Improved filter syntax for strings beginning with wildcards
+Default handling for conflict files now configurable
+New option to show all hidden dialogs again
+Fixed issue with makros %nameCo, %dirCo
+New option in *.ffs_gui/ffs_batch files: Verify copied files
+Use Windows Volume Shadow Copy for shared and locked files(new)
+More detailed information in *.cvs export
+Use current working directory to save global configuration (portable version)
+Respect subdirectories when manually changing sync-direction
+Allow import of batch configuration into GUI mode
+Some small GUI improvements
+New shortcuts: SPACE: (de-)select rows; ENTER: start external application
+Performance improvements: Reduced CPU time by 28%, (peak) memory consumption by 20%
+Added Traditional Chinese translation
+Updated translation files
+
+
 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
diff --git a/BUILD/Compress with UPX.cmd b/BUILD/Compress with UPX.cmd
index 40180a1e..c5f7dda2 100644
--- a/BUILD/Compress with UPX.cmd
+++ b/BUILD/Compress with UPX.cmd
@@ -1,2 +1 @@
-C:\Programme\C++\UPX\upx -9 --compress-icons=0 %1
-pause
\ No newline at end of file
+C:\Programme\C++\UPX\upx -9 --compress-icons=0 %1
\ No newline at end of file
diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index a33f3904..cf9b3e11 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -68,6 +68,8 @@
 加载(&L)
 &Load configuration
 加载配置(&L)
+&New
+
 &No
 否
 &OK
@@ -84,8 +86,14 @@
 保存(&S)
 &Yes
 是
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+
 ,
 .
+- Other side's counterpart to %dir
+
+- Other side's counterpart to %name
+
 - conflict
 - 冲突
 - conflict (same date, different size)
@@ -110,10 +118,6 @@
 - 右侧
 - right newer
 - 右侧较新
-- sibling of %dir
-- 与 %dir 同级
-- sibling of %name
-- 与 %name 同级
 -Open-Source file synchronization-
 -开源文件同步器-
 .
@@ -154,8 +158,6 @@ Add folder
 添加文件夹
 Add folder pair
 添加成对文件夹
-All items have been synchronized!
-所有项目已经同步完成!
 An exception occured!
 发生异常!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 正在比较文件内容的百分比 %x
 Comparing content...
 正在比较文件内容...
+Comparing files by content failed.
+
 Comparison Result
 比较结果
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 确认
 Conflict detected:
 检测到冲突:
+Conflicts/files that cannot be categorized
+
 Continue
 继续
 Conversion error:
@@ -270,16 +276,20 @@ Customize columns
 自定义栏
 Customize...
 自定义...
+D-Click
+
 DECISION TREE
 决策树
 Data remaining:
 剩余数据:
+Data verification error: Source and target file have different content!
+
 Date
 日期
 Delay
 延时
-Delay between two invocations of the commandline
-两个命令行调用之间的延时
+Delay between detection of changes and execution of commandline in seconds
+
 Delete files/folders existing on left side only
 删除仅在左侧存在的文件/文件夹
 Delete files/folders existing on right side only
@@ -300,6 +310,8 @@ Deleting folder %x
 正删除文件夹 %x
 Deletion handling
 删除处理
+Description
+
 Directories are dependent! Be careful when setting up synchronization rules:
 目录有依赖性！在设立同步规则时请小心:
 Directories to watch
@@ -320,8 +332,6 @@ 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?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 立即退出，并设置返回码 <0
 Exit with RC < 0
 退出并设置返回码 <0
+External applications
+
 Feedback and suggestions are welcome at:
 欢迎在下面提出反馈意见和建议:
 File %x has an invalid date!
 文件 %x 的日期非法!
-File Manager integration:
-文件管理器集成:
-File Time tolerance (seconds):
-文件时间容错(秒):
 File already exists. Overwrite?
 文件已经存在.覆盖?
 File content
@@ -410,12 +418,10 @@ 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 a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+文件 %x 的时间差异小于1小时！\n\n由于夏令时的问题因此不能安全地判断哪一个比较新.
 Files %x have the same date but a different size!
 文件 %x 日期相同但大小不同!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 如果文件大小和最后修改时间和日期相同则认为两者相同.
 Files remaining:
 剩余文件:
+Files that are equal on both sides
+
 Files that exist on both sides and have different content
 两侧都有并且内容不同的文件
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 过滤查看
 Folder Comparison and Synchronization
 文件夹比较与同步
-Folder pair
-文件夹对
+Free disk space available:
+
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - 文件夹比较与同步
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 全局设置
 Help
 帮助
+Hidden dialogs:
+
 Hide all error and warning messages
 隐藏所有错误与警告信息
 Hide conflicts
@@ -486,10 +496,6 @@ 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
@@ -498,6 +504,10 @@ Hide files that will be deleted on the left side
 隐藏将在左侧被删除的文件
 Hide files that will be deleted on the right side
 隐藏将在右侧被删除的文件
+Hide files that will be overwritten on left side
+
+Hide files that will be overwritten on right side
+
 Hide files that won't be copied
 隐藏将不会被复制的文件
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 信息
 Information
 信息
-Initialization of Recycle Bin failed!
-初始化回收站失败!
+Integrate external applications into context menu. The following macros are available:
+
 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如果你想包含此特性,请联系作者. :)
+Leave as unresolved conflict
+
 Left
 左侧
+Legend
+
 Load configuration from file
 从文件加载配置
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ Move column down
 下移一行
 Move column up
 上移一行
-Move files to a custom directory.
-将文件移动于自定义目录.
-Move to custom directory
-移动至自定义目录
+Move files to a user-defined 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.
-并非所有项目都已同步!请看此列表.
+Moving file %x to user-defined directory %y
+
+Moving folder %x to user-defined directory %y
+
+Multiple...
+
 Not enough free disk space available in:
 没有足够的可用磁盘空间用于:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ 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双击
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+
 Operation aborted!
 操作已取消!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 问题
 Quit
 退出
+Re-enable all hidden dialogs?
+
 RealtimeSync - Automated Synchronization
 实时同步 - 自动同步
 RealtimeSync configuration
 实时同步配置
 Relative path
 相对路径
+Remove alternate settings
+
 Remove folder
 删除文件夹
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 报告翻译错误
 Reset
 重置
-Reset all warning messages
-重置所有警告信息
-Reset all warning messages?
-重置所有警告信息?
 Result
 结果
 Right
@@ -640,6 +650,10 @@ Scanning:
 扫描中:
 Select a folder
 选择一个文件夹
+Select alternate filter settings
+
+Select alternate synchronization settings
+
 Select logfile directory:
 选择日志保存位置:
 Select variant:
@@ -660,10 +674,6 @@ 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
@@ -672,8 +682,14 @@ Show files that will be deleted on the left side
 显示将在左侧被删除的文件
 Show files that will be deleted on the right side
 显示将在右侧被删除的文件
+Show files that will be overwritten on left side
+
+Show files that will be overwritten on right side
+
 Show files that won't be copied
 显示将不被复制的文件
+Show hidden dialogs
+
 Show popup
 显示弹出窗口
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 静默模式
 Size
 大小
-Sorting file list...
-排序文件列表...
 Source code written completely in C++ utilizing:
 源代码完全使用C++工具编写:
 Speed:
@@ -728,8 +742,6 @@ Target file already existing!
 目标文件已经存在!
 The file does not contain a valid configuration:
 该文件不包含有效的配置:
-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时才认为它们是相同的.
 Time
@@ -766,16 +778,20 @@ Use Recycle Bin
 使用回收站
 Use Recycle Bin when deleting or overwriting files.
 当删除或覆盖文件时使用回收站.
+User-defined directory
+
+User-defined directory for deletion was not specified!
+
 Variant
 变化
+Verifying file %x
+
 Volume name %x not part of filename %y!
 卷名 %x 并非文件名 %y 的一部分!
 Warning
 警告
 Warning: Synchronization failed for %x item(s):
 警告:同步失败 %x (某些)项目:
-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.
diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng
new file mode 100644
index 00000000..08b20ee5
--- /dev/null
+++ b/BUILD/Languages/chinese_traditional.lng
@@ -0,0 +1,806 @@
+  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
+ GB
+ MB
+ MB
+ PB
+ PB
+ TB
+ TB
+ day(s)
+ 日
+ hour(s)
+ 時
+ kB
+ kB
+ min
+ 分
+ sec
+ 秒
+%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 of %y rows in view
+顯示 %x 之 %y 行
+%x of 1 row in view
+顯示 %x 之 1 行
+&Abort
+取消(&A)
+&About...
+關於(&A)...
+&Advanced
+進階(&A)
+&Apply
+套用(&Y)
+&Cancel
+取消(&C)
+&Check for new version
+檢查更新(&C)
+&Create batch job
+新建批次處理作業(&C)
+&Default
+預設(&D)
+&Exit
+結束(&E)
+&Export file list
+匯出檔案清單(&E)
+&File
+檔案(&F)
+&Global settings
+整體設定(&G)
+&Help
+說明(&H)
+&Ignore
+忽略(&I)
+&Language
+語言(&L)
+&Load
+載入(&L)
+&Load configuration
+載入配置(&L)
+&New
+新增專案(&N)
+&No
+否
+&OK
+確定(&O)
+&Pause
+暫停(&P)
+&Quit
+離開(&Q)
+&Restore
+回復(&R)
+&Retry
+重試(&R)
+&Save
+儲存(&S)
+&Yes
+是
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(請注意只有 FAT/FAT32 磁碟機會受到此問題的影響！\n在所有其他狀況下，可以關閉這個設定\"忽略1小時的誤差"\。)
+,
+.
+- Other side's counterpart to %dir
+- 另一邊對應到 %dir
+- Other side's counterpart to %name
+- 另一邊對應到 %name
+- 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
+- 右邊較新
+-Open-Source file synchronization-
+-開放原始碼檔案同步-
+.
+,
+/sec
+/秒
+1 directory
+1 目錄
+1 file,
+1 檔案，
+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. 使用萬用字元‘*’和‘?’。
+3. Exclude files directly on main grid via context menu.
+3. 經由內容選單直接在主要網格排除檔案。
+<Directory>
+<目錄>
+<Last session>
+<最後連線>
+<multiple selection>
+<多重選擇>
+A newer version of FreeFileSync is available:
+有較新版本的 FreeFileSync 可用：
+Abort requested: Waiting for current operation to finish...
+中止請求：正在等待目前操作完成...
+Aborted
+已中止
+About
+關於
+Action
+動作
+Add folder
+新增資料夾
+Add folder pair
+新增兩個資料夾
+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啟用此選項使決策樹較小：
+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!
+批次檔新建成功！
+Batch job
+批次處理作業
+Big thanks for localizing FreeFileSync goes out to:
+非常感謝 FreeFileSync 當地語系化的工作人員：
+Browse
+瀏覽
+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\"
+以檔案大小和日期比對
+Compare by...
+比對選項...
+Comparing content
+正在比對内容
+Comparing content of files %x
+正在比對檔案内容的百分比 %x
+Comparing content...
+正在比對檔案内容...
+Comparing files by content failed.
+比對檔案內容失敗
+Comparison Result
+比對結果
+Comparison settings
+比對設定
+Completed
+完成
+Configuration
+配置
+Configuration loaded!
+已載入配置！
+Configuration overview:
+配置概述：
+Configuration saved!
+配置已儲存！
+Configure filter
+配置篩選
+Configure filter...
+配置篩選...
+Configure your own synchronization rules.
+配置你自己的同步規則。
+Confirm
+確認
+Conflict detected:
+檢測到衝突：
+Conflicts/files that cannot be categorized
+衝突/檔案不能被分類
+Continue
+繼續
+Conversion error:
+轉換錯誤：
+Copy from left to right
+從左邊複製到右邊
+Copy from left to right overwriting
+從左邊複製到右邊覆蓋檔案
+Copy from right to left
+從右邊複製到左邊
+Copy from right to left overwriting
+從右邊複製到左邊覆蓋檔案
+Copy new or updated files to right folder.
+將新的或更新過的檔案複製到右邊的資料夾中。
+Copy to clipboard\tCTRL+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:
+無法讀取 XML 之後節點的值：
+Create a batch job
+新建一個批次處理作業
+Creating folder %x
+正在新建資料夾 %x
+Current operation:
+目前操作：
+Custom
+自訂
+Customize columns
+自訂列
+Customize...
+自訂...
+D-Click
+點兩下
+DECISION TREE
+決策樹
+Data remaining:
+剩餘資料：
+Data verification error: Source and target file have different content!
+資料驗證錯誤：來源和目的檔案內容不同！
+Date
+日期
+Delay
+延遲
+Delay between detection of changes and execution of commandline in seconds
+檢測更改和執行命令列的延遲時間，以秒為單位。
+Delete files/folders existing on left side only
+刪除只存在於左邊的檔案/資料夾
+Delete files/folders existing on right side only
+刪除只存在於右邊的檔案/資料夾
+Delete files\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
+刪除處理
+Description
+描述
+Directories are dependent! Be careful when setting up synchronization rules:
+目錄有依靠性！請小心設定同步規則：
+Directories to watch
+要監看的目錄
+Directory
+目錄
+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 嗎？
+Donate with PayPal
+使用 PayPal 捐贈
+Download now?
+要立即下載嗎？
+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:
+刪除目錄錯誤：
+Error deleting file:
+刪除檔案錯誤：
+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 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
+External applications
+外部應用程式
+Feedback and suggestions are welcome at:
+歡迎在下面提出回報和建議：
+File %x has an invalid date!
+檔案 %x 的日期無效！
+File already exists. Overwrite?
+檔案已存在，要覆蓋嗎？
+File content
+檔案内容
+File does not exist:
+檔案不存在：
+File list exported!
+檔案清單已匯出！
+File size and date
+檔案大小和日期
+Filename
+檔案名稱
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+檔案 %x 有一個檔案時差在1小時內！\n\n這不是安全的決定，其中之一是由於新的日光節約時間的問題。
+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 are equal on both sides
+兩邊相同的檔案
+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
+篩選檢視
+Folder Comparison and Synchronization
+資料夾比對和同步
+Free disk space available:
+可用的磁碟空間：
+FreeFileSync - Folder Comparison and Synchronization
+FreeFileSync - 資料夾比對和同步
+FreeFileSync Batch Job
+FreeFileSync 批次處理作業
+FreeFileSync at Sourceforge
+FreeFileSync at Sourceforge
+FreeFileSync batch file
+FreeFileSync 批次檔
+FreeFileSync configuration
+FreeFileSync 配置
+FreeFileSync is up to date!
+FreeFileSync 是最新版本！
+Full path
+完整路徑
+Generating file list...
+產生檔案清單...
+Global settings
+整體設定
+Help
+說明
+Hidden dialogs:
+隱藏對話框：
+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 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 will be overwritten on left side
+隱藏左邊將被覆蓋的檔案
+Hide files that will be overwritten on right side
+隱藏右邊將被覆蓋的檔案
+Hide files that won't be copied
+隱藏將不會被複製的檔案
+Hide filtered items
+隱藏已篩選的項目
+Hide further error messages during the current process
+在目前進程中隱藏進一步的錯誤訊息
+Hints:
+提示：
+Homepage
+首頁
+If you like FFS
+如果你喜歡 FFS
+Ignore 1-hour file time difference
+忽略1小時的檔案時差
+Ignore errors
+忽略錯誤
+Ignore subsequent errors
+忽略後續錯誤
+Ignore this error, retry or abort synchronization?
+忽略此錯誤、重試或中止同步嗎？
+Ignore this error, retry or abort?
+忽略此錯誤、重試或中止嗎？
+Include
+包括
+Include temporarily
+暫時包括
+Include: *.doc;*.zip;*.exe\nExclude: temp\\*
+包括：*.doc;*.zip;*.exe\n排除temp\\*
+Info
+訊息
+Information
+訊息
+Integrate external applications into context menu. The following macros are available:
+整合上下文功能表中的外部應用程式。可以使用下面的巨集：
+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如果你想包括此功能，請聯繫作者。:)
+Leave as unresolved conflict
+保留給未解決的衝突
+Left
+左邊
+Legend
+圖例
+Load configuration from file
+從檔案載入配置
+Load configuration history (press DEL to delete items)
+載入配置的歷史記錄(按DEL鍵刪除項目)
+Log-messages:
+日誌訊息：
+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% 以上的檔案將被複製或刪除！
+Move column down
+下移一行
+Move column up
+上移一行
+Move files to a user-defined directory.
+將檔案移動到自定義目錄。
+Moving %x to Recycle Bin
+移動 %x 到資源回收筒
+Moving file %x to user-defined directory %y
+移動檔案 %x 到自定義目錄 %y
+Moving folder %x to user-defined directory %y
+移動資料夾 %x 到自定義資料夾 %y
+Multiple...
+多個...
+Not enough free disk space available in:
+沒有足夠的可用空間：
+Nothing to synchronize according to configuration!
+根據配置没有任何同步！
+Number of files and directories that will be created
+一些檔案和目錄將被新建
+Number of files and directories that will be deleted
+一些檔案和目錄將被刪除
+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 base synchronization directories.
+只有被選中篩選的檔案/目錄會進行同步。篩選器將套用到基本同步目錄的相對名稱。
+Operation aborted!
+中止操作！
+Operation:
+操作：
+Overview
+摘要
+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.
+請填滿所有空白目錄欄位。
+Press button to activate filter
+按下按鈕以啟動篩選器
+Published under the GNU General Public License:
+在GNU通用公共許可證下發佈：
+Question
+問題
+Quit
+離開
+Re-enable all hidden dialogs?
+重新啟用所有隱藏的對話框嗎？
+RealtimeSync - Automated Synchronization
+即時同步 - 自動同步
+RealtimeSync configuration
+即時同步配置
+Relative path
+相對路徑
+Remove alternate settings
+刪除備用設定
+Remove folder
+刪除資料夾
+Remove folder pair
+刪除兩個資料夾
+Report translation error
+回報翻譯錯誤
+Reset
+重置
+Result
+結果
+Right
+右邊
+S&ave configuration
+儲存配置(&A)
+S&witch view
+切換檢視(&W)
+Save changes to current configuration?
+保存對目前配置的更改嗎？
+Save current configuration to file
+將目前配置儲存到檔案
+Scanning...
+正在掃瞄...
+Scanning:
+掃瞄中：
+Select a folder
+選擇一個資料夾
+Select alternate filter settings
+選擇備用篩選設定
+Select alternate synchronization settings
+選擇備用同步設定
+Select logfile directory:
+選擇日誌檔目錄：
+Select variant:
+選擇變數：
+Show conflicts
+顯示衝突
+Show file icons
+顯示檔案圖示
+Show files that are different
+顯示不同的檔案
+Show files that are equal
+顯示相同的檔案
+Show files that are newer on left
+顯示左邊較新的檔案
+Show files that are newer on right
+顯示右邊較新的檔案
+Show files that exist on left side only
+顯示只存在於左邊的檔案
+Show files that exist on right side only
+顯示只存在於右邊的檔案
+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 will be overwritten on left side
+顯示左邊將被覆蓋的檔案
+Show files that will be overwritten on right side
+顯示右邊將被覆蓋的檔案
+Show files that won't be copied
+顯示將不會被複製的檔案
+Show hidden dialogs
+顯示隱藏的對話框
+Show popup
+顯示快顯功能表
+Show popup on errors or warnings
+在快顯功能表上顯示錯誤或警告
+Significant difference detected:
+檢測到顯著的差異：
+Silent mode
+靜音模式
+Size
+大小
+Source code written completely in C++ utilizing:
+原始碼完全使用C++編寫：
+Speed:
+速度：
+Start
+開始
+Start synchronization
+開始同步
+Statistics
+統計
+Stop
+停止
+Swap sides
+兩邊交換
+Synchronization Preview
+同步預覽
+Synchronization aborted!
+同步已中止！
+Synchronization completed successfully!
+已成功的完成同步!
+Synchronization completed with errors!
+同步完成但有錯誤！
+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 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
+時間
+Time elapsed:
+經過時間：
+Time remaining:
+剩餘時間：
+Total amount of data that will be transferred
+將被傳輸的全部資料量
+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!
+無法新建日誌檔案！
+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.
+當刪除或覆蓋檔案時使用資源回收筒。
+User-defined directory
+自定義目錄
+User-defined directory for deletion was not specified!
+未指定要刪除的自定義目錄！
+Variant
+變數
+Verifying file %x
+驗證檔 %x
+Volume name %x not part of filename %y!
+卷名 %x 並非檔名 %y 的一部份！
+Warning
+警告
+Warning: Synchronization failed for %x item(s):
+警告：同步失敗的名稱為 %x 項目：
+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
+檔案在兩邊均已存在
+on one side only
+只有一邊
diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng
index f1178b94..ee1bbc04 100644
--- a/BUILD/Languages/czech.lng
+++ b/BUILD/Languages/czech.lng
@@ -68,6 +68,8 @@ Zkontrolovat &aktualizace
 &Načíst
 &Load configuration
 &Načíst konfiguraci
+&New
+&Nový
 &No
 &Ne
 &OK
@@ -84,8 +86,14 @@ U&končit
 &Uložit
 &Yes
 &Ano
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Platí pouze pro souborové systémy FAT/FAT32. V ostatních případech můžete nastavení \"Ignorovat 1 hodinu rozdílu v čase mezi soubory\" nechat vypnuté.)
 ,
  
+- Other side's counterpart to %dir
+- pouze cesta z opačného panelu (protistarna k %dir)
+- Other side's counterpart to %name
+- celá cesta nebo jméno souboru z opačného panelu (protistrana k %name)
 - conflict
 - konflikt
 - conflict (same date, different size)
@@ -110,10 +118,6 @@ U&končit
 - 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-
 .
@@ -154,8 +158,6 @@ 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:
@@ -208,6 +210,8 @@ Comparing content of files %x
 Porovnávání obsahu souborů %x
 Comparing content...
 Porovnávání obsahu...
+Comparing files by content failed.
+Porovnání obsahu souborů se nezdařilo.
 Comparison Result
 Výsledek porovnání
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Potvrdit
 Conflict detected:
 Zaznamenán konflikt:
+Conflicts/files that cannot be categorized
+Konflikty/soubory které nelze zařadit
 Continue
 Pokračovat
 Conversion error:
@@ -257,7 +263,7 @@ 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:
-
+Nelze načíst hodnoty následujících XML elementy:
 Create a batch job
 Vytvořit dávku
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 Vlastní sloupce
 Customize...
 Vlastní....
+D-Click
+Dvojklik
 DECISION TREE
 ROZHODOVÁNÍ
 Data remaining:
 Zbývá dat:
+Data verification error: Source and target file have different content!
+Chyba verifikace dat: Zdrojový a cílový soubor mají rozdílný obsah!
 Date
 Datum
 Delay
 Zpoždění
-Delay between two invocations of the commandline
-Zpoždění mezi dvěma příkazovými řádky
+Delay between detection of changes and execution of commandline in seconds
+Zpoždění detekce změn a suštění příkazu v sekundách
 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
@@ -300,6 +310,8 @@ Deleting folder %x
 Mazání adresáře %x
 Deletion handling
 Nastavení mazání
+Description
+Popis
 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
@@ -320,8 +332,6 @@ 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?
@@ -392,14 +402,12 @@ 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
+External applications
+Externí aplikace
 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
@@ -410,12 +418,10 @@ 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 a file time difference of less than 1 hour!\n\nIt'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.\n\nnení 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.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Soubory jsou shodné jestliže\n     - velikost souboru\n     - datum i čas poslední změny\njsou stejné.
 Files remaining:
 Zbývá souborů:
+Files that are equal on both sides
+Soubory shodné na obou stranách
 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
@@ -441,15 +449,15 @@ Soubory/adresáře, které existují pouze vpravo
 Filter
 Filtr
 Filter active: Press again to deactivate
-Filtr aktivní: Klikni znovu pro deaktivaci
+Filtr aktivní: Klikněte znovu pro deaktivaci
 Filter files
 Filtrovat soubory
 Filter view
 Filtrovat seznam
 Folder Comparison and Synchronization
 Porovnání a Synchronizace adresářů
-Folder pair
-Dvojice adresářů
+Free disk space available:
+Volné místo k dispozici:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Porovnání a Synchronizace adresářů
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Nastavení programu
 Help
 Nápověda
+Hidden dialogs:
+Skryté dialogy:
 Hide all error and warning messages
 Skrýt všechny chyby a varování
 Hide conflicts
@@ -486,10 +496,6 @@ 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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Skrýt soubory, které budou vlevo přepsány
+Hide files that will be overwritten on right side
+Skrýt soubory, které budou vpravo přepsány
 Hide files that won't be copied
 Skrýt soubory, které nebudou kopírovány
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Informace
-Initialization of Recycle Bin failed!
-Chyba inicializace Koše!
+Integrate external applications into context menu. The following macros are available:
+Integrace externí apilkace do kontextového menu. K dispozici jsou následující makra:
 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. :)
+Leave as unresolved conflict
+Ponechat jako nevyřešený konflikt
 Left
 Levý
+Legend
+Legenda
 Load configuration from file
 Načíst konfiguraci ze souboru
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ 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
+Move files to a user-defined directory.
+Přesunout soubory do uživatelem definovaného 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.
+Moving file %x to user-defined directory %y
+Přesouvání souboru %x do uživatelského adresáře %y
+Moving folder %x to user-defined directory %y
+Přesouvání adrsáře %x do uživatelského adresáře %y
+Multiple...
+Několikanásobný...
 Not enough free disk space available in:
 Nedostatek místa na disku:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ 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.
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base 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:
@@ -594,8 +606,6 @@ Please copy the appropriate \"Shadow.dll\" (located in \"Shadow.zip\" archive) i
 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:
@@ -604,12 +614,16 @@ Question
 Otázky
 Quit
 Konec
+Re-enable all hidden dialogs?
+Znovu povolit skryté dialogy?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Automatická synchronizace
 RealtimeSync configuration
 Konfigurace RealtimeSync
 Relative path
 Relativní cesta
+Remove alternate settings
+Odstranit jiné nastavení
 Remove folder
 Odstranit adresář
 Remove folder pair
@@ -618,10 +632,6 @@ 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
@@ -640,6 +650,10 @@ Scanning:
 Zpracováváno:
 Select a folder
 Vyberte adresář
+Select alternate filter settings
+Vyberte alternativní nastavení filtru
+Select alternate synchronization settings
+Vyberte alternativní nastavení synchronizace
 Select logfile directory:
 Vyberte adresář pro záznamy:
 Select variant:
@@ -660,10 +674,6 @@ 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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Zobrazit soubory, které budou vlevo přepsány
+Show files that will be overwritten on right side
+Zobrazit soubory, které budou vpravo přepsány
 Show files that won't be copied
 Zobrazit soubory, které nebudou kopírovány
+Show hidden dialogs
+Zobrazit skryté dialogy
 Show popup
 Zobrazit okno
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ 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:
@@ -723,13 +737,11 @@ Synchronizuji...
 System out of memory!
 Nedostatek paměti!
 Target directory already existing!
-
+Cílový adresář již existuje!
 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
@@ -766,16 +778,20 @@ 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ů.
+User-defined directory
+Uživatelsky definovaný adresář
+User-defined directory for deletion was not specified!
+Uživatelsky definovaný adresář pro mazání nebyl zadán!
 Variant
 Varianta
+Verifying file %x
+Kontroluji soubor %x
 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.
diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng
index 3484395a..4f694323 100644
--- a/BUILD/Languages/dutch.lng
+++ b/BUILD/Languages/dutch.lng
@@ -68,6 +68,8 @@
 &Laden
 &Load configuration
 &Laad de configuratie
+&New
+&Nieuw
 &No
 &Nee
 &OK
@@ -84,8 +86,14 @@
 &Opslaan
 &Yes
 &Ja
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Alleen FAT/FAT32 schijven hebben last van dit probleem!\nIn alle andere gevallen kunt u deze instelling uitschakelen \"negeer 1-uur tijdsverschil\".)
 ,
 .
+- Other side's counterpart to %dir
+- Tegenhander andere kant naar %dir
+- Other side's counterpart to %name
+- Tegenhanger andere kant naar %naam
 - conflict
 - conflict
 - conflict (same date, different size)
@@ -110,10 +118,6 @@
 - rechts
 - right newer
 - rechts is nieuwer
-- sibling of %dir
-- verwant aan %dir
-- sibling of %name
-- verwant aan &name
 -Open-Source file synchronization-
 -Open-Source bestandssynchronisatie-
 .
@@ -154,8 +158,6 @@ Add folder
 Map toevoegen
 Add folder pair
 Voeg 1 paar gekoppelde mappen toe
-All items have been synchronized!
-Alle bestanden zijn gesynchroniseerd!
 An exception occured!
 Er heeft een uitzondering plaatsgevonden!
 As a result the files are separated into the following categories:
@@ -201,13 +203,15 @@ Vergelijk met \"bestandsinhoud\"
 Compare by \"File size and date\"
 Vergelijk met \"bestandsgrootte en -datum\"
 Compare by...
-Vergelelijk met...
+Vergelijk met...
 Comparing content
 Vergelijken van inhoud
 Comparing content of files %x
 De inhoud van %x bestanden wordt vergeleken
 Comparing content...
 Inhoud vergelijken...
+Comparing files by content failed.
+Vergelijken van bestanden met de inhoud is mislukt.
 Comparison Result
 Resultaat vergelijken
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Bevestig
 Conflict detected:
 Conflict gedetecteerd:
+Conflicts/files that cannot be categorized
+Conflicten/bestanden die niet kunnen worden gecategoriseerd
 Continue
 Doorgaan
 Conversion error:
@@ -257,7 +263,7 @@ Kon de schijfnaam niet vaststellen van bestand:
 Could not initialize directory monitoring:
 Initaliseren van locatie-controle niet mogelijk:
 Could not read values for the following XML nodes:
-
+Kon geen waarden inlezen voor de volgende XML punten:
 Create a batch job
 Creëer batchjob
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 Aanpassen kolommen
 Customize...
 Aanpassen...
+D-Click
+Dubbele klik
 DECISION TREE
 BESLISSINGSBOOM
 Data remaining:
 Resterende data:
+Data verification error: Source and target file have different content!
+Dataverificatie-fout: Bron en doelbestand hebben verschillende inhoud!
 Date
 Datum
 Delay
 Vertraging
-Delay between two invocations of the commandline
-Vertraging tussen het aanroepen van twee opdrachten van de opdrachtregel
+Delay between detection of changes and execution of commandline in seconds
+Vertraging tussen detecteren van veranderingen en uitvoering van de opdrachtregel in seconden
 Delete files/folders existing on left side only
 Verwijder bestanden/folders die alleen links bestaan
 Delete files/folders existing on right side only
@@ -300,6 +310,8 @@ Deleting folder %x
 Map %x wordt verwijderd
 Deletion handling
 Verwijder-afhandeling
+Description
+Beschrijving
 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
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Weet u zeker dat u de/het volgende bestand(en) wilt verplaatsen naar de prullenbak?
 Do you want FreeFileSync to automatically check for updates every week?
 Wilt u FreeFileSync automatisch elke week laten controleren of er een nieuwe versie is?
-Don't ask me again
-Niet meer vragen
 Donate with PayPal
 Doneer met PayPal
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Onmiddelijk afsluiten en zet de returncode < 0
 Exit with RC < 0
 Afsluiten met RC < 0
+External applications
+Externe applicaties
 Feedback and suggestions are welcome at:
 Tips en suggesties zijn welkom op:
 File %x has an invalid date!
 Bestand %x heeft een ongeldige datum!
-File Manager integration:
-Integratie bestandsbeheer:
-File Time tolerance (seconds):
-Bestandtijd tolerantie (seconden):
 File already exists. Overwrite?
 Het bestand bestaat al. Overschrijven?
 File content
@@ -410,12 +418,10 @@ File list exported!
 Bestandslijst geëxporteerd!
 File size and date
 Bestandsgrootte en -datum
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Bestandstijden die verschillen met maximaal de gespecificeerde tijd worden nog steeds behandeld alsof ze dezelfde tijd hebben.
 Filename
 Bestandsnaam
-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.
-De bestanden %x hebben een bestandstijd verschil van minder dan één uur! Het is niet veilig te bepalen welke nieuwer is vanwege zomertijd instellingen
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+De bestanden %x hebben een bestandstijd verschil van minder dan één uur!\n\nHet is niet veilig te bepalen welke nieuwer is vanwege zomertijd instellingen
 Files %x have the same date but a different size!
 De bestanden %x hebben dezelfde data maar een afwijkende grootte!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Bestanden worden gelijk beschouwd als,\n     - de grootte\n     - datum en tijdstip van de laatste wijziging\novereenkomt.
 Files remaining:
 Resterende bestanden:
+Files that are equal on both sides
+Bestanden die aan beide kanten gelijk zijn
 Files that exist on both sides and have different content
 Bestanden die aan beide kanten bestaan maar een verschillende inhoud hebben
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Bekijk het filter
 Folder Comparison and Synchronization
 Mappen vergelijken en synchroniseren
-Folder pair
-Gekoppelde mappen
+Free disk space available:
+Beschikbare vrije schijfruimte :
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Mappen vergelijken en synchroniseren
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Algemene instellingen
 Help
 Help
+Hidden dialogs:
+Verborgen dialogen:
 Hide all error and warning messages
 Verberg alle foutmeldingen en waarschuwingen
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Verberg bestanden die alleen aan de linkerkant bestaan
 Hide files that exist on right side only
 Verberg bestanden die alleen aan de rechterkant bestaan
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Verberg bestanden die zullen worden overschreven aan de linkerkant
+Hide files that will be overwritten on right side
+Verberg bestanden die zullen worden overschreven aan de rechterkant
 Hide files that won't be copied
 Verberg bestanden die niet zullen worden gekopieerd
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Informatie
-Initialization of Recycle Bin failed!
-Initialiseren van de prullenbak is mislukt.
+Integrate external applications into context menu. The following macros are available:
+Integreer externe applicaties in het context menu. De volgende macros zijn beschikbaar:
 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. :)
+Leave as unresolved conflict
+Beschouwen als onopgelost conflict
 Left
 Links
+Legend
+Legenda
 Load configuration from file
 Laad configuratie uit bestand
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ 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
+Move files to a user-defined directory.
+Verplaats bestanden naar een door de gebruiker te definiëren map.
 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.
+Moving file %x to user-defined directory %y
+Verplaatsen bestand %x naar een door de gebruiker gedefinieerde locatie %y
+Moving folder %x to user-defined directory %y
+Verplaatsen map %x naar een door de gebruiker gedefinieerde locatie %y
+Multiple...
+Meerdere...
 Not enough free disk space available in:
 Niet genoeg schijfruimte beschikbaar op:
 Nothing to synchronize according to configuration!
@@ -575,11 +589,9 @@ Aantal mappen en bestanden die zullen worden verwijderd
 Number of files that will be overwritten
 Aantal bestanden dat zal worden overschreven
 OK
-OKE
-Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the synchronization directories.
-Alleen bestanden/mappen die niet zijn gefilterd worden geselecteerd voor synchronisatie. Het filter wordt toegepast op de naam relatief(!) ten opzichte van de synchronisatiemappen.
-Open with File Manager\tD-Click
-Openen met bestandsbeheerder\tD-klik
+Oke
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Alleen bestanden /locatie die niet worden gefilterd zullen worden gesynchroniseerd. Het filter word toegepast op de relatieve(!) naam van de basislocatie van de synchronisatie.
 Operation aborted!
 Operatie afgebroken!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Vraag
 Quit
 Afsluiten
+Re-enable all hidden dialogs?
+Herstellen van alle verborgen dialogen?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Automatische Synchronisatie
 RealtimeSync configuration
 RealtimeSync configuratie
 Relative path
 Relatieve pad
+Remove alternate settings
+Verwijder alternatieve instellingen
 Remove folder
 Verwijder map
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Rapporteer een fout in de vertaling
 Reset
 Reset
-Reset all warning messages
-Reset alle waarchuwingen
-Reset all warning messages?
-Reset alle waarschuwingen?
 Result
 Resultaat
 Right
@@ -640,6 +650,10 @@ Scanning:
 Scannen:
 Select a folder
 Selecteer een map
+Select alternate filter settings
+Selecteer alternatieve filter instellingen
+Select alternate synchronization settings
+Selecteer alternatieve synchronisatie instellingen
 Select logfile directory:
 Selecteer een map voor het logbestand:
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Geef bestanden weer die alleen bestaan aan de linkerkant
 Show files that exist on right side only
 Geef bestanden weer die alleen bestaan aan de rechterkant
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Geef bestanden weer die zullen worden overschreven aan de linkerkant
+Show files that will be overwritten on right side
+Geef bestanden weer die zullen worden overschreven aan de rechterkant
 Show files that won't be copied
 Geef bestanden weer die niet zullen worden gekopieerd
+Show hidden dialogs
+Geef verborgen dialogen weer
 Show popup
 Pop-up weergeven
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Stille modus
 Size
 Grootte
-Sorting file list...
-Bestandslijst sorteren...
 Source code written completely in C++ utilizing:
 Broncode compleet geschreven in C++ met behulp van:
 Speed:
@@ -723,13 +737,11 @@ Aan het synchroniseren...
 System out of memory!
 Systeem heeft te weinig geheugen
 Target directory already existing!
-
+Doellocatie bestaal al!
 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Gebruik de prullenbak
 Use Recycle Bin when deleting or overwriting files.
 Gebruik de prullenbak bij verwijderen of overschrijven van bestanden
+User-defined directory
+Door de gebruiker te definiëren locatie
+User-defined directory for deletion was not specified!
+Door de gebruiker te definiëren locatie voor verwijderen was niet opgegeven!
 Variant
 Variant
+Verifying file %x
+Verifiëren bestand %x
 Volume name %x not part of filename %y!
 Volume naam %x maakt niet deel uit van bestandsnaam %y!
 Warning
 Attentie
 Warning: Synchronization failed for %x item(s):
 Let op: %x item(s) konden niet worden gesynchroniseerd: 
-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.
diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng
index 47ce556d..ddfe21c2 100644
--- a/BUILD/Languages/french.lng
+++ b/BUILD/Languages/french.lng
@@ -68,6 +68,8 @@
 &Charger
 &Load configuration
 &Charger la configuration
+&New
+&Nouveau
 &No
 &Non
 &OK
@@ -84,8 +86,14 @@
 &Sauvegarder
 &Yes
 &Oui
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Notez que seuls les lecteurs FAT/FAT32 sont touchées par ce problème ! \ NDans les autres cas, vous pouvez désactiver le paramètre \ "ignorer la différence d'une heure \".)
 ,
  
+- Other side's counterpart to %dir
+- lié de l'autre côté à %dir
+- Other side's counterpart to %name
+- lié de l'autre côté à %name
 - conflict
 - conflit
 - conflict (same date, different size)
@@ -110,10 +118,6 @@
 - à droite
 - right newer
 - fichier de droite plus récent
-- sibling of %dir
-- correspondance de %dir
-- sibling of %name
-- correspondance de %name
 -Open-Source file synchronization-
 -Synchronisation de fichiers Open-Source-
 .
@@ -154,8 +158,6 @@ Add folder
 Ajout d'un dossier
 Add folder pair
 Ajout d'un couple de dossiers
-All items have been synchronized!
-Tous les éléments ont été synchronisés !
 An exception occured!
 Une violation s'est produite !
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 Comparaison du contenu des fichiers %x
 Comparing content...
 Comparaison du contenu...
+Comparing files by content failed.
+La comparaison des fichiers par leur contenu a échouée.
 Comparison Result
 Résultat de la comparaison
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Confirmation
 Conflict detected:
 Conflit détecté :
+Conflicts/files that cannot be categorized
+Conflits/fichiers ne pouvant être catégorisés
 Continue
 Continuer
 Conversion error:
@@ -257,7 +263,7 @@ Impossible de trouver le nom de volume pour le fichier :
 Could not initialize directory monitoring:
 Impossible d'initialiser la surveillance des dossiers:
 Could not read values for the following XML nodes:
-
+Impossible de lire les valeurs des noeuds XML suivants :
 Create a batch job
 Création du fichier de commandes
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 Personnaliser les colonnes
 Customize...
 Personnaliser...
+D-Click
+Clic Droit
 DECISION TREE
 ARBRE DE DECISION
 Data remaining:
 Données restantes :
+Data verification error: Source and target file have different content!
+Erreur lors du contrôle des données : Les fichiers source et destination ont des contenus différents !
 Date
 Date
 Delay
 délai
-Delay between two invocations of the commandline
-délai entre deux requêtes de la ligne de commande
+Delay between detection of changes and execution of commandline in seconds
+Intervalle entre la détection des changements et l'exécution de la ligne de commande en secondes
 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
@@ -299,7 +309,9 @@ Suppression du fichier %x
 Deleting folder %x
 Suppression du dossier %x
 Deletion handling
-Festion des suppressions
+Gestion des suppressions
+Description
+Description
 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
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Voulez-vous vraiment déplacer les objets suivants dans la corbeille ?
 Do you want FreeFileSync to automatically check for updates every week?
 Voulez-vous que FreeFileSync recherche automatiquement de nouvelles versions chaque semaine ?
-Don't ask me again
-Ne plus me redemander
 Donate with PayPal
 Faites un don avec PayPal
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Sortie immédiate avec le returncode < 0
 Exit with RC < 0
 Sortie avec RC < 0
+External applications
+Applications externes
 Feedback and suggestions are welcome at:
 Commentaires et suggestions sont les bienvenus à :
 File %x has an invalid date!
 Le fichier %x a une date invalide !
-File Manager integration:
-Choix du Gestionnaire de Fichiers :
-File Time tolerance (seconds):
-Tolérance sur l'heure de création du fichier (en secondes) :
 File already exists. Overwrite?
 Le fichier existe déjà. Voulez-vous le remplacer ?
 File content
@@ -410,12 +418,10 @@ File list exported!
 Liste des fichiers exportée !
 File size and date
 Taille et date du fichier
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Les fichiers ayant des heures qui diffèrent d'un nombre de secondes inférieur à celui spécifié sont considérés comme ayant la même heure.
 Filename
 Nom du fichier
-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.
-Les fichiers %x ont une différence de date inférieure à 1 heure ! Il n'est pas sain de décider quelle est la plus récente à cause de l'heure d'été.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Les fichiers %x ont une différence de date inférieure à 1 heure !\n\nIl n'est pas sain de décider quelle est la plus récente à cause de l'heure d'été.
 Files %x have the same date but a different size!
 Les fichiers %x ont la même data mais une taille différente !
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Les fichiers sont considérés comme identiques, si\n     - leur taille\n     - leur date et heure sont identiques.
 Files remaining:
 Fichiers restants :
+Files that are equal on both sides
+Fichiers identiques des deux côtés
 Files that exist on both sides and have different content
 Les fichiers existent des deux côtés et ont des contenus différents
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Filtrage de la vue
 Folder Comparison and Synchronization
 Comparaison de Dossiers et Synchronisation
-Folder pair
-Couple de dossiers
+Free disk space available:
+Espace disque disponible :
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Comparaison et synchronisation de répertoires
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Paramètres généraux
 Help
 Aide
+Hidden dialogs:
+Boîtes de dialogue masquées :
 Hide all error and warning messages
 Masquer tous les messages d'erreurs et les avertissements
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Masquer les fichiers existant des deux côtés
 Hide files that exist on right side only
 Masquer les fichiers n'existant qu'à droite
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Fichiers masqués qui ont été écrasés à gauche
+Hide files that will be overwritten on right side
+Fichiers masqués qui ont été écrasés à droite
 Hide files that won't be copied
 Masquer les fichiers qui ne seront pas copiés
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Information
-Initialization of Recycle Bin failed!
-Erreur lors de l'initialisation de la corbeille !
+Integrate external applications into context menu. The following macros are available:
+Inclure les applications externes dans le menu contextuel. Les macros suivantes sont disponibles :
 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. :)
+Leave as unresolved conflict
+Abandonner en tant que conflit non résolu
 Left
 Gauche
+Legend
+Légende
 Load configuration from file
 Charger la configuration à partir du fichier
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ 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
+Move files to a user-defined directory.
+Déplacer les fichiers vers un répertoire défini par l'utilisateur.
 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.
+Moving file %x to user-defined directory %y
+Déplacement du fichier %x vers le répertoire défini par l'utilisateur %y
+Moving folder %x to user-defined directory %y
+Déplacement du dossier %x vers le répertoire défini par l'utilisateur %y
+Multiple...
+Multiple...
 Not enough free disk space available in:
 Espace disque insuffisant sur :
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 Nombre de fichiers qui seront remplacés
 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.
-Seuls les fichiers/répertoires filtrés seront sélectionnés pour la synchronisation. Le filtre sera appliqué aux noms relatifs(!) pour la synchronisation.
-Open with File Manager\tD-Click
-Ouvrir avec le Gestionnaire de Fichiers\tClick droit
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Seuls les fichiers/répertoires filtrés seront sélectionnés pour la synchronisation. Le filtre sera appliqué au nom relatif (!) pour les répertoires de synchroniqation de base.
 Operation aborted!
 Opération abandonnée !
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Question
 Quit
 Quitter
+Re-enable all hidden dialogs?
+Ré-autoriser les boîtes de dialogues masquées ?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Synchronisation Automatisée
 RealtimeSync configuration
 RealtimeSync configuration
 Relative path
 Chemin
+Remove alternate settings
+Supprimer les paramètres de rechange
 Remove folder
 Supprimer le dossier
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Etat d'erreurs de transfert
 Reset
 Réinitialiser
-Reset all warning messages
-Réinitialisation de tous les avertissements
-Reset all warning messages?
-Réinitialiser tous les avertissements ?
 Result
 Situation
 Right
@@ -640,6 +650,10 @@ Scanning:
 Lecture en cours :
 Select a folder
 Choisissez un répertoire
+Select alternate filter settings
+Sélectionner une autre configuration du filtre
+Select alternate synchronization settings
+Sélectionner une autre configuration de la synchronisation
 Select logfile directory:
 Choisissez un dossier pour le fichier .log :
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Afficher les fichiers existants seulement à gauche
 Show files that exist on right side only
 Afficher les fichiers existants seulement à droite
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Afficher les fichiers qui seront écrasés à gauche
+Show files that will be overwritten on right side
+Afficher les fichiers qui seront écrasés à droite
 Show files that won't be copied
 Afficher les ficgier qui ne seront pas copiés
+Show hidden dialogs
+Afficher les boîtes de dialogue masquées
 Show popup
 Afficher la boîte de dialogue
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Mode silencieux
 Size
 Taille
-Sorting file list...
-Tri de la liste des fichiers...
 Source code written completely in C++ utilizing:
 Code source écrit totalement en C++ et utilisant :
 Speed:
@@ -723,13 +737,11 @@ Synchronisation en cours...
 System out of memory!
 Erreur mémoire système !
 Target directory already existing!
-
+Le répertoire de destination existe déjà !
 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Utilisation de la corbeille
 Use Recycle Bin when deleting or overwriting files.
 Utiliser la Corbeille lors de la suppression ou du remplacement d'un fichier.
+User-defined directory
+Réoertoire défini par l'utilisateur
+User-defined directory for deletion was not specified!
+Le réoertoire défini par l'utilisateur pour la suppression n'a pas été indiqué !
 Variant
 Variante
+Verifying file %x
+Contrôle du fichier %x
 Volume name %x not part of filename %y!
 Le nom de volume %x ne fait pas partie du nom de fichier %y !
 Warning
 Attention
 Warning: Synchronization failed for %x item(s):
 Attention : La synchronisation a échouée pour %x élément(s) :
-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.
diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng
index 3e801fc0..417923e4 100644
--- a/BUILD/Languages/german.lng
+++ b/BUILD/Languages/german.lng
@@ -68,6 +68,8 @@ Dateiliste e&xportieren
 &Laden
 &Load configuration
 Konfiguration &laden
+&New
+&Neu
 &No
 &Nein
 &OK
@@ -84,8 +86,14 @@ Konfiguration &laden
 &Speichern
 &Yes
 &Ja
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Achtung: Nur FAT/FAT32 Laufwerke sind von diesem Problem betroffen!\nIn allen anderen Fällen kann die Einstellung \"Zeitunterschied von einer Stunde ignorieren\" deaktiviert werden.)
 ,
 .
+- Other side's counterpart to %dir
+- Entsprechung der anderen Seite zu %dir
+- Other side's counterpart to %name
+- Entsprechung der anderen Seite zu %name
 - conflict
 - Konflikt
 - conflict (same date, different size)
@@ -110,10 +118,6 @@ Konfiguration &laden
 - rechts
 - right newer
 - rechts neuer
-- sibling of %dir
-- Gegenstück zu %dir
-- sibling of %name
-- Gegenstück zu %name
 -Open-Source file synchronization-
 -Open-Source Datei-Synchronisation-
 .
@@ -154,8 +158,6 @@ Add folder
 Verzeichnis hinzufügen
 Add folder pair
 Verzeichnispaar hinzufügen
-All items have been synchronized!
-Alle Elemente wurden synchronisiert!
 An exception occured!
 Eine Ausnahme ist aufgetreten!
 As a result the files are separated into the following categories:
@@ -189,7 +191,7 @@ Gefilterte Dateien bzw. Verzeichnisse ein-/ausblenden
 Comma separated list
 Kommagetrennte Liste
 Commandline
-Kommandozeile
+Befehlszeile
 Commandline is empty!
 Die Kommandozeile ist leer!
 Compare
@@ -208,6 +210,8 @@ Comparing content of files %x
 Vergleiche Inhalt der Dateien %x
 Comparing content...
 Vergleiche Dateiinhalt...
+Comparing files by content failed.
+Vergleich nach Dateiinhalt ist fehlgeschlagen.
 Comparison Result
 Ergebnis des Vergleichs
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Bestätigen
 Conflict detected:
 Ein Konflikt wurde erkannt:
+Conflicts/files that cannot be categorized
+Konflikte/Dateien, die nicht eingeordnet werden können
 Continue
 Fortfahren
 Conversion error:
@@ -270,16 +276,20 @@ Customize columns
 Spalten anpassen
 Customize...
 Anpassen...
+D-Click
+D-Klick
 DECISION TREE
 ENTSCHEIDUNGSBAUM
 Data remaining:
 Verbliebene Daten:
+Data verification error: Source and target file have different content!
+Verifizierungsfehler: Quell- und Zieldatei haben unterschiedlichen Inhalt!
 Date
 Datum
 Delay
 Verzögerung
-Delay between two invocations of the commandline
-Verzögerung zwischen zwei Aufrufen der Kommandozeile
+Delay between detection of changes and execution of commandline in seconds
+Verzögerung zwischen Erkennen einer Änderung und Aufrufen der Kommandozeile in Sekunden
 Delete files/folders existing on left side only
 Nur links existierende Dateien/Verzeichnisse löschen
 Delete files/folders existing on right side only
@@ -300,6 +310,8 @@ Deleting folder %x
 Lösche Verzeichnis %x
 Deletion handling
 Behandlung von Löschungen
+Description
+Beschreibung
 Directories are dependent! Be careful when setting up synchronization rules:
 Die Verzeichnisse sind voneinander abhängig! Achtung beim Festlegen der Synchronisationseinstellungen:
 Directories to watch
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Sollen folgende Elemente wirklich in den Papierkorb verschoben werden?
 Do you want FreeFileSync to automatically check for updates every week?
 Soll FreeFileSync automatisch jede Woche nach Aktualisierungen suchen?
-Don't ask me again
-Nicht mehr nachfragen
 Donate with PayPal
 Mit PayPal spenden
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Sofort beenden und Returncode < 0 setzen
 Exit with RC < 0
 Beenden mit RC < 0
+External applications
+Externe Anwendungen
 Feedback and suggestions are welcome at:
 Feedback und Vorschläge sind willkommen unter:
 File %x has an invalid date!
 Die Datei %x hat ein ungültiges Datum!
-File Manager integration:
-Einbinden des Dateimanagers:
-File Time tolerance (seconds):
-Abweichung der Dateizeit (Sekunden):
 File already exists. Overwrite?
 Die Datei existiert bereits. Überschreiben?
 File content
@@ -410,12 +418,10 @@ File list exported!
 Dateiliste exportiert!
 File size and date
 Dateigröße und -datum
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Dateiänderungszeiten, die um bis zu der angegebenen Anzahl an Sekunden abweichen, werden trotzdem als gleich angesehen.
 Filename
 Dateiname
-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.
-Die Dateien %x haben eine Abweichung der Dateizeit von unter einer Stunde! Aufgrund der Zeitumstellungsproblematik kann nicht zweifelsfrei festgestellt werden, welche die aktuellere ist.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Die Dateien %x haben eine Abweichung der Dateizeit von unter einer Stunde!\n\nAufgrund der Zeitumstellungsproblematik kann nicht zweifelsfrei festgestellt werden, welche die aktuellere ist.
 Files %x have the same date but a different size!
 Die Dateien %x haben dasselbe Datum, aber eine unterschiedliche Größe!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Dateien gelten als gleich, wenn\n     - die Größe\n     - Datum und Uhrzeit der letzten Änderung\ngleich sind.
 Files remaining:
 Verbliebene Dateien:
+Files that are equal on both sides
+Auf beiden Seiten gleiche Dateien
 Files that exist on both sides and have different content
 Auf beiden Seiten existierende Dateien mit unterschiedlichem Inhalt
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Ansicht filtern
 Folder Comparison and Synchronization
 Verzeichnisvergleich und Synchronisation
-Folder pair
-Verzeichnispaar
+Free disk space available:
+Verfügbarer freier Speicherplatz:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Verzeichnisvergleich und -synchronisation
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Globale Einstellungen
 Help
 Hilfe
+Hidden dialogs:
+Versteckte Dialoge:
 Hide all error and warning messages
 Alle Fehler- und Warnmeldungen werden unterdrückt
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Nur links existierende Dateien ausblenden
 Hide files that exist on right side only
 Nur rechts existierende Dateien ausblenden
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Dateien die links überschrieben werden ausblenden
+Hide files that will be overwritten on right side
+Dateien die rechts überschrieben werden ausblenden
 Hide files that won't be copied
 Dateien die nicht kopiert werden ausblenden
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Information
-Initialization of Recycle Bin failed!
-Die Initialisierung des Papierkorbs ist fehlgeschlagen!
+Integrate external applications into context menu. The following macros are available:
+Integriert externe Anwendungen in das Kontextmenu. Die folgenden Makros stehen zur Verfügung:
 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. :)
+Leave as unresolved conflict
+Als unbehandelten Konflikt belassen
 Left
 Links
+Legend
+Legende
 Load configuration from file
 Konfiguration aus Datei laden
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ 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
+Move files to a user-defined directory.
+Verschiebe Dateien in benutzerdefiniertes Verzeichnis
 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.
+Moving file %x to user-defined directory %y
+Verschiebe Datei %x in benutzerdefiniertes Verzeichnis %y
+Moving folder %x to user-defined directory %y
+Verschiebe Ordner %x in benutzerdefiniertes Verzeichnis %y
+Multiple...
+Verschiedene...
 Not enough free disk space available in:
 Nicht genügend freier Speicher verfügbar unter:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 Anzahl der zu überschreibenden Dateien
 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.
-Für die Synchronisation werden nur die Dateien/Verzeichnisse berücksichtigt, die den Filtereinstellungen genügen. Der Filter wird dabei auf den Dateinamen relativ(!) zu den zu synchronisierenden Verzeichnissen angewandt.
-Open with File Manager\tD-Click
-Mit Dateimanager öffnen\tD-Click
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Für die Synchronisation werden nur die Dateien/Verzeichnisse berücksichtigt, die den Filtereinstellungen genügen. Der Filter wird dabei auf den Dateinamen relativ(!) zu den Basis-Synchronisationsverzeichnissen angewandt.
 Operation aborted!
 Vorgang abgebrochen!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Frage
 Quit
 Beenden
+Re-enable all hidden dialogs?
+Alle versteckten Dialoge wieder anzeigen?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Automatisierte Synchronisation
 RealtimeSync configuration
 RealtimeSync Konfiguration
 Relative path
 Relativer Pfad
+Remove alternate settings
+Alternative Einstellungen entfernen
 Remove folder
 Verzeichnis entfernen
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Übersetzungsfehler melden
 Reset
 Zurücksetzen
-Reset all warning messages
-Alle Warnmeldungen zurücksetzen
-Reset all warning messages?
-Sollen alle Warnmeldungen zurückgesetzt werden?
 Result
 Ergebnis
 Right
@@ -640,6 +650,10 @@ Scanning:
 Suche Dateien:
 Select a folder
 Verzeichnis auswählen
+Select alternate filter settings
+Alternative Filtereinstellungen auswählen
+Select alternate synchronization settings
+Alternative Synchronisationseinstellungen auswählen
 Select logfile directory:
 Verzeichnis für Logdatei wählen:
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Nur links existierende Dateien anzeigen
 Show files that exist on right side only
 Nur rechts existierende Dateien anzeigen
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Dateien die links überschrieben werden anzeigen
+Show files that will be overwritten on right side
+Dateien die rechts überschrieben werden anzeigen
 Show files that won't be copied
 Dateien die nicht kopiert werden anzeigen
+Show hidden dialogs
+Zeige versteckte Dialoge
 Show popup
 Popup zeigen
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Stiller Modus
 Size
 Größe
-Sorting file list...
-Sortiere Dateiliste...
 Source code written completely in C++ utilizing:
 Sourcecode komplett in C++ geschrieben mit Hilfe von:
 Speed:
@@ -728,8 +742,6 @@ 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Papierkorb verwenden
 Use Recycle Bin when deleting or overwriting files.
 Papierkorb für zu löschende oder zu überschreibende Dateien nutzen.
+User-defined directory
+Benutzerdefiniertes Verzeichnis
+User-defined directory for deletion was not specified!
+Kein benutzerdefiniertes Verzeichnis zum Löschen angegeben!
 Variant
 Variante
+Verifying file %x
+Verifiziere Datei %x
 Volume name %x not part of filename %y!
 Laufwerksname %x ist kein Teil des Dateinamens %y!
 Warning
 Warnung
 Warning: Synchronization failed for %x item(s):
 Warnung: Synchronisation fehlgeschlagen für %x Element(e):
-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.
diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng
index 0c1926c6..d12fbca8 100644
--- a/BUILD/Languages/hungarian.lng
+++ b/BUILD/Languages/hungarian.lng
@@ -68,6 +68,8 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 &Betöltés
 &Load configuration
 &Beállítások betöltése
+&New
+
 &No
 &Nem
 &OK
@@ -84,8 +86,14 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 &Mestés
 &Yes
 &Igen
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+
 ,
 .
+- Other side's counterpart to %dir
+
+- Other side's counterpart to %name
+
 - conflict
 - ütközés
 - conflict (same date, different size)
@@ -110,10 +118,6 @@ A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl!
 - jobb oldali
 - right newer
 - a jobb oldali újabb
-- 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-
 .
@@ -154,8 +158,6 @@ Add folder
 Mappa hozzáadása
 Add folder pair
 Mappa pár megadása
-All items have been synchronized!
-Minden elem szinkronizálva lett!
 An exception occured!
 Kivétel keletkezett!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 %x fájlok tartalmának összehasonlítása
 Comparing content...
 Tartalom összehasonlítása...
+Comparing files by content failed.
+
 Comparison Result
 Az összehasonlítás eredménye
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Megerősítés
 Conflict detected:
 Ütközés történt:
+Conflicts/files that cannot be categorized
+
 Continue
 Folytatás
 Conversion error:
@@ -270,16 +276,20 @@ Customize columns
 Oszlopok testreszabása
 Customize...
 Testreszabás...
+D-Click
+
 DECISION TREE
 DÖNTÉSI FA
 Data remaining:
 Hátralévő adat:
+Data verification error: Source and target file have different content!
+
 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
+Delay between detection of changes and execution of commandline in seconds
+
 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
@@ -300,6 +310,8 @@ Deleting folder %x
 Mappa törlése %x
 Deletion handling
 Törlések kezelése
+Description
+
 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
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Valóban a Lomtárba (Recycle Bin) akarja mozgatni az alábbi objektumo(ka)t?
 Do you want FreeFileSync to automatically check for updates every week?
 Akarod, hogy a FreeFileSync automatikusan minden héten keressen frissítést?
-Don't ask me again
-Ne kérdezd még egyszer
 Donate with PayPal
 Ha szereted a FreeFileSync-et, támogasd a PayPal segítségével.
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Azonnali kilépés és a visszatérési érték < 0
 Exit with RC < 0
 Kilépés (visszatérési érték < 0)
+External applications
+
 Feedback and suggestions are welcome at:
 A visszajelzéseket és javaslatokat ide várjuk:
 File %x has an invalid date!
 A(z) %x fájlnak érvénytelen a dátuma!
-File Manager integration:
-Beépülés a Fájlkezelőbe:
-File Time tolerance (seconds):
-Fájl dátum tolerancia (másodpercek):
 File already exists. Overwrite?
 A fájl már létezik. Felülírjuk?
 File content
@@ -410,12 +418,10 @@ File list exported!
 A fájllista exportálása befejeződött!
 File size and date
 fájlméret és dátum alapján
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Két fájl, melyeknek dátuma legfeljebb az itt megadott másodperccel tér el egymástól, úgy lesz kezelve, mintha megegyezne a dátumuk.
 Filename
 Fájlnév
-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.
-A(z) %x fájlok dátuma kevesebb mint 1 órával eltér! A nyári időszámítás miatt nem biztonságos annak eldöntése, hogy melyik az újabb közülük.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+A(z) %x fájlok dátuma kevesebb mint 1 órával eltér!\n\nA nyári időszámítás miatt nem biztonságos annak eldöntése, hogy melyik az újabb közülük.
 Files %x have the same date but a different size!
 A(z) %x fájlok dátuma megegyezik, de a mérete nem!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 A fájlok megegyező ha\n  - a fájlméret\n  - az utolsó módosítás dátuma\nmegegyezik.
 Files remaining:
 Hátralévő fájlok:
+Files that are equal on both sides
+
 Files that exist on both sides and have different content
 Mindkét oldalon létező fájlok különböző tartalommal
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Szűrő nézet
 Folder Comparison and Synchronization
 Mappa összehasonlítás és szinkronizáció
-Folder pair
-Mappa pár
+Free disk space available:
+
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Mappa összehasonlítás és szinkronizáció
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Globális beállítások
 Help
 Súgó
+Hidden dialogs:
+
 Hide all error and warning messages
 Összes hibaüzenet és figyelmeztetés elrejtése
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Csak a bal oldalon létező fájlok elrejtése
 Hide files that exist on right side only
 Csak a jobb oldalon létező fájlok elrejtése
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+
+Hide files that will be overwritten on right side
+
 Hide files that won't be copied
 A nem másolandó fájlok elrejtése
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Információ
 Information
 Információ
-Initialization of Recycle Bin failed!
-A Lomtár (Recycle Bin) inicializálása sikertelen!
+Integrate external applications into context menu. The following macros are available:
+
 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. :)
+Leave as unresolved conflict
+
 Left
 Bal oldal
+Legend
+
 Load configuration from file
 Beállítások betöltése fájlból
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ 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
+Move files to a user-defined directory.
+
 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.
+Moving file %x to user-defined directory %y
+
+Moving folder %x to user-defined directory %y
+
+Multiple...
+
 Not enough free disk space available in:
 Nincs elég szabad lemezterület:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 A felülírandó fájlok száma
 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.
-Csak azok a fájlok/mappák lesznek kijelölve a szinkronizációhoz, amelyek átmennek a szűrésen. A szűrő a szinkronizálás mappájához relatív(!) nevekre lesz alkalmazva.
-Open with File Manager\tD-Click
-Megnyitás a Fájlkezelőben\tD-Click
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+
 Operation aborted!
 Művelet megszakítva!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Kérdés
 Quit
 Kilépés
+Re-enable all hidden dialogs?
+
 RealtimeSync - Automated Synchronization
 RealtimeSync - Automatikus szinkronizálás
 RealtimeSync configuration
 RealtimeSync beállítások
 Relative path
 Relatív útvonal
+Remove alternate settings
+
 Remove folder
 Mappa eltávolítása
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Fordítói hiba bejelentése
 Reset
 Helyreállítás
-Reset all warning messages
-Összes figyelmeztető üzenet helyreállítása
-Reset all warning messages?
-Helyreállítja az összes figyelmeztető üzenetet?
 Result
 Eredmény
 Right
@@ -640,6 +650,10 @@ Scanning:
 Vizsgálat:
 Select a folder
 Mappa kiválasztása
+Select alternate filter settings
+
+Select alternate synchronization settings
+
 Select logfile directory:
 Naplófájl mappájának kiválasztása:
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Csak a bal oldalon létező fájlok mutatása
 Show files that exist on right side only
 Csak a jobb oldalon létező fájlok mutatása
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+
+Show files that will be overwritten on right side
+
 Show files that won't be copied
 A nem másolandó fájlok mutatása
+Show hidden dialogs
+
 Show popup
 Felbukkanó ablak mutatása
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Csendes mód
 Size
 Méret
-Sorting file list...
-Fájllista rendezése...
 Source code written completely in C++ utilizing:
 A forráskód teljes egészében C++-ban íródott\na következők felhasználásával:
 Speed:
@@ -728,8 +742,6 @@ 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Lomtár (Recycle Bin) használata
 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.
+User-defined directory
+
+User-defined directory for deletion was not specified!
+
 Variant
 Variáns
+Verifying file %x
+
 Volume name %x not part of filename %y!
 A(z) %x kötetnevet nem tartalmazza a(z) %y fájlnév!
 Warning
 Figyelem
 Warning: Synchronization failed for %x item(s):
 Figyelem: A következő %x elem szinkronizálása sikertelen:
-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.
diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng
index 472a17cf..ef007fa8 100644
--- a/BUILD/Languages/italian.lng
+++ b/BUILD/Languages/italian.lng
@@ -68,6 +68,8 @@
 &Carica
 &Load configuration
 &Carica la configurazione
+&New
+&Nuovo
 &No
 &No
 &OK
@@ -84,8 +86,14 @@
 &Salva
 &Yes
 &Si
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Solo volumi con file-system FAT/FAT32 risentono di questo problema!\nIn tutti gli altri casi puoi disabilitare l'impostazione \"ignora differenze di 1 ora\".)
 ,
 , 
+- Other side's counterpart to %dir
+- L'altro lato e' equivalente a %dir
+- Other side's counterpart to %name
+- L'altro lato e' equivalente a %name
 - conflict
 - conflitto
 - conflict (same date, different size)
@@ -110,10 +118,6 @@
 - a destra
 - right newer
 - file di destra più recente
-- sibling of %dir
-- fratello di %dir
-- sibling of %name
-- fratello di %name
 -Open-Source file synchronization-
 -Sincronizzazione Open-Source-
 .
@@ -154,8 +158,6 @@ Add folder
 Aggiungi cartella
 Add folder pair
 Aggiungi una coppia di cartelle
-All items have been synchronized!
-Tutti gli elementi sono stati sincronizzati!
 An exception occured!
 Si è verificato un problema!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 Comparazione contenuto del file %x
 Comparing content...
 Comparazione contenuto...
+Comparing files by content failed.
+Comparazione file in base al contenuto fallita.
 Comparison Result
 Risultato della comparazione
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Conferma
 Conflict detected:
 Rilevato conflitto:
+Conflicts/files that cannot be categorized
+Conflitti/files senza categoria di appartenenza
 Continue
 Continua
 Conversion error:
@@ -257,7 +263,7 @@ Impossibile determinare il nome volume per il file:
 Could not initialize directory monitoring:
 Monitoraggio directory non inizializzabile:
 Could not read values for the following XML nodes:
-
+Impossibile leggere i valori per i seguenti nodi XML:
 Create a batch job
 Creazione di un job batch
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 Personalizza colonne
 Customize...
 Personalizza...
+D-Click
+D-Click
 DECISION TREE
 ALBERO DELLE DECISIONI
 Data remaining:
 Dati rimanenti:
+Data verification error: Source and target file have different content!
+Errore in verifica data: I file sorgente e destinazione hanno differente contenuto!
 Date
 Data
 Delay
 Ritardo
-Delay between two invocations of the commandline
-Ritardo tra due richieste nella lina di comando
+Delay between detection of changes and execution of commandline in seconds
+Ritardo in secondi tra rilevazione cambiamenti ed esecuzione della commandline
 Delete files/folders existing on left side only
 Elimina files/cartelle esistenti solo a sinistra
 Delete files/folders existing on right side only
@@ -300,6 +310,8 @@ Deleting folder %x
 Eliminazione cartella %x
 Deletion handling
 Gestione cancellazione
+Description
+Descrizione
 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
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Vuoi veramente spostare i seguenti oggetti nel Cestino?
 Do you want FreeFileSync to automatically check for updates every week?
 Vuoi che FreeFileSync controlli automaticamente gli aggiornamenti ogni settimana?
-Don't ask me again
-Non chiederlo di nuovo
 Donate with PayPal
 Fai una donazione con PayPal
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Esci immediatamente ed imposta returncode < 0
 Exit with RC < 0
 Esci con RC < 0
+External applications
+Applicazioni esterne
 Feedback and suggestions are welcome at:
 Commenti e suggerimenti sono i benvenuti:
 File %x has an invalid date!
 Il file %x ha una data non valida!
-File Manager integration:
-Integrazione File Manager:
-File Time tolerance (seconds):
-Tolleranza di File Time (in secondi):
 File already exists. Overwrite?
 Il file esiste già. Lo vuoi sovrascrivere?
 File content
@@ -410,12 +418,10 @@ File list exported!
 Lista dei file esportata!
 File size and date
 Dimensione e data del file
-File times that differ by up to the specified number of seconds are still handled as having same time.
-File time che differiscono per meno dello specificato numero di secondi sono considerati come aventi lo stesso File time.
 Filename
 Nome del file
-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.
-La data dei file %x differisce per meno di 1 ora! Non è sicuro decidere quale dei due è il più recente con la funzione Daylight Saving Time.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+La data dei file %x differisce per meno di 1 ora!\n\nNon è sicuro decidere quale dei due è il più recente con la funzione Daylight Saving Time.
 Files %x have the same date but a different size!
 I file %x hanno la stessa data ma dimensione diversa!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 I file sono considerati identici se\n     - dimensione\n     - data e ora sono identici.
 Files remaining:
 File rimanenti:
+Files that are equal on both sides
+Files identici su entrambi i lati
 Files that exist on both sides and have different content
 Files esistenti su entrambi i lati e aventi differente contenuto
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Filtro della vista
 Folder Comparison and Synchronization
 Comparazione di Cartelle e Sincronizzazione
-Folder pair
-Coppia di cartelle
+Free disk space available:
+Spazio libero su disco disponibile:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Comparazione e sincronizzazione di directory
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Preferenze
 Help
 Aiuto
+Hidden dialogs:
+Messaggi nascosti:
 Hide all error and warning messages
 Nascondi tutti gli errori e i messaggi d'avviso
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Nascondi i file esistenti solo a sinistra
 Hide files that exist on right side only
 Nascondi i file esistenti solo a destra
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Nascondi i file che verranno sovrascritti sul lato sinistro
+Hide files that will be overwritten on right side
+Nascondi i file che verranno sovrascritti sul lato destro
 Hide files that won't be copied
 Nascondi i file che non saranno copiati
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Informazioni
-Initialization of Recycle Bin failed!
-Inizializzazione del Cestino fallita!
+Integrate external applications into context menu. The following macros are available:
+Integra applicazioni esterne nel menu contestuale. Sono disponibili le seguenti macro:
 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. :)
+Leave as unresolved conflict
+Lascia come conflitti irrisolti
 Left
 Sinistra
+Legend
+Legenda
 Load configuration from file
 Carica configurazione da file
 Load configuration history (press DEL to delete items)
@@ -554,18 +568,18 @@ Move column down
 Sposta colonna giu'
 Move column up
 Sposta colonna su'
-Move files to a custom directory.
+Move files to a user-defined 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.
+Moving file %x to user-defined directory %y
+Spostamento del file %x nella directory personalizzata %y
+Moving folder %x to user-defined directory %y
+Spostamento di cartella  %x nella directory personalizzata %y
+Multiple...
+Multiplo...
 Not enough free disk space available in:
-Spazio libero su disco non sufficiente in:
+Spazio libero su disco insufficiente in:
 Nothing to synchronize according to configuration!
 Niente da sincronizzare in questa configurazione!
 Number of files and directories that will be created
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 Numero di file che verranno sovrascritti
 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.
-Solo file e/o directory non filtrati saranno selezionati per la sincronizzazione. Il filtro verrà applicato al nome relativo(!) nelle directory di sincronizzazione.
-Open with File Manager\tD-Click
-Apri con File Manager\tD-Click
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Solo file e directory che passano il filtro saranno selezionati per la sincronizzazione. Il filtro verrà applicato al nome relativo(!) sulla base delle directory di sincronizzazione.
 Operation aborted!
 Operazione abortita!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Domanda
 Quit
 Esci
+Re-enable all hidden dialogs?
+Ripristinare tutti i messaggi nascosti?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Sincronizzazione Automatizzata
 RealtimeSync configuration
 Configurazione di RealtimeSync
 Relative path
 Percorso relativo
+Remove alternate settings
+Rimuovi impostazioni alternative
 Remove folder
 Rimuovi cartella
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Segnala errori di traduzione
 Reset
 Reset
-Reset all warning messages
-Resetta tutti i messaggi d'avviso
-Reset all warning messages?
-Resettare tutti i messaggi d'avviso?
 Result
 Risultato
 Right
@@ -639,7 +649,11 @@ Analisi in corso...
 Scanning:
 Analisi in corso:
 Select a folder
-Selezionare una cartella
+Seleziona una cartella
+Select alternate filter settings
+Seleziona impostazioni di filtro alternative
+Select alternate synchronization settings
+Seleziona impostazioni di sincronizzazione alternative
 Select logfile directory:
 Seleziona cartella per il file di log:
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Mostra file esistenti solo a sinistra
 Show files that exist on right side only
 Mostra file esistenti solo a destra
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Mostra file che verranno sovrascritti sul lato sinistro
+Show files that will be overwritten on right side
+Mostra file che verranno sovrascritti sul lato destro
 Show files that won't be copied
 Mostra file che non saranno copiati
+Show hidden dialogs
+Mostra messaggi nascosti
 Show popup
 Mostra popup
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Modalità Silenziosa
 Size
 Dimensione
-Sorting file list...
-Ordinamento lista file...
 Source code written completely in C++ utilizing:
 Codice sorgente scritto completamente in C++ \ne utilizzando:
 Speed:
@@ -728,8 +742,6 @@ 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Usa il Cestino
 Use Recycle Bin when deleting or overwriting files.
 Usa il Cestino quando si cancella o sovrascrive un file.
+User-defined directory
+Directory personalizzata
+User-defined directory for deletion was not specified!
+Directory personalizzata per la cancellazione non specificata!
 Variant
 Variante
+Verifying file %x
+Verifica di file %x
 Volume name %x not part of filename %y!
 Il nome volume %x non è parte del nome file %y!
 Warning
 Attenzione
 Warning: Synchronization failed for %x item(s):
 Attenzione: Sincronizzazione fallita per %x elementi:
-Warnings:
-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.
diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng
index 0d473b8c..ecd3ccf5 100644
--- a/BUILD/Languages/japanese.lng
+++ b/BUILD/Languages/japanese.lng
@@ -68,6 +68,8 @@
 読み込み(&L)
 &Load configuration
 構成設定の読み込み(&L)
+&New
+新規(&N)
 &No
 いいえ(&N)
 &OK
@@ -84,8 +86,14 @@
 保存(&S)
 &Yes
 はい(&Y)
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(注意: FAT/FAT32 ドライブのみこの影響を受けます! \n その他のケースでは設定を無効にすることができます。"1 時間の差異は無視" )
 ,
 .
+- Other side's counterpart to %dir
+- %dir の反対側の対象
+- Other side's counterpart to %name
+- %name の反対側の対象
 - conflict
 - 不一致
 - conflict (same date, different size)
@@ -110,10 +118,6 @@
 - 右側
 - right newer
 - 右側の方が新しい
-- sibling of %dir
-- %dir の兄弟
-- sibling of %name
-- %name の兄弟
 -Open-Source file synchronization-
 -Open-Source ファイル同期ツール-
 .
@@ -154,8 +158,6 @@ Add folder
 フォルダを追加
 Add folder pair
 フォルダのペアを追加
-All items have been synchronized!
-すべてのアイテムは同期されました!
 An exception occured!
 例外が発生しました!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 ファイル %x の内容を比較中
 Comparing content...
 内容を比較中...
+Comparing files by content failed.
+ファイル内容の比較に失敗しました
 Comparison Result
 比較結果
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 確認
 Conflict detected:
 検出された競合:
+Conflicts/files that cannot be categorized
+ファイルに競合があるため分類できません
 Continue
 続行
 Conversion error:
@@ -257,7 +263,7 @@ Could not determine volume name for file:
 Could not initialize directory monitoring:
 監視するディレクトリを初期化できません:
 Could not read values for the following XML nodes:
-
+以下の XMLノードの値を読み込むことが出来ません:
 Create a batch job
 一括ジョブを作成
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 列の調整
 Customize...
 カスタマイズ...
+D-Click
+D-クリック
 DECISION TREE
 [判定ツリー]
 Data remaining:
 残りのデータ:
+Data verification error: Source and target file have different content!
+データ検証エラー: ソースと対象ファイルに異なる内容が含まれています!
 Date
 データ
 Delay
 遅延時間
-Delay between two invocations of the commandline
-2 つのコマンドラインを実行する時の遅延時間
+Delay between detection of changes and execution of commandline in seconds
+変更の検出とコマンドライン実行間の遅延(秒)
 Delete files/folders existing on left side only
 左側のみに存在するファイル/フォルダを削除
 Delete files/folders existing on right side only
@@ -300,6 +310,8 @@ Deleting folder %x
 フォルダ %x を削除中
 Deletion handling
 削除の取り扱い
+Description
+説明
 Directories are dependent! Be careful when setting up synchronization rules:
 ディレクトリが依存関係にあります! 同期規則の設定時には注意してください:
 Directories to watch
@@ -320,8 +332,6 @@ 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?
@@ -349,7 +359,7 @@ Error deleting directory:
 Error deleting file:
 ファイルの削除エラー:
 Error handling
-ハンドリングのエラー
+ハンドリングのエラー時:
 Error loading library function:
 ライブラリ読み込みエラー:
 Error moving directory:
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 すぐに終了する場合の戻り値設定 < 0
 Exit with RC < 0
 RC で終了 < 0
+External applications
+外部アプリケーション
 Feedback and suggestions are welcome at:
 フィードバック、提案など:
 File %x has an invalid date!
 ファイル %x の日付は無効なものです!
-File Manager integration:
-ファイラとの統合:
-File Time tolerance (seconds):
-ファイル時間の許容範囲 (秒):
 File already exists. Overwrite?
 ファイルは存在します、上書きしますか?
 File content
@@ -410,12 +418,10 @@ 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 の時間には、一時間未満の誤差があります! 夏時間の問題により、より新しい方を時間で決定するのは安全ではありません。
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+ファイル %x の時間には、一時間未満の誤差があります!\n\n夏時間の問題により、より新しい方を時間で決定するのは安全ではありません。
 Files %x have the same date but a different size!
 ファイル %x は、同じ時間ですがサイズが異なっています!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 ファイルが同様だった場合\n   - ファイルサイズ\n   - 最終書き込み時間と日付\nで判断する
 Files remaining:
 残りのファイル:
+Files that are equal on both sides
+両側で同様のファイル
 Files that exist on both sides and have different content
 両側に存在するが、内容が異なるファイル
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 表示フィルター
 Folder Comparison and Synchronization
 フォルダの比較と同期
-Folder pair
-フォルダペア
+Free disk space available:
+利用可能なディスク空き容量:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 全般的な設定
 Help
 ヘルプ
+Hidden dialogs:
+ダイアログを隠す
 Hide all error and warning messages
 すべてのエラーと警告メッセージを非表示
 Hide conflicts
@@ -486,10 +496,6 @@ 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
@@ -498,6 +504,10 @@ Hide files that will be deleted on the left side
 左側で削除されたファイルを非表示にする
 Hide files that will be deleted on the right side
 右側で削除されたファイルを非表示にする
+Hide files that will be overwritten on left side
+左側で上書きされたファイルを非表示にする
+Hide files that will be overwritten on right side
+右側で上書きされたファイルを非表示にする
 Hide files that won't be copied
 コピーしなかったファイルを隠す
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 情報
 Information
 インフォメーション
-Initialization of Recycle Bin failed!
-ゴミ箱の初期化に失敗しました!
+Integrate external applications into context menu. The following macros are available:
+外部のアプリケーションをコンテキストメニューに統合、以下のマクロが利用できます:
 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この機能を使用したい場合は、作者までご連絡ください :)
+Leave as unresolved conflict
+未解決の競合を残す
 Left
 左側
+Legend
+凡例
 Load configuration from file
 外部ファイルから構成設定を読み込みます
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ Move column down
 列を下に移動
 Move column up
 列を上に移動
-Move files to a custom directory.
-ファイルを指定ディレクトリに移動
-Move to custom directory
-指定ディレクトリに移動
+Move files to a user-defined 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.
-すべてのアイテムは同期されていません、リストを確認してください
+Moving file %x to user-defined directory %y
+ファイル %x をユーザ定義ディレクトリ %y に移動
+Moving folder %x to user-defined directory %y
+フォルダ %x をユーザ定義ディレクトリ %y に移動
+Multiple...
+複数処理...
 Not enough free disk space available in:
 利用可能なディスク空き容量が足りません:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 上書きされたファイル数
 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.
-フィルタリングをパスしたファイル/ディレクトリのみが同期対象に選択されます。 フィルターは同期先ディレクトリの同類の名前(!)に対して適用されます。
-Open with File Manager\tD-Click
-ファイラーから開く\tD-クリック
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+フィルターに適合するファイル/ディレクトリのみ同期対象に選択されます。このフィルターは、同期基準ディレクトリへの相対的(!)な名前に適用されます。
 Operation aborted!
 操作の中断!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 質問
 Quit
 終了
+Re-enable all hidden dialogs?
+すべての非表示ダイアログを有効にしますか?
 RealtimeSync - Automated Synchronization
 リアルタイム同期 - 自動同期
 RealtimeSync configuration
 リアルタイム同期の構成設定
 Relative path
 相対パス
+Remove alternate settings
+代替設定を除去
 Remove folder
 フォルダ除去
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 翻訳エラーの詳細
 Reset
 リセット
-Reset all warning messages
-すべての警告をリセット
-Reset all warning messages?
-すべての警告をリセットしますか?
 Result
 結果
 Right
@@ -640,6 +650,10 @@ Scanning:
 スキャン:
 Select a folder
 フォルダを選択
+Select alternate filter settings
+代替フィルター設定を選択
+Select alternate synchronization settings
+代替同期設定を選択
 Select logfile directory:
 ログファイルの保存先を選択:
 Select variant:
@@ -660,10 +674,6 @@ 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
@@ -672,8 +682,14 @@ Show files that will be deleted on the left side
 左側で削除されたファイルを表示
 Show files that will be deleted on the right side
 右側で削除されたファイルを表示
+Show files that will be overwritten on left side
+左側で上書きされたファイルを表示
+Show files that will be overwritten on right side
+右側で上書きされたファイルを表示
 Show files that won't be copied
 コピーされなかったファイルを表示
+Show hidden dialogs
+非表示ダイアログを表示
 Show popup
 ポップアップ表示
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 サイレントモード
 Size
 サイズ
-Sorting file list...
-一覧のソート中...
 Source code written completely in C++ utilizing:
 ソースコードは C++ で書かれ、コンパイルされています:
 Speed:
@@ -728,8 +742,6 @@ Target file already existing!
 対象ファイルは既に存在します!
 The file does not contain a valid configuration:
 このファイルには有効な構成が含まれていません:
-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
@@ -766,16 +778,20 @@ Use Recycle Bin
 ゴミ箱を使用
 Use Recycle Bin when deleting or overwriting files.
 ファイルの削除、上書き時にゴミ箱を使用する
+User-defined directory
+ユーで定義ディレクトリ
+User-defined directory for deletion was not specified!
+ユーザ定義ディレクトリが指定されていません!
 Variant
 変化
+Verifying file %x
+ファイル %x の検証中
 Volume name %x not part of filename %y!
 ボリューム名 %x にファイル名 %y はありません!
 Warning
 警告
 Warning: Synchronization failed for %x item(s):
 警告: %x アイテムの同期に失敗しました:
-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.
diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng
index 0a8b7f08..14474715 100644
--- a/BUILD/Languages/polish.lng
+++ b/BUILD/Languages/polish.lng
@@ -68,6 +68,8 @@
 &Wczytaj
 &Load configuration
 &Wczytaj konfigurację
+&New
+&Nowy
 &No
 &Nie
 &OK
@@ -84,8 +86,14 @@
 &Zapisz
 &Yes
 &Tak
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Pamiętaj, że ten problem dotyczy tylko FAT/FAT32!\nW każdym innym przypadku możesz wyłączyć opcję \"Ignoruj 1-godzinną różnicę\".)
 ,
 .
+- Other side's counterpart to %dir
+- Odpowiednik %dir
+- Other side's counterpart to %name
+- Odpowiednik %name
 - conflict
 - konflikt
 - conflict (same date, different size)
@@ -93,7 +101,7 @@
 - different
 - różny
 - directory part only
-- tylko struktura katalogu
+- tylko część katalogu
 - equal
 - równy
 - exists left only
@@ -110,10 +118,6 @@
 - prawy
 - right newer
 - prawy jest nowszy
-- sibling of %dir
-- brat %dir
-- sibling of %name
-- brat %name
 -Open-Source file synchronization-
 -synchronizacja plików Open-Source-
 .
@@ -154,8 +158,6 @@ Add folder
 Dodaj folder
 Add folder pair
 Dodaj foldery do porównania
-All items have been synchronized!
-Wszystkie elementy zsynchronizowane!
 An exception occured!
 Wystąpił wyjątek!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 Porównywanie zawartości plików %x
 Comparing content...
 Porównywanie zawartości...
+Comparing files by content failed.
+Porównywanie przez zawartość zakończone niepowodzeniem.
 Comparison Result
 Rezultat porównywania
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Potwierdź
 Conflict detected:
 Wykryto konflikt:
+Conflicts/files that cannot be categorized
+Konflikty/pliki, które nie mogą być skategoryzowane
 Continue
 Kontynuuj
 Conversion error:
@@ -257,7 +263,7 @@ Nie można określić nazwy dysku dla pliku:
 Could not initialize directory monitoring:
 Nie można uruchomić monitora katalogów:
 Could not read values for the following XML nodes:
-
+Nie można odczytać wartości dla danych gałęzi XML:
 Create a batch job
 Twórz plik wsadowy
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 Dostosuj kolumny
 Customize...
 Dostosuj...
+D-Click
+Podw. kliknięcie
 DECISION TREE
 DRZEWO DECYZYJNE
 Data remaining:
 Pozostałe dane:
+Data verification error: Source and target file have different content!
+Błąd weryfikacji danych: Plik źródłowy i docelowy różnią się zawartością!
 Date
 Data
 Delay
 Opóźnienie
-Delay between two invocations of the commandline
-Opóźnienie pomiędzy wywołaniem dwóch komend
+Delay between detection of changes and execution of commandline in seconds
+Opóźnienie pomiędzy wykryciem zmian, a wykonaniem komendy w sekundach
 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
@@ -300,6 +310,8 @@ Deleting folder %x
 Usuwanie folderu %x
 Deletion handling
 Obsługa usuwania
+Description
+Opis
 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
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Czy na pewno chcesz przenieść wybrane pliki do kosza?
 Do you want FreeFileSync to automatically check for updates every week?
 Czy chcesz aby FreeFileSync sprawdzał uaktualnienia co tydzień?
-Don't ask me again
-Nie pytaj mnie ponownie
 Donate with PayPal
 Wesprzyj z PayPal
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Zakończ natychmiastowo i zwróć wartość < 0
 Exit with RC < 0
 Zakończ z RC < 0
+External applications
+Aplikacje zewnętrzne
 Feedback and suggestions are welcome at:
 Komentarze i sugestie mile widziane na:
 File %x has an invalid date!
 Plik %x ma nieprawidłową datę!
-File Manager integration:
-Menadżer plików:
-File Time tolerance (seconds):
-Tolerancja czasu plików (sekundy):
 File already exists. Overwrite?
 Nadpisać istniejący już plik?
 File content
@@ -410,12 +418,10 @@ File list exported!
 Lista plików wyeksportowana!
 File size and date
 Rozmiar i data pliku
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Plik różniące się określoną liczbą sekund traktowane są jako równe.
 Filename
 Nazwa pliku
-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.
-Pliki %x różnią się mniej niż 1 godzinę. Nie można bezpiecznie określić, który plik jest nowszy zgodnie z przesunięciem czasu letniego.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Pliki %x różnią się mniej niż 1 godzinę.\n\nNie można bezpiecznie określić, który plik jest nowszy zgodnie z przesunięciem czasu letniego.
 Files %x have the same date but a different size!
 Pliki %x mają tą samą datę lecz różne rozmiary!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Pliki są jednakowe jeżeli\n     - rozmiar pliku\n     - czas i data modyfikacji\nsą identyczne.
 Files remaining:
 Pozostałe pliki:
+Files that are equal on both sides
+Pliki równe po obu stronach
 Files that exist on both sides and have different content
 Pliki, które istnieją po obu stronach i różnią się zawartością
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Filtr podglądu
 Folder Comparison and Synchronization
 Porównywanie i Synchronizacja folderów
-Folder pair
-Para folderów
+Free disk space available:
+Wolne miejsce:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Porównywanie i Synchronizacja folderów
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Ustawienia programu
 Help
 Pomoc
+Hidden dialogs:
+Ukryte dialogi:
 Hide all error and warning messages
 Ukryj wszystkie informacje błędach i ostrzeżeniach
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Ukryj pliki, które istnieją tylko po lewej stronie
 Hide files that exist on right side only
 Ukryj pliki, które istnieją tylko po prawej stronie
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Ukryj pliki, które zostaną nadpisane po lewej stronie
+Hide files that will be overwritten on right side
+Ukryj pliki, które zostaną nadpisane po prawej stronie
 Hide files that won't be copied
 Ukryj pliki, które nie będą kopiowane
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Informacja
-Initialization of Recycle Bin failed!
-Niepowodzenie inicjalizacji Kosza!
+Integrate external applications into context menu. The following macros are available:
+Dołącz zewnętrzną aplikację do menu kontekstowego. Dostępne macra:
 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. :)
+Leave as unresolved conflict
+Zostaw jako nierozwiązany konflikt
 Left
 Lewy
+Legend
+Legenda
 Load configuration from file
 Wczytaj konfigurację z pliku
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ 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
+Move files to a user-defined directory.
+Przenieś pliki do katalogu użytkownika.
 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ę.
+Moving file %x to user-defined directory %y
+Przenoszenie pliku %x do katalogu użytkownia %y
+Moving folder %x to user-defined directory %y
+Przenoszenie folderu %x do katalogu użytkownika %y
+Multiple...
+Wiele...
 Not enough free disk space available in:
 Brak wystarczającej przestrzeni dyskowej na:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 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 dodane będą do procesu synchronizacji. Filtr działa tylko dla nazw wprowadzonych relatywnie(!)
-Open with File Manager\tD-Click
-Exploruj
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Tylko pliki/katalogi zaakceptowane przez filtr będą synchronizowane. Filtr działa dla nazw nazw relatywnych(!) względem katalogu bazowego. 
 Operation aborted!
 Operacja przerwana!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Pytanie
 Quit
 Zakończ
+Re-enable all hidden dialogs?
+Odblokować wszystkie ukryte dialogi?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Automatyczna Synchronizacja
 RealtimeSync configuration
 RealtimeSync konfiguracja
 Relative path
 Relatywna ścieżka
+Remove alternate settings
+Usuń alternatywne ustawienia
 Remove folder
 Usuń folder
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Zgłoś błąd w tłumaczeniu
 Reset
 Resetuj
-Reset all warning messages
-Resetuj wszystkie ostrzeżenia
-Reset all warning messages?
-Zresetować wszystkie ostrzeżenia?
 Result
 Rezultat
 Right
@@ -640,6 +650,10 @@ Scanning:
 Skanowanie:
 Select a folder
 Wybierz folder
+Select alternate filter settings
+Stwórz alternatywne ustawienia filtra
+Select alternate synchronization settings
+Stwórz alternatywne reguły synchronizacji
 Select logfile directory:
 Wybierz katalog z logami:
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Pokaż pliki istniejące tylko po lewej stronie
 Show files that exist on right side only
 Pokaż pliki istniejące tylko po prawej stronie
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Pokaż pliki, które zostaną nadpisane po lewej stronie
+Show files that will be overwritten on right side
+Pokaż pliki, które zostaną nadpisane po prawej stronie
 Show files that won't be copied
 Pokaż pliki, które nie będą kopiowane
+Show hidden dialogs
+Pokaż ukryte dialogi
 Show popup
 Pokaż okno popup
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Tryb Cichy
 Size
 Rozmiar
-Sorting file list...
-Sortowanie listy plików...
 Source code written completely in C++ utilizing:
 Kod źródłowy napisany całkowicie w C++ z wykorzystaniem:
 Speed:
@@ -728,8 +742,6 @@ 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Użyj kosza
 Use Recycle Bin when deleting or overwriting files.
 Używaj Kosza podczas usuwania lub nadpisywania plików.
+User-defined directory
+Katalog użytkownika
+User-defined directory for deletion was not specified!
+Katalog użytkownika dla elementów usuniętych nie został określony!
 Variant
 Wariant
+Verifying file %x
+Weryfikowanie pliku %x
 Volume name %x not part of filename %y!
 Dysk %x nie jest częścią pliku %y!
 Warning
 Uwaga
 Warning: Synchronization failed for %x item(s):
 Uwaga: Błąd synchronizacji dla \"%x\" elementów:
-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.
diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng
index e250315d..97d6b758 100644
--- a/BUILD/Languages/portuguese.lng
+++ b/BUILD/Languages/portuguese.lng
@@ -68,6 +68,8 @@
 &Carregar
 &Load configuration
 &Carregar configuração
+&New
+&Novo
 &No
 &Não
 &OK
@@ -84,8 +86,14 @@
 &Guardar
 &Yes
 &Sim
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Apenas as drives FAT/FAT32 são afectadas por esta causa! \nPara todas as outras situações pode desactivar a opção \"ignorar diferença de 1 hora\".)
 ,
  
+- Other side's counterpart to %dir
+- Contrapartida de %dir
+- Other side's counterpart to %name
+- Contrapartida de %name
 - conflict
 - conflito
 - conflict (same date, different size)
@@ -110,12 +118,8 @@
 - direita
 - right newer
 - mais novo à direita
-- sibling of %dir
-- irmão de %dir
-- sibling of %name
-- irmão de %name
 -Open-Source file synchronization-
--Sincronização de ficheiros Open-Source-
+-Sincronização open-source de ficheiros-
 .
 ,
 /sec
@@ -154,8 +158,6 @@ Add folder
 Adicionar pasta
 Add folder pair
 Adicionar um par de pastas
-All items have been synchronized!
-Todos os itens sincronizados!
 An exception occured!
 Ocorreu uma excepção!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 A comparar o conteúdo do ficheiro %x
 Comparing content...
 A comparar...
+Comparing files by content failed.
+A comparação de ficheiros por conteúdo falhou.
 Comparison Result
 Resultados da Comparação
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Confirmar
 Conflict detected:
 Conflito detectado:
+Conflicts/files that cannot be categorized
+Conflitos/ficheiros que não podem ser categorizados
 Continue
 Continuar
 Conversion error:
@@ -257,7 +263,7 @@ Não é possível determinar o nome do volume para o ficheiro:
 Could not initialize directory monitoring:
 Não é possível iniciar monitorização do directório:
 Could not read values for the following XML nodes:
-
+Não foi possível ler os valores dos seguintes nós XML:
 Create a batch job
 Criar ficheiro batch
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 Personalizar colunas
 Customize...
 Personalizar...
+D-Click
+Duplo Clique
 DECISION TREE
 ÁRVORE DE DECISÃO
 Data remaining:
 Dados em falta:
+Data verification error: Source and target file have different content!
+Erro na verificação de dados: ficheiro fonte e de destino têm conteúdo diferente!
 Date
 Data
 Delay
 Atraso
-Delay between two invocations of the commandline
-Atraso entre duas chamadas da linha de comandos
+Delay between detection of changes and execution of commandline in seconds
+Atraso entre a detecção de diferenças e a execuçao dos comandos em segundos
 Delete files/folders existing on left side only
 Eliminar itens existentes apenas no lado esquerdo
 Delete files/folders existing on right side only
@@ -300,6 +310,8 @@ Deleting folder %x
 Apagar pasta %x
 Deletion handling
 Controlo eliminação
+Description
+Descriçã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
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Quer mesmo mover o(s) seguinte(s) objecto(s) para a Reciclagem?
 Do you want FreeFileSync to automatically check for updates every week?
 Deseja que o FreeFileSync procure automaticamente actualizações todas as semanas?
-Don't ask me again
-Não perguntar de novo
 Donate with PayPal
 Doar usando PayPal
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Sair imediatamente e enviar o código < 0
 Exit with RC < 0
 Sair com RC < 0
+External applications
+Aplicações externas
 Feedback and suggestions are welcome at:
 Comentários e sugestões são benvindos em:
 File %x has an invalid date!
 Ficheiro %x tem data inválida!
-File Manager integration:
-Integração c/ Gestor de Ficheiros:
-File Time tolerance (seconds):
-Tempo de tolerância do ficheiro (segundos):
 File already exists. Overwrite?
 O ficheiro já existe. Deseja substituir?
 File content
@@ -410,12 +418,10 @@ File list exported!
 Lista dos ficheiros exportada!
 File size and date
 Data e tamanho do ficheiro
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Ficheiro com diferença de tempo até ao número especificado de segundos são tratados como tendo o mesmo tempo.
 Filename
 Nome do ficheiro
-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.
-Os ficheiros %x têm uma diferença de tempo inferior a 1 hora! Não é seguro decidir qual o mais novo devido às mudanças de Hora de Verão.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Os ficheiros %x têm uma diferença de tempo inferior a 1 hora!\n\nNão é seguro decidir qual o mais novo devido às mudanças de Hora de Verão.
 Files %x have the same date but a different size!
 Os ficheiros %x têm a mesma data, mas tamanho diferente!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Os ficheiros são considerados iguais se\n     - o tamanho\n     - data e hora são iguais.
 Files remaining:
 Ficheiros restantes:
+Files that are equal on both sides
+Ficheiros iguais dos dois lados
 Files that exist on both sides and have different content
 Ficheiros existentes dos dois lados e com conteúdo diferente
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Filtrar vista
 Folder Comparison and Synchronization
 Comparação e Sincronização de pastas
-Folder pair
-Par de pastas
+Free disk space available:
+Espaço livre em disco:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Comparação e Sincronização de pastas
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Opções
 Help
 Ajuda
+Hidden dialogs:
+Diálogos ocultos:
 Hide all error and warning messages
 Ocultar todas as mensagens de erro ou aviso
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Ocultar ficheiros existentes somente à esquerda
 Hide files that exist on right side only
 Ocultar ficheiros existentes somente à direita
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Ocultar ficheiros a ser substituidos do lado esquerdo
+Hide files that will be overwritten on right side
+Ocultar ficheiros a ser substituidos do lado direito
 Hide files that won't be copied
 Ocultar ficheiros que não serão copiados
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Informação
-Initialization of Recycle Bin failed!
-Início da Reciclagem falhou!
+Integrate external applications into context menu. The following macros are available:
+Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis:
 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. :)
+Leave as unresolved conflict
+Deixar como conflito
 Left
 Esquerda
+Legend
+Legenda
 Load configuration from file
 Carregar configuração do ficheiro
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ 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
+Move files to a user-defined directory.
+Mover ficheiros para um directório definido pelo utilizador.
 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.
+A mover %x para a Reciclagem
+Moving file %x to user-defined directory %y
+A mover ficheiro %x para o directório &y
+Moving folder %x to user-defined directory %y
+A mover pasta %x para o directório %y
+Multiple...
+Multiplo...
 Not enough free disk space available in:
 Não há espaço livre suficiente em:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 Número de ficheiros substituidos
 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.
-Apenas ficheiros/pastas que passem o filtro serão selecionados para sincronização. O filtro será aplicado no nome relativo às pastas em sincronização.
-Open with File Manager\tD-Click
-Abrir c/ Gestor de Ficheiros\tD-Click
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Apenas ficheiros/directórios que passem o filtro serão seleccionados para sincronização. O filtro será aplicado ao nome relativo(!) ao directório base de sincronização.
 Operation aborted!
 Operação abortada!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Questão
 Quit
 Sair
+Re-enable all hidden dialogs?
+Reactivar todos os diálogos ocultos?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Sincronização Automática
 RealtimeSync configuration
 Configuração do RealtimeSync
 Relative path
 Caminho
+Remove alternate settings
+Remover opções alternativas
 Remove folder
 Remover pasta(s)
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Informar um erro de tradução
 Reset
 Reiniciar
-Reset all warning messages
-Reiniciar todas mensagens de aviso
-Reset all warning messages?
-Reiniciar todas mensagens de aviso?
 Result
 Resultado
 Right
@@ -640,6 +650,10 @@ Scanning:
 A pesquisar:
 Select a folder
 Seleccione uma pasta
+Select alternate filter settings
+Seleccionar opções alternativas de filtros
+Select alternate synchronization settings
+Seleccionar opções alternativas de sincronização
 Select logfile directory:
 Seleccione directório para ficheiro log:
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Mostrar ficheiros existentes somente à esquerda
 Show files that exist on right side only
 Mostrar ficheiros existentes somente à direita
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Mostrar ficheiros a ser substituidos do lado esquerdo
+Show files that will be overwritten on right side
+Mostrar ficheiros a ser substituidos do lado direito
 Show files that won't be copied
 Mostrar ficheiros que não serão copiados
+Show hidden dialogs
+Mostrar diálogos ocultos
 Show popup
 Mostrar popups
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Modo silencioso
 Size
 Tamanho
-Sorting file list...
-Ordenar lista de ficheiros...
 Source code written completely in C++ utilizing:
 Código fonte todo escrito em C++ utilizando:
 Speed:
@@ -728,8 +742,6 @@ Target file already existing!
 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Utilizar Reciclagem
 Use Recycle Bin when deleting or overwriting files.
 Utilizar Reciclagem ao apagar ou substituir ficheiros.
+User-defined directory
+Directório definido pelo utilizador
+User-defined directory for deletion was not specified!
+Directório para eliminação não foi especificado!
 Variant
 Variável
+Verifying file %x
+A verificar ficheiro %x
 Volume name %x not part of filename %y!
 Nome do volume %x não faz parte do ficheiro %y!
 Warning
 Atenção
 Warning: Synchronization failed for %x item(s):
 Atenção: A sincronização falhou para %x item(s):
-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.
diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng
index 5d6060b3..0839d747 100644
--- a/BUILD/Languages/portuguese_br.lng
+++ b/BUILD/Languages/portuguese_br.lng
@@ -68,6 +68,8 @@
 &Carregar
 &Load configuration
 &Carregar configuração 
+&New
+&Novo
 &No
 &Não
 &OK
@@ -79,13 +81,19 @@
 &Restore
 &Restaurar
 &Retry
-&Tentar de Novo
+&Tentar Novamente
 &Save
 &Salvar
 &Yes
 &Sim
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Note que apenas discos FAT/FAT32 são afetados por este problema!\nEm todos os outros casos pode-se desabilitar esta opção \"ignorar diferença de 1 hora\".)
 ,
 .
+- Other side's counterpart to %dir
+- Correspondente do outro lado a %dir
+- Other side's counterpart to %name
+- Correspondente do outro lado a %name
 - conflict
 - conflito
 - conflict (same date, different size)
@@ -110,10 +118,6 @@
 - direita
 - right newer
 - mais recente à direita
-- sibling of %dir
-- equivalente de %dir
-- sibling of %name
-- equivalente de %name
 -Open-Source file synchronization-
 -Sincronização de Arquivos Open-Source-
 .
@@ -154,16 +158,14 @@ Add folder
 Adicionar pasta
 Add folder pair
 Adicionar par de pastas
-All items have been synchronized!
-Todos os itens foram sincronizados!
 An exception occured!
 Ocorreu uma exceção!
 As a result the files are separated into the following categories:
 Como resultado, os arquivos são separados nas seguintes categorias:
 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:
-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:
+Como o nome sugere, dois arquivos com o mesmo nome são assinalados como iguais se e somente se eles tiverem o mesmo conteúdo. 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.
+Monta um arquivo batch para sincronização automatizada. Para iniciar o modo batch, passar o nome do arquivo para o executável do FreeFileSync: FreeFileSync.exe <arquivo batch>. Também pode ser programado no Agendador de Tarefas do sistema operacional.
 Auto-adjust columns
 Autoajustar colunas
 Batch execution
@@ -208,6 +210,8 @@ Comparing content of files %x
 Comparando conteúdo do arquivo %x
 Comparing content...
 Comparando conteúdo...
+Comparing files by content failed.
+Comparação de arquivos pelo conteúdo falhou.
 Comparison Result
 Resultado da Comparação
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Confirmar
 Conflict detected:
 Conflito detectado:
+Conflicts/files that cannot be categorized
+Conflitos/arquivos que não podem ser categorizados
 Continue
 Continuar
 Conversion error:
@@ -257,7 +263,7 @@ Não foi possível determinar o nome do volume para o arquivo:
 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:
-
+Não foi possível ler os valores para os seguintes nós XML:
 Create a batch job
 Criar arquivo batch
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 Personalizar colunas
 Customize...
 Personalizar...
+D-Click
+Duplo Click
 DECISION TREE
 ÁRVORE DE DECISÃO
 Data remaining:
 Dados faltantes:
+Data verification error: Source and target file have different content!
+Erro de verificação de dados: Arquivo de origem e destino têm o mesmo conteúdo!
 Date
 Data
 Delay
 Atraso
-Delay between two invocations of the commandline
-Atraso entre duas chamadas de linhas de comando
+Delay between detection of changes and execution of commandline in seconds
+Atraso entre detecção de mudanças e execução de linha de comando em segundos
 Delete files/folders existing on left side only
 Apagar arquivos/pastas existentes apenas no lado esquerdo
 Delete files/folders existing on right side only
@@ -300,6 +310,8 @@ Deleting folder %x
 Apagando pasta %x
 Deletion handling
 Tratamento da exclusão
+Description
+Descriçã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
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Quer mesmo mover o(s) seguinte(s) item(s) para a Lixeira?
 Do you want FreeFileSync to automatically check for updates every week?
 Deseja que o FreeFileSync procure automaticamente novas versões toda semana?
-Don't ask me again
-Não perguntar novamente
 Donate with PayPal
 Doar usando PayPal
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Sair imediatamente e setar\nreturncode < 0
 Exit with RC < 0
 Sair com RC < 0
+External applications
+Aplicações externas
 Feedback and suggestions are welcome at:
 Comentários e sugestões são bem-vindos em:
 File %x has an invalid date!
 Arquivo %x tem uma data inválida!
-File Manager integration:
-Integração com Gerenciador de Arquivos:
-File Time tolerance (seconds):
-Tolerância de Tempo do Arquivo (segundos):
 File already exists. Overwrite?
 O arquivo já existe. Deseja substituir?
 File content
@@ -410,12 +418,10 @@ File list exported!
 Lista de arquivos exportada!
 File size and date
 Data e tamanho do arquivo
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Arquivos com diferença de horário até o número especificado de segundos são tratados como tendo o mesmo horário.
 Filename
 Nome do arquivo
-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.
-Arquivos %x têm diferença no horário de criação menor do que 1 hora! Não é seguro decidir qual é o mais novo devido a problemas relacionados com o Horário de Verão.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Arquivos %x têm diferença no horário de criação menor do que 1 hora!\n\nNão é seguro decidir qual é o mais novo devido a problemas relacionados com o Horário de Verão.
 Files %x have the same date but a different size!
 Arquivos %x têm a mesma data mas tamanhos diferentes!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Os arquivos são considerados iguais se\n     - o tamanho\n     - e a data e hora da última modificação\nsão iguais.
 Files remaining:
 Arquivos restantes:
+Files that are equal on both sides
+Arquivos que são iguais em ambos os lados
 Files that exist on both sides and have different content
 Arquivos que existem nos dois lados e têm conteúdo diferente
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Filtrar vista
 Folder Comparison and Synchronization
 Comparação e Sincronização de Pastas
-Folder pair
-Par de pastas
+Free disk space available:
+Espaço livre em disco:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Comparação e Sincronização de Pastas
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Configurações
 Help
 Ajuda
+Hidden dialogs:
+Diálogos ocultos:
 Hide all error and warning messages
 Ocultar todas as mensagens de erro ou aviso
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Ocultar arquivos que existem somente à esquerda
 Hide files that exist on right side only
 Ocultar arquivos que existem somente à direita
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Ocultar arquivos que serão substituídos no lado esquerdo
+Hide files that will be overwritten on right side
+Ocultar arquivos que serão substituídos no lado direito
 Hide files that won't be copied
 Ocultar arquivos que não serão copiados
 Hide filtered items
@@ -511,7 +521,7 @@ Homepage
 If you like FFS
 Se gosta do FFS
 Ignore 1-hour file time difference
-Ignorar diferença de tempo do arquivo de 1 hora
+Ignorar diferença de tempo de 1 hora
 Ignore errors
 Ignorar erros
 Ignore subsequent errors
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Informação
-Initialization of Recycle Bin failed!
-Inicialização da Lixeira falhou!
+Integrate external applications into context menu. The following macros are available:
+Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis:
 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. :)
+Leave as unresolved conflict
+Deixar como conflito não resolvido
 Left
 Esquerda
+Legend
+Legenda
 Load configuration from file
 Carregar configuração do arquivo
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ 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
+Move files to a user-defined directory.
+Mover arquivos para um diretório especificado.
 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.
+Moving file %x to user-defined directory %y
+Movendo arquivo %x para o diretório especificado
+Moving folder %x to user-defined directory %y
+Movendo pasta %x para o diretório especificado
+Multiple...
+Múltiplos...
 Not enough free disk space available in:
 Espaço em disco insuficiente em:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 Número de arquivos que serão substituídos
 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.
-Apenas arquivos/diretórios que passarem a filtragem serão selecionados para sincronização. O filtro será aplicado ao nome em relação(!) aos diretórios de sincronização.
-Open with File Manager\tD-Click
-Abrir com Gerenciador de Arquivos\tD-Click
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Apenas arquivos/diretórios que passarem o filtro serão selecionados para sincronização. O filtro será aplicado ao nome relativo(!) aos diretórios base de sincronização.
 Operation aborted!
 Operação cancelada!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Questão
 Quit
 Sair
+Re-enable all hidden dialogs?
+Reabilitar todos os diálogos ocultos?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Sincronização Automátizada
 RealtimeSync configuration
 Configuração do RealtimeSync
 Relative path
 Caminho relativo
+Remove alternate settings
+Remover configurações alternativas
 Remove folder
 Remover pasta
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Reportar erro de tradução
 Reset
 Reiniciar
-Reset all warning messages
-Resetar todas as mensagens de aviso
-Reset all warning messages?
-Resetar todas as mensagens de aviso?
 Result
 Resultado
 Right
@@ -640,6 +650,10 @@ Scanning:
 Pesquisando:
 Select a folder
 Selecione uma pasta
+Select alternate filter settings
+Selecionar configuração de filtro alternativa
+Select alternate synchronization settings
+Selecionar configuração de sincronização alternativa
 Select logfile directory:
 Escolha um diretório para salvar o arquivo log:
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Mostrar arquivos que existem somente à esquerda
 Show files that exist on right side only
 Mostrar arquivos que existem somente à direita
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Mostrar arquivos que serão substituídos no lado esquerdo
+Show files that will be overwritten on right side
+Mostrar arquivos que serão substituídos no lado direito
 Show files that won't be copied
 Mostrar arquivos que não serão copiados
+Show hidden dialogs
+Mostrar diálogos ocultos
 Show popup
 Mostrar popup
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Modo silencioso
 Size
 Tamanho
-Sorting file list...
-Ordenando lista de arquivos...
 Source code written completely in C++ utilizing:
 Código fonte todo escrito em C++ utilizando:
 Speed:
@@ -728,8 +742,6 @@ 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 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
@@ -753,33 +765,37 @@ Não foi possível conectar a sourceforge.net!
 Unable to create logfile!
 Não foi possível criar arquivo log!
 Unable to initialize Recycle Bin!
-Não foi possível inicializar a Lixeira!
+Não foi possível abrir a Lixeira!
 Uncheck all
 Desmarcar todos
 Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchronization.
-Conflitos não resolvidos existentes! \n\nVocê pode ignorar conflitos e continuar a sincronização.
+Conflitos não resolvidos existentes! \n\nVocê pode ignorar os 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.
+Uso: Selecionar diretórios para monitoração e entrar com 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.
-Usar a Lixeira quando apagar ou sobrescrever arquivos.
+Usar a Lixeira quando apagar ou substituir arquivos.
+User-defined directory
+Diretório especificado
+User-defined directory for deletion was not specified!
+Diretório especificado para arquivos apagados não foi definido!
 Variant
 Variante
+Verifying file %x
+Verificando arquivo %x
 Volume name %x not part of filename %y!
 Nome do volume %x não é parte do arquivo %y!
 Warning
 Atenção
 Warning: Synchronization failed for %x item(s):
 Atenção: A sincronização falhou para %x item(s):
-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.
+Você pode ignorar o erro para considerar diretórios não existente como vazios.
 You may try to synchronize remaining items again (WITHOUT having to re-compare)!
 Você pode tentar sincronizar os elementos restantes outra vez (SEM ter que comparar novamente)!
 different
diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng
index 231757e3..c6300e78 100644
--- a/BUILD/Languages/russian.lng
+++ b/BUILD/Languages/russian.lng
@@ -68,6 +68,8 @@
 &Загрузить
 &Load configuration
 &Загрузить конфигурацию...
+&New
+&Новая
 &No
 &Нет
 &OK
@@ -84,8 +86,14 @@
 &Сохранить
 &Yes
 &Да
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Помните, что только диски FAT/FAT32 страдают от этой проблемы!\nВо всех остальных случаях вы можете отключить параметр \"игнорировать 1-часовую разницу\".)
 ,
 .
+- Other side's counterpart to %dir
+- аналогичная папка с другой стороны
+- Other side's counterpart to %name
+- аналогичный файл с другой стороны
 - conflict
 - конфликт
 - conflict (same date, different size)
@@ -110,10 +118,6 @@
 - правые
 - right newer
 - правые новее
-- sibling of %dir
-- аналогичная папка с другой стороны
-- sibling of %name
-- аналогичный файл с другой стороны
 -Open-Source file synchronization-
 Синхронизатор файлов с открытым исходным кодом
 .
@@ -154,8 +158,6 @@ Add folder
 Добавить папку
 Add folder pair
 Добавить папку
-All items have been synchronized!
-Все пункты были синхронизированы!
 An exception occured!
 Исключение произошло!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 Сравнение содержания файлов %x
 Comparing content...
 Сравнение содержания...
+Comparing files by content failed.
+Сравнение файлов по содержимому провалено.
 Comparison Result
 Результаты сравнения
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Подтвердить
 Conflict detected:
 Обнаружен конфликт:
+Conflicts/files that cannot be categorized
+Конфликты/файлы, которые не могут быть отнесены к какой-либо категории
 Continue
 Продолжить
 Conversion error:
@@ -270,16 +276,20 @@ Customize columns
 Выбор колонок
 Customize...
 Выбрать колонки...
+D-Click
+Двойной клик
 DECISION TREE
 Древо решений
 Data remaining:
 Осталось:
+Data verification error: Source and target file have different content!
+Ошибка проверки данных: исходный и конечный файлы имеют разное содержание!
 Date
 Дата
 Delay
 Задержка
-Delay between two invocations of the commandline
-Задержка между двумя обращениями к командной строке
+Delay between detection of changes and execution of commandline in seconds
+Задержка между обнаружением изменений и выполнением командной строки в секундах
 Delete files/folders existing on left side only
 Удалять файлы/папки, существующие только на левой стороне
 Delete files/folders existing on right side only
@@ -291,7 +301,7 @@ 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
@@ -300,6 +310,8 @@ Deleting folder %x
 Удаление папки %x
 Deletion handling
 Настройки удаления
+Description
+Описание
 Directories are dependent! Be careful when setting up synchronization rules:
 Зависимые папки! Будьте внимательны при настройке правил синхронизации:
 Directories to watch
@@ -317,11 +329,9 @@ 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?
@@ -357,7 +367,7 @@ Error moving directory:
 Error moving file:
 Ошибка перемещения файла:
 Error moving to Recycle Bin:
-Ошибка при отправке в Корзину:
+Ошибка при отправке в "Корзину":
 Error opening file:
 Ошибка при открытии файла:
 Error parsing configuration file:
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Выйти немедленно и установить код возврата <0
 Exit with RC < 0
 Выход с RC <0
+External applications
+Внешние приложения
 Feedback and suggestions are welcome at:
 Отзывы и предложения присылайте по адресу:
 File %x has an invalid date!
 Файл %x имеет недействительную дату!
-File Manager integration:
-Интеграция в Проводник:
-File Time tolerance (seconds):
-Допуск по времени файла (секунд):
 File already exists. Overwrite?
 Файл уже существует. Перезаписать?
 File content
@@ -410,12 +418,10 @@ 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 a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Файлы %x имеют время отличающееся менее чем на 1 час!\n\nРешать какой новее небезопасно ввиду перехода на летнее время.
 Files %x have the same date but a different size!
 Файлы %x имеют одинаковую дату, но различаются по размеру!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Файлы считаются равными, если одинаковые\n - размер файла\n - дата и время последнего изменения
 Files remaining:
 Файлов осталось:
+Files that are equal on both sides
+Файлы, одинаковые с обеих сторон
 Files that exist on both sides and have different content
 Файлы, существующие на обоих сторонах и имеющие разное содержание
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Вид фильтра
 Folder Comparison and Synchronization
 Сравнение и синхронизация
-Folder pair
-Дополнительная папка
+Free disk space available:
+Доступно свободного места на диске:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Сравнение и синхронизация
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Глобальные настройки
 Help
 Помощь
+Hidden dialogs:
+Скрытые диалоги
 Hide all error and warning messages
 Скрывать все ошибки и сообщения с предупреждениями
 Hide conflicts
@@ -486,10 +496,6 @@ 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
@@ -498,6 +504,10 @@ Hide files that will be deleted on the left side
 Скрыть файлы, которые будут удалены на левой стороне
 Hide files that will be deleted on the right side
 Скрыть файлы, которые будут удалены на правой стороне
+Hide files that will be overwritten on left side
+Скрыть файлы, которые будут перезаписаны на левой стороне
+Hide files that will be overwritten on right side
+Скрыть файлы, которые будут перезаписаны на правой стороне
 Hide files that won't be copied
 Скрыть файлы, которые не будут скопированы
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Информация
 Information
 Информация
-Initialization of Recycle Bin failed!
-Инициализация Корзины провалена!
+Integrate external applications into context menu. The following macros are available:
+Интегрирует внешние приложения в контекстное меню.\nСледующие команды доступны:
 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Если Вы хотите, чтобы эта функция была, пожалуйста свяжитесь с автором.:)
+Невозможно инициализировать "Корзину"!\n\nВероятно, что Вы не используете Windows.\nЕсли Вы хотите, чтобы эта функция была, пожалуйста свяжитесь с автором. :)
+Leave as unresolved conflict
+Оставить как нерешенный конфликт
 Left
 Слева
+Legend
+Легенда
 Load configuration from file
 Загрузить конфигурацию из файла
 Load configuration history (press DEL to delete items)
@@ -554,16 +568,16 @@ Move column down
 Переместить вниз
 Move column up
 Переместить вверх
-Move files to a custom directory.
-Перемещать файлы в выбранную папку
-Move to custom directory
-Перемещать в выбранную папку
+Move files to a user-defined 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.
-Не все пункты были синхронизированы! Посмотрите список.
+Отправка %x в "Корзину"
+Moving file %x to user-defined directory %y
+Перемещение файла %x в заданную пользователем папку %y
+Moving folder %x to user-defined directory %y
+Перемещение папки %x в заданную пользователем папку %y
+Multiple...
+Различные варианты синхронизации
 Not enough free disk space available in:
 Не достаточно свободного места в:
 Nothing to synchronize according to configuration!
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 Число файлов, которые будут перезаписаны
 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.
-Только файлы/папки, которые проходят фильтрацию, будут отобраны для синхронизации. Этот фильтр будет применяться к пути папки.
-Open with File Manager\tD-Click
-Открыть в Проводнике...\tD-Click
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Только файлы/папки, которые проходят фильтрацию будут отобраны для синхронизации. Фильтр будет применяться ко всем именам, относящимся к основным синхронизируемым папкам.
 Operation aborted!
 Операция отменена!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Вопрос
 Quit
 Выход
+Re-enable all hidden dialogs?
+Показать все скрытые диалоги?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Автоматическая синхронизация
 RealtimeSync configuration
 Настройка RealtimeSync
 Relative path
 Относительный путь
+Remove alternate settings
+Удалить альтернативные настройки
 Remove folder
 Удалить папку
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Сообщить об ошибке перевода
 Reset
 Сбросить
-Reset all warning messages
-Сбросить все сообщения с предупреждениями
-Reset all warning messages?
-Сбросить все сообщения с предупреждениями?
 Result
 Описание
 Right
@@ -640,6 +650,10 @@ Scanning:
 Сканирую:
 Select a folder
 Выбрать папку
+Select alternate filter settings
+Выбрать альтернативные настройки фильтра
+Select alternate synchronization settings
+Выбрать альтернативные настройки синхронизации
 Select logfile directory:
 Выберите папку для лог-файлов:
 Select variant:
@@ -660,10 +674,6 @@ 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
@@ -672,8 +682,14 @@ Show files that will be deleted on the left side
 Показать файлы, которые будут удалены на левой стороне
 Show files that will be deleted on the right side
 Показать файлы, которые будут удалены на правой стороне
+Show files that will be overwritten on left side
+Показать файлы, которые будут перезаписаны на левой стороне
+Show files that will be overwritten on right side
+Показать файлы, которые будут перезаписаны на правой стороне
 Show files that won't be copied
 Показать файлы, которые не будут скопированы
+Show hidden dialogs
+Показать скрытые диалоги
 Show popup
 Показывать всплывающие окна
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Скрытый режим
 Size
 Размер
-Sorting file list...
-Формирование списка файлов...
 Source code written completely in C++ utilizing:
 Исходный код написан на С++ с использованием:
 Speed:
@@ -728,8 +742,6 @@ Target file already existing!
 Конечный файл уже существует!
 The file does not contain a valid configuration:
 Файл не содержит действительную конфигурацию:
-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
@@ -753,7 +765,7 @@ Unable to connect to sourceforge.net!
 Unable to create logfile!
 Невозможно создать лог!
 Unable to initialize Recycle Bin!
-Невозможно инициализировать Корзину!
+Невозможно инициализировать "Корзину"!
 Uncheck all
 Снять выделение со всех
 Unresolved conflicts existing! \n\nYou can ignore conflicts and continue synchronization.
@@ -766,16 +778,20 @@ Use Recycle Bin
 Использовать "Корзину"
 Use Recycle Bin when deleting or overwriting files.
 Использовать "Корзину" при удалении или перезаписи файлов
+User-defined directory
+Использовать заданную пользователем папку
+User-defined directory for deletion was not specified!
+Пользовательская папка для удаления не была указана!
 Variant
 Вариант
+Verifying file %x
+Проверка файла %x
 Volume name %x not part of filename %y!
 Имя тома %x не является частью имени файла %y!
 Warning
 Внимание
 Warning: Synchronization failed for %x item(s):
 Внимание: Синхронизация провалена для %x 
-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.
diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng
index 5e77766b..93a7e4f8 100644
--- a/BUILD/Languages/slovenian.lng
+++ b/BUILD/Languages/slovenian.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 od 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 od GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI ogrodje\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE
  Byte
  Byte
  GB
@@ -68,6 +68,8 @@
 &Naloži
 &Load configuration
 Na&loži konfiguracijo
+&New
+&Novo
 &No
 &Ne
 &OK
@@ -84,8 +86,14 @@ Na&loži konfiguracijo
 &Shrani
 &Yes
 &Da
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+(Vedite, da samo na pogonih s FAT/FAT32 lahko pride do teh težav!\nV vseh drugih primerih lahko onemogočite nastavitev \"prezri 1-urno razliko\".)
 ,
 , 
+- Other side's counterpart to %dir
+Duplikat z druge strani od %dir
+- Other side's counterpart to %name
+Duplikat z druge strani od %name
 - conflict
 - spor
 - conflict (same date, different size)
@@ -110,10 +118,6 @@ Na&loži konfiguracijo
 - desno
 - right newer
 - desna novejša
-- sibling of %dir
-- v sorodu z %dir
-- sibling of %name
-- v sorodu z %name
 -Open-Source file synchronization-
 -Odprto-kodna sinhronizacija datotek-
 .
@@ -154,8 +158,6 @@ Add folder
 Dodaj mapo
 Add folder pair
 Dodaj par imenikov
-All items have been synchronized!
-Vsi predmeti so bili sinhronizirani!
 An exception occured!
 Zgodila se je napaka!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 Primerjam vsebino datotek %x
 Comparing content...
 Primerjam vsebino...
+Comparing files by content failed.
+Primerjava datotek po vsebini ni uspela.
 Comparison Result
 Rezultati primerjave
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Potrdi
 Conflict detected:
 Zaznan spor:
+Conflicts/files that cannot be categorized
+Prisotni so spori/datoteke, ki ne morejo biti kategorizirani
 Continue
 Nadaljuj
 Conversion error:
@@ -257,7 +263,7 @@ Ne morem določiti imena volumna za datoteko:
 Could not initialize directory monitoring:
 Ne morem začeti nadzorovanja imenikov:
 Could not read values for the following XML nodes:
-
+Ne morem brati vrednosti za naslednja XML vozlišča:
 Create a batch job
 Ustvari batch opravilo
 Creating folder %x
@@ -270,16 +276,20 @@ Customize columns
 Stolpce prikroji po meri
 Customize...
 Prilagodi...
+D-Click
+D-Klik
 DECISION TREE
 DREVO ODLOČITEV
 Data remaining:
 Preostanek podatkov:
+Data verification error: Source and target file have different content!
+Napaka pri preverjanju podatkov: izvorna in tarčna datoteka imata različno vsebino!
 Date
 Datum
 Delay
 Zakasnitev
-Delay between two invocations of the commandline
-Zakasnitev med dvema pozivoma ukazne vrstice
+Delay between detection of changes and execution of commandline in seconds
+Zakasnitev med zaznavo sprememb in izvršitvijo ukazov v sekundah
 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
@@ -300,6 +310,8 @@ Deleting folder %x
 Brisanje mape %x
 Deletion handling
 Postopanje pri brisanju
+Description
+Opis
 Directories are dependent! Be careful when setting up synchronization rules:
 Imeniki so v odvisnosti! Bodite pozorni, ko nastavljate sinhronizacijska pravila:
 Directories to watch
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 Ali resnično želite premakniti naslednje objekte v Koš?
 Do you want FreeFileSync to automatically check for updates every week?
 Ali želite, da FreeFileSync samodejno preverja za posodobitve vsak teden?
-Don't ask me again
-Ne sprašuj me več
 Donate with PayPal
 Doniraj s PayPal
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Takoj zapusti in vrni povratno kodo < 0
 Exit with RC < 0
 Zapusti z RC < 0
+External applications
+Zunanje aplikacije
 Feedback and suggestions are welcome at:
 Povratne informacije in predlogi so dobrodošli na:
 File %x has an invalid date!
 Datoteka %x ima neveljaven datum!
-File Manager integration:
-Integracija z urejevalnikom datotek:
-File Time tolerance (seconds):
-Toleranca v času zadnje spremembe datoteke (sekunde):
 File already exists. Overwrite?
 Datoteka že obstaja. Prepišem?
 File content
@@ -410,12 +418,10 @@ File list exported!
 Seznam datotek je bil izvožen!
 File size and date
 Velikosti in datumu datoteke
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Časi sprememb datotek, ki se razlikujejo do navedenega števila sekund so smatrani kot da imajo isti čas spremembe.
 Filename
 Ime datoteke
-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.
-Datoteki %x imata razliko v času spremembe manj kot 1 uro! Ni se varno odločiti katera je novejša zaradi vprašanj v zvezi s Poletnim časom.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
+Datoteki %x imata razliko v času spremembe manj kot 1 uro!\n\nNi se varno odločiti katera je novejša zaradi vprašanj v zvezi s Poletnim časom.
 Files %x have the same date but a different size!
 Datoteki %x imata enak datum ampak različno velikost!
 Files are found equal if\n     - file content\nis the same.
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Datoteki sta enaki, če so\n     - velikost datoteke\n     - zadnji čas spremembe in datum\nenaki.
 Files remaining:
 Preostale datoteke:
+Files that are equal on both sides
+Datoteki, ki sta enaki na obeh straneh
 Files that exist on both sides and have different content
 Datoteke, ki obstajajo na obeh straneh in imajo različno vesbino
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Filtriran pogled
 Folder Comparison and Synchronization
 Primerjava in sinhronizacija imenika
-Folder pair
-Par map
+Free disk space available:
+Prosti disk, ki je na voljo:
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Primerjava in sinhronizacija map
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Globalne nastavitve
 Help
 Pomoč
+Hidden dialogs:
+Skriti pogovori:
 Hide all error and warning messages
 Skrij vsa obvestila o napakah in opozorilih
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Skrij datoteke, ki obstajajo samo na levi strani
 Hide files that exist on right side only
 Skrij datoteke, ki obstajajo samo na desni strani
-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
@@ -498,6 +504,10 @@ 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 will be overwritten on left side
+Skrij datoteke, ki bodo prepisane na levi strani
+Hide files that will be overwritten on right side
+Skrij datoteke, ki bodo prepisane na desni strani
 Hide files that won't be copied
 Skrij datoteke, ki ne bodo kopirane
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Informacije
-Initialization of Recycle Bin failed!
-Inicializacija Koša ni uspela!
+Integrate external applications into context menu. The following macros are available:
+Integriraj zunanje aplikacije v kontekstni menu. Na voljo so naslednji makri:
 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. :)
+Leave as unresolved conflict
+Pusti kot nerešeni spor
 Left
 Levo
+Legend
+Legenda
 Load configuration from file
 Naloži konfiguracijo iz datoteke
 Load configuration history (press DEL to delete items)
@@ -554,20 +568,20 @@ 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
+Move files to a user-defined directory.
+Premakne datoteke v uporabniško-določen imenik.
 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.
+Moving file %x to user-defined directory %y
+Premikam datoteko %x v uporabniško-določen imenik %y
+Moving folder %x to user-defined directory %y
+Premikam mapo %x v uporabniško-določen imenik %y
+Multiple...
+Večkratno...
 Not enough free disk space available in:
 Na voljo ni dovolj prostega prostora na disku v:
 Nothing to synchronize according to configuration!
-Nič ni za sinhronizirati po trenutni konfiguraciji!
+Po trenutni konfiguraciji ni nič za sinhronizirati!
 Number of files and directories that will be created
 Število datotek in imenikov, ki bodo ustvarjeni
 Number of files and directories that will be deleted
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 Število datotek, ki bodo prepisane
 OK
 V redu
-Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the synchronization directories.
-Samo datoteke/imeniki, ki preidejo skozi filtriranje bodo izbrane za sinhronizacijo. Filter bo uveljavljen na ime relativno(!) glede na sinhronizacijske imenike.
-Open with File Manager\tD-Click
-Odpri z urejevalnikom datotek\tD-Click
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
+Samo datoteke/imeniki, ki preidejo filtriranje bodo izbrani za sinhronizacijo. Filter bo uveljavljnen k imenu relativno(!) na bazo sinhroniziranih imenikov.
 Operation aborted!
 Operacija prekinjena!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 Vprašanje
 Quit
 Zapusti
+Re-enable all hidden dialogs?
+Ponovno omogočim skrite pogovore?
 RealtimeSync - Automated Synchronization
 RealtimeSync - Avtomatizirana sinhronizacija
 RealtimeSync configuration
 RealtimeSync nastavitve
 Relative path
 Relativna pot
+Remove alternate settings
+Odstrani nadomestne nastavitve
 Remove folder
 Odstrani v mapo
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 Poročaj o napaki prevoda
 Reset
 Ponastavi
-Reset all warning messages
-Ponastavi vsa obvestila z opozorili
-Reset all warning messages?
-Ponastavim vsa obvestila z opozorili?
 Result
 Rezultat
 Right
@@ -640,6 +650,10 @@ Scanning:
 Pregledujem:
 Select a folder
 Izberite mapo
+Select alternate filter settings
+Izberite nadomestne nastavitve filtra
+Select alternate synchronization settings
+Izberite nadomestne nastavitve sinhronizacije
 Select logfile directory:
 Izberite imenik datoteke za beleženje:
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Prikaži datoteke, ki obstajajo samo na levi
 Show files that exist on right side only
 Prikaži datoteke, ki obstajajo samo na desni
-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
@@ -672,8 +682,14 @@ 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 will be overwritten on left side
+Prikaži datoteke, ki bodo prepisane na levi strani
+Show files that will be overwritten on right side
+Prikaži datoteke, ki bodo prepisane na desni strani
 Show files that won't be copied
 Prikaži datoteke, ki ne bodo kopirane
+Show hidden dialogs
+Prikaži skrite pogovore
 Show popup
 Prikaži pojavno okno
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Tihi način
 Size
 Velikost
-Sorting file list...
-Sortiram seznam datotek...
 Source code written completely in C++ utilizing:
 Izvorna koda napisana celotno v C++ z uporabo:
 Speed:
@@ -723,13 +737,11 @@ Sinhroniziram...
 System out of memory!
 Sistemu je zmanjkalo pomnilnika!
 Target directory already existing!
-
+Ciljni imenik že obstaja!
 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Uporabi Koš
 Use Recycle Bin when deleting or overwriting files.
 Uporabi Koš pri brisanju ali prepisovanju datotek.
+User-defined directory
+Uporabniško-določen imenik
+User-defined directory for deletion was not specified!
+Uporabniško-določen imenik za brisanje ni bil naveden!
 Variant
 Različica
+Verifying file %x
+Preverjam datoteko %x
 Volume name %x not part of filename %y!
 Ime volumna %x ni del imena datoteke %y!
 Warning
 Pozor
 Warning: Synchronization failed for %x item(s):
 Pozor: Sinhronizacija ni uspela za %x predmetov:
-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.
diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng
index c3029efc..ff290214 100644
--- a/BUILD/Languages/spanish.lng
+++ b/BUILD/Languages/spanish.lng
@@ -68,6 +68,8 @@
 &Cargar
 &Load configuration
 &Cargar configuración
+&New
+
 &No
 
 &OK
@@ -84,8 +86,14 @@
 &Guardar
 &Yes
 
+(Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".)
+
 ,
 , 
+- Other side's counterpart to %dir
+
+- Other side's counterpart to %name
+
 - conflict
 
 - conflict (same date, different size)
@@ -110,10 +118,6 @@
 - derecha
 - right newer
 - el más nuevo en la derecha
-- sibling of %dir
-
-- sibling of %name
-
 -Open-Source file synchronization-
 -Sincronización de ficheros Open-Source-
 .
@@ -154,8 +158,6 @@ Add folder
 
 Add folder pair
 Añadir un par de carpetas
-All items have been synchronized!
-¡Todos los elementos han sido sincronizados!
 An exception occured!
 ¡Ha ocurrido una excepción!
 As a result the files are separated into the following categories:
@@ -208,6 +210,8 @@ Comparing content of files %x
 Comparación del contenido de %x ficheros
 Comparing content...
 
+Comparing files by content failed.
+
 Comparison Result
 
 Comparison settings
@@ -232,6 +236,8 @@ Confirm
 Confirmar
 Conflict detected:
 
+Conflicts/files that cannot be categorized
+
 Continue
 Continuar
 Conversion error:
@@ -270,15 +276,19 @@ Customize columns
 Personalizar columnas
 Customize...
 
+D-Click
+
 DECISION TREE
 ÁRBOL DE DECISIÓN
 Data remaining:
 Datos que faltan:
+Data verification error: Source and target file have different content!
+
 Date
 Fecha
 Delay
 
-Delay between two invocations of the commandline
+Delay between detection of changes and execution of commandline in seconds
 
 Delete files/folders existing on left side only
 Eliminar sólo ficheros/carpetas existentes en el lado izquierdo
@@ -300,6 +310,8 @@ Deleting folder %x
 Borrar carpeta %x
 Deletion handling
 
+Description
+
 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
@@ -320,8 +332,6 @@ Do you really want to move the following objects(s) to the Recycle Bin?
 ¿Está seguro de querer mover el/los siguiente(s) objeto(s) a la Papelera?
 Do you want FreeFileSync to automatically check for updates every week?
 
-Don't ask me again
-
 Donate with PayPal
 Donar usando PayPal
 Download now?
@@ -392,14 +402,12 @@ Exit immediately and set returncode < 0
 Salir inmediatamente y enviar el código < 0
 Exit with RC < 0
 Salir com RC < 0
+External applications
+
 Feedback and suggestions are welcome at:
 Los comentarios y sugerencias será bienvenidos en:
 File %x has an invalid date!
 
-File Manager integration:
-Integración con el Explorador:
-File Time tolerance (seconds):
-
 File already exists. Overwrite?
 El fichero ya existe. ¿Sustituir?
 File content
@@ -410,11 +418,9 @@ File list exported!
 Lista de ficheros exportada!
 File size and date
 Fecha y tamaño del fichero
-File times that differ by up to the specified number of seconds are still handled as having same time.
-Las horas de los ficheros que difieren hasta el número de segundos especificados, son consideradas iguales.
 Filename
 Nombre del fichero
-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.
+Files %x have a file time difference of less than 1 hour!\n\nIt's not safe to decide which one is newer due to Daylight Saving Time issues.
 
 Files %x have the same date but a different size!
 
@@ -424,6 +430,8 @@ Files are found equal if\n     - filesize\n     - last write time and date\nare
 Los ficheros serán considerados iguales si\n     - la hora y fecha de la última escritura\nson iguales.
 Files remaining:
 Ficheros restantes:
+Files that are equal on both sides
+
 Files that exist on both sides and have different content
 Ficheros que existen en ambos lados y tienen contenidos diferentes
 Files that exist on both sides, left one is newer
@@ -448,8 +456,8 @@ Filter view
 Vista de filtros
 Folder Comparison and Synchronization
 Carpeta de Comparación y Sincronización
-Folder pair
-Par de carpetas
+Free disk space available:
+
 FreeFileSync - Folder Comparison and Synchronization
 FreeFileSync - Comparación y Sincronización de carpetas
 FreeFileSync Batch Job
@@ -470,6 +478,8 @@ Global settings
 Opciones globales
 Help
 Ayuda
+Hidden dialogs:
+
 Hide all error and warning messages
 Ocultar todos los mensajes de error y aviso
 Hide conflicts
@@ -486,10 +496,6 @@ Hide files that exist on left side only
 Ocultar los ficheros que existen sólo en el lado izquierdo
 Hide files that exist on right side only
 Ocultar los ficheros que existen sólo en el lado derecho
-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
@@ -498,6 +504,10 @@ Hide files that will be deleted on the left side
 
 Hide files that will be deleted on the right side
 
+Hide files that will be overwritten on left side
+
+Hide files that will be overwritten on right side
+
 Hide files that won't be copied
 
 Hide filtered items
@@ -530,12 +540,16 @@ Info
 Info
 Information
 Información
-Initialization of Recycle Bin failed!
-¡El inicio de la Papelera falló!
+Integrate external applications into context menu. The following macros are available:
+
 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 :)
+Leave as unresolved conflict
+
 Left
 
+Legend
+
 Load configuration from file
 Cargar configuración desde fichero
 Load configuration history (press DEL to delete items)
@@ -554,15 +568,15 @@ Move column down
 Mover columna abajo
 Move column up
 Mover columna arriba
-Move files to a custom directory.
-
-Move to custom directory
+Move files to a user-defined directory.
 
 Moving %x to Recycle Bin
 
-Moving %x to custom directory
+Moving file %x to user-defined directory %y
+
+Moving folder %x to user-defined directory %y
 
-Not all items have been synchronized! Have a look at the list.
+Multiple...
 
 Not enough free disk space available in:
 
@@ -576,10 +590,8 @@ Number of files that will be overwritten
 Número de ficheros que serán sustituídos
 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.
+Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories.
 
-Open with File Manager\tD-Click
-Abrir con el Explorador\tD-Click
 Operation aborted!
 Operación abortada!
 Operation:
@@ -594,8 +606,6 @@ 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:
@@ -604,12 +614,16 @@ Question
 
 Quit
 Salir
+Re-enable all hidden dialogs?
+
 RealtimeSync - Automated Synchronization
 
 RealtimeSync configuration
 
 Relative path
 Camino relativo
+Remove alternate settings
+
 Remove folder
 
 Remove folder pair
@@ -618,10 +632,6 @@ Report translation error
 
 Reset
 Reiniciar
-Reset all warning messages
-
-Reset all warning messages?
-¿Reiniciar todos los mensajes de aviso?
 Result
 Resultado
 Right
@@ -640,6 +650,10 @@ Scanning:
 Analizar:
 Select a folder
 Seleccione una carpeta
+Select alternate filter settings
+
+Select alternate synchronization settings
+
 Select logfile directory:
 
 Select variant:
@@ -660,10 +674,6 @@ Show files that exist on left side only
 Mostrar ficheros existentes en la izquierda sólamente
 Show files that exist on right side only
 Mostrar ficheros existentes en la derecha sólamente
-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
@@ -672,8 +682,14 @@ Show files that will be deleted on the left side
 
 Show files that will be deleted on the right side
 
+Show files that will be overwritten on left side
+
+Show files that will be overwritten on right side
+
 Show files that won't be copied
 
+Show hidden dialogs
+
 Show popup
 Mostrar "popups"
 Show popup on errors or warnings
@@ -684,8 +700,6 @@ Silent mode
 Modo silencioso
 Size
 Tamaño
-Sorting file list...
-Ordenar lista de ficheros...
 Source code written completely in C++ utilizing:
 Código fuente escrito en C++ utilizando:
 Speed:
@@ -728,8 +742,6 @@ 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 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
@@ -766,16 +778,20 @@ Use Recycle Bin
 Utilizar la Papelera
 Use Recycle Bin when deleting or overwriting files.
 
+User-defined directory
+
+User-defined directory for deletion was not specified!
+
 Variant
 
+Verifying file %x
+
 Volume name %x not part of filename %y!
 
 Warning
 Atención
 Warning: Synchronization failed for %x item(s):
 Atención: La sincronización falló para %x item(s):
-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.
diff --git a/BUILD/Readme.txt b/BUILD/Readme.txt
index 0e359fc5..20576738 100644
--- a/BUILD/Readme.txt
+++ b/BUILD/Readme.txt
@@ -1,4 +1,4 @@
-FreeFileSync v2.2
+FreeFileSync v2.3
 -----------------
 
 ---------
@@ -63,7 +63,7 @@ FreeFileSync v2.2
 - Create a FreeFileSync batch file using "silent mode".
 - Set error handling to "Exit with Returncode < 0" or "ignore errors" to avoid having a popup stop the program flow.
   In case errors occur FreeFileSync will abort with a returncode < 0 which can be checked via the ERRORLEVEL command.
-- Create a *.cmd or *.bat file and specify the location of FreeFileSync.exe and pass the name of the FreeFileSync batch file as %1 parameter; e.g.:
+- Create a *.cmd or *.bat file and specify the location of FreeFileSync.exe and pass the name of the FreeFileSync batch file as first argument; e.g.:
 
 	C:\Program Files\FreeFileSync\FreeFileSync.exe C:\SyncJob.ffs_batch
 	IF NOT ERRORLEVEL 0 echo An error occurred! && pause
@@ -93,12 +93,12 @@ You can: - drag & drop any directory onto the main window to set the directory f
 		 
 4.) Exclude all subfolders from synchronization
 
-Assuming you plan to synchronize two folders "C:\Source" and "D:\Target", simply set up a filter like this:
+If you want to synchronize all files from the base synchronization directories only, simply set up a filter like this:
 
 	Include: *
-	Exclude: *\*
+	Exclude: *\
 	
-This will exclude all files and folders within the two directories that contain a "\" character. These are exactly the subfolders and -files you want to exclude.
+This will exclude all objects within the two directories that end with a "\" character, which is interpreted as the end of a directory name,
 
 
 5.) Synchronize with FTP
@@ -108,15 +108,17 @@ FreeFileSync does not support FTP directly. But the FTP functionality can be eas
 Example: Use the free utility NetDrive (http://www.netdrive.net/)
 - Add a "New Site" and specify site name, site URL, drive letter, account and password.
 - Use the newly created drive as if it were a regular hard disk.
+- Note: Most FTP drives set a file's timestamp to current time when synchronizing. As a workaround you can try a "compare by filesize", see below.
 
 
-6.) Start associated program on double-click
+6.) Start external application 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
+FreeFileSync's default is to show files in the operating system's standard file browser on each double-click e.g. by invoking "explorer /select, %name" on Windows.
+If some other application shall be started instead, just navigate to "Menu -> Advanced -> Global settings: External Applications" and replace the command string:
 
-	cmd /c start "" "%name"
+Examples:	- Start associated application:		cmd /c start "" "%name" 				
+			- Start visual difference tool:		C:\Program Files\WinMerge\WinMergeU.exe "%name" "%nameCo"
+(Don't forget to use quotation marks if file names contain spaces!)
 
 	
 7. Synchronize USB sticks with variable drive letter
@@ -130,6 +132,22 @@ USB sticks often have different volume names assigned to them when plugged into
 => Working directory automatically is set to "E:\" by the operating system so that "\SyncDir" is interpreted as "E:\SyncDir". Now start synchronization as usual.
 
 
+8. Start RealtimeSync via commandline
+
+RealtimeSync can be used to load a configuration file and start processing immediately without additional user intervention. Just pass the name of a configuration file as 
+first commandline argument.
+
+Example: C:\Program Files\FreeFileSync\RealtimeSync.exe MyConfig.ffs_real
+
+
+9. Compare by filesize
+
+Sometimes you might want to compare both sides by filesize only, ignoring the last modification timestamp. Here is how you can do this: Open your *.ffs_gui configuration file
+and change the XML node <FileTimeTolerance> to some sufficiently large value. Now changed files will be detected as a conflict (same date, different filesize) and a default
+synchronization direction for conflics can be used.
+
+
+
 ---------
 | Links |
 ---------
diff --git a/BUILD/Resources.dat b/BUILD/Resources.dat
index b3d3376a..4fc53ba5 100644
--- a/BUILD/Resources.dat
+++ b/BUILD/Resources.dat
diff --git a/BUILD/Shadow.zip b/BUILD/Shadow.zip
index fbf0d585..24716c68 100644
--- a/BUILD/Shadow.zip
+++ b/BUILD/Shadow.zip
diff --git a/BUILD/mingwm10.dll b/BUILD/mingwm10.dll
index 572f8886..cf2113a1 100644
--- a/BUILD/mingwm10.dll
+++ b/BUILD/mingwm10.dll