Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gorhill/uBlock into next

This commit is contained in:
gorhill 2016-10-01 07:09:55 -04:00
parent 6e730772ac 93001a8635
commit 72d55f4ace
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/_locales/en/messages.json
View File

@ -164,8 +164,8 @@
"description":"Element picker preview mode: will cause the elements matching the current filter to be removed from the page" "description":"Element picker preview mode: will cause the elements matching the current filter to be removed from the page"
}, },
"pickerNetFilters":{ "pickerNetFilters":{
"message":"Net filters", "message":"Network filters",
"description":"English: Net filters" "description":"English: header for a type of filter in the element picker dialog"
}, },
"pickerCosmeticFilters":{ "pickerCosmeticFilters":{
"message":"Cosmetic filters", "message":"Cosmetic filters",
@ -683,6 +683,10 @@
"message": "bytes", "message": "bytes",
"description": "" "description": ""
}, },
"genericBy": {
"message": "by",
"description": "to be used in sentences such as '{what} by {whom}, i.e. 'Font Awesome by Dave Gandy'"
},
"contextMenuTemporarilyAllowLargeMediaElements": { "contextMenuTemporarilyAllowLargeMediaElements": {
"message": "Temporarily allow large media elements", "message": "Temporarily allow large media elements",
"description": "A context menu entry, present when large media elements have been blocked on the current site" "description": "A context menu entry, present when large media elements have been blocked on the current site"

4
src/about.html
View File

@ -21,8 +21,8 @@
<li><a href="https://github.com/gorhill/uBlock/graphs/contributors">Github</a> <li><a href="https://github.com/gorhill/uBlock/graphs/contributors">Github</a>
<li><a href="https://crowdin.net/project/ublock">Crowdin</a> <li><a href="https://crowdin.net/project/ublock">Crowdin</a>
</ul> </ul>
<li><a href="https://github.com/bestiejs/punycode.js" target="_blank">Punycode.js</a> by <a href="https://github.com/mathiasbynens">Mathias Bynens</a> <li><a href="https://github.com/bestiejs/punycode.js" target="_blank">Punycode.js</a> <span data-i18n="genericBy"></span> <a href="https://github.com/mathiasbynens">Mathias Bynens</a>
<li><a href="http://fontawesome.io" target="_blank">Font Awesome</a> by <a href="https://github.com/davegandy">Dave Gandy</a> <li><a href="http://fontawesome.io" target="_blank">Font Awesome</a> <span data-i18n="genericBy"></span> <a href="https://github.com/davegandy">Dave Gandy</a>
</ul> </ul>
<script src="js/vapi-common.js"></script> <script src="js/vapi-common.js"></script>