Issue 4362 - Update and improve text on "Learn More" tab on adblockplus.org and rearrange links in …

includes/index.tmpl

Index: includes/index.tmpl
===================================================================
--- a/includes/index.tmpl
+++ b/includes/index.tmpl
@@ -191,185 +191,49 @@
       {{"Learn More"|translate("s50")}}
     </button>
     <button id="less" onclick="toggleMore();return false;">
       {{"Show Less"|translate("s51")}}
     </button>
   </div>
 
   <div id="more-tabs">
+
     <div id="sidebar">
-      <button id="more-firefox" onclick="showTab(this);return false;">
-        {{"Mozilla Firefox"|translate("s52")}}
-      </button>
       <button id="more-chrome" onclick="showTab(this);return false;">
-        {{"Google Chrome"|translate("s53")}}
+        {{"Chrome"|translate("s53")}}
       </button>
-      <button id="more-opera" onclick="showTab(this);return false;">
-        {{"Opera"|translate("s54")}}
-      </button>
-      <button id="more-android" onclick="showTab(this);return false;">
-        {{"Android"|translate("s55")}}
+      <button id="more-firefox" onclick="showTab(this);return false;">
+        {{"Firefox"|translate("s52")}}
       </button>
       <button id="more-internet-explorer" onclick="showTab(this);return false;">
         {{"Internet Explorer"|translate("s56")}}
       </button>
-      <button id="more-safari" onclick="showTab(this);return false;">
-        {{"Apple Safari"|translate("s57")}}
-      </button>
-      <button id="more-yandex-browser" onclick="showTab(this);return false;">
-        {{"Yandex Browser"|translate("s58")}}
-      </button>
       <button id="more-maxthon" onclick="showTab(this);return false;">
         {{"Maxthon"|translate("s59")}}
       </button>
       <button id="more-edge" onclick="showTab(this);return false;">
         {{"Microsoft Edge"|translate("microsoft-edge")}}
       </button>
