1.19

1 files changed, 151 insertions, 49 deletions

diff --git a/Languages/chinese_simple.lng b/Languages/chinese_simple.lng
index af963b6e..a72ffc60 100644
--- a/Languages/chinese_simple.lng
+++ b/Languages/chinese_simple.lng
@@ -1,5 +1,7 @@
+  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
- Byte
+ 字节
  GB
  GB
  MB
@@ -8,14 +10,24 @@
  PB
  TB
  TB
+ day(s)
+ 日
+ hour(s)
+ 时
  kB
  kB
+ min
+ 分
+ sec
+ 秒
 !=	files are different\n
 !=	文件不同\n
 %x directories
 %x 目录
 %x files,
 %x 文件,
+%x is not a valid FreeFileSync batch file!
+%x 无有效的 FreeFileSync 批处理文件
 %x of %y rows in view
 %x of %y 横向视图
 %x of 1 row in view
@@ -30,8 +42,8 @@
 应用(&Y)
 &Cancel
 撒消(&C)
-&Compare
-比较(&C)
+&Check for new version
+检查更新(&C)
 &Create batch job
 创建批处理作业(&C)
 &Default
@@ -52,6 +64,8 @@
 加载(&L)
 &Load configuration
 加载配置(&L)
+&No
+
 &OK
 确定(&O)
 &Pause
@@ -62,16 +76,18 @@
 重试(&R)
 &Save
 保存(&S)
-&Start
-开始(&S)
-&Synchronize...
-同步(&S)...
+&Yes
+
 ,
 .
+-	do not copy\n
+
+- conflict
+
+- conflict (same date, different size)
+
 - different
 - 不同
-- different (same date, different size)
-- 不同 (日期相同,大小不同)
 - equal
 - 相同
 - exists left only
@@ -86,26 +102,30 @@
 - 右侧
 - right newer
 - 右侧较新
-- same date (different size)
-- 日期相同 (大小不同)
+->	copy to right side\n
+
 -Open-Source file synchronization-
 -开源文件同步器-
 .
 ,
+/sec
+/秒
 1 directory
 1 目录
 1 file,
 1 文件,
 1. &Compare
 1. 比较(&C)
-1. Enter full file or directory names separated by ';' or a new line.
-1. 输入完整的文件名或目录名(用";"号或一个新行)
+1. Enter relative file or directory names separated by ';' or a new line.
+
 2. &Synchronize...
 2. 同步(&S)...
 2. Use wildcard characters '*' and '?'.
 2. 使用通配符"*"和"?".
 3. Exclude files directly on main grid via context menu.
 3. 直接通过上下文菜单的主要网格排除文件.
+<-	copy to left side\n
+
 <<	left file is newer\n
 <<	左侧文件较新\n
 <Directory>
@@ -116,10 +136,12 @@
 <多选>
 <|	file on left side only\n
 <|	仅左侧文件\n
-==	files are equal\n\n
-==	文件相同\n\n
+==	files are equal\n
+
 >>	right file is newer\n
 >>	右侧文件较新\n
+A newer version of FreeFileSync is available:
+FreeFileSync 有新版可用:
 Abort requested: Waiting for current operation to finish...
 取消请求: 正在等待当前操作完成...
 Aborted
@@ -147,17 +169,21 @@ Batch file created successfully!
 Batch job
 批处理作业
 Big thanks for localizing FreeFileSync goes out to:
-非常感谢做本地化FreeFileSync工作的以下人员:
+非常感谢以下本地化 FreeFileSync 的工作人员:
+Browse
+浏览
 Build:
 开发:
 Cancel
-放弃
+取消
 Check all
 检查所有
 Choose to hide filtered files/directories from list
 从列表中选择隐藏过滤文件/文件夹
 Comma separated list
 逗号分隔的列表
+Compare
+
 Compare both sides
 两侧比较
 Compare by \"File content\"
@@ -170,8 +196,10 @@ Comparing content
 正在比较内容
 Comparing content of files %x
 正在比较档案内容的百分比 %x
-Comparing...
-比较中...
+Comparing content...
+
+Comparison Result
+
 Completed
 完成
 Configuration
