5.5

1 files changed, 106 insertions, 103 deletions

diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng
index acd8a931..dbf75eac 100644
--- a/BUILD/Languages/chinese_simple.lng
+++ b/BUILD/Languages/chinese_simple.lng
@@ -10,6 +10,18 @@
 <source>Searching for folder %x...</source>
 <target>正在搜索文件夹 %x...</target>
 
+<source>Batch execution</source>
+<target>批处理执行</target>
+
+<source>Items processed:</source>
+<target>已处理的项目:</target>
+
+<source>Items remaining:</source>
+<target>剩余的项目:</target>
+
+<source>Total time:</source>
+<target>总共时间:</target>
+
 <source>Show in Explorer</source>
 <target>在Explorer中显示</target>
 
@@ -58,12 +70,6 @@
 <source>About</source>
 <target>关于</target>
 
-<source>Warning</source>
-<target>警告</target>
-
-<source>Question</source>
-<target>问题</target>
-
 <source>Confirm</source>
 <target>确认</target>
 
@@ -109,6 +115,9 @@
 <source>Info</source>
 <target>信息</target>
 
+<source>Warning</source>
+<target>警告</target>
+
 <source>Fatal Error</source>
 <target>致命错误</target>
 
@@ -138,12 +147,6 @@
 <pluralform>%x 字节</pluralform>
 </target>
 
-<source>Cannot read file %x.</source>
-<target>无法读取文件 %x .</target>
-
-<source>Cannot write file %x.</source>
-<target>无法写入文件 %x .</target>
-
 <source>Database file %x is incompatible.</source>
 <target>数据库文件 %x 不兼容.</target>
 
@@ -153,9 +156,18 @@
 <source>Database file %x does not yet exist.</source>
 <target>数据库文件 %x 还未存在.</target>
 
+<source>Database file is corrupt:</source>
+<target>数据库文件已损坏:</target>
+
 <source>Out of memory!</source>
 <target>内存不足!</target>
 
+<source>Cannot write file %x.</source>
+<target>无法写入文件 %x .</target>
+
+<source>Cannot read file %x.</source>
+<target>无法读取文件 %x .</target>
+
 <source>Database files do not share a common session.</source>
 <target>数据库文件并未共享一个公共会话.</target>
 
@@ -202,6 +214,9 @@
 <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>
 
@@ -226,14 +241,11 @@
 <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>
 
-<source>&Save...</source>
-<target>保存(&S)...</target>
+<source>Save &As...</source>
+<target>另存为(&A)...</target>
 
 <source>&Quit</source>
 <target>退出(&Q)</target>
@@ -309,8 +321,8 @@ The command is triggered if:
 <source>(Build: %x)</source>
 <target>(Build: %x)</target>
 
-<source>RealtimeSync configuration</source>
-<target>实时同步配置</target>
+<source>All files</source>
+<target>所有文件</target>
 
 <source>&Restore</source>
 <target>恢复(&R)</target>
@@ -324,8 +336,8 @@ The command is triggered if:
 <source>Waiting for missing directories...</source>
 <target>正在等待丢失的目录...</target>
 
-<source>An input folder name is empty.</source>
-<target>有一个输入的文件夹名为空.</target>
+<source>A folder input field is empty.</source>
+<target>有一个文件夹输入框为空.</target>
 
 <source>Logging</source>
 <target>记录</target>
@@ -348,26 +360,8 @@ The command is triggered if:
 <source>Custom</source>
 <target>自定义</target>
 
-<source>FreeFileSync batch file</source>
-<target>FreeFileSync 批处理文件</target>
-
-<source>FreeFileSync configuration</source>
-<target>FreeFileSync 配置</target>
-
-<source>Batch execution</source>
-<target>批处理执行</target>
-
-<source>Items processed:</source>
-<target>已处理的项目:</target>
-
-<source>Items remaining:</source>
-<target>剩余的项目:</target>
-
-<source>Total time:</source>
-<target>总共时间:</target>
-
-<source>Stop</source>
-<target>停止</target>
+<source>FreeFileSync batch</source>
+<target>FreeFileSync批处理文件</target>
 
 <source>Synchronization aborted!</source>
 <target>同步已被中止!</target>
@@ -390,8 +384,8 @@ The command is triggered if:
 <source>Unable to connect to sourceforge.net!</source>
 <target>无法链接到 Sourceforge.net!</target>
 
