Skip to content

Commit

Permalink
Merge branch 'merge1.14.22'
Browse files Browse the repository at this point in the history
  • Loading branch information
cqx931 committed Mar 2, 2018
2 parents 49c2bc5 + c1fe452 commit 2ddc686
Show file tree
Hide file tree
Showing 139 changed files with 35,884 additions and 32,334 deletions.
3 changes: 1 addition & 2 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@
"sub": true,
"undef": true,
"unused": true,
"validthis": true,
"-W058": true // suppress "Missing '()' invoking a constructor" message
"validthis": true
}
62 changes: 33 additions & 29 deletions assets/assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,6 @@
"assets/ublock/unbreak.txt"
]
},
"aak-continued": {
"content": "filters",
"group": "ads",
"off": true,
"title": "AAK-Cont Filters For uBlock Origin",
"contentURL": "https://xuhaiyang1234.gitlab.io/AAK-Cont/dist/aak-cont-list-ubo.txt",
"supportURL": "https://gitlab.com/xuhaiyang1234/AAK-Cont/issues",
"instructionURL": "https://gitlab.com/xuhaiyang1234/AAK-Cont#installation-instruction"
},
"awrl-0": {
"content": "filters",
"group": "ads",
Expand All @@ -115,7 +106,17 @@
"title": "Adguard Base Filters",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#english-filter"
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
},
"adguard-mobile": {
"content": "filters",
"group": "ads",
"off": true,
"title": "Adguard Mobile Filters",
"ua": "mobile",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/11.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
},
"easylist": {
"content": "filters",
Expand All @@ -137,14 +138,7 @@
"title": "Adguard Spyware Filters",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#privacy"
},
"disconnect-tracking": {
"content": "filters",
"group": "privacy",
"off": true,
"title": "Basic tracking list by Disconnect",
"contentURL": "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt"
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
},
"easyprivacy": {
"content": "filters",
Expand All @@ -165,7 +159,7 @@
"off": true,
"title": "Fanboy’s Enhanced Tracking List",
"contentURL": "https://www.fanboy.co.nz/enhancedstats.txt",
"supportURL": "https://forums.lanik.us/"
"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
},
"malware-0": {
"content": "filters",
Expand Down Expand Up @@ -210,15 +204,15 @@
"title": "Adguard’s Annoyance List",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/14.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#annoyances-filter"
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
},
"fanboy-thirdparty_social": {
"content": "filters",
"group": "social",
"off": true,
"title": "Fanboy’s Anti-Thirdparty Social (see warning inside list)",
"contentURL": "https://fanboy.co.nz/fanboy-antifacebook.txt",
"supportURL": "https://forums.lanik.us/"
"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
},
"fanboy-annoyance": {
"content": "filters",
Expand Down Expand Up @@ -347,8 +341,8 @@
"group": "regions",
"off": true,
"title": "CZE, SVK: EasyList Czech and Slovak",
"lang": "cs",
"contentURL": "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt",
"lang": "cs sk",
"contentURL": "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters_ublock.txt",
"supportURL": "https://github.com/tomasko126/easylistczechandslovak"
},
"DEU-0": {
Expand Down Expand Up @@ -481,6 +475,16 @@
"contentURL": "https://raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abpjf.txt",
"supportURL": "https://github.com/k2jp/abp-japanese-filters/wiki/Support_Policy"
},
"JPN-1": {
"content": "filters",
"group": "regions",
"off": true,
"title": "JPN: Adguard Japan Filter",
"lang": "ja",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/7.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
},
"KOR-0": {
"content": "filters",
"group": "regions",
Expand Down Expand Up @@ -533,7 +537,7 @@
"title": "POL: polskie filtry do Adblocka i uBlocka",
"lang": "pl",
"contentURL": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt",
"supportURL": "https://www.certyficate.it/adblock-ublock-polish-filters/"
"supportURL": "https://github.com/MajkiIT/polish-ads-filter/issues"
},
"POL-1": {
"content": "filters",
Expand All @@ -542,15 +546,15 @@
"title": "POL: polskie filtry do uBlocka uzupelnienie",
"lang": "pl",
"contentURL": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_ublock.txt",
"supportURL": "https://www.certyficate.it/adblock-ublock-polish-filters/"
"supportURL": "https://github.com/MajkiIT/polish-ads-filter/issues"
},
"RUS-0": {
"content": "filters",
"group": "regions",
"off": true,
"title": "RUS: RU AdList",
"lang": "be ru uk",
"contentURL": "https://easylist-downloads.adblockplus.org/advblock.txt",
"contentURL": "https://easylist-downloads.adblockplus.org/advblock+cssfixes.txt",
"supportURL": "https://forums.lanik.us/viewforum.php?f=102",
"instructionURL": "https://forums.lanik.us/viewtopic.php?f=102&t=22512"
},
Expand Down Expand Up @@ -579,7 +583,7 @@
"lang": "es pt",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#spanish"
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
},
"SVN-0": {
"content": "filters",
Expand All @@ -597,7 +601,7 @@
"title": "SWE: Fanboy's Swedish",
"lang": "sv",
"contentURL": "https://www.fanboy.co.nz/fanboy-swedish.txt",
"supportURL": "https://forums.lanik.us/"
"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
},
"TUR-0": {
"content": "filters",
Expand All @@ -607,7 +611,7 @@
"lang": "tr",
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt",
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters#turkish"
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
},
"VIE-1": {
"content": "filters",
Expand Down
5 changes: 3 additions & 2 deletions dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ Remember that you have to update manually also. For some users, updating manuall

### Firefox webext

Compatible with Firefox 52 and beyond.
Compatible with Firefox 52 and beyond. This works only if you set `xpinstall.signatures.required` to `false` in `about:config`.

- Download `ublock0.webext.xpi` ([latest release desirable](https://github.com/gorhill/uBlock/releases)).
- Download `ublock0.webext.xpi` ([latest release desirable](https://github.com/gorhill/uBlock/releases)).
- Right-click and choose _"Save As..."_.
- Drag and drop the previously downloaded `ublock0.webext.xpi` into Firefox

On Linux, the settings are saved in a JSON file located at `~/.mozilla/firefox/[profile name]/browser-extension-data/[email protected]/storage.js`.
Expand Down
49 changes: 49 additions & 0 deletions dist/description/description-bn.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
একটি কার্যকর বিজ্ঞাপন প্রতিরোধক: মেমরি ও প্রসেসর সহায়ক, এবং অন্যান্য জনপ্রিয় বিজ্ঞাপন প্রতিরোধক বা অবরোধকারী থেকে হাজার অধিক ফিল্টারকে লোড এবং বাস্তবায়ন করতে পারে।

এটির কার্যকারিতার সচিত্র সংক্ষিপ্ত বিবরণ: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared

ব্যবহারের ধরন: পপআপে বড় পাওয়ার বোতাম স্থায়ীভাবে বর্তমান ওয়েব সাইটের জন্য uBlock সক্রিয়/নিষ্ক্রিয় করবে। এটা শুধুমাত্র বর্তমান ওয়েব সাইটে প্রযোজ্য, এটি একটি সার্বজনীন পাওয়ার বোতাম নয়।

***

নমনীয়, এটি একটি "বিজ্ঞাপন প্রতিরোধক"-এর চেয়েও বেশি: এছাড়াও এটি হোস্ট ফাইল থেকে ফিল্টার পড়তে ও তৈরি করতে পারে।

বাক্সের বাইরের, এই তালিকার ফিল্টারগুলি লোড করে এবং তা প্রয়োগ করে:

- সহজ তালিকা
- পিটার লো'য়ের বিজ্ঞাপন সার্ভারের তালিকা
- সহজ গোপনীয়তা
- ম্যালওয়্যার ডোমেইন

আপনি যদি চান আপনি নির্বাচন করার জন্য আরো তালিকা পাবেন:

- ফ্যানবয়ের বর্ধিত অনুসরণকরণ তালিকা
- ডেন পোলোকস-এর হোস্ট ফাইল
- এইচপিহোস্টসের বিজ্ঞাপন এবং অনুসরণকরণ সার্ভার
- MVPS হোস্টসমূহ
- স্প্যাম৪০৪
- এবং আরও অনেক কিছু

অবশ্যই, যতবেশি ফিল্টার সক্রিয় করবেন, মেমরি ব্যবহার ততবেশি হবে। এমনকি Fanboy-এর দুটি অতিরিক্ত তালিকা, hpHosts-এর বিজ্ঞাপন এবং ট্র্যাকিং সার্ভার যোগ করার পরেও uব্লক অন্যান্য খুব জনপ্রিয় ব্লকারের থেকে কম মেমরি পদচিহ্ন ব্যবহার করে।

এছাড়াও, এই অতিরিক্ত তালিকা নির্বাচন কিছু ওয়েব সাইট বিগড়ে দেওয়ার সম্ভাবনা বাড়িয়ে দিতে পারে তাই সাবধান --- বিশেষ করে এই তালিকাগুলি যা সাধারণত হোস্ট ফাইল হিসেবে ব্যবহার করা হয়।

***

ফিল্টারের পূর্বনির্ধারিত তালিকা ছাড়া, এই এক্সটেনশনটি কিছুই না। তাই কখনও যদি আপনি সত্যিই কিছু অবদান রাখতে চান, আপনার ব্যবহার করা ফিল্টার তালিকা রক্ষণাবেক্ষণের জন্য কঠোর পরিশ্রম করা সেই সব মানুষের করা কথা চিন্তা করুন যারা এই সব বিনামূল্যে ব্যবহারের জন্য উপলব্ধ করেছেন।

***

বিনামূল্যে।
পাবলিক লাইসেন্সসহ মুক্ত উৎসের (GPLv3)
ব্যবহারকারীদের দ্বারা ব্যবহারকারীদের জন্য।

অবদানকারীগণ @ Github: https://github.com/gorhill/uBlock/graphs/contributors
অবদানকারীগণ @ Crowdin: https://crowdin.net/project/ublock

***

এটি একটি প্রাথমিক সংস্করণ, আপনার পর্যালোচনার সময় তা মনে রাখুন।

প্রকল্পের পরিবর্তন লগ:
https://github.com/gorhill/uBlock/releases
10 changes: 5 additions & 5 deletions dist/description/description-ca.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Un blocador eficient: Amb un consum discret de memòria i de processador, pot carregar i aplicar milers de filtres més que altres aplicacions semblants.
Un bloquejador eficient: amb un consum discret de memòria i de processador, pot carregar i aplicar milers de filtres més que altres aplicacions semblants.

Gràfic de l'eficiència: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared

Ús: El gran botó d'engegada de la finestra emergent serveix per a desactivar/activar permanentment el uBlock per al lloc web actual. No és un botó d'engegada general de l'extensió.
Ús: el botó gran d'engegada de la finestra emergent serveix per a desactivar/activar permanentment l'uBlock per al lloc web actual. Només s'aplica al lloc web actual, no és un botó d'engegada global.

***

Expand All @@ -22,11 +22,11 @@ Si voleu, podeu seleccionar altres llistes disponibles:
- hpHosts’s Ad and tracking servers
- MVPS HOSTS
- Spam404
- I altres
- I moltes més

Òbviament, com més filtres activeu, més gran serà el consum de memòria. Però fins i tot després d'afegir dues llistes extra de Fanboy, hpHosts’s Ad and tracking servers, el uBlock encara té un consum de memòria inferior al d'altres bloquejadors coneguts.
Per descomptat, com més filtres activeu, més gran serà el consum de memòria. Però fins i tot després d'afegir les dues llistes extra de Fanboy, els servidors d'anuncis i rastreig d'hpHosts, l'uBlock encara té un consum de memòria inferior al d'altres bloquejadors coneguts.

També heu de ser conscient que seleccionant algunes d'aquestes llistes extra és més probable trobar-se amb llocs webs inservibles -- especialment aquelles llistes que s'utilitzen normalment com a fitxer de hosts.
Tingueu en compte també que és més probable trobar-se amb llocs web inservibles en seleccionar algunes d'aquestes llistes extra, especialment aquelles llistes que s'utilitzen normalment com a fitxer de hosts.

***

Expand Down
49 changes: 49 additions & 0 deletions dist/description/description-pt_BR.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Um bloqueador eficiente: com baixo consumo de memória e CPU, e ainda pode carregar e aplicar milhares de filtros a mais do quê qualquer outro bloqueador popular por aí.

Visão geral ilustrada de sua eficiência: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP :-Efficiency-compared

Utilização: Use o botão de energia no pop-up para desativar/ativar o uBlock₀ para o site atual. Isso se aplica apenas ao site atual, não é um botão global.

***

Flexível, é mais do que um "ad blocker": ele também pode ler e criar filtros a partir de arquivos de hosts.

Por padrão, essas listas de filtros são carregadas e aplicadas:

- EasyList
- Peter Lowe’s Ad server list
- EasyPrivacy
- Malware domains

Mais listas estão disponíveis para você escolher, se desejar:

- Fanboy’s Enhanced Tracking List
- Dan Pollock’s hosts file
- hpHosts’s Ad and tracking servers
- MVPS HOSTS
- Spam404
- E varias outras

Claro, quanto mais filtros habilitados, maior o consumo de memória. Ainda, mesmo após a adição do Fanboy's duas listas extras, hpHosts’s e servidores de rastreamento, uBlock₀ ainda tem o consumo de memória menor do que outros bloqueadores populares lá fora.

Também, esteja ciente de que selecionar algumas dessas listas extras pode levar em uma maior probabilidade de quebrar o layout do site, especialmente aquelas listas que são normalmente usadas como arquivo hosts.

***

Sem as listas predefinidas de filtros, esta extensão não é nada. Por isso, se você nunca contribuiu com alguma coisa, pense nas pessoas que trabalham duro para manter as listas de filtro que você está usando e que foram disponibilizadas para usar tudo de graça.

***

Gratuito
Código aberto com licença pública (GPLv3)
De usuários para usuários.

Contribuidores no Github: https://github.com/gorhill/uBlock/graphs/contributors
Contribuidores no Crowdin: https://crowdin.net/project/ublock

***

Essa é uma versão ainda em desenvolvimento, tenha isso em mente quando você avaliar.

Registro de alterações do projeto:
https://github.com/gorhill/uBlock/releases
52 changes: 52 additions & 0 deletions dist/description/description-zh_CN.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
一款高效的请求过滤工具:占用极低的内存和CPU,和其他常见的过滤工具相比,它能够加载并执行上千条过滤规则。

效率概述说明:
https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared

用法:点击弹出窗口中的电源按钮,uBlock 将对当前网页永久禁用/启用过滤功能。 它只控制当前网页的请求过滤,而不是一个全局开关。

***

它很灵活,它不只是一个广告拦截工具,它还可以从 hosts 文件里读取和创建过滤规则。

初始默认加载和执行下列过滤规则列表:

- EasyList
- Peter Lowe’s Ad server list
- EasyPrivacy
- Malware domains

这里还有更多的规则列表供你选择:

- Fanboy’s Enhanced Tracking List
- Dan Pollock’s hosts file
- hpHosts’s Ad and tracking servers
- MVPS HOSTS
- Spam404
- 等等

当然,启用越多的过滤规则就会产生越高的内存占用。 然而,即使再添加两个 Fanboy 规则列表,比如 hpHosts’s Ad 和 tracking servers,uBlock 的内存占用依然比其他常见的过滤工具要低得多。

另外请注意,启用一些额外的规则列表可能会增加网页显示错误的可能性 —— 尤其是那些通常被用作 hosts 文件的列表。

***

没有这些过滤规则列表,这个扩展就没有了意义。 所以如果你真的想做点贡献,想想那些努力维护过滤规则的人们,是他们让所有人能够免费使用这一切。

***

免费。
遵从 GPLv3 公共许可协议开源。
一切为了用户。

贡献者 @ Github:
https://github.com/gorhill/uBlock/graphs/contributors
贡献者 @ Crowdin:
https://crowdin.net/project/ublock

***

它还是一个相当早期的版本,在您评论的时候请记住这一点。

项目更新日志:
https://github.com/gorhill/uBlock/releases
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"content_scripts": [{
"matches": ["http://*/*", "https://*/*"],
"js": ["js/vapi-client.js", "js/adn/textads.js", "js/adn/parser.js", "js/contentscript.js"],
"js": ["js/vapi.js", "js/vapi-client.js", "js/adn/textads.js", "js/adn/parser.js", "js/contentscript.js"],
"run_at": "document_start",
"all_frames": true
}, {
Expand Down
Loading

0 comments on commit 2ddc686

Please sign in to comment.