this fixes #231

gorhill · May 14, 2014 · cf97437 · cf97437
1 parent d9d3458
commit cf97437
Show file tree

Hide file tree

Showing 7 changed files with 785 additions and 359 deletions.
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
@@ -430,12 +430,12 @@
         "description": "English: {{used}} used out of {{total}}"
     },
     "ubiquitousParseAllABPFiltersPrompt1" : {
-        "message": "Parse and enforce Adblock+ complex filters (beta).",
-        "description": "English: Parse and enforce Adblock+ complex filters (beta)."
+        "message": "Parse and enforce Adblock+ complex filters.",
+        "description": "English: Parse and enforce Adblock+ complex filters."
     },
     "ubiquitousParseAllABPFiltersPrompt2" : {
         "message": "{{abpFilterCount}} complex filters used.",
-        "description": "English: Parse and enforce Adblock+ complex filters (beta)."
+        "description": "English: {{abpFilterCount}} complex filters used."
     },
     "ubiquitousParseAllABPFiltersInfo" : {
         "message": "<p>Normally, <i>HTTP Switchboard</i> will extract from <i>Adblock Plus</i>-compatible filter lists <b>only</b> those filters which are used to block an entire domain (example: &ldquo;<b>||a.ucoz.net^</b>&rdquo;).</p><p>This option enables the parsing and enforcing of finer-grained <i>Adblock Plus</i> filters (example: &ldquo;<b>/adwords-conversion-tracking.</b>&rdquo;). These complex filters are incompatible with the matrix, and thus are only used internally to evaluate whether a net request should be blocked: they have no user interface counterpart.</p><p>Even if this option is enabled, <i>Adblock Plus</i> filters used for <a href=\"https://adblockplus.org/en/filters#elemhide\">element hiding</a> are completely ignored.</p><p>Memory usage requirement is higher when this option is enabled.</p>",

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -430,12 +430,12 @@
         "description": "English: {{used}} used out of {{total}}"
     },
     "ubiquitousParseAllABPFiltersPrompt1" : {
-        "message": "Parse and enforce Adblock+ complex filters (beta).",
-        "description": "English: Parse and enforce Adblock+ complex filters (beta)."
+        "message": "Parse and enforce Adblock+ complex filters.",
+        "description": "English: Parse and enforce Adblock+ complex filters."
     },
     "ubiquitousParseAllABPFiltersPrompt2" : {
         "message": "{{abpFilterCount}} complex filters used.",
-        "description": "English: Parse and enforce Adblock+ complex filters (beta)."
+        "description": "English: {{abpFilterCount}} complex filters used."
     },
     "ubiquitousParseAllABPFiltersInfo" : {
         "message": "<p>Normally, <i>HTTP Switchboard</i> will extract from <i>Adblock Plus</i>-compatible filter lists <b>only</b> those filters which are used to block an entire domain (example: &ldquo;<b>||a.ucoz.net^</b>&rdquo;).</p><p>This option enables the parsing and enforcing of finer-grained <i>Adblock Plus</i> filters (example: &ldquo;<b>/adwords-conversion-tracking.</b>&rdquo;). These complex filters are incompatible with the matrix, and thus are only used internally to evaluate whether a net request should be blocked: they have no user interface counterpart.</p><p>Even if this option is enabled, <i>Adblock Plus</i> filters used for <a href=\"https://adblockplus.org/en/filters#elemhide\">element hiding</a> are completely ignored.</p><p>Memory usage requirement is higher when this option is enabled.</p>",

diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
@@ -430,12 +430,12 @@
         "description": "English: {{used}} used out of {{total}}"
     },
     "ubiquitousParseAllABPFiltersPrompt1" : {
-        "message": "Utiliser en plus les règles Adblock Plus avancées (beta).",
-        "description": "English: Parse and enforce Adblock+ complex filters (beta)."
+        "message": "Utiliser en plus les règles Adblock Plus avancées.",
+        "description": "English: Parse and enforce Adblock+ complex filters."
     },
     "ubiquitousParseAllABPFiltersPrompt2" : {
         "message": "{{abpFilterCount}} règles Adblock Plus avancées utilisées.",
-        "description": "English: Parse and enforce Adblock+ complex filters (beta)."
+        "description": "English: {{abpFilterCount}} complex filters used."
     },
     "ubiquitousParseAllABPFiltersInfo" : {
         "message": "<p>En temps normal, <i>HTTP Switchboard</i> n'extrait depuis les listes compatibles <i>Adblock Plus</i> <b>que</b> les filtres utilisés pour bloquer un domaine entier spécifique (par exemple : &ldquo;<b>||a.ucoz.net^</b>&rdquo;).</p><p>Cette option permet d'également utiliser des filtres <i>Adblock Plus</i> plus élaborés (par exemple : &ldquo;<b>/adwords-conversion-tracking.</b>&rdquo;). Ces filtres complexes sont incompatibles avec la matrice; ainsi ils sont utilisés &ldquo;en interne&rdquo; pour vérifier si une requête réseau devrait être bloquée ou non, et l'interaction utilisateur est limitée.</p><p>Même si cette option est activée, les filtres <i>Adblock Plus</i> utilisés pour <a href=\"https://adblockplus.org/en/filters#elemhide\">cacher des éléments</a> demeureront ignorés.</p><p>L'utilisation en mémoire vive est plus importante lorsque vous utilisez cette fonctionnalité.</p>",

diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
@@ -430,12 +430,12 @@
         "description": "English: {{used}} used out of {{total}}"
     },
     "ubiquitousParseAllABPFiltersPrompt1" : {
-        "message": "Разбор и применение Adblock+ complex фильтров (beta).",
-        "description": "English: Parse and enforce Adblock+ complex filters (beta)."
+        "message": "Разбор и применение Adblock+ complex фильтров.",
+        "description": "English: Parse and enforce Adblock+ complex filters."
     },
     "ubiquitousParseAllABPFiltersPrompt2" : {
         "message": "{{abpFilterCount}} complex фильтров использовано.",
-        "description": "English: Parse and enforce Adblock+ complex filters (beta)."
+        "description": "English:  {{abpFilterCount}} complex filters used."
     },
     "ubiquitousParseAllABPFiltersInfo" : {
         "message": "<p>Обычно, <i>HTTP Switchboard</i> будет извлекать из <i>Adblock Plus</i>-совместимых фильтр листов <b>только</b> те фильтры, которые используются для блокировки всего домена (пример: &ldquo;<b>||a.ucoz.net^</b>&rdquo;).</p><p>Эта опция разрешает разбор и соблюдение <i>Adblock Plus</i> фильтров(пример: &ldquo;<b>/adwords-conversion-tracking.</b>&rdquo;). Эти фильтры не совместимы с матрицей, поэтому запросы блокированные этим фильтром нельзя увидеть и настроить.</p><p>Даже если эта опция включена, <i>Adblock Plus</i> фильтры используемые для <a href=\"https://adblockplus.org/en/filters#elemhide\">скрытия элементов</a> полностью игнорируется.</p><p>Включение этой опции увеличивает использование памяти.</p>",