-<source>A newer version of FreeFileSync is available:</source>
-<target>FreeFileSync 有新版可用:</target>
+<source>A new version of FreeFileSync is available:</source>
+<target>已经有新版本的FreeFileSync可用:</target>
 
 <source>Download now?</source>
 <target>立即下载?</target>
@@ -435,6 +429,12 @@ The command is triggered if:
 <source>Extension</source>
 <target>扩展名</target>
 
+<source>Size:</source>
+<target>大小:</target>
+
+<source>Date:</source>
+<target>日期:</target>
+
 <source>Action</source>
 <target>动作</target>
 
@@ -468,6 +468,9 @@ The command is triggered if:
 <source>&New</source>
 <target>新建(&N)</target>
 
+<source>&Save</source>
+<target>保存(&S)</target>
+
 <source>&Language</source>
 <target>切换语言(&L)</target>
 
@@ -534,11 +537,8 @@ The command is triggered if:
 <source>Number of files and folders that will be deleted</source>
 <target>将被删除的文件和文件夹数</target>
 
-<source>Total amount of data that will be transferred</source>
-<target>将被传输的数据总量</target>
-
-<source>Operation:</source>
-<target>操作:</target>
+<source>Total bytes to copy</source>
+<target>要复制的总字节数</target>
 
 <source>Items found:</source>
 <target>已找到的项目:</target>
@@ -546,10 +546,10 @@ The command is triggered if:
 <source>Speed:</source>
 <target>速度:</target>
 
-<source>Remaining time:</source>
+<source>Time remaining:</source>
 <target>剩余时间:</target>
 
-<source>Elapsed time:</source>
+<source>Time elapsed:</source>
 <target>已用时间:</target>
 
 <source>Batch job</source>
@@ -672,6 +672,15 @@ is the same
 <source>Source code written in C++ utilizing:</source>
 <target>源代码用如下C++工具写成:</target>
 
+<source>If you like FreeFileSync</source>
+<target>如果你喜欢 FreeFileSync</target>
+
+<source>Donate with PayPal</source>
+<target>通过PayPal捐赠</target>
+
+<source>Big thanks for localizing FreeFileSync goes out to:</source>
+<target>非常感谢以下本地化 FreeFileSync 的工作人员:</target>
+
 <source>Feedback and suggestions are welcome</source>
 <target>欢迎反馈意见和提出建议</target>
 
@@ -684,39 +693,9 @@ is the same
 <source>Email</source>
 <target>邮箱</target>
 
-<source>Big thanks for localizing FreeFileSync goes out to:</source>
-<target>非常感谢以下本地化 FreeFileSync 的工作人员:</target>
-
-<source>If you like FreeFileSync</source>
-<target>如果你喜欢 FreeFileSync</target>
-
-<source>Donate with PayPal</source>
-<target>通过PayPal捐赠</target>
-
 <source>Published under the GNU General Public License</source>
 <target>在GNU通用公共许可下发布</target>
 
-<source>Ignore further errors</source>
-<target>忽略之后出现的错误</target>
-
-<source>Hide further error messages during the current process</source>
-<target>在当前进程中隐藏进一步的错误信息</target>
-
-<source>&Ignore</source>
-<target>忽略(&I)</target>
-
-<source>Do not show this dialog again</source>
-<target>不要再显示此对话框</target>
-
-<source>&Switch</source>
-<target>切换(&S)</target>
-
-<source>&Yes</source>
-<target>是(&Y)</target>
-
-<source>&No</source>
-<target>否(&N)</target>
-
 <source>Use Recycle Bin</source>
 <target>使用回收站</target>
 
@@ -789,6 +768,9 @@ Note: File names must be relative to base directories!
 <source>Statistics</source>
 <target>统计</target>
 
+<source>Do not show this dialog again</source>
+<target>不要再显示此对话框</target>
+
 <source>Find what:</source>
 <target>要查找什么:</target>
 
@@ -867,8 +849,14 @@ Note: File names must be relative to base directories!
 <source>Never save changes</source>
 <target>永不保存更改</target>
 
-<source>Save changes to current configuration?</source>
-<target>保存更改到当前配置?</target>
+<source>Do you want to save changes to %x?</source>
+<target>是否要保存修改到 %x ?</target>
+
+<source>Save</source>
+<target>保存</target>
+
+<source>Don't Save</source>
+<target>不保存</target>
 
 <source>Configuration loaded!</source>
 <target>配置已加载!</target>
