From e3f745b1839f3c3c8be58efb7b81681f4f2d2e4c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 10:30:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/assets/i18n/zh-CN.json | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index 2488a5e..255f31a 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -38,19 +38,25 @@
"typography": "������������",
"iconsfont": "icon������",
"colors": "������",
+ "other": "������",
+ "split": "������������",
+ "clipboard": "���������",
"forms": "������",
"standard": "������",
"extended": "������",
"validation": "������",
"upload": "������",
"cropper": "������������",
+ "editor": "���������",
"charts": "������",
"tables": "������",
+ "fs-table": "������������",
"maps": "������",
"qq": "QQ",
"baidu": "������",
"logics": "������������",
"guard": "������������",
+ "cache": "������������",
"acl": "������������������������",
"downfile": "������������",
"report": "������",
--
Gitblit v1.8.0