Issue 4037 - Update the user numbers on adblockplus.org

includes/index.tmpl

 title=Adblock Plus - Surf the web without annoying ads!
 noheading=True
 localefile=index
 
 {#
  # This file is part of the Adblock Plus website,
  # Copyright (C) 2006-2016 Eyeo GmbH
  #
  # Adblock Plus is free software: you can redistribute it and/or modify
  # it under the terms of the GNU General Public License version 3 as
@@ skipping 12 matching lines @@
 <link class="cssfx" href="/css/index.css" rel="stylesheet">
 <link class="cssfx" href="/css/index-desktop.css" media="(min-width: 1000px)" rel="stylesheet">
 <link href="/css/index-mobile.css" media="(max-width: 1000px)" rel="stylesheet">
 
 <link href="https://adblockplus.org/" rel="canonical">
 <link href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddilifddb" rel="chrome-webstore-item">
 <meta content="product" property="og:type">
 <meta content="https://adblockplus.org/img/adblockplus_promo.png" property="og:image">
 <meta content="https://adblockplus.org/" property="og:url">
 <meta content="{{"Adblock Plus - Surf the web without annoying ads!"|translate("s1")}}" name="title">
-<meta content="{{"Adblock Plus is the most popular adblocker available for Firefox, Chrome, Opera, Safari, Android and Internet Explorer. Block all annoying ads all over the web: remove video ads on YouTube, block Facebook ads, get rid of pop-ups and much more. On Google Chrome, Adblock Plus is one of the fastest growing extensions ever. Adblock Plus for Chrome is used by 10 million people worldwide.. Download online for free now!"|translate("s2")}}" name="description">

[juliandoucette, 2016/08/16 17:12:04]

1. I don't remember this being part of this patch :/ 
2. The user number is wrong here isn't it?

[saroyanm, 2016/08/18 10:21:08]

It's in the ticket, so I guess this also should be in the patch
Addressed in the ticket.

[saroyanm, 2016/08/22 10:08:59]

The text should, be changed to: Adblock Plus is used on over 100 million devices
please
Please also update it consistently for the meta tag below.

+<meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker available 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 all over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fix> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adblock 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 now!"|translate("s2")}}" name="description">
 <meta content="{{"Adblock Plus - Surf the web without annoying ads!"|translate("s1")}}" property="og:title">
-<meta content="{{"Adblock Plus is the most popular adblocker available for Firefox, Chrome, Opera, Safari, Android and Internet Explorer. Block all annoying ads all over the web: remove video ads on YouTube, block Facebook ads, get rid of pop-ups and much more. On Google Chrome, Adblock Plus is one of the fastest growing extensions ever. Adblock Plus for Chrome is used by 10 million people worldwide.. Download online for free now!"|translate("s2")}}" property="og:description">

[juliandoucette, 2016/08/16 17:12:04]

Same as comment above ^

+<meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker available 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 all over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fix> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adblock 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 now!"|translate("s2")}}" property="og:description">
 </head>
 
 <div id="abb-banner">
   <h2>{{"Want to block ads on your smartphone or tablet?"|translate("abb-banner-headline")}}</h2>
   <img src="/img/abb-promo-image.png" alt="{{"Adblock Browser promotional image"|translate("abb-promotion-alt")}}" />
   <a id="abb-android-download" href="https://adblockplus.org/redirect?link=adblock_browser_android_store">{{"Download Adblock Browser"|translate("abb-banner-button-text")}}</a>
   <a id="abb-ios-download" href="https://adblockplus.org/redirect?link=adblock_browser_ios_store">{{"Download Adblock Browser"|translate("abb-banner-button-text")}}</a>
 </div>
 <div itemscope="itemscope" itemtype="http://schema.org/SoftwareApplication">
   <section id="main">
@@ skipping 16 matching lines @@
           <span class="license-note" style="display: inline">{{"(<a href=\"https://www.gnu.org/licenses\">GPLv3</a>)"|translate("s10")}}</span>
         </li>
         <li id="feature-maxthon" itemprop="featureList">
           <div class="sprite"></div>
 {{"Integrated by default in"|translate("s11")}} <a href="http://www.maxthon.com/" target="_blank">{{"Maxthon Cloud Browser"|translate("s12")}}</a>
         </li>
       </ul>
     </div>
 
     <h3 class="edge-message">
-      {{"Adblock Plus is ​available for Windows Insiders on build 14342 or higher."|translate("edge-message")}}
+      {{"Adblock Plus for Microsoft Edge requires Windows 10 Anniversary Update"|translate("edge-message")}}
     </h3>
 
     <div id="install">
       <a class="install-button" href="https://update.adblockplus.org/latest/adblockplusfirefox.xpi" id="install-firefox">{{"Install for Firefox"|translate("s13")}}</a>
       <a class="install-button" href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddilifddb" id="install-chrome" onclick="chrome.webstore.install(); return false;">{{"Install for Chrome"|translate("s14")}}</a>
       <a class="install-button" href="https://addons.opera.com/extensions/details/opera-adblock/?display=en-US" id="install-opera">{{"Install for Opera"|translate("s15")}}</a>
       <a class="install-button" href="android-install" id="install-android">{{"Install for Android"|translate("s16")}}</a>
       <a class="install-button" href="https://update.adblockplus.org/latest/adblockplusie.exe" id="install-internet-explorer">{{"Install for Internet Explorer"|translate("s17")}}</a>
       <a class="install-button" href="https://update.adblockplus.org/latest/adblockplussafari.safariextz" id="install-safari">{{"Install for Safari"|translate("s18")}}</a>
       <a class="install-button" href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddilifddb" id="install-yandex-browser" onclick="chrome.webstore.install(); return false;">{{"Install for Yandex Browser"|translate("s19")}}</a>
@@ skipping 62 matching lines @@
     <h1>{{"Open Source"|translate("s44")}}</h1>
     <p>
         {{"Adblock Plus is an open source project.\n      <a href=\"contribute\">Join us!</a>"|translate("s45")}}
     </p>
   </section>
 
   <section>
     <div class="sprite" id="facts-downloads"></div>
     <h1>{{"Active on <fix>100</fix> million devices"|translate("s46")}}</h1>
     <p>
-{{"Adblock Plus is the world’s most popular browser extension."|translate("s47")}}
+{{"<fix>Adblock Plus</fix> is the world’s most popular browser extension."|translate("s47")}}
     </p>
   </section>
 
   <section>
     <div class="sprite" id="facts-privacy"></div>
     <h1>{{"Privacy Guaranteed"|translate("s48")}}</h1>
     <p>
       {{"Adblock Plus will never collect any of your personal data."|translate("s49")}}
     </p>
 
@@ skipping 62 matching lines @@
 
       <p>
         {{"Adblock Plus is the most advanced adblocker for the Google Chrome browser. Are you fed up with advertisers infringing on your browsing experience? Simply install the extension and all annoying ads will be automatically blocked from the internet. Blinking banners, popups, video commercials on YouTube and Facebook ads: The Chrome Adblock Plus extension will automatically remove any unwanted ad from every website you visit. Want more? You can easily activate additional privacy and security <a href=\"features\">features</a> such as tracking and malware protection."|translate("s65")}}
       </p>
 
       <p>
         {{"Installing the Chrome Adblock Plus add-on to your browser only takes a few seconds. Simply click the \"Install for Chrome\" button above and confirm the installation by clicking the \"Add\" button. Please note: The Chrome browser displays a warning that Adblock Plus can access the data on any website you visit. This is a standard warning for Chrome extensions running on every tab. We promise to never collect any data about you."|translate("s66")}}
       </p>
 
       <p>
-        {{"The add-on is developed by the open source community and free to use for everybody. With more than <fix>100</fix> active devices, Adblock Plus is one of the most popular browser extensions for Chrome."|translate("s67")}}
+        {{"The add-on is developed by the open source community and free to use for everybody. With more than <fix>100</fix> million active devices, <fix>Adblock Plus</fix> is one of the most popular browser extensions for <fix>Google Chrome</fix>."|translate("s67")}}
       </p>
     </div>
 
     <div class="more-tab" id="tab-opera">
       <h2>{{"Blocking ads on Opera"|translate("s72")}}</h2>
 
       <p>
-        {{"Adblock Plus is one of the most popular add-ons available, and is used on over <fix>100</fix> million devices. The installation of Opera extensions only takes a few seconds. By adding Adblock Plus to your Opera browser, you can remove all online advertising such as banners, pop-ups, 30-second YouTube commercials, Facebook ads and any other unwanted online ad. After installing this extension, all annoying ads will automatically be removed from all websites, which makes browsing the internet less distracting and more enjoyable."|translate("s73")}}
+        {{"<fix>Adblock Plus</fix> is one of the most popular add-ons available, and is used on over <fix>100</fix> million devices. The installation of <fix>Opera</fix> extensions only takes a few seconds. By adding <fix>Adblock Plus</fix> to your <fix>Opera</fix> browser, you can remove all online advertising such as banners, pop-ups, 30-second <fix>YouTube</fix> commercials, <fix>Facebook</fix> ads and any other unwanted online ad. After installing this extension, all annoying ads will automatically be removed from all websites, which makes browsing the internet less distracting and more enjoyable."|translate("s73")}}
       </p>
 
       <p>
         {{"Besides blocking all obtrusive advertising from your browsing experience, Adblock Plus significantly increases the speed of your Opera browser. By preventing advertisements from being loaded by your browser, the ad blocker helps you to save bandwidth and makes surfing the internet faster, especially if you are on a slow internet connection."|translate("s74")}}
       </p>
 
       <p>
         {{"Add Adblock Plus to your Opera browser by clicking on the green button \"Install for Opera\" above. Click \"Install\" to confirm the installation and to add the extension to Opera. There are no additional steps or configurations necessary, you will automatically be protected against all obtrusive online advertising."|translate("s75")}}
       </p>
 
@@ skipping 90 matching lines @@
       <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|translate("abp-for-edge-be-notified")}}</h2>
 
       <p>
         {{"Microsoft Edge <a href='https://wpdev.uservoice.com/forums/257854-microsoft-edge-developer/suggestions/6508820-javascript-browser-extensions'>does not 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 waiting, you may want to try the latest version of Adblock Plus for Internet Explorer."|translate("ms-edge-description")}}
       </p>
     </div>
   </div>
 </section>
 
 <script src="/js/index.js"></script>