-    </div>
-
-    <div class="more-tab" id="tab-firefox">
-      <h2>{{"Download Firefox Adblock Plus"|translate("s60")}}</h2>
-
-      <p>
-        {{"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 browser to improve privacy and security and the way you view the web. Since its launch in 2006, Adblock Plus has continuously been the most popular add-on for the Mozilla Firefox web browser."|translate("s61")}}
-      </p>
-
-      <p>
-        {{"Adblock Plus for Firefox is more than a popup blocker. Are you troubled by banners, overlays and other annoying advertisements? Just install the Firefox ad blocker and experience the web as it should be. Depending on the filter lists you have activated, you can even block YouTube video ads and block Facebook tracking. Filter lists are created by members of the open source community and free to use. If you don't want to rely on filter lists, you can create your own <a href=\"filters\">blocking rules</a> to customize your web experience."|translate("s62")}}
-      </p>
-
-      <p>
-        {{"Adblock Plus for Firefox is the most downloaded browser extension worldwide and winner of the About.com Reader's Choice Award 2011 and 2013, as well as the Linux New Media award for the Best Open Source Firefox Extension."|translate("s63")}}
-      </p>
-    </div>
-
-    <div class="more-tab" id="tab-chrome">
-      <h2>{{"Ad Blocker for Chrome"|translate("s64")}}</h2>
-
-      <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 \"Agree and 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> 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>
-        {{"<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 \"Agree and 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>
-
-      <p>
-        {{"Adblock Plus for Opera works great. Don't believe us? Don't just take our word for it. Here is what the popular download portal Softpedia has to say: \"Adblock Plus for Opera is a very useful add-on that was especially designed to help users get rid of nuisances like pop-up ads, flashing banners and other such things.\""|translate("s76")}}
-      </p>
-    </div>
-
-    <div class="more-tab" id="tab-android">
-      <h2>{{"Android Adblock app"|translate("s77")}}</h2>
-
-      <p>
-        {{"Adblock Plus is the most popular ad blocking app for Android, and is used by over <fix>1</fix> million users every day. It is the first mobile ad blocker which works on non-rooted devices, which makes it much more convenient to use than any other ad blocking app on Android. By adding Adblock Plus to your Android device, all banners and other nasty ads will automatically be blocked from most apps and the websites you visit on your smartphone or tablet. The Android adblocker works with most browsers such as Google Chrome on Android."|translate("s78")}}
-      </p>
-
-      <p>
-        {{"By installing the Android Adblock Plus app, you can significantly increase the speed of browsing with your mobile device. The app filters the web traffic and prevents unwanted ads from being downloaded, which reduces bandwidth and jacks up the speed of your browsing. Blocking ads on Android is also useful to protect your privacy and to eliminate the threat of downloading malicious apps, which are often distributed through misleading advertisements."|translate("s79")}}
-      </p>
-
-      <p>
-        {{"Please note that there are some limitations in Android which may require some manual efforts for the app to block ads. For non-rooted devices running on 4.1.2, 4.2.1 and higher, some minor configuration is required. For non-rooted devices with Android 3.1 or higher, Adblock Plus will automatically block all ads over your WiFi connection. Android devices without root will not be able to block ads on 3G connections."|translate("s80")}}
-      </p>
+      <button id="more-opera" onclick="showTab(this);return false;">
+        {{"Opera"|translate("s54")}}
+      </button>
+      <button id="more-safari" onclick="showTab(this);return false;">
+        {{"Safari"|translate("s57")}}
+      </button>
+      <button id="more-yandex-browser" onclick="showTab(this);return false;">
+        {{"Yandex.Browser"|translate("s58")}}
+      </button>
     </div>
 
-    <div class="more-tab" id="tab-internet-explorer">
-      <h2>{{"Adblock Plus for Internet Explorer"|translate("s81")}}</h2>
-
-      <p>
-        {{"Although you might not expect it, Internet Explorer is still the world's second most popular browser with hundreds of millions of daily users. We developed Adblock Plus for Internet Explorer precisely for those users — so that they can finally experience the web without annoying ads."|translate("s82")}}
-      </p>
-
-      <p>
-        {{"Developing an extension for Internet Explorer is challenging — that’s one of the reasons there are not as many extensions on Internet Explorer as on Mozilla Firefox, Google Chrome and Opera. The installation of Adblock Plus for Internet Explorer is different than on other browsers. Usually, the extension is directly added to the browser; however, for Internet Explorer you need to install it through a so-called setup program. But don’t worry: it takes under 30 seconds to install Adblock Plus for Internet Explorer. Just click on the green button above called “Agree and Install for Internet Explorer” to protect yourself from annoying advertising."|translate("s83")}}
-      </p>
-
-      <p>
-        {{"Current limitations: Due to the limitations of some of the fragmented versions of Internet Explorer, Adblock Plus currently doesn’t work for:"|translate("s84")}}
-      </p>
-
-      <ul>
-        <li>{{"Metro Mode of Internet Explorer in Windows 8"|translate("s85")}}</li>
-        <li>{{"Internet Explorer in Windows RT"|translate("s86")}}</li>
-      </ul>
-    </div>
-
-    <div class="more-tab" id="tab-safari">
-      <h2>{{"Adblock Plus for Safari"|translate("s87")}}</h2>
-
-      <p>
-        {{"With the release of Adblock Plus for Safari in January 2014, the ABP browser family became complete. From that point on, our extension has been available to all the major browsers: Mozilla Firefox, Google Chrome, Internet Explorer, Opera and  Apple Safari."|translate("s88")}}
-      </p>
-
-      <p>
-        {{"Adblock Plus for Safari uses the same codebase as the Chrome and Opera versions. Although this made the development of the adblocker much more complex, there are certain key advantages. For instance, it shares the same codebase, any changes or improvements made to one of these browsers will automatically land in Safari, ensuring an experience that is always up-to-date."|translate("s89")}}
-      </p>
-
-      <p>
-        {{"In contrast to Chrome and Firefox, Safari comes with a few innate limitations. Because these are built into the browser, they affect every add-on available for Safari - and ours is of course no exception.  These limitations exist because it is not possible to get “deep” access to the Safari code, like we can with other browsers. Bottom line: there are some facets of Adblock Plus for Safari that cannot function optimally. For example, it is not possible to block ads in “third-party plugins” like video players or to block the so-called XHR requests. Usually this would mean that YouTube video ads cannot be blocked. But because of some very smart workarounds, Adblock Plus can block these annoying video ads in your Safari browser."|translate("s90")}}
-      </p>
-
-      <p>
-        {{"But, overall, Adblock Plus for Safari is a good as it gets ad-blocker for Safari and will block all annoying banners and video ads."|translate("s91")}}
-      </p>
-
-      <p>
-        {{"Currently, Adblock Plus is supported by Safari 6.0 and higher."|translate("s92")}}
-      </p>
-    </div>
-
-    <div class="more-tab" id="tab-yandex-browser">
-      <h2>{{"Ad Blocker for Yandex Browser"|translate("s93")}}</h2>
-
-      <p>
-        {{"Adblock Plus is the most advanced adblocker for Yandex 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, Facebook and Vkontakte ads: The Yandex Browser 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("s94")}}
-      </p>
-
-      <p>
-        {{"Installing the Yandex Browser Adblock Plus add-on to your browser only takes a few seconds. Simply click the \"Agree and Install for Yandex Browser\" button above and confirm the installation by clicking the \"Add\" button. Please note: Yandex Browser displays a warning that Adblock Plus can access the data on any website you visit. This is a standard warning for Yandex Browser extensions running on every tab. We promise to never collect any data about you."|translate("s95")}}
-      </p>
-
-      <p>
-        {{"The add-on is developed by the open source community and free to use for everybody. With more than <fix>100</fix> million devices, it is the most popular browser extension ever."|translate("s96")}}
-      </p>
-    </div>
-
-    <div class="more-tab" id="tab-maxthon">
-      <h2>{{"Adblock Plus for Maxthon"|translate("s97")}}</h2>
-
-      <p>
-        {{"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 Chinese users. Are you fed up with advertisers infringing on your browsing experience? Simply install Maxthon Cloud Browser and all annoying ads will be automatically blocked from the internet. Blinking banners, popups, video commercials on YouTube and Facebook ads: Maxthon Cloud Browser with Adblock Plus integrated will automatically remove any unwanted ad from every website you visit. Want more? You can easily activate additional privacy and security features such as tracking and malware protection."|translate("s98")}}
-      </p>
-    </div>
-    <div class="more-tab" id="tab-edge">
-      <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>
+    <? include learn-more/chrome ?>
+    <? include learn-more/firefox ?>
+    <? include learn-more/ie ?>
+    <? include learn-more/maxthon ?>
+    <? include learn-more/edge ?>
+    <? include learn-more/opera ?>
+    <? include learn-more/safari ?>
+    <? include learn-more/yandex ?>
+    
   </div>
 </section>
 
 <script src="/js/index.js"></script>