Commit 0b4d113e authored by Winsley's avatar Winsley

Merge branch 'master' into issue-reporter-req-hits

parents 8a357290 fb06af04
# Chrome Web Store Listing Adblock Plus
1. [Listing Overview](#listing-overview)
## Listing Overview
![](/res/abp/chrome-web-store/listing.png)
1. [Title](#title)
1. [Summary](#summary)
1. [Detailed Description](#detailed-description)
### Title
`Adblock Plus`
### Summary
`Used on over 100 million devices, Adblock Plus is the world's most popular ad blocker.`
### Detailed Description
```
Browse the web without annoying and intrusive ads.
Adblock Plus for Google Chrome blocks video ads, banners, pop-ups and other forms of intrusive and annoying advertising, as well as blocking tracking and malware.
An easy-to-use, customizable ad-blocking browser extension, Adblock Plus gives you control over your Google Chrome browsing experience. Block annoying and intrusive ads for a cleaner, better web experience. Blocking ads also reduces the risk of infection from malvertising campaigns. Users also have the option to add personal filters and whitelist websites.
Used by millions worldwide, Adblock Plus is a community-driven open source project. Hundreds of volunteers contribute daily to ensure that all intrusive ads are blocked.
Adblock Plus supports the Acceptable Ads initiative. By default, Acceptable Ads are shown, which helps support websites that rely on advertising revenue, but choose to only display nonintrusive ads. This can be disabled at any time for users who wish to block all ads. Learn more at https://adblockplus.org/acceptable-ads
Please Note: When installing Adblock Plus for Chrome, you will receive a warning that Adblock Plus for Chrome will receive access to your browsing history and data. This is a standard message - we NEVER collect any user information.
By downloading and installing this extension, you agree to our Terms of Use https://adblockplus.org/terms and our Privacy Policy https://adblockplus.org/privacy.
************
Release announcements and changelogs can be found at: http://adblockplus.org/releases/
Problem with the extension? Try restarting Google Chrome and/or clicking “Update now” in Adblock Plus options.
Found a bug? Check known issues at https://adblockplus.org/bugs or visit our forum at https://adblockplus.org/forum/viewforum.php?f=10
If you feel adventurous you can always try out the development builds to get the latest features of Adblock Plus for Chrome. These builds are updated separately with independent settings. https://adblockplus.org/development-builds```
......@@ -271,7 +271,11 @@ X closes the [Language modal window](#language-modal-window).
Already added filter subscriptions will appear greyed out and disabled in the modal window.
#### Filter subscription
Show filter *Description* followed by *Subscription title*. See [Language filter lists](#language-filter-lists) for titles and description.
The bundled language filter subscriptions should be used where possible (i.e. it includes EasyList) otherwise use the supplement list.
Display label in the modal window as *Description* followed by its respective *Bundled subscription title*/*Subscription title*.
See [Language filter lists](#language-filter-lists) for titles and description.
#### Scroll bar
The size of the layover menu should correspond to the screen size. The scroll bar should adjust accordingly.
......@@ -361,8 +365,10 @@ Navigation label will match headline.
##### Behaviour
When a duplicate entry is made, move the original entry to the top of the list and discard the duplicate.
Convert URLs into domains when adding domain to whitelist.
##### Text input
Textinput to enter domains to be added to the whitelist.
Text input to enter domains to be added to the whitelist.
##### Label in text input
`e.g. www.example.com`
......@@ -614,32 +620,32 @@ This will behave in the same way as the [Language modal window](#language-modal-
Clicking `+ ADD FILTER LIST VIA URL` closes the [Add filter list modal window](#add-filter-list-modal-window) and opens the [Add custom subscription popup](#add-custom-subscription-popup)
### Language filter lists
| Subscription title | Description | URL + EasyList | URL |
|-----------|---------------|---------------|---------------|
| `EasyList` | `English` | https://easylist-downloads.adblockplus.org/easylist.txt | |
| `ABPindo` | `Bahasa Indonesia` | https://easylist-downloads.adblockplus.org/abpindo+easylist.txt | https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt |
| `Bulgarian list` | `български` | https://easylist-downloads.adblockplus.org/bulgarian_list+easylist.txt | https://stanev.org/abp/adblock_bg.txt |
| `EasyList China` | `中文` | https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt | https://easylist-downloads.adblockplus.org/easylistchina.txt |
| `EasyList Czech and Slovak` | `čeština, slovenčina` | https://easylist-downloads.adblockplus.org/easylistczechslovak+easylist.txt | https://raw.github.com/tomasko126/easylistczechandslovak/master/filters.txt |
| `EasyList Dutch` | `Nederlands` | https://easylist-downloads.adblockplus.org/easylistdutch+easylist.txt | https://easylist-downloads.adblockplus.org/easylistdutch.txt |
| `EasyList Germany` | `Deutsch` | https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt | https://easylist-downloads.adblockplus.org/easylistgermany.txt |
| `EasyList Hebrew` | `עברית` | https://easylist-downloads.adblockplus.org/israellist+easylist.txt | https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt |
| `EasyList Italy` | `Italiano` | https://easylist-downloads.adblockplus.org/easylistitaly+easylist.txt | |
| `EasyList Lithuania` | `lietuvių kalba` | https://easylist-downloads.adblockplus.org/easylistlithuania+easylist.txt | |
| `EasyList Latvian` | `latviešu valoda` | https://easylist-downloads.adblockplus.org/latvianlist+easylist.txt | https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt |
| `EasyList Spanish` | `Español` | https://easylist-downloads.adblockplus.org/easylistspanish+easylist.txt | https://easylist-downloads.adblockplus.org/easylistspanish.txt |
| `EasyList AR` | `العربية` | https://easylist-downloads.adblockplus.org/liste_ar+liste_fr+easylist.txt | https://easylist-downloads.adblockplus.org/Liste_AR.txt |
| `EasyList FR` | `Français` | https://easylist-downloads.adblockplus.org/liste_fr+easylist.txt | https://easylist-downloads.adblockplus.org/liste_fr.txt |
| `ROList` | `Românesc` | https://easylist-downloads.adblockplus.org/rolist+easylist.txt | https://easylist-downloads.adblockplus.org/advblock.txt |
| `Icelandic ABP List` | `íslenska` | https://adblock.gardar.net/is.abp.txt | |
| `void.gr` | `ελληνικά` | https://void.gr/kargig/void-gr-filters.txt | |
| `ABP Japanese Filters` | `日本語` | https://raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abpjf.txt | |
| `ABPVN List` | `Việt` | https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt | |
| `Adblock List for Finland` | `suomi` | http://adb.juvander.net/Finland_adb.txt | |
| `Czech List` | `čeština` | http://adblock.dajbych.net/adblock.txt | |
| `Eesti saitidele kohandatud filter` | `Eesti keel` | http://adblock.ee/list.php | |
| `hufilter` | `magyar` | https://raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt | |
| `YousList` | `한국어` | https://raw.githubusercontent.com/yous/YousList/master/youslist.txt | |
| Subscription title | Bundled subscription title | Description | URL + EasyList | URL |
|-----------|---------------|---------------|---------------|---------------|
| `EasyList` | N/A | `English` | https://easylist-downloads.adblockplus.org/easylist.txt | |
| `ABPindo` | `ABPindo+EasyList` | `Bahasa Indonesia` | https://easylist-downloads.adblockplus.org/abpindo+easylist.txt | https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt |
| `Bulgarian list` | `Bulgarian list+EasyList` | `български` | https://easylist-downloads.adblockplus.org/bulgarian_list+easylist.txt | https://stanev.org/abp/adblock_bg.txt |
| `EasyList China` | `EasyList China+EasyList` | `中文` | https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt | https://easylist-downloads.adblockplus.org/easylistchina.txt |
| `EasyList Czech and Slovak` | `EasyList Czech and Slovak+EasyList` | `čeština, slovenčina` | https://easylist-downloads.adblockplus.org/easylistczechslovak+easylist.txt | https://raw.github.com/tomasko126/easylistczechandslovak/master/filters.txt |
| `EasyList Dutch` | `EasyList Dutch+EasyList` | `Nederlands` | https://easylist-downloads.adblockplus.org/easylistdutch+easylist.txt | https://easylist-downloads.adblockplus.org/easylistdutch.txt |
| `EasyList Germany` | `EasyList Germany+EasyList` | `Deutsch` | https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt | https://easylist-downloads.adblockplus.org/easylistgermany.txt |
| `EasyList Hebrew` | `EasyList Hebrew+EasyList` | `עברית` | https://easylist-downloads.adblockplus.org/israellist+easylist.txt | https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt |
| `EasyList Italy` | `EasyList Italy+EasyList` | `Italiano` | https://easylist-downloads.adblockplus.org/easylistitaly+easylist.txt | |
| `EasyList Lithuania` | `EasyList Lithuania+EasyList` | `lietuvių kalba` | https://easylist-downloads.adblockplus.org/easylistlithuania+easylist.txt | |
| `EasyList Latvian` | `EasyList Latvian+EasyList` | `latviešu valoda` | https://easylist-downloads.adblockplus.org/latvianlist+easylist.txt | https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt |
| `EasyList Spanish` | `EasyList Spanish+EasyList` | `Español` | https://easylist-downloads.adblockplus.org/easylistspanish+easylist.txt | https://easylist-downloads.adblockplus.org/easylistspanish.txt |
| `EasyList AR` | `Liste AR+Liste FR+EasyList` | `العربية` | https://easylist-downloads.adblockplus.org/liste_ar+liste_fr+easylist.txt | https://easylist-downloads.adblockplus.org/Liste_AR.txt |
| `EasyList FR` | `EasyList FR+EasyList` | `Français` | https://easylist-downloads.adblockplus.org/liste_fr+easylist.txt | https://easylist-downloads.adblockplus.org/liste_fr.txt |
| `ROList` | `ROList+EasyList` | `Românesc` | https://easylist-downloads.adblockplus.org/rolist+easylist.txt | https://easylist-downloads.adblockplus.org/advblock.txt |
| `Icelandic ABP List` | N/A | `íslenska` | https://adblock.gardar.net/is.abp.txt | |
| `void.gr` | N/A | `ελληνικά` | https://void.gr/kargig/void-gr-filters.txt | |
| `ABP Japanese Filters` | N/A | `日本語` | https://raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abpjf.txt | |
| `ABPVN List` | `ABPVN List+EasyList` | `Việt` | https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn.txt | |
| `Adblock List for Finland` | N/A | `suomi` | http://adb.juvander.net/Finland_adb.txt | |
| `Czech List` | N/A | `čeština` | http://adblock.dajbych.net/adblock.txt | |
| `Eesti saitidele kohandatud filter` | `Eesti saitidele kohandatud filter` | `Eesti keel` | http://adblock.ee/list.php | |
| `hufilter` | N/A | `magyar` | https://raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt | |
| `YousList` | N/A | `한국어` | https://raw.githubusercontent.com/yous/YousList/master/youslist.txt | |
## Add custom subscription popup
### Add custom subscription popup: Initial
......
# Updates Page
An updates page will be shown to all Adblock Plus desktop users to announce the launch of the new Settings Page. This page will open in a new tab when a user opens their browser with Adblock Plus installed on. This will be a one-time event.
## Index
1. [General requirements](#general-requirements)
1. [Assets](#assets)
## General requirements
![](/res/adblockplus.org/screens/abp-updates.jpg)
### Content
#### Left Side content
```
# Update complete
Version ####
```
#### Section 1
```
# Adblock Plus has been updated!
## What's new?
Brand new Settings page - revamped and restyled with more privacy and security options - so it's easier to [customize Adblock Plus just like you want it][1].
```
[1] Opens Settings page in a new tab.
#### Section 2
###### For German users
```
New blocking technology! There are now more ways than ever to create new blocking filters that let you blast hidden ads on websites like Facebook, even if the Empire strikes back.
```
###### For all other users (non-German)
```
The Open Source Rebel Alliance created new blocking filters that let you blast hidden ads on websites like Facebook, even if the Empire strikes back.
```
#### Section 3
```
# But wait! What about your phone?
If you are taking control on desktop, you can block ads and improve your privacy and security on mobile too. Get the [Adblock Browser App below][1].
```
[1] Opens the [Documentation link](/spec/abp/prefs.md#documentation-link): `%LINK%=adblock_browser_website`
##### 7. Buttons
| Icon | Link |
|-----------|---------------|
| Apple App Store | Opens [Documentation link](/spec/abp/prefs.md#documentation-link) `%LINK%=adblock_browser_ios_store` in a new tab |
| Google Play | Opens [Documentation link](/spec/abp/prefs.md#documentation-link) `%LINK%=adblock_browser_android_store` in a new tab |
......@@ -35,6 +35,7 @@ The Documentation link page is used by the our adblocking products to redirect t
|adblock_browser_android_store|-|`cn`|`https://downloads.adblockplus.org/adblockbrowser-1.1.0-arm.apk`|
|adblock_browser_ios_store|-|-|`https://geo.itunes.apple.com/us/app/adblock-browser-best-ad-blocker/id1015653330?mt=8?`|
|adblock_browser_android_download|-|-|`https://downloads.adblockplus.org/adblockbrowser-1.1.0-arm.apk`|
|adblock_browser_website|-|-|`https://adblockplus.org/adblock-browser`|
|adblock_plus_safari_ios_support|-|-|`/forum/viewforum.php?f=26?`|
|adblock_plus_safari_ios_store|-|-|`https://itunes.apple.com/app/adblock-plus-abp/id1028871868?`|
|adblock_plus_sbrowser_store|-|-|`https://play.google.com/store/apps/details?id=org.adblockplus.adblockplussbrowser?`|
......@@ -81,6 +82,7 @@ The Documentation link page is used by the our adblocking products to redirect t
|adblock_plus|IF APL|-|`https://adblockplus.org`|
|eyeo|IF APL|-|`https://eyeo.com`|
|developer|-|-|`https://adblockplus.org/forum/viewforum.php?f=4`|
|help_center|-|-|`http://help.eyeo.com`|
[1] ***Locale***: *-* ignore locale, `*` apply for all unspecified locales, `xy` apply only for specified locale, *IF APL* (If applicable) redirect to locale specific document if applicable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment