gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'demostration_08' into 'develop'

Browse Source 
去掉国际化汉语重复单词：来函

See merge request !30
This commit is contained in:
zhanghongqing
2018-08-16 16:30:20 -04:00
parent 9450df24b5 e1a035762a
commit 0f13045065
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -314,7 +314,6 @@ config_describe=\u914D\u7F6E\u63CF\u8FF0
match_area=\u5339\u914D\u533A\u57DF match_area=\u5339\u914D\u533A\u57DF
key_word=\u5173\u952E\u5B57 key_word=\u5173\u952E\u5B57
block_type=\u7BA1\u63A7\u7C7B\u578B block_type=\u7BA1\u63A7\u7C7B\u578B
letter=\u6765\u51FD
whether_area_block=\u533A\u57DF\u7BA1\u63A7\u8303\u56F4 whether_area_block=\u533A\u57DF\u7BA1\u63A7\u8303\u56F4
classification=\u5206\u7C7B classification=\u5206\u7C7B
label=\u6807\u7B7E label=\u6807\u7B7E
@@ -986,7 +985,7 @@ isp_report=\u8FD0\u8425\u5546\u5C40\u70B9\u62A5\u8868
ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565 ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565
target_ip_protect=\u6297DDOS\u653B\u51FB target_ip_protect=\u6297DDOS\u653B\u51FB
ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60 ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60
letter=\u61D2\u6C49 letter=\u6765\u51FD
show_more=\u5C55\u793A\u66F4\u591A show_more=\u5C55\u793A\u66F4\u591A
#===============dashboard begin=================================== #===============dashboard begin===================================
dashboard=\u7EDF\u8BA1\u56FE\u8868 dashboard=\u7EDF\u8BA1\u56FE\u8868

4
src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
View File

@@ -219,7 +219,7 @@
</div> </div>
<div for="groupId"></div> <div for="groupId"></div>
</div> </div>
<%-- <div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:select path="isLeaf" class="form-control leafChange"> <form:select path="isLeaf" class="form-control leafChange">
@@ -228,7 +228,7 @@
</c:forEach> </c:forEach>
</form:select> </form:select>
</div> </div>
</div> --%> </div>
<%-- <div class="form-group"> <%-- <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="cfg_type"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="cfg_type"/>:</label>
<div class="col-md-4"> <div class="col-md-4">