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

Conflicts:
	src/main/resources/messages/message_zh_CN.properties
	增加file_digest_control=file digest control

src/main/resources/messages/message_en.properties

@@ -566,4 +566,13 @@ ip_subnet=Subnet
 district=match district
 keywords=keywords
 ingress=ingress
-degress=egress
+degress=egress
+action_drop=drop
+action_reject=reject
+action_redirect=\redirect
+action_loop=loop
+action_forward=forward
+action_ratelimit=rate limit
+action_replace=replace
+action_whitelist=white list
+action_monit=monitor

src/main/resources/messages/message_ru.properties

@@ -392,4 +392,13 @@ ip_subnet=Subnet
 district=match district
 keywords=keywords
 ingress=ingress
-degress=egress
+degress=egress
+action_drop=\u0431\u0440\u043E\u0441\u044C
+action_reject=\u043E\u0442\u043A\u043B\u043E\u043D\u0438\u0442\u044C
+action_redirect=\u043F\u0435\u0440\u0435\u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435
+action_loop=\u043F\u0435\u0442\u043B\u044F
+action_forward=\u0432\u043F\u0435\u0440\u0435\u0434
+action_ratelimit=\u0441\u0442\u0430\u0432\u043A\u0438 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0438\u0442\u044C
+action_replace=\u0437\u0430\u043C\u0435\u043D\u0438\u0442\u044C
+action_whitelist=\u0431\u0435\u043B\u044B\u0439 \u0441\u043F\u0438\u0441\u043E\u043A
+action_monit=\u041C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433

src/main/resources/messages/message_zh_CN.properties

@@ -600,6 +600,6 @@ action_loop=\u56DE\u6D41
 action_forward=\u8F6C\u53D1
 action_ratelimit=\u9650\u901F
 action_replace=\u66FF\u6362
-action_whitelist=\u767D\u540D\u5355
+action_whitelist=\u767D\u540D\u5355
 action_monit=\u76D1\u6D4B
-file_digest_control=\u6587\u4EF6\u6458\u8981\u7BA1\u63A7
+file_digest_control=\u6587\u4EF6\u6458\u8981\u7BA1\u63A7