Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: includes/index.tmpl

Issue 29458622: Issue 4920 - Add "Ready for Windows" section to adblockplus.org (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org
Left Patch Set: Created June 7, 2017, 2:53 p.m.
Right Patch Set: Style fixes Created June 21, 2017, 8:29 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « includes/abb-notification.tmpl ('k') | static/css/index.css » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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-2017 eyeo GmbH 7 # Copyright (C) 2006-2017 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 17 matching lines...) Expand all
28 <link href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddi lifddb" rel="chrome-webstore-item"> 28 <link href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddi lifddb" rel="chrome-webstore-item">
29 <meta content="product" property="og:type"> 29 <meta content="product" property="og:type">
30 <meta content="https://adblockplus.org/img/adblockplus_promo.png" property="og:i mage"> 30 <meta content="https://adblockplus.org/img/adblockplus_promo.png" property="og:i mage">
31 <meta content="https://adblockplus.org/" property="og:url"> 31 <meta content="https://adblockplus.org/" property="og:url">
32 <meta content="{{"Adblock Plus - Surf the web without annoying ads!"|translate(" s1")}}" name="title"> 32 <meta content="{{"Adblock Plus - Surf the web without annoying ads!"|translate(" s1")}}" name="title">
33 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"|translate("s2")}}" name="description"> 33 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"|translate("s2")}}" name="description">
34 <meta content="{{"Adblock Plus - Surf the web without annoying ads!"|translate(" s1")}}" property="og:title"> 34 <meta content="{{"Adblock Plus - Surf the web without annoying ads!"|translate(" s1")}}" property="og:title">
35 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"|translate("s2")}}" property="og:description"> 35 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"|translate("s2")}}" property="og:description">
36 </head> 36 </head>
37 37
38 <div id="abb-banner"> 38 <div id="abb-banner" class="notice">
39 <h2>{{"Want to block ads on your smartphone or tablet?"|translate("abb-banner- headline")}}</h2> 39 <h2>{{"Want to block ads on your smartphone or tablet?"|translate("abb-banner- headline")}}</h2>
40 <img src="/img/abb-promo-image.png" alt="{{"Adblock Browser promotional image" |translate("abb-promotion-alt")}}" /> 40 <img src="/img/abb-promo-image.png" alt="{{"Adblock Browser promotional image" |translate("abb-promotion-alt")}}" />
41 <a id="abb-android-download" href="https://adblockplus.org/redirect?link=adblo ck_browser_android_store">{{"Download Adblock Browser"|translate("abb-banner-but ton-text")}}</a> 41 <a id="abb-android-download" href="https://adblockplus.org/redirect?link=adblo ck_browser_android_store">{{"Download Adblock Browser"|translate("abb-banner-but ton-text")}}</a>
42 <a id="abb-ios-download" href="https://adblockplus.org/redirect?link=adblock_b rowser_ios_store">{{"Download Adblock Browser"|translate("abb-banner-button-text ")}}</a> 42 <a id="abb-ios-download" href="https://adblockplus.org/redirect?link=adblock_b rowser_ios_store">{{"Download Adblock Browser"|translate("abb-banner-button-text ")}}</a>
43 </div> 43 </div>
44 <div itemscope="itemscope" itemtype="http://schema.org/SoftwareApplication"> 44 <div itemscope="itemscope" itemtype="http://schema.org/SoftwareApplication">
45 <section id="main"> 45 <section id="main">
46 <div id="summary"> 46 <div id="summary">
47 <h1 itemprop="name">{{"Adblock Plus"|translate("s5")}}</h1> 47 <h1 itemprop="name">{{"Adblock Plus"|translate("s5")}}</h1>
48 <h2 itemprop="description">{{"Surf the web without annoying ads!"|translat e("s6")}}</h2> 48 <h2 itemprop="description">{{"Surf the web without annoying ads!"|translat e("s6")}}</h2>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 <section> 160 <section>
161 <div class="sprite" id="facts-privacy"></div> 161 <div class="sprite" id="facts-privacy"></div>
162 <h1>{{"Privacy Guaranteed"|translate("s48")}}</h1> 162 <h1>{{"Privacy Guaranteed"|translate("s48")}}</h1>
163 <p> 163 <p>
164 {{"Adblock Plus will never collect your <a href=\"privacy\">personal data< /a>."|translate("privacy-policy-note")}} 164 {{"Adblock Plus will never collect your <a href=\"privacy\">personal data< /a>."|translate("privacy-policy-note")}}
165 </p> 165 </p>
166 166
167 </section> 167 </section>
168 </div> 168 </div>
169 169
juliandoucette 2017/06/07 17:48:11 I know that I told you that you could show/hide ba
ire 2017/06/08 13:41:26 Okay. I like that better than hiding with CSS so I
juliandoucette 2017/06/16 18:19:02 :+1: Note: I asked Ollie if this applies to Edge
170 <div id="ready-for-windows-note"> 170 {% if page == "internet-explorer" %}
juliandoucette 2017/06/07 17:48:11 Why not place the `id` on the `<p>` and drop the `
juliandoucette 2017/06/07 17:48:11 NIT: I don't think "note" is descriptive (Ack: You
ire 2017/06/08 13:41:26 Okay, I'll go with "ready-for-windows-notice".
ire 2017/06/08 13:41:26 Will do.
171 <p>{{"Adblock Plus for Internet Explorer is supported by eyeo GmbH on the foll owing editions of Windows 10 – Windows 10 Pro, Windows 10 Education and Windows 10 Enterprise. Adblock Plus for Internet Explorer is supported on the in-market supported servicing branches of Windows 10 including - Current Branch, Current B ranch for Business and the following Long-Term Servicing branch: Windows 10."|tr anslate("ready-for-windows-note")}}</p> 171 <p id="ready-for-windows-notice" class="notice">
juliandoucette 2017/06/07 17:48:11 Don't forget to `<fix>` product / brand names.
ire 2017/06/08 13:41:26 Okay. I mentioned this in the translation string d
juliandoucette 2017/06/08 21:12:30 Good questions. I know we fix all of "Internet E
juliandoucette 2017/06/16 18:16:16 (Moving the discussion that was in reply back to r
172 </div> 172 {{"Adblock Plus for Internet Explorer is supported by eyeo GmbH on the followi ng editions of Windows 10 – Windows 10 Pro, Windows 10 Education and Windows 10 Enterprise. Adblock Plus for Internet Explorer is supported on the in-market sup ported servicing branches of Windows 10 including - Current Branch, Current Bran ch for Business and the following Long-Term Servicing branch: Windows 10."|trans late("ready-for-windows-notice")}}
173 </p>
174 {% endif %}
173 175
174 <hr> 176 <hr>
175 <div id="footnote"> 177 <div id="footnote">
176 [1] {{"The following rules <strong>have</strong> and <strong>always will</stro ng> apply to everyone, without exception:"|translate("footnote-headline")}} 178 [1] {{"The following rules <strong>have</strong> and <strong>always will</stro ng> apply to everyone, without exception:"|translate("footnote-headline")}}
177 <ul> 179 <ul>
178 <li> 180 <li>
179 {{"Participants cannot pay to avoid the <a href=\"acceptable-ads#criteria- general\">criteria</a>. Every ad must comply."|translate("footnote-must-comply") }} 181 {{"Participants cannot pay to avoid the <a href=\"acceptable-ads#criteria- general\">criteria</a>. Every ad must comply."|translate("footnote-must-comply") }}
180 </li> 182 </li>
181 <li> 183 <li>
182 {{"For transparency, we add all Acceptable Ads to our <a href=\"https://ad blockplus.org/forum/viewforum.php?f=12\">forum</a> so that our community of user s can provide feedback."|translate("footnote-forum")}} 184 {{"For transparency, we add all Acceptable Ads to our <a href=\"https://ad blockplus.org/forum/viewforum.php?f=12\">forum</a> so that our community of user s can provide feedback."|translate("footnote-forum")}}
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|tra nslate("abp-for-edge-be-notified")}}</h2> 373 <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|tra nslate("abp-for-edge-be-notified")}}</h2>
372 374
373 <p> 375 <p>
374 {{"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. While you're wait ing, you may want to try the latest version of Adblock Plus for Internet Explore r."|translate("ms-edge-description")}} 376 {{"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. While you're wait ing, you may want to try the latest version of Adblock Plus for Internet Explore r."|translate("ms-edge-description")}}
375 </p> 377 </p>
376 </div> 378 </div>
377 </div> 379 </div>
378 </section> 380 </section>
379 381
380 <script src="/js/index.js"></script> 382 <script src="/js/index.js"></script>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld