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

修改en国际化冲突记录，修改ru国际化code

Browse Source
This commit is contained in:
duandongmei
2018-08-21 14:10:35 +08:00
parent 122e763b1b
commit 549cae1823
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/messages/message_en.properties
View File

@@ -1043,7 +1043,6 @@ app_desc=Application Description
tunnel_code=Tunnel Behavior No
tunnel_name=Tunnel Behavior Name
tunnel_desc=Tunnel Behavior Description
<<<<<<< HEAD
call_external_procedures_failed=Call external procedures failed
is_hex=Is HEX
is_case_insenstive=Is Case-senstive
@@ -1084,10 +1083,6 @@ PXY_INTERCEPT_PKT_BIN=Intercept Messages
certificate=Certificate
app_ssl_config=APP SSL Cert Feature
call_external_procedures_failed=Call external procedures failed
=======
call_external_procedures_failed=Call external procedures failedfile_strategy=\u6587\u4ef6\u7b56\u7565
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
file_strategy=File Strategy
file_desc=File Desc
content_type=Content Type