@@ -208,12 +236,12 @@ Copy to clipboard\tCTRL+C
 复制到剪贴板\t使用CTRL+C键
 Copying file %x to %y
 正复制文件 %x 到 %y
+Copying file %x to %y overwriting target
+复制文件 %x 并覆盖到目标 %y
 Could not set working directory:
 无法设置工作目录:
 Create a batch job
 创建一个批工作
-Create:
-创建:
 Creating folder %x
 正创建文件夹 %x
 Current operation:
@@ -226,8 +254,6 @@ DECISION TREE
 决策树
 Data remaining:
 剩余数据:
-Data:
-数据:
 Date
 日期
 Delete files/folders existing on left side only
@@ -240,16 +266,18 @@ Delete on both sides
 删除两侧
 Delete on both sides even if the file is selected on one side only
 删除两侧(仅对在一侧已选择文件)
-Delete:
-删除:
 Deleting file %x
 正删除文件 %x
 Deleting folder %x
 正删除文件夹 %x
 Directories are dependent! Be careful when setting up synchronization rules:
 目录有依赖性！注意设立同步的规则:
+Directory
+目录
 Directory does not exist:
 目录不存在:
+Do not display visual status information but write to a logfile instead
+不显示视觉状态信息,使用写入日志文件代替。
 Do not show this warning again
 不再显示警告信息
 Do nothing
@@ -258,10 +286,20 @@ 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?
+立即下载?
 Drag && drop
 拖拽
+Email
+邮箱
+Enable filter to exclude files from synchronization
+启用同步时使用过滤排除文件。
 Error
 错误
 Error changing modification time:
@@ -290,6 +328,8 @@ Error reading file:
 读取文件出错:
 Error resolving symbolic link:
 解决字符链接出错:
+Error retrieving full path:
+获取完整路径时出错:
 Error traversing directory:
 遍历目录出错:
 Error writing file attributes:
@@ -314,10 +354,14 @@ Feedback and suggestions are welcome at:
 欢迎在下面提出反馈意见和建议:
 File Manager integration:
 文件管理集成器:
+File Time tolerance (seconds):
+文件时间容错(秒):
 File already exists. Overwrite?
 文件已经存在.覆盖?
 File content
 文件内容
+File does not exist:
+文件不存在:
 File list exported!
 文件清单已经列出!
 File size and date
@@ -334,8 +378,6 @@ Files remaining:
 其余档案:
 Files that exist on both sides and have different content
 两侧都有但内容不同的文件
-Files that exist on both sides, have same date but different filesizes
-两侧都有且日期相同但文件大小不同的文件
 Files that exist on both sides, left one is newer
 两侧都有但左侧较新的文件
 Files that exist on both sides, right one is newer
@@ -348,6 +390,8 @@ 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
@@ -368,8 +412,10 @@ FreeFileSync batch file
 FreeFileSync 批处理文件
 FreeFileSync configuration
 FreeFileSync 配置
-Full name
-全称
+FreeFileSync is up to date!
+FreeFileSync 已是最新!
+Full path
+
 Generating file list...
 生成文件列表...
 Global settings
@@ -378,6 +424,8 @@ Help
 帮助
 Hide all error and warning messages
 隐藏所有错误与警告信息
+Hide conflicts
+
 Hide files that are different
 隐藏不同的档案
 Hide files that are equal
@@ -390,6 +438,12 @@ 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 won't be copied
+
 Hide filtered items
 隐藏已过滤的项目
 Hide further error messages during the current process
@@ -398,6 +452,12 @@ Hides error messages during synchronization:\nThey are collected and shown as a
 隐藏同步时的错误信息：在结束进程时收集和显示的清单
 Hints:
 提示:
+Homepage
+主页
+If you like FFS
+如果你喜欢 FFS
+Ignore 1-hour file time difference
+
 Ignore errors
 忽略错误
 Ignore subsequent errors
@@ -410,8 +470,8 @@ Include
 包括
 Include temporarily
 包括暂时的
