gui: Update translations and documentation

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

@@ -8,11 +8,13 @@
     "Add": "添加",
     "Add Device": "添加设备",
     "Add Folder": "添加文件夹",
+    "Add Remote Device": "添加远程设备",
     "Add new folder?": "添加新文件夹？",
     "Address": "地址",
     "Addresses": "地址列表",
     "Advanced": "高级",
     "Advanced Configuration": "高级设置",
+    "Advanced settings": "高级设置",
     "All Data": "所有数据",
     "Allow Anonymous Usage Reporting?": "允许匿名使用报告?",
     "Alphabetic": "字母顺序",
@@ -32,10 +34,12 @@
     "Connection Error": "连接出错",
     "Copied from elsewhere": "从其他设备复制",
     "Copied from original": "从源复制",
+    "Copyright © 2014-2016 the following Contributors:": "版权所有© 2014-2016 以下贡献者:",
     "Copyright © 2015 the following Contributors:": "版权 ©2015 由下列贡献者所有：",
     "Danger!": "危险！",
     "Delete": "删除",
     "Deleted": "已删除",
+    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
     "Device ID": "设备标识",
     "Device Identification": "设备标识",
     "Device Name": "设备名",
@@ -66,6 +70,7 @@
     "Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.": "在其它设备中对该文件夹内文件的修改并不会被同步到本机，但是在本机上对其的修改，则会被同步到其它设备中。",
     "Folder": "文件夹",
     "Folder ID": "文件夹标识",
+    "Folder Label": "文件夹标签",
     "Folder Master": "主文件夹",
     "Folder Path": "文件夹路径",
     "Folders": "文件夹",
@@ -111,6 +116,7 @@
     "OK": "确定",
     "Off": "关闭",
     "Oldest First": "旧文件优先",
+    "Optional descriptive label for the folder. Can be different on each device.": "可选的文件夹表述标签。在不同设备上可以不一致。",
     "Options": "选项",
     "Out of Sync": "未同步",
     "Out of Sync Items": "未同步的项目",
@@ -132,7 +138,9 @@
     "Relayed via": "中转经由",
     "Relays": "中转",
     "Release Notes": "发布说明",
+    "Remote Devices": "远程设备",
     "Remove": "移除",
+    "Required identifier for the folder. Must be the same on all cluster devices.": "需要给文件夹设置标识。在所有丛设备上必须一致。",
     "Rescan": "重新扫描",
     "Rescan All": "全部重新扫描",
     "Rescan Interval": "扫描间隔",
@@ -203,6 +211,7 @@
     "The rate limit must be a non-negative number (0: no limit)": "传输速度限制为非负整数（0 表示不限制）",
     "The rescan interval must be a non-negative number of seconds.": "扫描间隔单位为秒，且不能为负数。",
     "They are retried automatically and will be synced when the error is resolved.": "系统将会自动重试，当错误被解决时，它们将会被同步。",
+    "This Device": "当前设备",
     "This can easily give hackers access to read and change any files on your computer.": "这会让骇客能够轻而易举地访问及修改您的文件",
     "This is a major version upgrade.": "这是一个重大版本更新",
     "Trash Can File Versioning": "回收站式版本控制",
@@ -220,6 +229,7 @@
     "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}}\"的子文件夹.",
     "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.": "若你添加了新文件夹，记住文件夹标识是用以在不同设备间建立联系的。在不同设备间拥有相同标识的文件夹将会被同步。且文件夹标识大小写敏感。",
     "Yes": "是",
@@ -227,5 +237,6 @@
     "days": "天",
     "full documentation": "完整文档",
     "items": "条目",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想将 “{{folder}}” 文件夹共享给您"
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想将 “{{folder}}” 文件夹共享给您",
+    "{%device%} wants to share folder \"{%folderLabel%}\" ({%folder%}).": "{{device}}想要分享文件夹\"{{folderLabel}}\" ({{folder}}).\n"
 }