Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

2018-08-07 15:56:10 +08:00
parent 4be46ac31a 3ce8bd2ea8
commit 736d8ba620
10 changed files with 70 additions and 59 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -367,7 +367,7 @@ configuration=Configuration
 direction=Direction
 protocol=Protocol
 oneway=Single
-twoway=Two-way
+twoway=Double
 arbitrary=Arbitrarily
 basic_config=Basic Configuration
 block_config=Configuration Info