5.15

1 files changed, 128 insertions, 143 deletions

diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index 5c431691..3d0f0d25 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -19,6 +19,9 @@
 <source>Total time:</source>
 <target>总共时间:</target>
 
+<source>Cannot set directory lock for %x.</source>
+<target></target>
+
 <source>Show in Explorer</source>
 <target>在Explorer中显示</target>
 
@@ -40,6 +43,9 @@
 <source>Error</source>
 <target>错误</target>
 
+<source>Selected variant:</source>
+<target></target>
+
 <source>Select alternate comparison settings</source>
 <target>选择替换的比较设置</target>
 
@@ -58,6 +64,12 @@
 <source>Clear filter settings</source>
 <target>清除过滤器设置</target>
 
+<source>Copy</source>
+<target>复制</target>
+
+<source>Paste</source>
+<target></target>
+
 <source>Save as batch job</source>
 <target>另存为批处理作业</target>
 
@@ -97,11 +109,8 @@
 <source>Fatal Error</source>
 <target>致命错误</target>
 
-<source>Windows Error Code %x:</source>
-<target>Windows错误代码 %x:</target>
-
-<source>Linux Error Code %x:</source>
-<target>Linux错误代码 %x:</target>
+<source>Error Code %x:</source>
+<target></target>
 
 <source>Cannot resolve symbolic link %x.</source>
 <target>无法解决符号连接 %x.</target>
@@ -159,8 +168,8 @@
 <source>Waiting while directory is locked (%x)...</source>
 <target>由于目录已锁定而正在等待(%x)...</target>
 
-<source>Cannot set directory lock %x.</source>
-<target>无法设置目录锁定 %x .</target>
+<source>Creating file %x</source>
+<target>正在创建文件 %x</target>
 
 <source>
 <pluralform>1 sec</pluralform>
@@ -190,9 +199,6 @@
 <source>/sec</source>
 <target>/秒</target>
 
-<source>Cannot find file %x.</source>
-<target>无法找到文件 %x .</target>
-
 <source>File %x does not contain a valid configuration.</source>
 <target>文件 %x 并未包含合法的配置.</target>
 
@@ -217,6 +223,9 @@
 <source>Cannot read the following XML elements:</source>
 <target>无法读取如下XML元素:</target>
 
+<source>Cannot find file %x.</source>
+<target>无法找到文件 %x .</target>
+
 <source>&Open...</source>
 <target>打开(&O)...</target>
 
@@ -450,24 +459,21 @@ The command is triggered if:
 <source>&Advanced</source>
 <target>高级(&A)</target>
 
-<source>&Check for new version</source>
-<target>检查更新(&C)</target>
+<source>&Check now</source>
+<target></target>
 
-<source>Compare</source>
-<target>比较</target>
+<source>Check &automatically once a week</source>
+<target></target>
 
-<source>Compare both sides</source>
-<target>比较两侧</target>
+<source>Check for new version</source>
+<target></target>
 
-<source>&Abort</source>
-<target>取消(&A)</target>
+<source>Compare</source>
+<target>比较</target>
 
 <source>Synchronize</source>
 <target>同步</target>
 
-<source>Start synchronization</source>
-<target>开始同步</target>
-
 <source>Add folder pair</source>
 <target>添加成对文件夹</target>
 
@@ -477,15 +483,6 @@ The command is triggered if:
 <source>Swap sides</source>
 <target>两侧互换</target>
 
-<source>Open</source>
-<target>打开</target>
-
-<source>Save</source>
-<target>保存</target>
-
-<source>Last used configurations (press DEL to remove from list)</source>
-<target>最后使用的配置(按DEL键将其从列表中移除)</target>
-
 <source>Hide excluded items</source>
 <target>隐藏排除项目</target>
 
@@ -516,6 +513,18 @@ The command is triggered if:
 <source>Time elapsed:</source>
 <target>已用时间:</target>
 
+<source>Synchronizing...</source>
+<target>同步中...</target>
+
+<source>On completion</source>
+<target>在完成时</target>
+
+<source>Close</source>
+<target></target>
+
+<source>&Pause</source>
+<target>暂停(&P)</target>
+
 <source>Batch job</source>
 <target>批处理作业</target>
 
@@ -546,9 +555,6 @@ The command is triggered if:
 <source>Abort synchronization on first error</source>
 <target>在第一个错误时中止同步</target>
 
