From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/assets/i18n/zh-CN.json | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index 44d7e46..386097b 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -2,7 +2,7 @@
"home": "������",
"user_management": "������������",
"user_management_install": "������������",
- "user_management_receive": "������������",
+ "user_management_alarm-user": "������������",
"device_management": "������������",
"device_management_info": "������������",
"device_management_version": "������������",
@@ -11,6 +11,9 @@
"sensor_management": "���������������",
"sensor_management_info": "������������",
+ "system_management":"������������",
+ "system_management_account":"������������",
+
"settings": "������",
"profile": "������������",
"login": "������",
--
Gitblit v1.8.0