From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/global_zh_CN.properties |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index eb58994..128f98e 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1111,10 +1111,20 @@
 
 ###################  ex-battinfo.jsp   ##################################
 Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
-
+Audit = \u5ba1\u6838
+Acceptance = \u9a8c\u6536
 
 ##################  batch-set-curr.jsp  ##############################
 Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5
 
 ##################  batt-station-update1.jsp   #########################
-BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
\ No newline at end of file
+BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
+
+##################  bat-set-test.jsp     ##############################
+Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e
+
+##################  sys-set-test.jsp     ##############################
+Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
+
+##################  bts-comm-mon.jsp      #########################
+Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2
\ No newline at end of file

--
Gitblit v1.9.1