Revert "Merge pull request #10647 from srirambv/sort"

This reverts commit 8993297, reversing changes made to d8a6a80.
brave · Sep 5, 2017 · ab60908 · ab60908
1 parent 739ca53
commit ab60908
Show file tree

Hide file tree

Showing 20 changed files with 999 additions and 971 deletions.
diff --git a/app/extensions/brave/about-contributions.html b/app/extensions/brave/about-contributions.html
@@ -16,6 +16,7 @@
     <link rel="localization" href="locales/{locale}/preferences.properties">
     <link rel="localization" href="locales/{locale}/common.properties">
     <link rel="localization" href="locales/{locale}/bravery.properties">
+    <link rel="localization" href="locales/{locale}/error.properties">
     <link rel="localization" href="locales/{locale}/errorMessages.properties">
   </head>
   <body>

diff --git a/app/extensions/brave/about-error.html b/app/extensions/brave/about-error.html
@@ -14,6 +14,7 @@
     <script src="ext/l20n.min.js"></script>
     <script src="gen/aboutPages.entry.js" async></script>
     <link rel="localization" href="locales/{locale}/app.properties">
+    <link rel="localization" href="locales/{locale}/error.properties">
     <link rel="localization" href="locales/{locale}/errorMessages.properties">
  </head>
  <body>

diff --git a/app/extensions/brave/about-preferences.html b/app/extensions/brave/about-preferences.html
@@ -16,6 +16,7 @@
     <link rel="localization" href="locales/{locale}/preferences.properties">
     <link rel="localization" href="locales/{locale}/common.properties">
     <link rel="localization" href="locales/{locale}/bravery.properties">
+    <link rel="localization" href="locales/{locale}/error.properties">
     <link rel="localization" href="locales/{locale}/errorMessages.properties">
     <link rel="localization" href="locales/{locale}/extensions.properties">
   </head>

diff --git a/app/extensions/brave/locales/en-US/adblock.properties b/app/extensions/brave/locales/en-US/adblock.properties
@@ -1,10 +1,9 @@
-adblock=Ad Block
 adblockTitle=Ad Block
-adblockTooManyListsWarning=Warning: Turning on too many lists will degrade performance
-additionalFilterLists=Additional filter lists
+adblock=Ad Block
+lastUpdateCheckDateLabel=Last update check:
+lastCheckETagLabel=Last check ETag:
 blockedCountLabel=Blocked count:
-customFilterDescription=One per line, a filter is described in Adblock Plus filter syntax
+additionalFilterLists=Additional filter lists
 customFilters=Custom filters
-disableAdBlockForSite=Disable Ad block
-lastCheckETagLabel=Last check ETag:
-lastUpdateCheckDateLabel=Last update check:
+customFilterDescription=One per line, a filter is described in Adblock Plus filter syntax
+adblockTooManyListsWarning=Warning: Turning on too many lists will degrade performance