修改英文国际化文件

Signed-off-by: zhangwei <zhangwei@intranet.com>

src/main/resources/messages/message_en.properties

@@ -90,7 +90,7 @@ rtp_ip_control=RTP IP Control
 mms_ip_control=MMS IP Control
 rtsp_ip_control=RTSP IP Control
 rtmp_ip_control=RTMP IP Control
-examine_manage=Examine Management
+examine_manage=Confirmation Management
 audit_manage=Audit Management
 log_search=Log Search
 sysService_manage=System Business Management
@@ -173,7 +173,7 @@ item_value=Item Value
 desc=Description
 parent_id=Parent ID
 is_leaf=Is Leaf Node
-is_valid=Is Valid
+is_valid=Confirm Valid
 create_time=Create Time
 superior_config=Parent Node
 config_content=Configuration Content
@@ -190,8 +190,8 @@ refresh=Refresh
 add=Add
 request_number=Request Number
 state=State
-created=Unaudited
-examine=Examine
+created=Unconfirmed
+examine=Confirmation
 unapproved=Unapproved
 approved=Approved
 title=Title
@@ -215,7 +215,7 @@ task_time=Submitted Time
 #==========laihan end=====================
 
 #==========message begin=====================
-required=Can't be empty\!
+required=Can't be empty!
 select=Please Select
 date_list=Data List
 confirm_message=Confirm\uFF1F
@@ -223,7 +223,7 @@ export_confirm_message=The maximum number of data exported
 fill_loginName=Please Enter Login Account
 fill_loginPassWord=Please Enter Login Password
 loginName_error=Account or password wrong ,Please try again.
-system_error=There is a problem in the system. Please try again later\uFF01
+system_error=There is a problem in the system. Please try again later!
 save_success=Save Success
 save_failed=Save Failed
 update_success=Edit Success
@@ -231,10 +231,10 @@ update_failed=Edit Failed
 delete_success=Delete Success
 delete_failed=Delete Failed
 delete_failed_admin=Delete Failed, Admin account can't be deleted
-audit_success=Examine Success
-audit_failed=Examine Failed
+audit_success=Confirmataion Success
+audit_failed=Confirmataion Failed
 turning_page=Redirect URL
-login_timeout=No login or login timeout, please log in again. Thank you.\!
+login_timeout=No login or login timeout, please log in again. Thank you.!
 captcha_error=Validation code is incorrect
 enter_captcha=Please enter the verification code
 input=Please enter
@@ -244,17 +244,17 @@ filter=Filter
 to=to
 reset=Reset
 info=Prompt
-has_approved=After audited, the operation can not be carried out\uFF01
-hasnot_approved=The operation cannot be carried out without approval\uFF01
-check_one=Please Select one data\uFF01
-one_more=Select at least one data\!
-one_more_area=Please Select ISP\!
+has_approved=The operation can not be carried out if data is approved!
+hasnot_approved=The operation cannot be carried if data is unapproved!
+check_one=Please Select one data!
+one_more=Select at least one data!
+one_more_area=Please Select ISP!
 custom_columns=Custom column fields
-maxlength_64=Please enter a string with a maximum of 64\uFF01
-maxlength_128=Please enter a string with a maximum of 128\uFF01
-maxlength_256=Please enter a string with a maximum of 256\uFF01
-maxlength_512=Please enter a string with a maximum of 512\uFF01
-maxlength_4000=Please enter a string with a maximum of 4000\uFF01
+maxlength_64=Please enter a string with a maximum of 64!
+maxlength_128=Please enter a string with a maximum of 128!
+maxlength_256=Please enter a string with a maximum of 256!
+maxlength_512=Please enter a string with a maximum of 512!
+maxlength_4000=Please enter a string with a maximum of 4000!
 ok=ok
 clear=clear
 close=close
@@ -313,8 +313,8 @@ createTime_asc=Ascending order by create time
 createTime_desc=Reversse order by create time
 editTime_asc=Ascending order by edit time
 editTime_desc=Reversse order by edit time
-auditTime_asc=Ascending order by audit time
-auditTime_desc=Reversse order by audit time
+auditTime_asc=Ascending order by confirmation time
+auditTime_desc=Reversse order by confirmation time
 config_describe=Configuration Description
 match_area=Match District
 key_word=Keyowrd
@@ -328,17 +328,17 @@ area=Area
 isp=ISP
 scope=Feature Scope
 valid_identifier=Valid Intentifier
-is_audit=Is Approved
+is_audit=Confirmation State
 creator=Creator
 config_time=Create Time
 editor=Editor
 edit_time=Edit Time
-auditor=Audited\u4EBA\u5458
-audit_time=Audited Time
+auditor=Confirmation User
+audit_time=Confirmation Time
 yes=Yes
 no=No
 deleted=Deleted
