Left: | ||
Right: |
OLD | NEW |
---|---|
1 title=Adblock Plus - Surf the web without annoying ads! | 1 title=Adblock Plus - Surf the web without annoying ads! |
2 noheading=True | 2 noheading=True |
3 localefile=index | 3 localefile=index |
4 | 4 |
5 {# | 5 {# |
6 # This file is part of the Adblock Plus website, | 6 # This file is part of the Adblock Plus website, |
7 # Copyright (C) 2006-2015 Eyeo GmbH | 7 # Copyright (C) 2006-2015 Eyeo GmbH |
8 # | 8 # |
9 # Adblock Plus is free software: you can redistribute it and/or modify | 9 # Adblock Plus is free software: you can redistribute it and/or modify |
10 # it under the terms of the GNU General Public License version 3 as | 10 # it under the terms of the GNU General Public License version 3 as |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
58 </li> | 58 </li> |
59 <li class="emphasized" id="feature-free" itemprop="featureList"> | 59 <li class="emphasized" id="feature-free" itemprop="featureList"> |
60 <div class="sprite"></div> | 60 <div class="sprite"></div> |
61 {{"It's free!"|translate("s9")}} | 61 {{"It's free!"|translate("s9")}} |
62 <span class="license-note" style="display: inline">{{"(<a href=\"https ://www.gnu.org/licenses\">GPLv3</a>)"|translate("s10")}}</span> | 62 <span class="license-note" style="display: inline">{{"(<a href=\"https ://www.gnu.org/licenses\">GPLv3</a>)"|translate("s10")}}</span> |
63 </li> | 63 </li> |
64 <li id="feature-maxthon" itemprop="featureList"> | 64 <li id="feature-maxthon" itemprop="featureList"> |
65 <div class="sprite"></div> | 65 <div class="sprite"></div> |
66 {{"Integrated by default in"|translate("s11")}} <a href="http://www.maxthon.com/ " target="_blank">{{"Maxthon Cloud Browser"|translate("s12")}}</a> | 66 {{"Integrated by default in"|translate("s11")}} <a href="http://www.maxthon.com/ " target="_blank">{{"Maxthon Cloud Browser"|translate("s12")}}</a> |
67 </li> | 67 </li> |
68 <li id="feature-edge" itemprop="featureList"> | |
saroyanm
2015/09/22 13:15:45
It's not part of the feature block, so please move
Oleksandr
2015/09/23 00:37:57
I agree that it makes sense to move this away from
saroyanm
2015/09/23 12:44:20
My point was about CSS actually, but still.
| |
69 <p class="subscribe-description"> | |
saroyanm
2015/09/22 13:15:45
It's probably not description and even you can and
| |
70 {{"Get a heads-up prior to the launch!"|translate("subscription-desc ription")}} | |
71 </p> | |
72 <form id="subscribe-form" accept-charset="utf-8" action="/submitEmail" method="post"> | |
saroyanm
2015/09/22 13:15:45
If you will do changes mentioned above you will no
| |
73 <input id="subscribe-textbox" type="email" name="email" placeholder= "{{"Your email address"|translate("subscription-input-placeholder")}}" required /> | |
74 <button id="subscribe-button" type="submit"><span>{{"Notify me"|tran slate("subscription-button")}}</span></button> | |
75 <span class="sucess-label"> | |
76 {{"A confirmation email has been sent. Please check your email and click the confirmation link."|translate("subscription-message-success")}} | |
77 </span> | |
78 <span class="invalid-label"> | |
79 {{"Please enter a valid email address."|translate("subscription-me ssage-invalid-email")}} | |
80 </span> | |
81 <span id="response-error"> | |
saroyanm
2015/09/22 13:15:45
I'd use class here as well, so it can be applied t
| |
82 </span> | |
83 </form> | |
84 </li> | |
68 </ul> | 85 </ul> |
69 </div> | 86 </div> |
70 | 87 |
71 <div id="install"> | 88 <div id="install"> |
72 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplusfirefox.xpi" id="install-firefox">{{"Install for Firefox"|translate("s13" )}}</a> | 89 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplusfirefox.xpi" id="install-firefox">{{"Install for Firefox"|translate("s13" )}}</a> |
73 <a class="install-button" href="https://chrome.google.com/webstore/detail/ cfhdojbkjhnklbpkdaibdccddilifddb" id="install-chrome" onclick="chrome.webstore.i nstall(); return false;">{{"Install for Chrome"|translate("s14")}}</a> | 90 <a class="install-button" href="https://chrome.google.com/webstore/detail/ cfhdojbkjhnklbpkdaibdccddilifddb" id="install-chrome" onclick="chrome.webstore.i nstall(); return false;">{{"Install for Chrome"|translate("s14")}}</a> |
74 <a class="install-button" href="https://addons.opera.com/extensions/detail s/opera-adblock/?display=en-US" id="install-opera">{{"Install for Opera"|transla te("s15")}}</a> | 91 <a class="install-button" href="https://addons.opera.com/extensions/detail s/opera-adblock/?display=en-US" id="install-opera">{{"Install for Opera"|transla te("s15")}}</a> |
75 <a class="install-button" href="android-install" id="install-android">{{"I nstall for Android"|translate("s16")}}</a> | 92 <a class="install-button" href="android-install" id="install-android">{{"I nstall for Android"|translate("s16")}}</a> |
76 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplusie.exe" id="install-internet-explorer">{{"Install for Internet Explorer"| translate("s17")}}</a> | 93 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplusie.exe" id="install-internet-explorer">{{"Install for Internet Explorer"| translate("s17")}}</a> |
77 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplussafari.safariextz" id="install-safari">{{"Install for Safari"|translate(" s18")}}</a> | 94 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplussafari.safariextz" id="install-safari">{{"Install for Safari"|translate(" s18")}}</a> |
78 <a class="install-button" href="https://chrome.google.com/webstore/detail/ cfhdojbkjhnklbpkdaibdccddilifddb" id="install-yandex-browser" onclick="chrome.we bstore.install(); return false;">{{"Install for Yandex Browser"|translate("s19") }}</a> | 95 <a class="install-button" href="https://chrome.google.com/webstore/detail/ cfhdojbkjhnklbpkdaibdccddilifddb" id="install-yandex-browser" onclick="chrome.we bstore.install(); return false;">{{"Install for Yandex Browser"|translate("s19") }}</a> |
96 <div id="other-browsers">{{"Download Adblock Plus for another browser:"|tr anslate("other-browsers")}}</div> | |
79 <ul> | 97 <ul> |
80 <li> | 98 <li> |
81 <a class="sprite" href="firefox" id="platform-firefox" title="{{"Adblo ck Plus for Firefox"|translate("s20")}}"></a> | 99 <a class="sprite" href="firefox" id="platform-firefox" title="{{"Adblo ck Plus for Firefox"|translate("s20")}}"></a> |
82 </li> | 100 </li> |
83 <li> | 101 <li> |
84 <a class="sprite" href="chrome" id="platform-chrome" title="{{"Adblock Plus for Chrome"|translate("s21")}}"></a> | 102 <a class="sprite" href="chrome" id="platform-chrome" title="{{"Adblock Plus for Chrome"|translate("s21")}}"></a> |
85 </li> | 103 </li> |
86 <li> | 104 <li> |
87 <a class="sprite" href="android" id="platform-android" title="{{"Adblo ck Plus for Android"|translate("s22")}}"></a> | 105 <a class="sprite" href="android" id="platform-android" title="{{"Adblo ck Plus for Android"|translate("s22")}}"></a> |
88 </li> | 106 </li> |
89 <li> | 107 <li> |
90 <a class="sprite" href="opera" id="platform-opera" title="{{"Adblock P lus for Opera"|translate("s23")}}"></a> | 108 <a class="sprite" href="opera" id="platform-opera" title="{{"Adblock P lus for Opera"|translate("s23")}}"></a> |
91 </li> | 109 </li> |
92 <li> | 110 <li> |
93 <a class="sprite" href="internet-explorer" id="platform-internet-explo rer" title="{{"Adblock Plus for Internet Explorer"|translate("s24")}}"></a> | 111 <a class="sprite" href="internet-explorer" id="platform-internet-explo rer" title="{{"Adblock Plus for Internet Explorer"|translate("s24")}}"></a> |
94 </li> | 112 </li> |
95 <li> | 113 <li> |
96 <a class="sprite" href="safari" id="platform-safari" title="{{"Adblock Plus for Safari"|translate("s25")}}"></a> | 114 <a class="sprite" href="safari" id="platform-safari" title="{{"Adblock Plus for Safari"|translate("s25")}}"></a> |
97 </li> | 115 </li> |
98 <li> | 116 <li> |
99 <a class="sprite" href="yandex-browser" id="platform-yandex-browser" t itle="{{"Adblock Plus for Yandex Browser"|translate("s26")}}"></a> | 117 <a class="sprite" href="yandex-browser" id="platform-yandex-browser" t itle="{{"Adblock Plus for Yandex Browser"|translate("s26")}}"></a> |
100 </li> | 118 </li> |
101 <li> | 119 <li> |
102 <a class="sprite" href="maxthon" id="platform-maxthon" title="{{"Adblo ck Plus for Maxthon"|translate("s27")}}"></a> | 120 <a class="sprite" href="maxthon" id="platform-maxthon" title="{{"Adblo ck Plus for Maxthon"|translate("s27")}}"></a> |
103 </li> | 121 </li> |
122 <li> | |
123 <a class="sprite" href="edge" id="platform-edge" title="{{"Adblock Plu s for Microsoft Edge"|translate("abp-microsoft-edge")}}"></a> | |
124 </li> | |
104 </ul> | 125 </ul> |
105 </div> | 126 </div> |
106 </section> | 127 </section> |
107 | 128 |
108 <div id="messages-wrapper"> | 129 <div id="messages-wrapper"> |
109 <? include abb-notification ?> | 130 <? include abb-notification ?> |
110 <div class="disclaimer lang-fr"> | 131 <div class="disclaimer lang-fr"> |
111 En téléchargeant le logiciel Adblock Plus vous acceptez que si vous utilis ez Adblock Plus pour visiter un site Internet en violation de toute obligation o u droit de quelque nature que ce soit en relation avec ce site Internet, en aucu n cas EYEO ne pourra être tenu pour responsable envers vous ou tout autre tiers pour toute perte ou dommage (y compris, sans y être limité, les dommages pour pe rte de chances et perte de bénéfices) découlant directement ou indirectement de votre utilisation de ce logiciel. | 132 En téléchargeant le logiciel Adblock Plus vous acceptez que si vous utilis ez Adblock Plus pour visiter un site Internet en violation de toute obligation o u droit de quelque nature que ce soit en relation avec ce site Internet, en aucu n cas EYEO ne pourra être tenu pour responsable envers vous ou tout autre tiers pour toute perte ou dommage (y compris, sans y être limité, les dommages pour pe rte de chances et perte de bénéfices) découlant directement ou indirectement de votre utilisation de ce logiciel. |
112 </div> | 133 </div> |
113 <div id="maxthon-notification"> | 134 <div id="maxthon-notification"> |
114 使用傲游云浏览器,享受最好的广告过滤体验. (内置Adblock Plus) <a href="http://www.maxthon.cn" tar get="_blank">下载傲游云浏览器</a> | 135 使用傲游云浏览器,享受最好的广告过滤体验. (内置Adblock Plus) <a href="http://www.maxthon.cn" tar get="_blank">下载傲游云浏览器</a> |
115 </div> | 136 </div> |
116 <div class="warning-platform firefox">{{"It appears that you are using Mozil la Firefox."|translate("s28")}} <a href="firefox">{{"Switch to Adblock Plus for Firefox."|translate("s29")}}</a></div> | 137 <div class="warning-platform firefox">{{"It appears that you are using Mozil la Firefox."|translate("s28")}} <a href="firefox">{{"Switch to Adblock Plus for Firefox."|translate("s29")}}</a></div> |
117 <div class="warning-platform chrome">{{"It appears that you are using Google Chrome."|translate("s30")}} <a href="chrome">{{"Switch to Adblock Plus for Chro me."|translate("s31")}}</a></div> | 138 <div class="warning-platform chrome">{{"It appears that you are using Google Chrome."|translate("s30")}} <a href="chrome">{{"Switch to Adblock Plus for Chro me."|translate("s31")}}</a></div> |
118 <div class="warning-platform android">{{"It appears that you are using Andro id."|translate("s32")}} <a href="android">{{"Switch to Adblock Plus for Android. "|translate("s33")}}</a></div> | 139 <div class="warning-platform android">{{"It appears that you are using Andro id."|translate("s32")}} <a href="android">{{"Switch to Adblock Plus for Android. "|translate("s33")}}</a></div> |
119 <div class="warning-platform opera">{{"It appears that you are using Opera." |translate("s34")}} <a href="opera">{{"Switch to Adblock Plus for Opera."|transl ate("s35")}}</a></div> | 140 <div class="warning-platform opera">{{"It appears that you are using Opera." |translate("s34")}} <a href="opera">{{"Switch to Adblock Plus for Opera."|transl ate("s35")}}</a></div> |
120 <div class="warning-platform internet-explorer">{{"It appears that you are u sing Internet Explorer."|translate("s36")}} <a href="internet-explorer">{{"Switc h to Adblock Plus for Internet Explorer."|translate("s37")}}</a></div> | 141 <div class="warning-platform internet-explorer">{{"It appears that you are u sing Internet Explorer."|translate("s36")}} <a href="internet-explorer">{{"Switc h to Adblock Plus for Internet Explorer."|translate("s37")}}</a></div> |
121 <div class="warning-platform safari">{{"It appears that you are using Safari ."|translate("s38")}} <a href="safari">{{"Switch to Adblock Plus for Safari."|tr anslate("s39")}}</a></div> | 142 <div class="warning-platform safari">{{"It appears that you are using Safari ."|translate("s38")}} <a href="safari">{{"Switch to Adblock Plus for Safari."|tr anslate("s39")}}</a></div> |
122 <div class="warning-platform yandex-browser">{{"It appears that you are usin g Yandex Browser."|translate("s40")}} <a href="yandex-browser">{{"Switch to Adbl ock Plus for Yandex Browser."|translate("s41")}}</a></div> | 143 <div class="warning-platform yandex-browser">{{"It appears that you are usin g Yandex Browser."|translate("s40")}} <a href="yandex-browser">{{"Switch to Adbl ock Plus for Yandex Browser."|translate("s41")}}</a></div> |
123 <div class="warning-platform maxthon">{{"It appears that you are using Maxth on."|translate("s42")}} <a href="maxthon">{{"Switch to Adblock Plus for Maxthon. "|translate("s43")}}</a></div> | 144 <div class="warning-platform maxthon">{{"It appears that you are using Maxth on."|translate("s42")}} <a href="maxthon">{{"Switch to Adblock Plus for Maxthon. "|translate("s43")}}</a></div> |
124 </div> | 145 </div> |
125 <iframe frameborder="0" height="285" id="video" itemprop="video" src="//www.yo utube-nocookie.com/embed/pVYtzF5SemU?html5=1&autohide=1&enablejsapi=1&am p;controls=2&fs=1&modestbranding=1&rel=0&showinfo=0&theme=li ght" width="520"></iframe> | 146 <iframe frameborder="0" height="285" id="video" itemprop="video" src="//www.yo utube-nocookie.com/embed/pVYtzF5SemU?html5=1&autohide=1&enablejsapi=1&am p;controls=2&fs=1&modestbranding=1&rel=0&showinfo=0&theme=li ght" width="520"></iframe> |
126 <img height="305" id="maxthon-instruction" src="/img/maxthon-instruction.png" width="540"> | 147 <img height="305" id="maxthon-instruction" src="/img/maxthon-instruction.png" width="540"> |
148 <img id="edge-teaser" src="/img/edge_teaser.png"> | |
127 </div> | 149 </div> |
128 | 150 |
129 <div id="key-facts"> | 151 <div id="key-facts"> |
130 <section class="first"> | 152 <section class="first"> |
131 <div class="sprite" id="facts-open-source"></div> | 153 <div class="sprite" id="facts-open-source"></div> |
132 <h1>{{"Open Source"|translate("s44")}}</h1> | 154 <h1>{{"Open Source"|translate("s44")}}</h1> |
133 <p> | 155 <p> |
134 {{"Adblock Plus is an open source project.\n <a href=\"contribute\" >Join us!</a>"|translate("s45")}} | 156 {{"Adblock Plus is an open source project.\n <a href=\"contribute\" >Join us!</a>"|translate("s45")}} |
135 </p> | 157 </p> |
136 </section> | 158 </section> |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
182 </button> | 204 </button> |
183 <button id="more-safari" onclick="showTab(this);return false;"> | 205 <button id="more-safari" onclick="showTab(this);return false;"> |
184 {{"Apple Safari"|translate("s57")}} | 206 {{"Apple Safari"|translate("s57")}} |
185 </button> | 207 </button> |
186 <button id="more-yandex-browser" onclick="showTab(this);return false;"> | 208 <button id="more-yandex-browser" onclick="showTab(this);return false;"> |
187 {{"Yandex Browser"|translate("s58")}} | 209 {{"Yandex Browser"|translate("s58")}} |
188 </button> | 210 </button> |
189 <button id="more-maxthon" onclick="showTab(this);return false;"> | 211 <button id="more-maxthon" onclick="showTab(this);return false;"> |
190 {{"Maxthon"|translate("s59")}} | 212 {{"Maxthon"|translate("s59")}} |
191 </button> | 213 </button> |
214 <button id="more-edge" onclick="showTab(this);return false;"> | |
215 {{"Microsoft Edge"|translate("microsoft-edge")}} | |
216 </button> | |
192 </div> | 217 </div> |
193 | 218 |
194 <div class="more-tab" id="tab-firefox"> | 219 <div class="more-tab" id="tab-firefox"> |
195 <h2>{{"Download Firefox Adblock Plus"|translate("s60")}}</h2> | 220 <h2>{{"Download Firefox Adblock Plus"|translate("s60")}}</h2> |
196 | 221 |
197 <p> | 222 <p> |
198 {{"Firefox is a free and open source browser available for Windows, OS X , Linux, and Android which supports add-ons. Add-ons are extensions to your brow ser to improve privacy and security and the way you view the web. Since its laun ch in 2006, Adblock Plus has continuously been the most popular add-on for the M ozilla Firefox web browser."|translate("s61")}} | 223 {{"Firefox is a free and open source browser available for Windows, OS X , Linux, and Android which supports add-ons. Add-ons are extensions to your brow ser to improve privacy and security and the way you view the web. Since its laun ch in 2006, Adblock Plus has continuously been the most popular add-on for the M ozilla Firefox web browser."|translate("s61")}} |
199 </p> | 224 </p> |
200 | 225 |
201 <p> | 226 <p> |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
334 </p> | 359 </p> |
335 </div> | 360 </div> |
336 | 361 |
337 <div class="more-tab" id="tab-maxthon"> | 362 <div class="more-tab" id="tab-maxthon"> |
338 <h2>{{"Adblock Plus for Maxthon"|translate("s97")}}</h2> | 363 <h2>{{"Adblock Plus for Maxthon"|translate("s97")}}</h2> |
339 | 364 |
340 <p> | 365 <p> |
341 {{"Different from being as an extension on other browsers, Adblock Plus has been integrated by default for Maxthon users, and as an opt-in option for Ch inese users. Are you fed up with advertisers infringing on your browsing experie nce? Simply install Maxthon Cloud Browser and all annoying ads will be automatic ally blocked from the internet. Blinking banners, popups, video commercials on Y ouTube and Facebook ads: Maxthon Cloud Browser with Adblock Plus integrated will automatically remove any unwanted ad from every website you visit. Want more? Y ou can easily activate additional privacy and security features such as tracking and malware protection."|translate("s98")}} | 366 {{"Different from being as an extension on other browsers, Adblock Plus has been integrated by default for Maxthon users, and as an opt-in option for Ch inese users. Are you fed up with advertisers infringing on your browsing experie nce? Simply install Maxthon Cloud Browser and all annoying ads will be automatic ally blocked from the internet. Blinking banners, popups, video commercials on Y ouTube and Facebook ads: Maxthon Cloud Browser with Adblock Plus integrated will automatically remove any unwanted ad from every website you visit. Want more? Y ou can easily activate additional privacy and security features such as tracking and malware protection."|translate("s98")}} |
342 </p> | 367 </p> |
343 </div> | 368 </div> |
369 <div class="more-tab" id="tab-edge"> | |
370 <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|tra nslate("abp-for-edge-be-notified")}}</h2> | |
371 | |
372 <p> | |
373 {{"Microsoft Edge <a href='https://wpdev.uservoice.com/forums/257854-mic rosoft-edge-developer/suggestions/6508820-javascript-browser-extensions'>does no t yet support extensions</a>. However, you can be sure that a version of Adblock Plus for Microsoft Edge will be released as soon as possible. Enter your email in the field above to receive a notification when Adblock Plus for Microsoft Edg e is available. While you're waiting, you may want to try the latest version of Adblock Plus for Internet Explorer."|translate("ms-edge-description")}} | |
374 </p> | |
375 </div> | |
344 </div> | 376 </div> |
345 </section> | 377 </section> |
346 | 378 |
347 <script src="/js/index.js"></script> | 379 <script src="/js/index.js"></script> |
OLD | NEW |