pages/adware.md - Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org

Unified Diff: pages/adware.md

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)

Patch Set: Fixed styles, moved styles back to page, fixed translation error Created May 31, 2016, 7:25 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Index: pages/adware.md

===================================================================

new file mode 100644

--- /dev/null

+++ b/pages/adware.md

@@ -0,0 +1,200 @@

+title=About adware

+description=What is adware and how to get rid of it

+noheading=true

+<head>

+ <style>

+ .split-section

+ {

+ margin-top: 20px;

+ padding-top: 20px;

+ border-top: 1px solid #ccc;

+ }

+ .narrow-list

+ {

+ display: inline-block;

+ width: 250px;

+ margin: 0px 35px 10px 0px;

saroyanm 2016/06/06 14:47:31 Right margin will misalign the element for RTL dir

juliandoucette 2016/06/13 18:12:50 Done.

+ vertical-align: top;

+ }

+ .narrow-list ul

+ {

+ margin-bottom: 0px;

+ }

+ .text-danger

+ {

+ color: #e11a2c;

+ }

+ .alert-danger

+ {

+ padding: 15px;

+ border: 2px solid;

+ border-color: #e11a2c;

+ background-color: #fff;

+ }

+ .badge-header

+ {

+ vertical-align: middle;

+ line-height: 34px;

+ }

+ .badge-success

+ {

+ display: inline-block;

+ vertical-align: top;

+ text-align: center;

+ line-height: 20px;

+ margin-right: 7px;

+ padding: 7px 0px;

+ width: 34px;

+ border-radius: 4px;

+ color: #fff;

+ background-color: #53b044;

+ font-weight: bold;

+ font-size: 20px;

+ }

+ .list-unstyled,

+ .list-unstyled li

+ {

+ margin-left: 0px;

saroyanm 2016/06/06 14:47:30 Please also consider RTL direction.

juliandoucette 2016/06/13 18:12:50 Done.

+ padding-left: 0px;

+ }

+ .list-unstyled li

+ {

+ list-style-type: none;

+ }

+ .list-unstyled li

+ {

+ padding-bottom: 10px;

+ line-height: 20px;

+ }

+ .list-custom

+ {

+ padding-left: 0px;

+ overflow: visible;

+ list-style-type: none;

+ }

+ .list-custom ul {

saroyanm 2016/06/06 14:47:30 Detail: the braces should go to their own line

juliandoucette 2016/06/13 18:12:49 Done.

+ margin-left: 45px;

+ margin-top: 20px;

+ }

+ .list-custom > li

+ {

+ margin-bottom: 25px;

+ }

+ .list-custom .check-item,

+ .list-custom .cross-item

+ {

+ min-height: 20px;

+ padding-left: 45px;

+ padding-top: 2px;

+ }

+ .list-custom .check-item

saroyanm 2016/06/06 14:47:31 This solution also doesn't work for RTL directions

juliandoucette 2016/06/13 18:12:50 Done.

+ {

+ background: url("/img/check.png") no-repeat 10px top;

+ }

+ .list-custom .cross-item

+ {

+ background: url("/img/cross.png") no-repeat 10px top;

+ }

+ </style>

+</head>

+# {{page-header I’m using Adblock Plus but I still see suspicious ads}}

+<div class="text-danger" markdown="1">

+## {{alert-heading What happened?}}

+{{alert-content Adblock Plus has detected ads that are likely injected with Adware, which may have infected your computer.}}

+{: .alert-danger }

+</div>

+## {{what-is-adware-heading What is Adware?}}

