解决冲突

2018-03-07 09:38:10 +08:00
parent 173d80f07f
commit e60e9a57ea
3 changed files with 52 additions and 32 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -228,4 +228,7 @@ block_url=block url
 configuration=configuration
 direction=direction
 protocol=protocol
+oneway=oneway
+twoway=twoway
+arbitrary=arbitrary
 #==========guankongbaimingdan end=====================
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -226,4 +226,7 @@ block_url=\u5c01\u5835\u8def\u5f84
 configuration=\u914d\u7f6e
 direction=\u65b9\u5411
 protocol=\u534f\u8bae
+oneway=\u5355\u5411
+twoway=\u53cc\u5411
+arbitrary=\u4efb\u610f
 #==========guankongbaimingdan end=====================