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

Side by Side Diff: 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
Patch Set: Created June 7, 2017, 2:53 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | static/css/index.css » ('j') | static/css/index.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 148 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
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">
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>
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>
173
169 <hr> 174 <hr>
170 <div id="footnote"> 175 <div id="footnote">
171 [1] {{"The following rules <strong>have</strong> and <strong>always will</stro ng> apply to everyone, without exception:"|translate("footnote-headline")}} 176 [1] {{"The following rules <strong>have</strong> and <strong>always will</stro ng> apply to everyone, without exception:"|translate("footnote-headline")}}
172 <ul> 177 <ul>
173 <li> 178 <li>
174 {{"Participants cannot pay to avoid the <a href=\"acceptable-ads#criteria- general\">criteria</a>. Every ad must comply."|translate("footnote-must-comply") }} 179 {{"Participants cannot pay to avoid the <a href=\"acceptable-ads#criteria- general\">criteria</a>. Every ad must comply."|translate("footnote-must-comply") }}
175 </li> 180 </li>
176 <li> 181 <li>
177 {{"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")}} 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")}}
178 </li> 183 </li>
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|tra nslate("abp-for-edge-be-notified")}}</h2> 371 <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|tra nslate("abp-for-edge-be-notified")}}</h2>
367 372
368 <p> 373 <p>
369 {{"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")}} 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")}}
370 </p> 375 </p>
371 </div> 376 </div>
372 </div> 377 </div>
373 </section> 378 </section>
374 379
375 <script src="/js/index.js"></script> 380 <script src="/js/index.js"></script>
OLDNEW
« no previous file with comments | « no previous file | static/css/index.css » ('j') | static/css/index.css » ('J')

Powered by Google App Engine
This is Rietveld