Skip to content
This repository was archived by the owner on Nov 15, 2017. It is now read-only.

Commit 8f6b369

Browse files
committed
Adblock Plus filters now supported in user-supplied rules
1 parent 00380a0 commit 8f6b369

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

_locales/de/messages.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -419,20 +419,20 @@
419419
"description": "English: Lists of blocked hosts"
420420
},
421421
"userUbiquitousBlacklistHeader" : {
422-
"message": "Your blacklisted hosts",
423-
"description": "English: Your blacklisted hosts"
422+
"message": "Your block rules",
423+
"description": "English: Your block rules"
424424
},
425425
"userUbiquitousWhitelistHeader" : {
426-
"message": "Your whitelisted hosts",
427-
"description": "English: Your whitelisted hosts"
426+
"message": "Your allow rules",
427+
"description": "English: Your allow rules"
428428
},
429429
"ubiquitousApplyChanges" : {
430430
"message": "Apply changes",
431431
"description": "English: Apply changes"
432432
},
433433
"ubiquitousFormatHint" : {
434-
"message": "One hostname per line. Lines prefixed with ‘#’ will be ignored.",
435-
"description": "English: One hostname per line. Line prefixed with ‘#’ will be ignored."
434+
"message": "One rule per line. A rule can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with ‘#’ will be ignored.",
435+
"description": "English: One rule per line. A rule can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with ‘#’ will be ignored."
436436
},
437437
"ubiquitousImport" : {
438438
"message": "Import and append",

_locales/en/messages.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,20 +415,20 @@
415415
"description": "English: Lists of blocked hosts"
416416
},
417417
"userUbiquitousBlacklistHeader" : {
418-
"message": "Your blacklisted hosts",
419-
"description": "English: Your blacklisted hosts"
418+
"message": "Your block rules",
419+
"description": "English: Your block rules"
420420
},
421421
"userUbiquitousWhitelistHeader" : {
422-
"message": "Your whitelisted hosts",
423-
"description": "English: Your whitelisted hosts"
422+
"message": "Your allow rules",
423+
"description": "English: Your allow rules"
424424
},
425425
"ubiquitousApplyChanges" : {
426426
"message": "Apply changes",
427427
"description": "English: Apply changes"
428428
},
429429
"ubiquitousFormatHint" : {
430-
"message": "One hostname per line. Lines prefixed with ‘#’ will be ignored.",
431-
"description": "English: One hostname per line. Line prefixed with ‘#’ will be ignored."
430+
"message": "One rule per line. A rule can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with ‘#’ will be ignored.",
431+
"description": "English: One rule per line. A rule can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with ‘#’ will be ignored."
432432
},
433433
"ubiquitousImport" : {
434434
"message": "Import and append",

_locales/fr/messages.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,20 +415,20 @@
415415
"description": "English: Lists of blocked hosts"
416416
},
417417
"userUbiquitousBlacklistHeader" : {
418-
"message": "Votre liste d'hôtes à bloquer",
419-
"description": "English: Your blacklisted hosts"
418+
"message": "Votre liste de règles pour bloquer",
419+
"description": "English: Your block rules"
420420
},
421421
"userUbiquitousWhitelistHeader" : {
422-
"message": "Votre liste d'hôtes à allouer",
423-
"description": "English: Your whitelisted hosts"
422+
"message": "Votre liste de règles pour allouer",
423+
"description": "English: Your allow rules"
424424
},
425425
"ubiquitousApplyChanges" : {
426426
"message": "Appliquer",
427427
"description": "English: Apply changes"
428428
},
429429
"ubiquitousFormatHint" : {
430-
"message": "Un nom d'hôte par ligne. Les lignes débutant par ‘#’ seront ignorées.",
431-
"description": "English: One hostname per line. Line prefixed with ‘#’ will be ignored."
430+
"message": "Une règle par ligne. Une règle peut être un simple nom d'hôte, ou encore un filtre respectant la syntaxe des filtres Adblock Plus. Les lignes débutant par ‘#’ seront ignorées.",
431+
"description": "English: One rule per line. A rule can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with ‘#’ will be ignored."
432432
},
433433
"ubiquitousImport" : {
434434
"message": "Importer",

0 commit comments

Comments
 (0)