-Include: *.doc;*.zip;*.exe\nExclude: *\\temp\\*
-包括:*.doc;*.zip;*.exe 除外:*\\temp\\*
+Include: *.doc;*.zip;*.exe\nExclude: \\temp\\*
+
 Info
 信息
 Information
@@ -420,24 +480,30 @@ Initialization of Recycle Bin failed!
 初始化回收站失败!
 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. :)
 初始化回收站是不大可能了!估计你使用的不是Windows系统.如果你想未来在此系统上应用请联系作者. :)
-Legend
-联想
+Left:
+左侧:
 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
 移动上一行
-Not all items were synchronized! Have a look at the list.
-不是所有项目被同步!看一下列表
+Not all items have been synchronized! Have a look at the list.
+
+Not enough free disk space available in:
+无足够的可用空间于:
 Nothing to synchronize according to configuration!
 根据配置没有任何同步!
 Number of files and directories that will be created
@@ -448,18 +514,20 @@ 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 full name including path prefix.
-只有过滤的文件/目录将选定做同步.该过滤器将被应用到全称包括路径前缀.
-Open synchronization dialog
-打开同步对话框
+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
-打开文件管理
+在资源管理器中打开
 Operation aborted!
 操作已取消!
 Operation:
 操作:
+Overview
+摘要
 Pause
 暂停
+Paused
+已暂停
 Please fill all empty directory fields.
 请填满所有空的目录区域.
 Press button to activate filter
@@ -468,6 +536,8 @@ Preview
 视图
 Published under the GNU General Public License:
 在GNU通用公共许可下发布:
+Question
+
 Quit
 退出
 Relative path
@@ -476,16 +546,20 @@ Remove folder pair
 删除文件夹对
 Reset
 重置
+Reset all warning messages
+
 Reset all warning messages?
 重置所有警告信息?
-Resets all warning messages
-重置所有警告信息
 Result
 结果
+Right:
+右侧:
 S&ave configuration
 保存配置(&A)
-Save aborted!
-保存失败!
+S&witch view
+
+Save changes to current configuration?
+
 Save current configuration to file
 保存当前配置到文件
 Scanning...
@@ -494,8 +568,14 @@ Scanning:
 扫描中:
 Select a folder
 选择一个文件夹
+Select logfile directory:
+选择日志保存位置:
 Select variant:
 选择变化的:
+Show conflicts
+
+Show file icons
+
 Show files that are different
 显示不同的文件
 Show files that are equal
@@ -508,10 +588,18 @@ 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 won't be copied
+
 Show popup
 查看弹出
 Show popup on errors or warnings
 查看弹出的错误或警告
+Significant difference detected:
+已侦测到显著不同:
 Silent mode
 静默模式
 Size
@@ -520,6 +608,8 @@ Sorting file list...
 排序文件列表...
 Source code written completely in C++ utilizing:
 使用C++编写的源代码已完全写好:
+Speed:
+速度:
 Start
 开始
 Start synchronization
@@ -528,6 +618,8 @@ Stop
 停止
 Swap sides
 换边
+Synchronization Preview
+
 Synchronization aborted!
 同步已放弃!
 Synchronization completed successfully!
@@ -540,8 +632,8 @@ Synchronization settings
 同步设置
 Synchronization status
 同步状态
-Synchronize all .doc, .zip and .exe files except everything from folder \"temp\".
-同步所有的 .doc, .zip und .exe的文件( 文件夹 \"temp\"下的所有文件除外).
+Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\".
+
 Synchronize both sides simultaneously: Copy new or updated files in both directions.
 同时同步两侧:  复制新的或更新的文件在两个方向.
 Synchronizing...
@@ -560,22 +652,30 @@ 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.
+
 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.
+
 Update ->
 升级 ->
-Update:
-升级:
 Use Recycle Bin
 使用回收站
 Use Recycle Bin when deleting or overwriting files during synchronization
@@ -594,7 +694,9 @@ different
 不同
 file exists on both sides
 两侧文件已存在
+flash	conflict\n
+
 on one side only
 仅在一侧
 |>	file on right side only\n
-|>	仅在可侧的文件\n
+|>	仅右侧文件\n