5.21

1 files changed, 156 insertions, 94 deletions

diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index 754d0ca3..98c55320 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -25,14 +25,14 @@
 <source>Checking recycle bin availability for folder %x...</source>
 <target>正在为文件夹 %x 检测回收站可用性...</target>
 
-<source>Moving file %x to recycle bin</source>
-<target>正在移动文件 %x 到回收站</target>
+<source>Moving file %x to the recycle bin</source>
+<target>移动文件 %x 到回收站</target>
 
-<source>Moving folder %x to recycle bin</source>
-<target>正在移动文件夹 %x 到回收站</target>
+<source>Moving folder %x to the recycle bin</source>
+<target>移动文件夹 %x 到回收站</target>
 
-<source>Moving symbolic link %x to recycle bin</source>
-<target>正在移动符号连接 %x 到回收站</target>
+<source>Moving symbolic link %x to the recycle bin</source>
+<target>移动符号连接 %x 到回收站</target>
 
 <source>Deleting file %x</source>
 <target>正删除文件 %x</target>
@@ -43,14 +43,20 @@
 <source>Deleting symbolic link %x</source>
 <target>正在删除符号连接 %x</target>
 
-<source>The Recycle Bin is not available for the following folders. Files will be deleted permanently instead:</source>
-<target>回收站对如下文件夹无效. 文件将被永久性删除:</target>
+<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source>
+<target>对于如下的文件夹回收站不可用. 文件将被永久性删除:</target>
 
 <source>An exception occurred</source>
 <target>发生异常</target>
 
-<source>Cannot find file %x.</source>
-<target>无法找到文件 %x .</target>
+<source>A directory path is expected after %x.</source>
+<target>在 %x 之后预期是一个目录路径.</target>
+
+<source>Syntax error</source>
+<target>语法错误</target>
+
+<source>Cannot open file %x.</source>
+<target>无法打开文件 %x.</target>
 
 <source>Error</source>
 <target>错误</target>
@@ -58,6 +64,36 @@
 <source>File %x does not contain a valid configuration.</source>
 <target>文件 %x 并未包含合法的配置.</target>
 
+<source>Unequal number of left and right directories specified.</source>
+<target>左边和右边指定了数量不相等的目录.</target>
+
+<source>The config file must not contain settings at directory pair level when directories are set via command line.</source>
+<target>当目录通过命令行设定时配置文件必须不包含目录对级别的设置.</target>
+
+<source>Warning</source>
+<target>警告</target>
+
+<source>Directories cannot be set for more than one configuration file.</source>
+<target>无法为多于一个配置文件设置目录.</target>
+
+<source>Syntax:</source>
+<target>语法:</target>
+
+<source>config files</source>
+<target>配置文件</target>
+
+<source>directory</source>
+<target>目录</target>
+
+<source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source>
+<target>任意数量的 FreeFileSync .ffs_gui 和/或 .ffs_batch 配置文件.</target>
+
+<source>Any number of alternative directories for at most one config file.</source>
+<target>任意数量的替代目录中至多有一个配置文件.</target>
+
+<source>Command line</source>
+<target>命令行</target>
+
 <source>A folder input field is empty.</source>
 <target>有一个文件夹输入框为空.</target>
 
@@ -214,8 +250,8 @@
 <target>总共时间:</target>
 
 <source>
-<pluralform>1 Byte</pluralform>
-<pluralform>%x Bytes</pluralform>
+<pluralform>1 byte</pluralform>
+<pluralform>%x bytes</pluralform>
 </source>
 <target>
 <pluralform>%x 字节</pluralform>
@@ -240,11 +276,11 @@
 <target>扫描中:</target>
 
 <source>
-<pluralform>[1 Thread]</pluralform>
-<pluralform>[%x Threads]</pluralform>
+<pluralform>1 thread</pluralform>
+<pluralform>%x threads</pluralform>
 </source>
 <target>