-cancel_approved=Cancel Audited
+cancel_approved=Cancel Confirmation
 
 #==========youjianguankong end=====================
 
@@ -418,7 +418,7 @@ success=Success
 password=Password
 nochange_blank=If don't modify,please keep blank
 confirm_password=Confirm Password
-manager_info=Management\u4EBA\u5458\u9700\u6307\u5B9A\u8EAB\u4EFD\u6807\u8BC6\u4E3A\u201C Management\u4EBA\u5458\u201D,\u5426\u5219\u5F71\u54CDAudited\u6D41\u7A0B\uFF01
+manager_info=Management\u4EBA\u5458\u9700\u6307\u5B9A\u8EAB\u4EFD\u6807\u8BC6\u4E3A\u201C Management\u4EBA\u5458\u201D,\u5426\u5219\u5F71\u54CDAudited\u6D41\u7A0B!
 name_existed=Login id has existed
 company_range=\u90E8\u95E8\u4E0D\u518D\u516C\u53F8\u8303\u56F4\u5185
 equal_password=\u8F93\u5165\u4E0E\u4E0A\u9762\u76F8\u540C\u7684\u5BC6\u7801
@@ -442,7 +442,7 @@ master=\u8D1F\u8D23\u4EBA
 post_code=\u90AE\u653F\u7F16\u7801
 phone=\u7535\u8BDD
 fax=\u4F20\u771F
-nochange=\u6682\u65E0\u4FEE\u6539\u8BB0\u5F55\!
+nochange=\u6682\u65E0\u4FEE\u6539\u8BB0\u5F55!
 module_name=\u6A21\u5757Name
 dict_mark=\u5B57\u5178\u6807\u8BC6
 run_state=\u8FD0\u884CState
@@ -456,10 +456,10 @@ edit_record=\u4FEE\u6539\u8BB0\u5F55
 edit_record_view=\u4FEE\u6539\u8BB0\u5F55\u67E5\u770B
 dict_edit_info=\u6570\u636E\u5B57\u5178\u5728\u7CFB\u7EDF\u4E2D\u975E\u5E38\u91CD\u8981,\u60A8\u786E\u8BA4\u8981\u4FEE\u6539\u5417\uFF1F
 dict_delete_info=\u6570\u636E\u5B57\u5178\u5728\u7CFB\u7EDF\u4E2D\u975E\u5E38\u91CD\u8981,\u60A8\u786E\u8BA4\u8981\u5220\u9664\u5417\uFF1F
-dict_saveitem_error=\u4FDD\u5B58\u4FE1\u606F\u51FA\u73B0\u95EE\u9898,\u8BF7\u6DFB\u52A0\u8BCD\u6761\u9879\uFF01
-dict_saveitem_nullerror=\u4FDD\u5B58\u4FE1\u606F\u51FA\u73B0\u95EE\u9898,\u6BCF\u4E2A\u8BCD\u6761\u6807\u8BC6\u4E0E\u503C\u90FDCan't be empty\uFF01
-submit_error=\u63D0\u4EA4Configuration\u51FA\u73B0\u95EE\u9898,\u8BF7\u770B\u9519\u8BEF\u63D0\u793A\uFF01
-form_validate=\u8868\u5355\u9A8C\u8BC1\u6210\u529F\uFF01
+dict_saveitem_error=\u4FDD\u5B58\u4FE1\u606F\u51FA\u73B0\u95EE\u9898,\u8BF7\u6DFB\u52A0\u8BCD\u6761\u9879!
+dict_saveitem_nullerror=\u4FDD\u5B58\u4FE1\u606F\u51FA\u73B0\u95EE\u9898,\u6BCF\u4E2A\u8BCD\u6761\u6807\u8BC6\u4E0E\u503C\u90FDCan't be empty!
+submit_error=\u63D0\u4EA4Configuration\u51FA\u73B0\u95EE\u9898,\u8BF7\u770B\u9519\u8BEF\u63D0\u793A!
+form_validate=\u8868\u5355\u9A8C\u8BC1\u6210\u529F!
 entry=\u8BCD\u6761\u9879
 add_entry=\u6DFB\u52A0\u8BCD\u6761
 click_add_entry=\u70B9\u51FB\u6DFB\u52A0\u8BCD\u6761
@@ -480,21 +480,21 @@ menu=\u83DC\u5355
 parent_menu=\u4E0A\u7EA7\u83DC\u5355
 aim=\u76EE\u6807
 click_menu_turn=\u70B9\u51FB\u83DC\u5355\u8DF3\u8F6C\u7684\u9875\u9762
