Issue 2668 - Use new subscription types in options page

ext/common.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 123 matching lines @@
 
       if (/^\$\d+$/.test(content))
         placeholders[parseInt(content.substr(1), 10) - 1] = placeholder;
       else
         text = replacePlaceholder(text, placeholder, content);
     }
 
     return [text, placeholders];
   };
 
-  var readCatalog = function(locale)
+  var readCatalog = function(locale, catalogFile)
   {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", "locale/" + locale + "/" + catalogFile, false);
     xhr.overrideMimeType("text/plain");
 
     try
     {
       xhr.send();
     }
     catch (e)
@@ skipping 28 matching lines @@
 
           for (var i = 0; i < placeholders.length; i++)
             text = replacePlaceholder(text, placeholders[i], substitutions[i]);
 
           return text;
         }
 
         if (locales.length == 0)
           return "";
 
-        readCatalog(locales.shift());
+        var locale = locales.shift();
+        readCatalog(locale, "common.json");
+        readCatalog(locale, catalogFile);
       }
     }
   };
 })(this);