-<pluralform>[%x 线程]</pluralform>
+<pluralform>%x 线程</pluralform>
 </target>
 
 <source>Encoding extended time information: %x</source>
@@ -253,6 +289,9 @@
 <source>/sec</source>
 <target>/秒</target>
 
+<source>%x items</source>
+<target>%x 个项目</target>
+
 <source>Configuration file %x loaded partially only.</source>
 <target>配置文件 %x 只是部分载入.</target>
 
@@ -265,7 +304,7 @@
 <source>Browse directory</source>
 <target>浏览目录</target>
 
-<source>Cannot access Volume Shadow Copy Service.</source>
+<source>Cannot access the Volume Shadow Copy Service.</source>
 <target>无法访问卷影复制服务.</target>
 
 <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source>
@@ -277,8 +316,8 @@
 <source>Cannot determine volume name for %x.</source>
 <target>无法为 %x 确定卷名.</target>
 
-<source>Volume name %x not part of file name %y.</source>
-<target>卷名 %x 并非文件名 %y 的一部分.</target>
+<source>Volume name %x is not part of file path %y.</source>
+<target>卷名 %x 不是文件路径 %y 的一部分.</target>
 
 <source>Abort requested: Waiting for current operation to finish...</source>
 <target>请求中止: 正在等待当前操作完成...</target>
@@ -346,9 +385,6 @@
 <source>Idle time between last detected change and execution of command</source>
 <target>最后检测到改变和命令执行之间的空闲时间</target>
 
-<source>Command line</source>
-<target>命令行</target>
-
 <source>
 The command is triggered if:
 - files or subfolders change
@@ -372,9 +408,6 @@ The command is triggered if:
 <source>RealtimeSync - Automated Synchronization</source>
 <target>实时同步 - 自动同步</target>
 
-<source>Warning</source>
-<target>警告</target>
-
 <source>Build: %x</source>
 <target>Build: %x</target>
 
@@ -384,15 +417,21 @@ The command is triggered if:
 <source>All files</source>
 <target>所有文件</target>
 
+<source>Directory monitoring active</source>
+<target>目录监视激活</target>
+
+<source>Waiting until all directories are available...</source>
+<target>正在等待直到所有目录都可用...</target>
+
 <source>&Restore</source>
 <target>恢复(&R)</target>
 
+<source>&Show error</source>
+<target>显示错误(&S)</target>
+
 <source>&Exit</source>
 <target>退出(&E)</target>
 
-<source>Waiting for missing directories...</source>
-<target>正在等待丢失的目录...</target>
-
 <source>Invalid command line:</source>
 <target>无效的命令行:</target>
 
@@ -402,14 +441,14 @@ The command is triggered if:
 <source>File time and size</source>
 <target>文件时间和大小</target>
 
-<source> Two way </source>
+<source>Two way</source>
 <target>双向</target>
 
 <source>Mirror</source>
-<target>镜像 </target>
+<target>镜像</target>
 
 <source>Update</source>
-<target>更新 </target>
+<target>更新</target>
 
 <source>Custom</source>
 <target>自定义</target>
@@ -465,11 +504,8 @@ The command is triggered if:
 <source>The following items have unresolved conflicts and will not be synchronized:</source>
 <target>如下项目有无法解决的冲突并将不会被同步:</target>
 
-<source>Significant difference detected:</source>
-<target>已侦测到显著不同:</target>
-
-<source>More than 50% of the total number of files will be copied or deleted.</source>
-<target>超过总数 50% 以上的文件要被复制或删除.</target>
+<source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source>
+<target>如下的文件夹有显著的不同. 请确认你为同步配对了正确的文件夹.</target>
 
 <source>Not enough free disk space available in:</source>
 <target>没有足够的可用磁盘空间用于:</target>
@@ -489,12 +525,15 @@ The command is triggered if:
 <source>Generating database...</source>
 <target>正在生成数据库...</target>
 