+{{what-is-adware-content Adware is one type of Malware, short for "Malicious Software.” It is a term generally used for software installed on your computer that is designed to infiltrate or damage a computer system without your consent. In many cases you obtained this software without knowing it, as these applications are often bundled in other software installers.}}

+## {{why-not-blocked-heading Why doesn't Adblock Plus block these ads?}}

+{{why-not-blocked-content Adblock Plus is designed to block ads that are delivered from websites or their advertising partners. Malicious software can inject ads in such a way that the ads can not reliably be blocked by Adblock Plus. The best way to stop these ads is to remove the Malware that displays them.}}

+## {{how-to-solve-heading How can I solve this?}}

+### <span class="badge-success">1</span> {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .split-section .badge-header }

+{{remove-unwanted-programs-content For users unfamiliar with the administration of their computer's operating system, it’s recommended to run automated checks for Malware with one of the programs listed below, which also allow to remove the found unwanted software. All of the programs are free (for at least a trial period) with full functionality, and safe to install alongside your antivirus solution.}}

+<div class="narrow-list" markdown="1">

+#### {{windows-os Windows}}

+<ul class="list-unstyled" markdown="1">

+* [{{malwarebytes-brand Malwarebytes}}]({{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-trial/adblock/en/?c=adblock&s=en&k=trial}})

saroyanm 2016/06/06 14:47:31 I think the brand/website names shouldn't be trans

saroyanm 2016/06/06 14:47:31 As mentioned here: https://codereview.adblockplus.

Philip Hill 2016/06/06 14:52:51 As I mentioned already, localizing website content

saroyanm 2016/06/06 15:44:52 Having another look into the issue, seems like the

saroyanm 2016/06/06 15:53:39 @Julian probably if you will use <a> tags the link

@Julian probably if you will use <a> tags the links will not be broken, I thought it was our CMS, but apparently it's Markdown, so I'll suggest to implement using <a> inline tag instead of markdown syntax for this issue and if that works I'll create a ticket for Markdown after investigating it, probably that can be issue on Markdown side, but not sure yet :/ * <a href="{{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-trial/adblock/en/?c=adblock&s=en&k=trial}}">M...>

juliandoucette 2016/06/13 18:12:51 Done. I vote we investigate this issue further in

On 2016/06/06 15:53:39, saroyanm wrote: > On 2016/06/06 15:44:52, saroyanm wrote: > > On 2016/06/06 14:52:51, Philip Hill wrote: > > > On 2016/06/06 14:47:31, saroyanm wrote: > > > > As mentioned here: > > > > > > > > > > https://codereview.adblockplus.org/29340844/diff/29340845/pages/adware.html#n... > > > > > > > > > > > > Our CMS is not supporting the link translations. So this links currently > are > > > not > > > > working. > > > > So I can see two options here: > > > > 1. We are using not localized links and relying to the websites to manage > > > that. > > > > 2. We will need to hardcode all the links here and hide and show according > > to > > > > the locale. > > > > I'd say that I'll be in favor of solution 1, because going with 2-nd > > solution > > > it > > > > will not be scalable and maintainable and we will need to map their > locales > > to > > > > our. But probably this needs to also be communicated in the ticket as > well, > > so > > > > please let me know what you think about this. > > > > > > As I mentioned already, localizing website contents and links is a standard > > > problem that we have to solve since we will face this more and more with > more > > > specific environments that we (legally) move into. Another such example is > the > > > notification text we show to French users only or the different GPL link for > > > French users. Working around a proper solution now will simply delay solving > > > this in future where we might be under more time pressure than now. > > Having another look into the issue, seems like the reason why the links are > > screwed is because of markdown screwing them when we are using our CMS syntax, > > so seems like the issue is irrelevant, maybe it still will be possible to > > translate through crowdin, make sense to test, just in case, let me > investigate > > the issue more. > > @Julian probably if you will use <a> tags the links will not be broken, I > thought it was our CMS, but apparently it's Markdown, so I'll suggest to > implement using <a> inline tag instead of markdown syntax for this issue and if > that works I'll create a ticket for Markdown after investigating it, probably > that can be issue on Markdown side, but not sure yet :/ > * <a href="{{malwarebytes-win-affiliate-link > http://buy.malwarebytes.com/get-trial/adblock/en/?c=adblock&s=en&k=trial%7D%7...>

Done. I vote we investigate this issue further in a separate CMS issue.

+* [{{hitmanpro-brand HitmanPro}}]({{hitmanpro-win-affiliate-link http://www.surfright.nl/en/hitmanpro}})

+* [{{adwcleaner-brand AdwCleaner}}]({{adcleaner-win-affiliate-link https://toolslib.net/downloads/viewdownload/1-adwcleaner/}})

+</ul>

+</div>

+<div class="narrow-list" markdown="1">

+#### {{osx-os OS X}}

+<ul class="list-unstyled" markdown="1">

+* [{{malwarebytes-brand Malwarebytes}}]({{malwarebytes-osx affiliate-link https://www.malwarebytes.org/antimalware/mac/)

+</ul>

+</div>

+{{advanced-users-content For advanced users, refer to the guides below to remove Malware and other programs on your computer that you don't remember installing. To regain control of your browsing experience, you must uninstall any malicious programs. For more help on uninstalling malicious programs from your computer, click one of the links below.}}

+<ul class="list-unstyled" markdown="1">

+* [{{windows-os Windows}}](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)

+* [{{osx-os OS X}}](https://support.apple.com/en-us/HT203987)

+</ul>

+### <span class="badge badge-success">2</span> {{reset-browser-settings-heading Reset your browser settings}} { .split-section .badge-header }

saroyanm 2016/06/06 14:47:31 Class "badge" is not being used anywhere

juliandoucette 2016/06/13 18:12:50 Done.

+{{reset-browser-settings-content Oftentimes uninstalling unwanted software does not restore your browser settings to their original state. Follow these guides to do this manually:}}

+<ul class="list-unstyled" markdown="1">

+* [{{internet-explorer-browser Internet Explorer}}](https://support.microsoft.com/en-us/kb/923737)

+* [{{firefox-browser Mozilla Firefox}}](https://support.mozilla.org/kb/reset-firefox-easily-fix-most-problems)

+* [{{chrome-browser Google Chrome}}](https://support.google.com/chrome/answer/3296214)

+* [{{opera-browser Opera}}](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-defaults/)

+* [{{yandex-browser Yandex.Browser}}](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset)

+* [{{safari-6-7-browser Safari 6 & 7}}](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-browser-to-its-default-settings-on-Macintosh)

+* [{{safari-8-9-browser Safari 8 & 9}}](https://discussions.apple.com/message/26874735)

+</ul>

+## {{prevent-infection-heading How do I prevent my computer from getting infected with Malware in the future?}} { .split-section .badge-header }

+<ul markdown="1" class="list-custom">

+* **{{use-official-channels-heading Use official channels to download your browser:}}**{: .check-item }

+ <ul class="list-unstyled" markdown="1">

+ * [{{firefox-browser Mozilla Firefox}}](http://www.mozilla.org/firefox)

+ * [{{chrome-browser Google Chrome}}](https://www.google.com/chrome/browser/desktop/)

+ * [{{opera-browser Opera}}](http://www.opera.com/)

+ * [{{yandex-browser Yandex.Browser}}](https://browser.yandex.com/)

+ </ul>

+* **{{install-abp-heading Install Adblock Plus.}}** {{install-abp-content Adblock Plus can help to block and hide ads that trick you into installing potentially unwanted programs. Get Adblock Plus from}} [https://adblockplus.org/](https://adblockplus.org/).

saroyanm 2016/06/06 14:47:30 The product name can be fixed: <fix>Adblock Plus</

juliandoucette 2016/06/13 18:12:50 Is it obvious for translators that the fixed text

+{: .check-item }

+* **{{update-os-heading Keep your operating system and other software up-to-date.}}**

+{: .check-item }

+* </span> **{{avoid-popups-heading Don't click inside misleading pop-up windows.}}**{ .text-danger } {{avoid-popups-content Many malicious websites try to install Malware on your system by making images look like pop-up windows, or by displaying an animation of the website scanning your computer.}}

+{: .cross-item }

+* **{{dont-install-untrusted-heading Don't install untrusted software.}}**{: .text-danger} {{dont-install-untrusted-content Some websites offer you software to accelerate your browser, to help you search the web, or to add toolbars that do things your browser already does. Some unwanted programs also come bundled in software packages. Usually, these programs gather information on your browsing behavior that serve only the people who designed them. Make sure you only install add-ons, extensions and plug-ins from your browser’s web store website and that you uncheck unwanted programs in software installation wizards.}}

+{: .cross-item}

+</ul>

« no previous file with comments | « no previous file | static/img/check.png » ('j') | templates/default.tmpl » ('J')