gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

冲突解决

Browse Source
This commit is contained in:
zhanghongqing
2018-07-18 09:26:56 +08:00
parent f499c90a28
commit 55b26a7b19
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/resources/messages/message_en.properties
View File

@@ -970,16 +970,16 @@ dashboard=Dashboard
traffic_chart=Traffic Chart traffic_chart=Traffic Chart
os_type=OS Type os_type=OS Type
browser_type=Browser Type browser_type=Browser Type
traffic_protocol_chart=Traffic Protocol Chart traffic_protocol_chart=Protocol Chart
traffic_ipactive_chart=Traffic IpActive Chart traffic_ipactive_chart=IP Active Chart
traffic_app_chart=Traffic App Chart traffic_app_chart=App Chart
traffic_ua_list=Traffic UA List traffic_ua_list=Traffic UA List
traffic_ua_chart=Traffic UA Chart traffic_ua_chart=Traffic UA Chart
ranking=Ranking ranking=Ranking
os=OS os=OS
browser=Browser browser=Browser
trend=Trend trend=Trend
traffic_website_list=Traffic Website List traffic_website_list=Website List
traffic_website_type_chart=Traffic Website Type Chart traffic_website_type_chart=Website Type Chart
website=Website website=Website
#===============dashboard end=================================== #===============dashboard end===================================