Skip to content

Commit

Permalink
Merge branch 'feature/AG-2737' into fix/AG-9455
Browse files Browse the repository at this point in the history
  • Loading branch information
zhelvis committed Aug 9, 2021
2 parents 7085785 + 71f9d66 commit d166200
Show file tree
Hide file tree
Showing 27 changed files with 522 additions and 2,492 deletions.
34 changes: 32 additions & 2 deletions Extension/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@
"message": "Media"
},
"filtering_log_tag_tooltip_other": {
"message": "Other"
"message": "Fonts, pings, WebRTC, WebSocket, etc."
},
"filtering_log_badge_tooltip_third_party": {
"message": "Third-party request"
Expand All @@ -994,5 +994,35 @@
},
"options_stealth_miscellaneous_title": {
"message": "Miscellaneous"
},
"blocking_pages_malware": {
"message": "This web page at <strong>%host%</strong> has been reported as a malware page and has been blocked based on your security preferences."
},
"blocking_pages_phishing": {
"message": "This web page at <strong>%host%</strong> has been reported as a phishing page and has been blocked based on your security preferences."
},
"blocking_pages_advanced_button": {
"message": "Advanced"
},
"blocking_pages_more_info_button": {
"message": "More information"
},
"blocking_pages_page_title": {
"message": "Access denied"
},
"blocking_pages_safe_header_title": {
"message": "AdGuard has blocked access to this page"
},
"blocking_pages_rule_header_title": {
"message": "Blocked by AdGuard"
},
"blocking_pages_rule_content_title": {
"message": "AdGuard has prevented this page from loading due to the following filter rule"
},
"blocking_pages_btn_go_back": {
"message": "Go back"
},
"blocking_pages_btn_proceed": {
"message": "Proceed anyway"
}
}
}
1 change: 1 addition & 0 deletions Extension/assets/images/hero-green.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d166200

Please sign in to comment.