From 6c8cec2c7fa18ed804ae192fec5325a45aba5f0b Mon Sep 17 00:00:00 2001 From: deniz Date: Sat, 14 Nov 2020 00:00:13 +0100 Subject: [PATCH 1/9] replace all occurences of "Blacklist" with "Blocklist" --- README.md | 2 +- src/_locales/af_ZA/messages.json | 6 ++--- src/_locales/ar_SA/messages.json | 6 ++--- src/_locales/bg_BG/messages.json | 4 +-- src/_locales/ca_ES/messages.json | 6 ++--- src/_locales/cs/messages.json | 4 +-- src/_locales/da_DK/messages.json | 6 ++--- src/_locales/de/messages.json | 6 ++--- src/_locales/el_GR/messages.json | 4 +-- src/_locales/en/messages.json | 6 ++--- src/_locales/es_ES/messages.json | 4 +-- src/_locales/fi_FI/messages.json | 6 ++--- src/_locales/fr/messages.json | 4 +-- src/_locales/he_IL/messages.json | 6 ++--- src/_locales/hu_HU/messages.json | 6 ++--- src/_locales/it_IT/messages.json | 4 +-- src/_locales/ja_JP/messages.json | 4 +-- src/_locales/ko_KR/messages.json | 4 +-- src/_locales/nl_NL/messages.json | 4 +-- src/_locales/no_NO/messages.json | 6 ++--- src/_locales/pl_PL/messages.json | 4 +-- src/_locales/pt_BR/messages.json | 4 +-- src/_locales/pt_PT/messages.json | 4 +-- src/_locales/ro_RO/messages.json | 4 +-- src/_locales/ru/messages.json | 4 +-- src/_locales/si_LK/messages.json | 6 ++--- src/_locales/sk_SK/messages.json | 4 +-- src/_locales/sr_SP/messages.json | 6 ++--- src/_locales/sv_SE/messages.json | 4 +-- src/_locales/th_TH/messages.json | 6 ++--- src/_locales/tr_TR/messages.json | 4 +-- src/_locales/uk_UA/messages.json | 4 +-- src/_locales/vi_VN/messages.json | 4 +-- src/_locales/zh_CN/messages.json | 4 +-- src/_locales/zh_TW/messages.json | 4 +-- src/core/content.js | 2 +- src/core/workarounds/content.bundle.js | 2 +- src/resources/json/defaults.json | 2 +- src/views/options/css/layout.css | 2 +- src/views/options/html/content/blacklist.inc | 4 +-- src/views/options/html/index.html | 6 ++--- src/views/options/js/content/blacklist.js | 26 ++++++++++---------- 42 files changed, 104 insertions(+), 104 deletions(-) diff --git a/README.md b/README.md index 906a75a76..9c3f44c24 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Gesturefy is a pure mouse gesture extension, which means it's only suited for mi - Wheel gestures (scroll wheel while holding the left, middle, or right button) - Multilingual, thanks to volunteers on [Crowdin](https://crowdin.com/project/gesturefy) - User script support - - Blacklist support + - Blocklist support **Limitations:** diff --git a/src/_locales/af_ZA/messages.json b/src/_locales/af_ZA/messages.json index 9212a5f60..76c912236 100644 --- a/src/_locales/af_ZA/messages.json +++ b/src/_locales/af_ZA/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/ar_SA/messages.json b/src/_locales/ar_SA/messages.json index 36ef07b9e..3de95088a 100644 --- a/src/_locales/ar_SA/messages.json +++ b/src/_locales/ar_SA/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/bg_BG/messages.json b/src/_locales/bg_BG/messages.json index 76e76acee..ee1658551 100644 --- a/src/_locales/bg_BG/messages.json +++ b/src/_locales/bg_BG/messages.json @@ -35,9 +35,9 @@ "message": "Екстри", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Черен списък", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Относно", diff --git a/src/_locales/ca_ES/messages.json b/src/_locales/ca_ES/messages.json index 9212a5f60..76c912236 100644 --- a/src/_locales/ca_ES/messages.json +++ b/src/_locales/ca_ES/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json index b7b787636..0ad3e8515 100644 --- a/src/_locales/cs/messages.json +++ b/src/_locales/cs/messages.json @@ -35,9 +35,9 @@ "message": "Extra", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Černá listina", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "O doplňku", diff --git a/src/_locales/da_DK/messages.json b/src/_locales/da_DK/messages.json index 69f161df7..b1a157a75 100644 --- a/src/_locales/da_DK/messages.json +++ b/src/_locales/da_DK/messages.json @@ -35,9 +35,9 @@ "message": "Ekstra", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "Om", diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index f60d1cd2c..65b7c5311 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "Über", diff --git a/src/_locales/el_GR/messages.json b/src/_locales/el_GR/messages.json index 7d333f545..ca22b691b 100644 --- a/src/_locales/el_GR/messages.json +++ b/src/_locales/el_GR/messages.json @@ -35,9 +35,9 @@ "message": "Πρόσθετες επιλογές", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Μαύρη λίστα", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Σχετικά", diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 4b147192e..fd802f4fe 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -37,9 +37,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/es_ES/messages.json b/src/_locales/es_ES/messages.json index e58d72292..1b497dc38 100644 --- a/src/_locales/es_ES/messages.json +++ b/src/_locales/es_ES/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Lista negra", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Acerca de", diff --git a/src/_locales/fi_FI/messages.json b/src/_locales/fi_FI/messages.json index 9212a5f60..76c912236 100644 --- a/src/_locales/fi_FI/messages.json +++ b/src/_locales/fi_FI/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json index a91f93f8d..42f3743d3 100644 --- a/src/_locales/fr/messages.json +++ b/src/_locales/fr/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Liste de blocage", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "À propos", diff --git a/src/_locales/he_IL/messages.json b/src/_locales/he_IL/messages.json index 9212a5f60..76c912236 100644 --- a/src/_locales/he_IL/messages.json +++ b/src/_locales/he_IL/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/hu_HU/messages.json b/src/_locales/hu_HU/messages.json index f706955ec..a564c903a 100644 --- a/src/_locales/hu_HU/messages.json +++ b/src/_locales/hu_HU/messages.json @@ -35,9 +35,9 @@ "message": "Extrák", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "Névjegy", diff --git a/src/_locales/it_IT/messages.json b/src/_locales/it_IT/messages.json index 949d3e8e1..1899cbc71 100644 --- a/src/_locales/it_IT/messages.json +++ b/src/_locales/it_IT/messages.json @@ -35,9 +35,9 @@ "message": "Extra", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Lista vietati", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Info", diff --git a/src/_locales/ja_JP/messages.json b/src/_locales/ja_JP/messages.json index 585fd5ad9..5a8b4c053 100644 --- a/src/_locales/ja_JP/messages.json +++ b/src/_locales/ja_JP/messages.json @@ -35,9 +35,9 @@ "message": "その他", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "ブラックリスト", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "情報", diff --git a/src/_locales/ko_KR/messages.json b/src/_locales/ko_KR/messages.json index 1fa240fa4..f68f1b9f7 100644 --- a/src/_locales/ko_KR/messages.json +++ b/src/_locales/ko_KR/messages.json @@ -35,9 +35,9 @@ "message": "부가 기능", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "블랙 리스트", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "정보", diff --git a/src/_locales/nl_NL/messages.json b/src/_locales/nl_NL/messages.json index 1552a99c6..aaa08d21d 100644 --- a/src/_locales/nl_NL/messages.json +++ b/src/_locales/nl_NL/messages.json @@ -35,9 +35,9 @@ "message": "Extra's", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Blokkeerlijst", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Over", diff --git a/src/_locales/no_NO/messages.json b/src/_locales/no_NO/messages.json index 9212a5f60..76c912236 100644 --- a/src/_locales/no_NO/messages.json +++ b/src/_locales/no_NO/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/pl_PL/messages.json b/src/_locales/pl_PL/messages.json index 7718479b0..b0617dfb0 100644 --- a/src/_locales/pl_PL/messages.json +++ b/src/_locales/pl_PL/messages.json @@ -35,9 +35,9 @@ "message": "Dodatki", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Czarna lista", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "O programie", diff --git a/src/_locales/pt_BR/messages.json b/src/_locales/pt_BR/messages.json index 8fb445bab..d192653b3 100644 --- a/src/_locales/pt_BR/messages.json +++ b/src/_locales/pt_BR/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Lista negra", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Sobre", diff --git a/src/_locales/pt_PT/messages.json b/src/_locales/pt_PT/messages.json index 8c699e63a..de936c3c8 100644 --- a/src/_locales/pt_PT/messages.json +++ b/src/_locales/pt_PT/messages.json @@ -35,9 +35,9 @@ "message": "Outros", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Lista negra", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Sobre", diff --git a/src/_locales/ro_RO/messages.json b/src/_locales/ro_RO/messages.json index b6496eb8a..381df83e8 100644 --- a/src/_locales/ro_RO/messages.json +++ b/src/_locales/ro_RO/messages.json @@ -35,9 +35,9 @@ "message": "Extra", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Lista neagră", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Despre", diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index 857b87f9f..c2513a1c2 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -35,9 +35,9 @@ "message": "Ещё", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Исключения", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Инфо", diff --git a/src/_locales/si_LK/messages.json b/src/_locales/si_LK/messages.json index 000ae9e1f..a278adec8 100644 --- a/src/_locales/si_LK/messages.json +++ b/src/_locales/si_LK/messages.json @@ -35,9 +35,9 @@ "message": "අමතර", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/sk_SK/messages.json b/src/_locales/sk_SK/messages.json index 122a3194c..c418c0602 100644 --- a/src/_locales/sk_SK/messages.json +++ b/src/_locales/sk_SK/messages.json @@ -35,9 +35,9 @@ "message": "Extra", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Čierna listina", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "O doplnku", diff --git a/src/_locales/sr_SP/messages.json b/src/_locales/sr_SP/messages.json index 9212a5f60..76c912236 100644 --- a/src/_locales/sr_SP/messages.json +++ b/src/_locales/sr_SP/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/sv_SE/messages.json b/src/_locales/sv_SE/messages.json index 76a4fd52d..e4cf383b4 100644 --- a/src/_locales/sv_SE/messages.json +++ b/src/_locales/sv_SE/messages.json @@ -35,9 +35,9 @@ "message": "Extra", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Uteslutningslista", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Om", diff --git a/src/_locales/th_TH/messages.json b/src/_locales/th_TH/messages.json index bfa95d75d..f8212ff0b 100644 --- a/src/_locales/th_TH/messages.json +++ b/src/_locales/th_TH/messages.json @@ -35,9 +35,9 @@ "message": "Extras", "description": "Extras" }, - "navigationBlacklist": { - "message": "Blacklist", - "description": "Blacklist" + "navigationBlocklist": { + "message": "Blocklist", + "description": "Blocklist" }, "navigationAbout": { "message": "About", diff --git a/src/_locales/tr_TR/messages.json b/src/_locales/tr_TR/messages.json index 944d74633..e53c3c59f 100644 --- a/src/_locales/tr_TR/messages.json +++ b/src/_locales/tr_TR/messages.json @@ -35,9 +35,9 @@ "message": "Ekstralar", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Engellenenler listesi", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Hakkında", diff --git a/src/_locales/uk_UA/messages.json b/src/_locales/uk_UA/messages.json index 48c76ef9b..dfaf9df9b 100644 --- a/src/_locales/uk_UA/messages.json +++ b/src/_locales/uk_UA/messages.json @@ -35,9 +35,9 @@ "message": "Додатки", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Чорний список", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Більше про це", diff --git a/src/_locales/vi_VN/messages.json b/src/_locales/vi_VN/messages.json index 96f159e8a..94ea536f4 100644 --- a/src/_locales/vi_VN/messages.json +++ b/src/_locales/vi_VN/messages.json @@ -35,9 +35,9 @@ "message": "Tính năng bổ sung", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "Danh sách đen", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "Về chúng tôi", diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index 07dc69ee9..2dc2a9d0d 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -35,9 +35,9 @@ "message": "其他", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "黑名单", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "关于", diff --git a/src/_locales/zh_TW/messages.json b/src/_locales/zh_TW/messages.json index 535bcc65a..1ee5825e4 100644 --- a/src/_locales/zh_TW/messages.json +++ b/src/_locales/zh_TW/messages.json @@ -35,9 +35,9 @@ "message": "其他", "description": "Extras" }, - "navigationBlacklist": { + "navigationBlocklist": { "message": "黑名單", - "description": "Blacklist" + "description": "Blocklist" }, "navigationAbout": { "message": "關於", diff --git a/src/core/content.js b/src/core/content.js index dfa4b7f9c..90f185475 100644 --- a/src/core/content.js +++ b/src/core/content.js @@ -262,7 +262,7 @@ function handleRockerAndWheelEvents (subject, event) { **/ function main () { // check if current url is not listed in the blacklist - if (!Config.get("Blacklist").some(matchesCurrentURL)) { + if (!Config.get("Blocklist").some(matchesCurrentURL)) { // apply all settings MouseGestureController.mouseButton = Config.get("Settings.Gesture.mouseButton"); diff --git a/src/core/workarounds/content.bundle.js b/src/core/workarounds/content.bundle.js index e9aed7dff..14400769e 100644 --- a/src/core/workarounds/content.bundle.js +++ b/src/core/workarounds/content.bundle.js @@ -2279,7 +2279,7 @@ function handleRockerAndWheelEvents (subject, event) { **/ function main () { // check if current url is not listed in the blacklist - if (!Config.get("Blacklist").some(matchesCurrentURL)) { + if (!Config.get("Blocklist").some(matchesCurrentURL)) { // apply all settings MouseGestureController.mouseButton = Config.get("Settings.Gesture.mouseButton"); diff --git a/src/resources/json/defaults.json b/src/resources/json/defaults.json index be137dd10..f870b4772 100644 --- a/src/resources/json/defaults.json +++ b/src/resources/json/defaults.json @@ -291,5 +291,5 @@ } } ], - "Blacklist": [] + "Blocklist": [] } diff --git a/src/views/options/css/layout.css b/src/views/options/css/layout.css index 1560023ca..ffa201755 100644 --- a/src/views/options/css/layout.css +++ b/src/views/options/css/layout.css @@ -1071,7 +1071,7 @@ label.button > span { /** - * Blacklist layout + * Blocklist layout **/ .bl-form { diff --git a/src/views/options/html/content/blacklist.inc b/src/views/options/html/content/blacklist.inc index e22a662f3..d8d12a190 100644 --- a/src/views/options/html/content/blacklist.inc +++ b/src/views/options/html/content/blacklist.inc @@ -1,10 +1,10 @@
-

+

- +


diff --git a/src/views/options/html/index.html b/src/views/options/html/index.html index 69b1406b5..f90d6bb1f 100644 --- a/src/views/options/html/index.html +++ b/src/views/options/html/index.html @@ -41,9 +41,9 @@