gui, man: Update docs & translations

gui/default/assets/lang/lang-zh-CN.json

@@ -4,6 +4,7 @@
     "A new major version may not be compatible with previous versions.": "重大更新可能与之前的版本之间无法兼容",
     "API Key": "API Key",
     "About": "关于",
+    "Action": "操作",
     "Actions": "操作",
     "Add": "添加",
     "Add Device": "添加设备",
@@ -37,8 +38,10 @@
     "Copied from elsewhere": "从其他设备复制",
     "Copied from original": "从源复制",
     "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 以下贡献者：",
+    "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 以下贡献者：",
     "Danger!": "危险！",
     "Deleted": "已删除",
+    "Device": "设备",
     "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "设备 \"{{name}}\"（位于 {{address}} 的 {{device}}）请求连接。是否添加新设备？",
     "Device ID": "设备 ID",
     "Device Identification": "设备标识",
@@ -79,6 +82,7 @@
     "GUI Authentication User": "图形管理界面用户名",
     "GUI Listen Addresses": "图形管理界面监听地址",
     "Generate": "生成",
+    "Global Changes": "全局更改",
     "Global Discovery": "在互联网上寻找设备\n",
     "Global Discovery Servers": "全局发现服务器",
     "Global State": "全局状态",
@@ -89,6 +93,7 @@
     "Ignore Permissions": "忽略文件权限",
     "Incoming Rate Limit (KiB/s)": "下载速率限制 (KiB/s)",
     "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "错误的配置可能损坏您文件夹内的内容，使得 Syncthing 无法工作。",
+    "Introduced By": "介绍自",
     "Introducer": "介绍人设备",
     "Inversion of the given condition (i.e. do not exclude)": "对本条件取反（例如：不要排除某项）",
     "Keep Versions": "保留历史版本数量",
@@ -126,6 +131,7 @@
     "Out of Sync Items": "未同步的项目",
     "Outgoing Rate Limit (KiB/s)": "上传速度限制 (KiB/s)",
     "Override Changes": "撤销改变",
+    "Path": "路径",
     "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "文件夹在本地的路径。如果不存在，则会被创建。波浪线符号（~）是如下路径的缩略符：",
     "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "用来存储历史版本的文件夹（留空则将默认会存储在.stversions文件夹中）",
     "Pause": "暂停",
@@ -138,7 +144,7 @@
     "Quick guide to supported patterns": "支持的通配符的简单教程：",
     "RAM Utilization": "内存使用量",
     "Random": "随机顺序",
-    "Reduced by ignore patterns": "Reduced by ignore patterns",
+    "Reduced by ignore patterns": "已由忽略列表缩减",
     "Release Notes": "发布说明",
     "Remote Devices": "远程设备",
     "Remove": "移除",
@@ -215,7 +221,9 @@
     "This Device": "当前设备",
     "This can easily give hackers access to read and change any files on your computer.": "这会让骇客能够轻而易举地访问及修改您的文件",
     "This is a major version upgrade.": "这是一个重大版本更新",
+    "Time": "时间",
     "Trash Can File Versioning": "回收站式版本控制",
+    "Type": "类型",
     "Unknown": "未知",
     "Unshared": "未共享",
     "Unused": "未使用",
@@ -230,7 +238,10 @@
     "Version": "版本",
     "Versions Path": "历史版本路径",
     "Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.": "超过最长保留时间，或者不满足下列条件的历史版本，将会被删除。",
-    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "警告, 该路径是一个已经存在文件夹\"{{otherFolder}}\"的子文件夹.",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolder%}\".": "警告，该路径是已有文件夹\"{{otherFolder}}\"的上级目录。",
+    "Warning, this path is a parent directory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "警告，该路径是已有文件夹\"{{otherFolderLabel}}\" ({{otherFolder}})的上级目录。",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolder%}\".": "警告，该路径是已有文件夹\"{{otherFolder}}\"的下级目录。",
+    "Warning, this path is a subdirectory of an existing folder \"{%otherFolderLabel%}\" ({%otherFolder%}).": "警告，该路径是已有文件夹\"{{otherFolderLabel}}\" ({{otherFolder}})的下级目录。",
     "When adding a new device, keep in mind that this device must be added on the other side too.": "若您在本机添加新设备，记住您也必须在这个设备上添加本机。",
     "When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.": "若你添加了新文件夹，记住文件夹 ID 是用以在不同设备间建立联系的。在不同设备间拥有相同 ID 的文件夹将会被同步。且文件夹 ID 区分大小写。",
     "Yes": "是",