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

src/main/resources/messages/message_en.properties

@@ -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

src/main/resources/messages/message_ru.properties

@@ -22,7 +22,7 @@ choose=\u0412\u044B\u0431\u0440\u0430\u0442\u044C
 onloading=\u0417\u0430\u0433\u0440\u0443\u0437\u043A\u0430 ...
 #==========menu begin=====================
 requestInfo=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u0437\u0430\u043F\u0440\u043E\u0441\u0430\u0445
-Configuration_manage=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0431\u0438\u0437\u043D\u0435\u0441\u0430
+configuration_manage=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0431\u0438\u0437\u043D\u0435\u0441\u0430
 text_control=\u041E\u0431\u044B\u0447\u043D\u044B\u0439 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u044C \u0442\u0435\u043A\u0441\u0442\u0430
 text_monitor=\u041E\u0431\u044B\u0447\u043D\u044B\u0439 \u043C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433 \u0442\u0435\u043A\u0441\u0442\u0430
 text_enhance_manage=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0439 \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u044C \u0442\u0435\u043A\u0441\u0442\u0430
@@ -39,8 +39,8 @@ online_media_control=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u043
 sip_ip_control=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 IP-\u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B\u043E\u043C SIP
 domain_control_white=\u0411\u0435\u043B\u044B\u0439 \u0441\u043F\u0438\u0441\u043E\u043A \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u0434\u043E\u043C\u0435\u043D\u043D\u044B\u043C\u0438 \u0438\u043C\u0435\u043D\u0430\u043C\u0438
 ip_address_control=IP
-Ip_control=IP-\u0430\u0434\u0440\u0435\u0441
+ip_control=IP-\u0430\u0434\u0440\u0435\u0441
-Ip_redirect=\u041F\u0435\u0440\u0435\u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 IP
+ip_redirect=\u041F\u0435\u0440\u0435\u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 IP
 domain_control=\u041A\u043E\u043D\u0442\u0440\u043E\u043B\u044C \u0434\u043E\u043C\u0435\u043D\u0430
 dns_control=DNS
 basic_configuration=\u0411\u0430\u0437\u043E\u0432\u0430\u044F \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
@@ -72,7 +72,7 @@ ftp_content_control=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435
 http_app_feature=\u0424\u0443\u043D\u043A\u0446\u0438\u044F HTTP \u0434\u043B\u044F \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0445 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0439
 ssl_app_feature=\u0424\u0443\u043D\u043A\u0446\u0438\u0438 SSL \u0434\u043B\u044F \u0441\u043E\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0445 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0439
 tunnel_protocol_control=\u0422\u0443\u043D\u043D\u0435\u043B\u044C\u043D\u044B\u0439 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B
-i2tp_ip_control=L2TP
+l2tp_ip_control=L2TP
 pptp_ip_control=PPTP
 openvpn_control=OpenVPN
 socks_control=\u041D\u041E\u0421\u041A\u0418