-<source>Creating Volume Shadow Copy for %x...</source>
-<target>正在为 %x 创建卷影响复制...</target>
+<source>Creating a Volume Shadow Copy for %x...</source>
+<target>为 %x 创建一个卷影副本...</target>
 
 <source>Data verification error: %x and %y have different content.</source>
 <target>数据校验错误: %x 和 %y 有不同的内容.</target>
 
+<source>job name</source>
+<target>作业名称</target>
+
 <source>Synchronization aborted</source>
 <target>同步已被中止</target>
 
@@ -519,6 +558,9 @@ The command is triggered if:
 <source>Switching to FreeFileSync main dialog</source>
 <target>正在切换到 FreeFileSync 主对话框</target>
 
+<source>Retrying operation after error:</source>
+<target>发生错误后重试操作:</target>
+
 <source>A new version of FreeFileSync is available:</source>
 <target>已经有新版本的FreeFileSync可用:</target>
 
@@ -642,8 +684,8 @@ The command is triggered if:
 <source>&Export file list...</source>
 <target>导出文件列表(&E)...</target>
 
-<source>&Global settings...</source>
-<target>全局设置(&G)...</target>
+<source>&Global settings</source>
+<target>全局设置(&G)</target>
 
 <source>&Tools</source>
 <target>工具(&T)</target>
@@ -714,6 +756,9 @@ The command is triggered if:
 <source>Synchronizing...</source>
 <target>同步中...</target>
 
+<source>Minimize to notification area</source>
+<target>最小化到托盘</target>
+
 <source>On completion</source>
 <target>在完成时</target>
 
@@ -723,6 +768,15 @@ The command is triggered if:
 <source>&Pause</source>
 <target>暂停(&P)</target>
 
+<source>Variant</source>
+<target>变化</target>
+
+<source>Statistics</source>
+<target>统计</target>
+
+<source>&Don't show this dialog again</source>
+<target>不要再显示这个对话框(&D)</target>
+
 <source>Select a variant</source>
 <target>选择一个变化</target>
 
@@ -771,6 +825,12 @@ is the same
 <source>Configure your own synchronization rules.</source>
 <target>配置你自己的同步规则.</target>
 
+<source>Detect moved files</source>
+<target>检测被移动的文件</target>
+
+<source>Requires database files. Not supported by all file systems.</source>
+<target>需要数据库文件. 不是所有文件系统都支持.</target>
+
 <source>Error handling</source>
 <target>错误处理</target>
 
@@ -795,17 +855,17 @@ is the same
 <source>Delete or overwrite files permanently</source>
 <target>永久性删除或覆盖文件</target>
 
-<source>Recycle Bin</source>
+<source>Recycle bin</source>
 <target>回收站</target>
 
-<source>Use Recycle Bin for deleted and overwritten files</source>
-<target>将删除和覆盖文件放到回收站</target>
+<source>Back up deleted and overwritten files in the recycle bin</source>
+<target>备份被删除和被覆盖的文件到回收站</target>
 
 <source>Versioning</source>
 <target>保留历史版本</target>
 
-<source>Move files to user-defined folder</source>
-<target>移动文件至用户定义文件夹</target>
+<source>Move files to a user-defined folder</source>
+<target>移动文件到一个用户定义的文件夹</target>
 
 <source>Naming convention:</source>
 <target>命名规则:</target>
@@ -813,8 +873,8 @@ is the same
 <source>Batch job</source>
 <target>批处理作业</target>
 
-<source>Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch</source>
-<target>创建一个用于自动同步的批处理文件. 双击这个文件或者在你的系统的任务计划中定时执行: FreeFileSync.exe <作业名>.ffs_batch</target>
+<source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source>
+<target>创建一个用于无人值守同步的批处理文件. 要开始, 双击这个文件或任务计划器中的计划调度: %x</target>
 
 <source>Exit</source>
 <target>退出</target>
