2.3

1 files changed, 70 insertions, 54 deletions

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.