From 95f1954c784cc178df93bb85197aef858f528e0b Mon Sep 17 00:00:00 2001 From: luccioman Date: Wed, 14 Feb 2018 07:51:07 +0100 Subject: [PATCH] Adjusted last blacklist entry example for a more accurate description As discussed in issue #160 , blacklist entries can indeed currently not be "complete" regular expressions, but must be structured as a domain part, a separator character ('/'), and a path part. --- htroot/Blacklist_p.html | 2 +- locales/de.lng | 1 - locales/fr.lng | 1 - locales/hi.lng | 1 - locales/ja.lng | 1 - locales/master.lng.xlf | 3 --- locales/ru.lng | 1 - locales/uk.lng | 1 - locales/zh.lng | 1 - 9 files changed, 1 insertion(+), 11 deletions(-) diff --git a/htroot/Blacklist_p.html b/htroot/Blacklist_p.html index 2b9e18b05..3a9275d9b 100644 --- a/htroot/Blacklist_p.html +++ b/htroot/Blacklist_p.html @@ -88,7 +88,7 @@
  • *.sub.domain.net/*
  • sub.domain.*/*
  • domain.*/*
    • -
  • a complete regular expression (slow)
    • +
  • domain and path regular expressions separated by a '/' (slow)
    • diff --git a/locales/de.lng b/locales/de.lng index 3441a6d0f..c877b2730 100644 --- a/locales/de.lng +++ b/locales/de.lng @@ -140,7 +140,6 @@ domain.net/fullpath<==domain.de/vollerpfad< *.sub.domain.net/*<==*.sub.domain.de/*< #sub.domain.*/*<==sub.domain.*/*< #domain.*/*<==domain.*/*< -a complete <==ein ganzer < (slow)==(langsam) #was removed from blacklist==wurde aus Blacklist entfernt #was added to the blacklist==wurde zur Blacklist hinzugefügt diff --git a/locales/fr.lng b/locales/fr.lng index 434c895de..84e1d9b4f 100644 --- a/locales/fr.lng +++ b/locales/fr.lng @@ -44,7 +44,6 @@ Move selected pattern(s) to==Déplacer l(es) entrée(s) sélectionnée(s) vers Add new pattern:==Ajouter une nouvelle entrée : The right '*', after the '/', can be replaced by a==Le caractère '*' à droite, après le '/', peut être remplacé par une >regular expression<==>expression régulière< -a complete <==une < (slow)==(lent) Show entries:==Afficher les entrées : Entries per page:==Entrées par page : diff --git a/locales/hi.lng b/locales/hi.lng index e7f4d89cf..245922a54 100644 --- a/locales/hi.lng +++ b/locales/hi.lng @@ -92,7 +92,6 @@ domain.net/fullpath<==डोमेन .नेट /फुल्ल्पथ < *.sub.domain.net/*<==*.सुब .डोमेन .दे /*< #sub.domain.*/*<==सुब .डोमेन .*/*< #domain.*/*<==डोमेन .*/*< -a complete regular expression (slow)==एक पूरा रेगेक्स (मगर धीरे ) #was removed from blacklist==ब्लैकलिस्ट से हटा दिया गया था #was added to the blacklist==ब्लैकलिस्ट में जोड़ा गया था Activate this list for==इस लिस्ट को सक्रिय करें diff --git a/locales/ja.lng b/locales/ja.lng index 73bbb0f39..e090dc20c 100644 --- a/locales/ja.lng +++ b/locales/ja.lng @@ -158,7 +158,6 @@ domain.net/fullpath<==domain.net/フルパス< #*.sub.domain.net/*<==*.sub.domain.net/*< #sub.domain.*/*<==sub.domain.*/*< #domain.*/*<==domain.*/*< -a complete <==完全な < (slow)==(遅い) #was removed from blacklist==はブラックリストから削除されました #was added to the blacklist==はブラックリストに追加されました diff --git a/locales/master.lng.xlf b/locales/master.lng.xlf index 517055e55..8c816ce2c 100644 --- a/locales/master.lng.xlf +++ b/locales/master.lng.xlf @@ -482,9 +482,6 @@ *.sub.domain.net/*< - - a complete < - (slow) diff --git a/locales/ru.lng b/locales/ru.lng index 1e6016eec..ae6a2aeb6 100644 --- a/locales/ru.lng +++ b/locales/ru.lng @@ -175,7 +175,6 @@ domain.net/fullpath<==domain.net/полный путь< #*.sub.domain.net/*<==*.sub.domain.net/*< #sub.domain.*/*<==sub.domain.*/*< #domain.*/*<==domain.*/*< -a complete <==полное < (slow)==(медленно) #was removed from blacklist==был удален из черного списка #was added to the blacklist==был добавлен в черный список diff --git a/locales/uk.lng b/locales/uk.lng index df68247f9..0818e7ab7 100644 --- a/locales/uk.lng +++ b/locales/uk.lng @@ -91,7 +91,6 @@ domain.net/fullpath<==domain.de/повний шлях< #*.sub.domain.net/*<==*.sub.domain.de/*< #sub.domain.*/*<==sub.domain.*/*< #domain.*/*<==domain.*/*< -a complete regular expression (slow)==повний регулярний вираз (повільний) #was removed from blacklist==було видалено з чорного списку #was added to the blacklist==було додано до чорного списку Activate this list for==Активува цей список для diff --git a/locales/zh.lng b/locales/zh.lng index e7e620e94..bd04f27aa 100644 --- a/locales/zh.lng +++ b/locales/zh.lng @@ -459,7 +459,6 @@ domain.net/fullpath<==domain.net/绝对路径< #*.sub.domain.net/*<==*.sub.domain.net/*< #sub.domain.*/*<==sub.domain.*/*< #domain.*/*<==domain.*/*< -a complete regular expression (slow)==一个完整的正则表达式 (慢) #was removed from blacklist==wurde aus Blacklist entfernt #was added to the blacklist==wurde zur Blacklist hinzugefügt Activate this list for==为以下条目激活此名单