Merge branch 'master' of https://github.com/charliexp/thingsboard

# Conflicts:
#	ui/src/app/locale/locale.constant-zh.js

Signed-off-by: charlie <charlie_weng@163.com>

ui/src/app/locale/locale.constant-zh.js

@@ -1031,47 +1031,6 @@ export default function addLocaleChinese(locales) {
 			"password-link-sent-message": "密码重置链接已成功发送！",
 			"email": "电子邮件"
 		},
-		"plugin": {
-			"plugins": "插件",
-			"delete": "删除插件",
-			"activate": "激活插件",
-			"suspend": "暂停插件",
-			"active": "激活",
-			"suspended": "暂停",
-			"name": "名称",
-			"name-required": "名称必填。",
-			"description": "描述",
-			"add": "添加插件",
-			"delete-plugin-title": "你确定要删除插件 '{{pluginName}}' 吗？",
-			"delete-plugin-text": "小心！确认后，插件和所有相关数据将不可恢复。",
-			"delete-plugins-title": "你确定你要删除 { count, select, 1 {1 插件} other {# 插件} } 吗？",
-			"delete-plugins-action-title": "删除 { count, select, 1 {1 插件} other {# 插件} }",
-			"delete-plugins-text": "小心！确认后，所有选定的插件将被删除，所有相关数据将不可恢复。",
-			"add-plugin-text": "添加新的插件",
-			"no-plugins-text": "没有找到插件",
-			"plugin-details": "插件详细信息",
-			"api-token": "API令牌",
-			"api-token-required": "API令牌必填。",
-			"type": "插件类型",
-			"type-required": "插件类型必填。",
-			"configuration": "插件配置",
-			"system": "系统",
-			"select-plugin": "选择插件",
-			"plugin": "插件",
-			"no-plugins-matching": "没有找到匹配'{{entity}}'的插件。",
-			"plugin-required": "插件必填。",
-			"plugin-require-match": "请选择一个现有的插件。",
-			"events": "事件",
-			"details": "详情",
-			"import": "导入插件",
-			"export": "导出插件",
-			"export-failed-error": "无法导出插件：{{error}}",
-			"create-new-plugin": "创建新的插件",
-			"plugin-file": "插件文件",
-			"invalid-plugin-file-error": "无法导入插件：插件数据结构无效。",
-			"copyId": "复制插件ID",
-			"idCopiedMessage": "插件ID已经复制到粘贴板"
-		},
 		"position": {
 			"top": "顶部",
 			"bottom": "底部",