-link_window_info=\u94FE\u63A5\u5730\u5740\u6253\u5F00\u7684\u76EE\u6807\u7A97\u53E3,\u9ED8\u8BA4\uFF1AmainFrame
+link_window_info=\u94FE\u63A5\u5730\u5740\u6253\u5F00\u7684\u76EE\u6807\u7A97\u53E3,\u9ED8\u8BA4:mainFrame
 is_top_menu=\u662F\u5426\u9876\u90E8\u5BFC\u822A\u83DC\u5355
 icon=\u56FE\u6807
 is_top_menu_info=\u8BE5\u83DC\u5355\u6216\u64CD\u4F5C\u662F\u5426\u9876\u90E8\u5BFC\u822A\u83DC\u5355
 sort_info=\u6392\u5217\u987A\u5E8F,\u5347\u5E8F.
 is_show_sysmenu=\u8BE5\u83DC\u5355\u6216\u64CD\u4F5C\u662F\u5426\u663E\u793A\u5230\u7CFB\u7EDF\u83DC\u5355\u4E2D
-control_permission_info=\u63A7\u5236\u5668\u4E2D\u5B9A\u4E49\u7684\u6743\u9650\u6807\u8BC6,\u5982\uFF1A@RequiresPermissions("\u6743\u9650\u6807\u8BC6")
+control_permission_info=\u63A7\u5236\u5668\u4E2D\u5B9A\u4E49\u7684\u6743\u9650\u6807\u8BC6,\u5982:@RequiresPermissions("\u6743\u9650\u6807\u8BC6")
 role_name=\u89D2\u8272Name
 data_range=\u6570\u636E\u8303\u56F4
 allot=\u5206\u914D
 role_type=\u89D2\u8272Type
 role_permission=\u89D2\u8272\u6743\u9650
 task_allot=\u4EFB\u52A1\u5206\u914D
-role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4Type\uFF1Asecurity-role\u3001assignment\u3001user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1
-role_type_info=\u5DE5\u4F5C\u6D41\u7EC4\u7528\u6237\u7EC4Type\uFF08\u4EFB\u52A1\u5206\u914D\uFF1Aassignment\u3001 Management\u89D2\u8272\uFF1Asecurity-role\u3001\u666E\u901A\u89D2\u8272\uFF1Auser\uFF09
+role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4Type:security-role\u3001assignment\u3001user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1
+role_type_info=\u5DE5\u4F5C\u6D41\u7EC4\u7528\u6237\u7EC4Type\uFF08\u4EFB\u52A1\u5206\u914D:assignment\u3001 Management\u89D2\u8272:security-role\u3001\u666E\u901A\u89D2\u8272:user\uFF09
 data_range_info=\u7279\u6B8A\u60C5\u51B5\u4E0B,\u8BBE\u7F6E\u4E3A\u201C\u6309\u660E\u7EC6\u8BBE\u7F6E\u201D,\u53EF\u8FDB\u884C\u8DE8\u673A\u6784\u6388\u6743
 permission_list=\u6743\u9650\u5217\u8868
 area_name=\u533ADomain\u79F0
@@ -516,11 +516,11 @@ new_password=New Password
 sure_new_password=Confirm New Password
 be_selected_staff=\u5F85\u9009\u4EBA\u5458
 selected_staff=\u5DF2\u9009\u4EBA\u5458
-old_remove_error=\u89D2\u8272\u539F\u6709\u6210\u5458\u4E0D\u80FD\u6E05\u9664\uFF01
-selected_clear_success=\u5DF2\u9009\u4EBA\u5458\u6E05\u9664\u6210\u529F\uFF01
-cancel_clear=\u53D6\u6D88\u6E05\u9664\u64CD\u4F5C\uFF01
+old_remove_error=\u89D2\u8272\u539F\u6709\u6210\u5458\u4E0D\u80FD\u6E05\u9664!
+selected_clear_success=\u5DF2\u9009\u4EBA\u5458\u6E05\u9664\u6210\u529F!
+cancel_clear=\u53D6\u6D88\u6E05\u9664\u64CD\u4F5C!
 sure_clear=\u6E05\u9664\u786E\u8BA4
-role_no_new=\u89D2\u8272\u672A\u5206\u914D\u65B0\u6210\u5458\uFF01
+role_no_new=\u89D2\u8272\u672A\u5206\u914D\u65B0\u6210\u5458!
 role_unique=\u89D2\u8272Name\u5DF2\u5B58\u5728
 role_error_info=\u8F93\u5165\u6709\u8BEF,\u8BF7\u5148\u66F4\u6B63.
 user=User
@@ -571,7 +571,7 @@ src_file=Source File
 select_file=Please Select Upload File
 sample_file=Sample File
 sample_sign=Sample Sign