-<source>On completion</source>
-<target>在完成时</target>
-
 <source>Show progress dialog</source>
 <target>显示进度对话框</target>
 
@@ -606,8 +612,8 @@ is the same
 <source><- Two way -></source>
 <target><-双向-></target>
 
-<source>Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically.</source>
-<target>使用一个数据库来识别和传播两边的改变. 删除，重命名和冲突会自动检测.</target>
+<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source>
+<target></target>
 
 <source>Mirror ->></source>
 <target>镜像 ->></target>
@@ -645,15 +651,12 @@ is the same
 <source>Versioning</source>
 <target>保留历史版本</target>
 
-<source>Move time-stamped files into specified folder</source>
-<target>移动时间标记文件到指定的文件夹</target>
+<source>Move files to user-defined folder</source>
+<target></target>
 
 <source>Naming convention:</source>
 <target>命名规则:</target>
 
-<source>Configuration</source>
-<target>配置</target>
-
 <source>Item exists on left side only</source>
 <target>项目仅存在于左侧</target>
 
@@ -672,12 +675,6 @@ is the same
 <source>Conflict/item cannot be categorized</source>
 <target>冲突/项目未能被分类</target>
 
-<source>Synchronizing...</source>
-<target>同步中...</target>
-
-<source>&Pause</source>
-<target>暂停(&P)</target>
-
 <source>Source code written in C++ using:</source>
 <target>源代码用如下C++工具写成:</target>
 
@@ -738,8 +735,8 @@ Note: File names must be relative to base directories!
 <source>Maximum</source>
 <target>最大</target>
 
-<source>&Default</source>
-<target>默认(&D)</target>
+<source>&Clear</source>
+<target></target>
 
 <source>Fail-safe file copy</source>
 <target>无风险的文件复制</target>
@@ -768,6 +765,12 @@ Note: File names must be relative to base directories!
 <source>Description</source>
 <target>描述</target>
 
+<source>&Default</source>
+<target>默认(&D)</target>
+
+<source>Start synchronization</source>
+<target>开始同步</target>
+
 <source>Variant</source>
 <target>变化</target>
 
@@ -798,12 +801,24 @@ Note: File names must be relative to base directories!
 <source>Overview</source>
 <target>摘要</target>
 
+<source>Configuration</source>
+<target>配置</target>
+
 <source>Filter files</source>
 <target>过滤器文件</target>
 
 <source>Select view</source>
 <target>选择视图</target>
 
+<source>Open...</source>
+<target></target>
+
+<source>Save</source>
+<target>保存</target>
+
+<source>Compare both sides</source>
+<target>比较两侧</target>
+
 <source>Set direction:</source>
 <target>设置方向:</target>
 
@@ -861,102 +876,63 @@ Note: File names must be relative to base directories!
 <source>FreeFileSync batch</source>
 <target>FreeFileSync批处理文件</target>
 
-<source>Never save changes</source>
-<target>永不保存更改</target>
-
 <source>Do you want to save changes to %x?</source>
 <target>是否要保存修改到 %x ?</target>
 
 <source>Do&n't save</source>
 <target>不保存(&N)</target>
 
+<source>Never save changes</source>
+<target>永不保存更改</target>
+
 <source>Configuration loaded!</source>
 <target>配置已加载!</target>
 
-<source>Hide files that exist on left side only</source>
-<target>隐藏仅在左侧的文件</target>
-
 <source>Show files that exist on left side only</source>
 <target>显示仅存在左侧的文件</target>
 
-<source>Hide files that exist on right side only</source>
-<target>隐藏仅在右侧的文件</target>
-
 <source>Show files that exist on right side only</source>
 <target>显示仅存在右侧的文件</target>
 
-<source>Hide files that are newer on left</source>
-<target>隐藏左侧较新的文件</target>
-
 <source>Show files that are newer on left</source>
 <target>显示左侧较新的文件</target>
 
-<source>Hide files that are newer on right</source>
-<target>隐藏右侧较新的文件</target>
-
 <source>Show files that are newer on right</source>
 <target>显示右侧较新的文件</target>
 
-<source>Hide files that are equal</source>
-<target>隐藏相同的文件</target>
-
 <source>Show files that are equal</source>
 <target>显示相同的文件</target>
 