@@ -963,9 +951,6 @@ Note: File names must be relative to base directories!
 <source>All directories in sync!</source>
 <target>所有目录已同步!</target>
 
-<source>Please run a Compare first before synchronizing!</source>
-<target>同步之前请先进行对比</target>
-
 <source>Comma separated list</source>
 <target>逗号分隔的列表</target>
 
@@ -1007,6 +992,24 @@ Note: File names must be relative to base directories!
 <pluralform>%y 中的 %x 行可见</pluralform>
 </target>
 
+<source>Ignore further errors</source>
+<target>忽略之后出现的错误</target>
+
+<source>&Ignore</source>
+<target>忽略(&I)</target>
+
+<source>&Switch</source>
+<target>切换(&S)</target>
+
+<source>Question</source>
+<target>问题</target>
+
+<source>&Yes</source>
+<target>是(&Y)</target>
+
+<source>&No</source>
+<target>否(&N)</target>
+
 <source>Scanning...</source>
 <target>正扫描...</target>
 
@@ -1182,6 +1185,9 @@ Note: File names must be relative to base directories!
 <source>Cannot delete directory %x.</source>
 <target>无法删除目录 %x.</target>
 
+<source>Cannot write file attributes of %x.</source>
+<target>无法写入 %x 的文件属性.</target>
+
 <source>Cannot write modification time of %x.</source>
 <target>无法写入 %x 的最后修改时间.</target>
 
@@ -1206,9 +1212,6 @@ Note: File names must be relative to base directories!
 <source>Cannot copy symbolic link %x to %y.</source>
 <target>无法复制符号连接 %x 到 %y.</target>
 
-<source>Cannot write file attributes of %x.</source>
-<target>无法写入 %x 的文件属性.</target>
-
 <source>Cannot copy file %x to %y.</source>
 <target>无法复制文件 %x 到 %y.</target>
 
@@ -1233,11 +1236,8 @@ Note: File names must be relative to base directories!
 <source>No change since last synchronization!</source>
 <target>自从最后一次同步以来没有变动!</target>
 
-<source>Filter settings have changed!</source>
-<target>过滤设置已改变!</target>
-
-<source>The file was not processed by last synchronization!</source>
-<target>此文件在最后一次同步中未被处理!</target>
+<source>The corresponding database entries are not in sync considering current settings.</source>
+<target>根据当前设置相关的数据库入口并未同步.</target>
 
 <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source>
 <target>设置默认的同步方向:旧文件会被新文件覆盖.</target>
@@ -1365,14 +1365,14 @@ Note: File names must be relative to base directories!
 <source>Updating attributes of %x</source>
 <target>更新 %x 的属性</target>
 
-<source>Target folder name must not be empty.</source>
-<target>目标文件夹名必须不是空的.</target>
+<source>Target folder input field must not be empty.</source>
+<target>目标文件夹输入框必须不为空.</target>
 
-<source>Folder name for file versioning must not be empty.</source>
-<target>存放历史版本的文件夹名必须不是空的.</target>
+<source>Folder input field for versioning must not be empty.</source>
+<target>用于存放历史版本的文件夹输入框必须不为空.</target>
 
-<source>Source directory %x not found.</source>
-<target>来源目录 %x 无法找到.</target>
+<source>Source folder %x not found.</source>
+<target>无法找到源文件夹 %x.</target>
 
 <source>Unresolved conflicts existing!</source>
 <target>存在不可解决的冲突!</target>
@@ -1389,11 +1389,11 @@ Note: File names must be relative to base directories!
 <source>Not enough free disk space available in:</source>
 <target>没有足够的可用磁盘空间用于:</target>
 
-<source>Free disk space required:</source>
-<target>需要可用的磁盘空间:</target>
+<source>Required:</source>
+<target>必需:</target>
 
-<source>Free disk space available:</source>
-<target>可用磁盘空间:</target>
+<source>Available:</source>
+<target>可用:</target>
 
 <source>Recycle Bin is not available for the following paths! Files will be deleted permanently instead:</source>
 <target>如下路径的回收站不可用! 文件会被永久删除:</target>
@@ -1404,6 +1404,9 @@ Note: File names must be relative to base directories!
 <source>Processing folder pair:</source>
 <target>正在处理成对文件夹:</target>
 
+<source>Target folder %x already existing.</source>
+<target>目标文件夹 %x 已经存在.</target>
+
 <source>Generating database...</source>
 <target>正在生成数据库...</target>