@@ -868,12 +928,12 @@ is the same
 <target>从两侧删除(即使仅在一侧选择文件)</target>
 
 <source>
-Only files that match all filter settings will be synchronized.
-Note: File names must be relative to base directories.
+Files will only be synchronized if they pass all filter rules.
+Note: File paths must be relative to base directories.
 </source>
 <target>
-只有匹配所有过滤器的文件会被同步.
-注:文件名必须是主目录的相对路径.
+文件仅仅在它们通过了所有的过滤器规则时才会被同步.
+备注: 文件路径必须是主目录的相对路径.
 </target>
 
 <source>Include</source>
@@ -903,20 +963,20 @@ Note: File names must be relative to base directories.
 <source>Fail-safe file copy</source>
 <target>无风险的文件复制</target>
 
-<source>Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.</source>
-<target>首先写入到一个临时文件(*.ffs_tmp)然后再重命名. 这样即使出现致命错误也能保持一致的状态.</target>
+<source>Copy to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of a fatal error.</source>
+<target>先复制到一个临时文件(*.ffs_tmp)然后再改名. 这保证了即使是在发生致使错误的情况下也有一致的状态.</target>
 
 <source>Copy locked files</source>
 <target>复制被锁定的文件</target>
 
-<source>Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)</source>
-<target>通过卷影复制服务复制共享或锁定的文件(需要管理员权限)</target>
+<source>Copy shared or locked files using the Volume Shadow Copy Service (requires administrator rights)</source>
+<target>使用卷影复制服务来复制已共享或已锁定的文件(需要管理员权限)</target>
 
 <source>Copy file access permissions</source>
 <target>复制文件存取权限</target>
 
-<source>Transfer file and folder permissions (Requires Administrator rights)</source>
-<target>传输文件和文件夹的权限(需要管理员权限)</target>
+<source>Transfer file and folder permissions (requires administrator rights)</source>
+<target>传输文件和文件夹权限(需要管理员权限)</target>
 
 <source>Restore hidden dialogs</source>
 <target>恢复被隐藏的对话框</target>
@@ -930,15 +990,6 @@ Note: File names must be relative to base directories.
 <source>&Default</source>
 <target>默认(&D)</target>
 
-<source>Variant</source>
-<target>变化</target>
-
-<source>Statistics</source>
-<target>统计</target>
-
-<source>Don't show this dialog again</source>
-<target>不要再显示这个对话框</target>
-
 <source>Find what:</source>
 <target>要查找什么:</target>
 
@@ -948,15 +999,15 @@ Note: File names must be relative to base directories.
 <source>&Find next</source>
 <target>查找下一个(&F)</target>
 
+<source>Start synchronization</source>
+<target>开始同步</target>
+
 <source>Delete</source>
 <target>删除</target>
 
 <source>Configure filter</source>
 <target>配置过滤器</target>
 
-<source>Start synchronization</source>
-<target>开始同步</target>
-
 <source>Find</source>
 <target>查找</target>
 
@@ -991,6 +1042,20 @@ Note: File names must be relative to base directories.
 <target>比较两侧</target>
 
 <source>
+<pluralform>Do you really want to execute the command %y for 1 item?</pluralform>
+<pluralform>Do you really want to execute the command %y for %x items?</pluralform>
+</source>
+<target>
+<pluralform>你是否真的要对 %x 个项目执行命令 %y?</pluralform>
+</target>
+
+<source>Confirm</source>
+<target>确认</target>
+
+<source>&Execute</source>
+<target>排除(&E)</target>
+
+<source>
 <pluralform>1 directory</pluralform>
 <pluralform>%x directories</pluralform>
 </source>
@@ -1023,12 +1088,15 @@ Note: File names must be relative to base directories.
 <source>Include temporarily</source>
 <target>暂时包括</target>
 