-<source>Hide files that are different</source>
-<target>隐藏不同的文件</target>
-
 <source>Show files that are different</source>
 <target>显示不同的文件</target>
 
-<source>Hide conflicts</source>
-<target>隐藏冲突</target>
-
 <source>Show conflicts</source>
 <target>显示冲突</target>
 
-<source>Hide files that will be created on the left side</source>
-<target>隐藏将在左侧被建立的文件</target>
-
 <source>Show files that will be created on the left side</source>
 <target>显示将在左侧被建立的文件</target>
 
-<source>Hide files that will be created on the right side</source>
-<target>隐藏将在右侧被建立的文件</target>
-
 <source>Show files that will be created on the right side</source>
 <target>显示将在右侧被建立的文件</target>
 
-<source>Hide files that will be deleted on the left side</source>
-<target>隐藏将在左侧被删除的文件</target>
-
 <source>Show files that will be deleted on the left side</source>
 <target>显示将在左侧被删除的文件</target>
 
-<source>Hide files that will be deleted on the right side</source>
-<target>隐藏将在右侧被删除的文件</target>
-
 <source>Show files that will be deleted on the right side</source>
 <target>显示将在右侧被删除的文件</target>
 
-<source>Hide files that will be overwritten on left side</source>
-<target>隐藏将在左侧被覆盖的文件</target>
-
 <source>Show files that will be overwritten on left side</source>
 <target>显示将在左侧被覆盖的文件</target>
 
-<source>Hide files that will be overwritten on right side</source>
-<target>隐藏将在右侧被覆盖的文件</target>
-
 <source>Show files that will be overwritten on right side</source>
 <target>显示将在右侧被覆盖的文件</target>
 
-<source>Hide files that won't be copied</source>
-<target>隐藏将不会被复制的文件</target>
-
 <source>Show files that won't be copied</source>
 <target>显示将不被复制的文件</target>
 
+<source>Set as default</source>
+<target></target>
+
 <source>All folders are in sync!</source>
 <target>所有文件夹都是同步的!</target>
 
@@ -969,13 +945,8 @@ Note: File names must be relative to base directories!
 <source>File list exported!</source>
 <target>文件清单已经导出!</target>
 
-<source>
-<pluralform>Object deleted successfully!</pluralform>
-<pluralform>%x objects deleted successfully!</pluralform>
-</source>
-<target>
-<pluralform>%x 个对象被成功删除!</pluralform>
-</target>
+<source>Searching for program updates...</source>
+<target></target>
 
 <source>
 <pluralform>1 directory</pluralform>
@@ -1007,6 +978,9 @@ Note: File names must be relative to base directories!
 <source>&Ignore</source>
 <target>忽略(&I)</target>
 
+<source>Don't show this warning again</source>
+<target></target>
+
 <source>&Switch</source>
 <target>切换(&S)</target>
 
@@ -1025,9 +999,6 @@ Note: File names must be relative to base directories!
 <source>Comparing content...</source>
 <target>正在比较文件内容...</target>
 
-<source>Copy</source>
-<target>复制</target>
-
 <source>Paused</source>
 <target>已暂停</target>
 
@@ -1110,33 +1081,32 @@ Note: File names must be relative to base directories!
 <target>重新让已经隐藏的警告和对话框变为可见?</target>
 
 <source>
-<pluralform>Do you really want to move the following object to the Recycle Bin?</pluralform>
-<pluralform>Do you really want to move the following %x objects 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>
-</target>
+<target></target>
 
 <source>
-<pluralform>Do you really want to delete the following object?</pluralform>
-<pluralform>Do you really want to delete the following %x objects?</pluralform>
+<pluralform>Do you really want to delete the following item?</pluralform>
+<pluralform>Do you really want to delete the following %x items?</pluralform>
 </source>
-<target>
-<pluralform>你是否真的要删除如下 %x 个对象?</pluralform>
-</target>
+<target></target>
 
 <source>Leave as unresolved conflict</source>
 <target>遗留为未解决的冲突</target>
 
+<source>Time stamp</source>
+<target></target>
+
+<source>Append a timestamp to each file name</source>
+<target>附加时间戳到每一个文件名</target>
+
 <source>Replace</source>
 <target>替换</target>
 
 <source>Move files and replace if existing</source>
 <target>移动文件, 若文件已存在则替换</target>
 