-click_detail=\u8BF7\u70B9\u51FB\u201C\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F\u201D\u6309\u94AE,\u5C06\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F\u53D1\u9001\u7ED9\u7CFB\u7EDF Management\u5458,\u8C22\u8C22\uFF01
+click_detail=\u8BF7\u70B9\u51FB\u201C\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F\u201D\u6309\u94AE,\u5C06\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F\u53D1\u9001\u7ED9\u7CFB\u7EDF Management\u5458,\u8C22\u8C22!
 return_lastpage=\u8FD4\u56DE\u4E0A\u4E00\u9875
 show_detail=\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F
 hidden_detail=\u9690\u85CF\u4FE1\u606F\u4FE1\u606F
@@ -614,9 +614,9 @@ ftp_ip=FTP IP Configuration
 dns_ip=DNS IP Configuration
 dns_domain=DNS Domain Configuration
 action=action
-has_prohibit_delete=Only unaudited configuration can by deleted
-has_prohibit_nopass=Only unaudited configuration can by audited
-has_prohibit_pass=Only unaudited configuration can by audited
+has_prohibit_delete=Only unconfirmed configuration can be deleted
+has_prohibit_nopass=Only unconfirmed configuration can be confirmed
+has_prohibit_pass=Only unconfirmed configuration can be confirmed
 multiple_keywords_tip=Multiple keyowrd can be input,Please separate it with the return key.
 action_drop=drop
 action_reject=block
@@ -642,7 +642,7 @@ download=Template Download
 import_success=Import Success
 import_error=Import Error
 import_failed=Import Failed
-import_template_failed=Failed to download the template\! Failure information\uFF1A
+import_template_failed=Failed to download the template! Failure information:
 the_line_of=Line rowNum
 val_protocol_id=Protocol name is empty or not exist
 val_ip_type=IP Type Can't be empty,and should by 4(IPV4) or 6(IPV6)
@@ -720,7 +720,7 @@ ip_intercept=IP Intercept
 domain_intercept=Domain Intercept
 control_policy=Control Policy
 domain_forward=Domain Forward
-http_redirect=Http Redirect
+http_redirect=HTTP redirect
 http_req_replace=Http Request Body Replace
 http_res_replace=Http ResponseContent Replace
 replace_content=Replace Content 
@@ -735,8 +735,8 @@ policy_group_manage=Policy Group Management
 ip_Reuse_policy=IP Reuse Policy
 target_ip_protectTarget IP Protect
 ratelimit_config=Ratelimit Management
-ip_ratelimit=IP Ratelimit
-domain_ratelimit=Domain Ratelimit
+ip_ratelimit=IP speed limit
+domain_ratelimit=Domain speed limit
 ratelimit=Limit Rate
 ir_type=Reuse type
 dns_strategy_id=DNS Policy ID
@@ -844,11 +844,10 @@ userregion4=\u81EA\u5B9A\u4E49\u57DF4
 userregion5=\u81EA\u5B9A\u4E49\u57DF5
 #=============userregions===============
 #=============multipart upload error info=================
-single_file_upload_size_error=Filesize of file %s is %s,Allow the maximum value of a single file to be %s\uFF01
-total_file_upload_size_error=The maximum size of the uploaded file is %s,The total size of the file allowed to upload is %s\uFF01
-file_upload_type_error=%s file type is incorrect,Allow uploaded files type contains %s\uFF01
-file_upload_error=File upload failure\uFF01
-<<<<<<< HEAD
+single_file_upload_size_error=Filesize of file %s is %s,Allow the maximum value of a single file to be %s!
+total_file_upload_size_error=The maximum size of the uploaded file is %s,The total size of the file allowed to upload is %s!
+file_upload_type_error=%s file type is incorrect,Allow uploaded files type contains %s!
+file_upload_error=File upload failure!
 #=============multipart upload error info=================
 #=============function_service_dict==>service_name=================
 audio_sample_reject=Audio and video sample control
@@ -928,15 +927,9 @@ app_http_feature_monit=APP HTTP feature monitoring
 app_domain_feature_monit=APP domain feature monitoring
 app_byte_feature_monit=APP byte feature monitoring
 proxy_domain_forward=Domain forward
-ip_ratelimit=IP speed limit
-domain_ratelimit=Domain speed limit
 ip_complex_loop=IP complex
-http_redirect=HTTP redirect
 ddos_ip_drop=DDOS IP
 ip_reuse_adress_pool_loop=IP reuse address pool
 app_strategy_monit=APP strategy monitoring
 app_strategy_drop=APP strategy drop 
-#=============function_service_dict==>service_name=================
-=======
-#=============multipart upload error info=================
->>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
+#=============multipart upload error info=================