-<source>Exclude via filter:</source>
-<target>通过过滤器排除:</target>
-
 <source>multiple selection</source>
 <target>多选</target>
 
+<source>Include via filter:</source>
+<target>通过过滤器包括:</target>
+
+<source>Exclude via filter:</source>
+<target>通过过滤器排除:</target>
+
 <source>Include all</source>
 <target>包括所有</target>
 
@@ -1074,8 +1142,8 @@ Note: File names must be relative to base directories.
 <source>Do&n't save</source>
 <target>不保存(&N)</target>
 
-<source>Never save changes</source>
-<target>永不保存更改</target>
+<source>Never save &changes</source>
+<target>不再保存更改(&C)</target>
 
 <source>Show files that exist on left side only</source>
 <target>显示仅存在左侧的文件</target>
@@ -1128,8 +1196,8 @@ Note: File names must be relative to base directories.
 <source>All folders are in sync</source>
 <target>所有文件夹都是同步的</target>
 
-<source>Comma separated list</source>
-<target>逗号分隔的列表</target>
+<source>Comma-separated values</source>
+<target>逗号分割的数值(CSV)</target>
 
 <source>File list exported</source>
 <target>文件清单已经导出</target>
@@ -1137,8 +1205,8 @@ Note: File names must be relative to base directories.
 <source>Searching for program updates...</source>
 <target>正在搜索程序的更新...</target>
 
-<source>Ignore further errors</source>
-<target>忽略之后出现的错误</target>
+<source>&Ignore subsequent errors</source>
+<target>忽略后续的错误(&I)</target>
 
 <source>&Ignore</source>
 <target>忽略(&I)</target>
@@ -1146,8 +1214,8 @@ Note: File names must be relative to base directories.
 <source>Fatal Error</source>
 <target>致命错误</target>
 
-<source>Don't show this warning again</source>
-<target>不要再显示这个警告</target>
+<source>&Don't show this warning again</source>
+<target>不再显示这个警告(&D)</target>
 
 <source>&Switch</source>
 <target>切换(&S)</target>
@@ -1182,14 +1250,11 @@ Note: File names must be relative to base directories.
 <source>Completed</source>
 <target>完成</target>
 
-<source>Continue</source>
-<target>继续</target>
+<source>&Continue</source>
+<target>继续(&C)</target>
 
-<source>Pause</source>
-<target>暂停</target>
-
-<source>Logging</source>
-<target>记录</target>
+<source>Log</source>
+<target>日志</target>
 
 <source>Cannot find %x</source>
 <target>找不到 %x</target>
@@ -1225,11 +1290,11 @@ Note: File names must be relative to base directories.
 <target>过滤器</target>
 
 <source>
-<pluralform>Do you really want to move the following item to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x items to the Recycle Bin?</pluralform>
+<pluralform>Do you really want to move the following item to the recycle bin?</pluralform>
+<pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform>
 </source>
 <target>
-<pluralform>是否真的要移动如下 %x 个项目到回收站?</pluralform>
+<pluralform>你是否要将如下 %x 个项目移动到回收站?</pluralform>
 </target>
 
 <source>
@@ -1282,9 +1347,6 @@ Note: File names must be relative to base directories.
 <source>Append a timestamp to each file name</source>
 <target>附加时间戳到每一个文件名</target>
 
-<source>Folder</source>
-<target>文件夹</target>
-
 <source>File</source>
 <target>文件</target>
 
@@ -1402,8 +1464,8 @@ Note: File names must be relative to base directories.
 <source>Cannot change process I/O priorities.</source>
 <target>无法更改进程的I/O优先级.</target>
 
-<source>Unable to move %x to the Recycle Bin.</source>
-<target>无法移动 %x 到回收站.</target>
+<source>Unable to move %x to the recycle bin.</source>
+<target>无法将 %x 移动到回收站.</target>
 
 <source>Cannot determine final path for %x.</source>
 <target>无法确定 %x 的最终路径.</target>