-<source>Append a timestamp to each file name</source>
-<target>附加时间戳到每一个文件名</target>
-
 <source>Folder</source>
 <target>文件夹</target>
 
@@ -1248,6 +1218,12 @@ Note: File names must be relative to base directories!
 <source>Cannot set privilege %x.</source>
 <target>无法设置 %x 的特权.</target>
 
+<source>Failed to suspend system sleep mode.</source>
+<target></target>
+
+<source>Cannot change process I/O priorities.</source>
+<target></target>
+
 <source>Unable to move %x to the Recycle Bin!</source>
 <target>无法移动 %x 到回收站!</target>
 
@@ -1266,14 +1242,38 @@ Note: File names must be relative to base directories!
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>设置默认的同步方向:旧文件会被新文件覆盖.</target>
 
+<source>Checking recycle bin availability for folder %x...</source>
+<target></target>
+
+<source>Moving file %x to recycle bin</source>
+<target>正在移动文件 %x 到回收站</target>
+
+<source>Moving folder %x to recycle bin</source>
+<target>正在移动文件夹 %x 到回收站</target>
+
+<source>Moving symbolic link %x to recycle bin</source>
+<target>正在移动符号连接 %x 到回收站</target>
+
+<source>Deleting file %x</source>
+<target>正删除文件 %x</target>
+
+<source>Deleting folder %x</source>
+<target>正删除文件夹 %x</target>
+
+<source>Deleting symbolic link %x</source>
+<target>正在删除符号连接 %x</target>
+
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>如下路径的回收站不可用! 文件会被永久删除:</target>
 
-<source>You can ignore this error to consider the folder as empty.</source>
-<target>你可以忽略这个错误而认为文件夹是空的.</target>
+<source>The corresponding folder will be considered as empty.</source>
+<target></target>
+
+<source>Cannot find the following folders:</source>
+<target></target>
 
-<source>Cannot find folder %x.</source>
-<target>无法找到文件夹 %x</target>
+<source>You can ignore this error to consider each folder as empty.</source>
+<target></target>
 
 <source>Directories are dependent! Be careful when setting up synchronization rules:</source>
 <target>目录有依赖性！在设立同步规则时请小心:</target>
@@ -1281,8 +1281,8 @@ Note: File names must be relative to base directories!
 <source>Start comparison</source>
 <target>开始比较</target>
 
-<source>Preparing synchronization...</source>
-<target>正在准备同步...</target>
+<source>Calculating sync directions...</source>
+<target></target>
 
 <source>Conflict detected:</source>
 <target>检测到的冲突:</target>
@@ -1347,24 +1347,6 @@ Note: File names must be relative to base directories!
 <source>Multiple...</source>
 <target>并联...</target>
 
-<source>Deleting file %x</source>
-<target>正删除文件 %x</target>
-
-<source>Deleting folder %x</source>
-<target>正删除文件夹 %x</target>
-
-<source>Deleting symbolic link %x</source>
-<target>正在删除符号连接 %x</target>
-
-<source>Moving file %x to recycle bin</source>
-<target>正在移动文件 %x 到回收站</target>
-
-<source>Moving folder %x to recycle bin</source>
-<target>正在移动文件夹 %x 到回收站</target>
-
-<source>Moving symbolic link %x to recycle bin</source>
-<target>正在移动符号连接 %x 到回收站</target>
-
 <source>Moving file %x to %y</source>
 <target>正在移动文件 %x 到 %y</target>
 
@@ -1377,9 +1359,6 @@ Note: File names must be relative to base directories!
 <source>Removing old versions...</source>
 <target>移除旧版本</target>
 
-<source>Creating file %x</source>
-<target>正在创建文件 %x</target>
-
 <source>Creating symbolic link %x</source>
 <target>正在创建符号连接 %x</target>
 
@@ -1398,6 +1377,9 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>更新 %x 的属性</target>
 
+<source>Cannot find %x.</source>
+<target></target>
+
 <source>Target folder %x already existing.</source>
 <target>目标文件夹 %x 已经存在.</target>
 
@@ -1443,6 +1425,9 @@ Note: File names must be relative to base directories!
 <source>Generating database...</source>
 <target>正在生成数据库...</target>
 
+<source>Creating Volume Shadow Copy for %x...</source>
+<target></target>
+
 <source>Data verification error: Source and target file have different content!</source>
 <target>数据校验错误:源文件和目标文件内容不同!</target>