Side by Side Diff: pages/adware.md
Issue 29359889:
Issue 2292 - Add a disclaimer text on all landing pages in French language that provide the user li… (Closed)
Patch Set:
Created Oct. 25, 2016, 3:53 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« includes/zh-maxthon-notification.tmpl ('k')
|
pages/customizations.html » ('j')
|
static/css/index.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 title=About adware | 1 title=About adware |
| 2 description=What is adware and how to get rid of it | 2 description=What is adware and how to get rid of it |
| 3 noheading=true | 3 noheading=true |
| 4 | 4 |
| 5 <head> | 5 <head> |
| 6 <style> | 6 <style> |
| 7 .separate-section | 7 .separate-section |
| 8 { | 8 { |
| 9 margin-top: 20px; | 9 margin-top: 20px; |
| 10 padding-top: 20px; | 10 padding-top: 20px; |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 { | 28 { |
| 29 margin-bottom: 0px; | 29 margin-bottom: 0px; |
| 30 } | 30 } |
| 31 | 31 |
| 32 .warning | 32 .warning |
| 33 { | 33 { |
| 34 display: none; | 34 display: none; |
| 35 color: #e11a2c; | 35 color: #e11a2c; |
| 36 } | 36 } |
| 37 | 37 |
| 38 .warning p | |
| 39 { | |
| 40 padding: 15px; | |
| 41 border: 2px solid; | |
| 42 border-color: #e11a2c; | |
| 43 background-color: #fff; | |
| 44 } | |
| 45 | |
| 46 .show-warning .warning | 38 .show-warning .warning |
| 47 { | 39 { |
| 48 display: block; | 40 display: block; |
| 49 } | 41 } |
| 50 | 42 |
| 51 .icon-header | 43 .icon-header |
| 52 { | 44 { |
| 53 vertical-align: middle; | 45 vertical-align: middle; |
| 54 line-height: 34px; | 46 line-height: 34px; |
| 55 } | 47 } |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 151 }, false); | 143 }, false); |
| 152 </script> | 144 </script> |
| 153 </head> | 145 </head> |
| 154 | 146 |
| 155 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }} | 147 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }} |
| 156 | 148 |
| 157 <div class="warning" markdown="1"> | 149 <div class="warning" markdown="1"> |
| 158 ## {{alert-heading What happened?}} | 150 ## {{alert-heading What happened?}} |
| 159 | 151 |
| 160 {{alert-content <fix>Adblock Plus</fix> has detected ads that are likely injecte d with Adware, which may have infected your computer.}} | 152 {{alert-content <fix>Adblock Plus</fix> has detected ads that are likely injecte d with Adware, which may have infected your computer.}} |
| 153 {: .alert} | |
| 154 | |
| 161 </div> | 155 </div> |
| 162 | 156 |
| 163 ## {{what-is-adware-heading What is Adware?}} | 157 ## {{what-is-adware-heading What is Adware?}} |
| 164 | 158 |
| 165 {{what-is-adware-content Adware is one type of Malware, short for "Malicious Sof tware.” 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.}} | 159 {{what-is-adware-content Adware is one type of Malware, short for "Malicious Sof tware.” 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.}} |
| 166 | 160 |
| 167 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}} | 161 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}} |
| 168 | 162 |
| 169 {{why-not-blocked-content <fix>Adblock Plus</fix> is designed to block ads that are delivered from websites or their advertising partners. Malicious software ca n inject ads in such a way that the ads can not reliably be blocked by <fix>Adbl ock Plus</fix>. The best way to stop these ads is to remove the Malware that dis plays them.}} | 163 {{why-not-blocked-content <fix>Adblock Plus</fix> is designed to block ads that are delivered from websites or their advertising partners. Malicious software ca n inject ads in such a way that the ads can not reliably be blocked by <fix>Adbl ock Plus</fix>. The best way to stop these ads is to remove the Malware that dis plays them.}} |
| 170 | 164 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 217 * [{{opera-brand}}](http://www.opera.com/) | 211 * [{{opera-brand}}](http://www.opera.com/) |
| 218 * [{{yandex-brand}}](https://browser.yandex.com/) | 212 * [{{yandex-brand}}](https://browser.yandex.com/) |
| 219 * **{{install-abp-heading Install <fix>Adblock Plus</fix>.}}** {{install-abp-con tent <fix>Adblock Plus</fix> can help to block and hide ads that trick you into installing potentially unwanted programs. Get <fix>Adblock Plus</fix> from}} [ht tps://adblockplus.org/](https://adblockplus.org/). | 213 * **{{install-abp-heading Install <fix>Adblock Plus</fix>.}}** {{install-abp-con tent <fix>Adblock Plus</fix> can help to block and hide ads that trick you into installing potentially unwanted programs. Get <fix>Adblock Plus</fix> from}} [ht tps://adblockplus.org/](https://adblockplus.org/). |
| 220 { .icon .check } | 214 { .icon .check } |
| 221 * **{{update-os-heading Keep your operating system and other software up-to-date .}}** | 215 * **{{update-os-heading Keep your operating system and other software up-to-date .}}** |
| 222 { .icon .check } | 216 { .icon .check } |
| 223 * **{{avoid-popups-heading Don't click inside misleading pop-up windows.}}**{ .t ext-danger } {{avoid-popups-content Many malicious websites try to install Malwa re on your system by making images look like pop-up windows, or by displaying an animation of the website scanning your computer.}} | 217 * **{{avoid-popups-heading Don't click inside misleading pop-up windows.}}**{ .t ext-danger } {{avoid-popups-content Many malicious websites try to install Malwa re on your system by making images look like pop-up windows, or by displaying an animation of the website scanning your computer.}} |
| 224 { .icon .cross } | 218 { .icon .cross } |
| 225 * **{{dont-install-untrusted-heading Don't install untrusted software.}}**{: .te xt-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 so ftware packages. Usually, these programs gather information on your browsing beh avior that serve only the people who designed them. Make sure you only install a dd-ons, extensions and plug-ins from your browser’s web store website and that y ou uncheck unwanted programs in software installation wizards.}} | 219 * **{{dont-install-untrusted-heading Don't install untrusted software.}}**{: .te xt-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 so ftware packages. Usually, these programs gather information on your browsing beh avior that serve only the people who designed them. Make sure you only install a dd-ons, extensions and plug-ins from your browser’s web store website and that y ou uncheck unwanted programs in software installation wizards.}} |
| 226 { .icon .cross } | 220 { .icon .cross } |
| OLD | NEW |
« no previous file with comments
|
« includes/zh-maxthon-notification.tmpl ('k')
|
pages/customizations.html » ('j')
|
static/css/index.css » ('J')
