Merge branch 'master' into poeditor

# Conflicts: # _locales/fr/messages.json
Updated changelog
2025-12-16 22:25:36 +07:00 · 2022-07-27 00:57:26 +02:00 · 2022-07-27 00:46:12 +02:00 · 2022-07-27 00:43:04 +02:00 · 2022-07-26 22:37:59 +00:00 · 2022-07-26 22:37:59 +00:00
22 changed files with 728 additions and 405 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
 before_script:
  - export DEBIAN_FRONTEND= noninteractive
  - apt-get update -y
-  - apt-get install -y zip unzip nodejs jsonlint
+  - apt-get install -y zip unzip nodejs jsonlint jq

 stages:
  - build
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Require Firefox >= 55
 - Require Chrome >= 37

+
+## [1.25.0] - 2022-07-27
+
+### Compatibility note
+- Require Firefox >= 55
+- Require Chrome >= 37
+
+### Changed
+- ETag filtering now generates random values and does no longer delete the header. As a result, filtering also works under Chrome-based browsers
+- ETag filtering no longer increases the counter
+- ETag filtering is now disabled by default
+- Updated rules URL href
+- Updated translations. Big update by [IHatePineapples](https://github.com/IHatePineapples)
+
+### Fixed
+- [524](https://gitlab.com/KevinRoebert/ClearUrls/-/issues/524)
+- [67](https://github.com/ClearURLs/Addon/issues/67)
+- [138](https://github.com/ClearURLs/Addon/issues/138)
+- [1177](https://gitlab.com/KevinRoebert/ClearUrls/-/issues/1177)
+- [234](https://github.com/ClearURLs/Addon/issues/234)
+- [191](https://github.com/ClearURLs/Addon/issues/191)
+
+## [1.24.1] - 2022-03-25
+
+### Compatibility note
+- Require Firefox >= 55
+- Require Chrome >= 37
+
+### Changed
+- Replaced self-written URL parser through `URL` and `URLSearchParams` from the Web API
+
+### Fixed
+- Fixed [185](https://github.com/ClearURLs/Addon/issues/185)
+- Fixed [186](https://github.com/ClearURLs/Addon/issues/186)
+
 ## [1.23.1] - 2022-03-23

 ### Compatibility note
--- a/README.md
+++ b/README.md
@@ -76,8 +76,9 @@ Please push your translation into the folder `_locales/{language code}/messages.

 * [Uroute](https://github.com/walterl/uroute) used ClearURLs to filter/clean URL before launching browser
 * [Scrub](https://gitlab.com/CrunchBangDev/cbd-cogs/-/tree/master/Scrub) used ClearURLs to filter/clean URLs as cog for the Red Discord bot
-* [Unalix](https://github.com/AmanoTeam/Unalix) a simple Python module that removes tracking fields from URLs and unshort shortened URLs
-* [Unalix-nim](https://github.com/AmanoTeam/Unalix-nim) a simple Nim library that removes tracking fields from URLs and unshort shortened URLs
+* [Unalix](https://github.com/AmanoTeam/Unalix) small, dependency-free, fast Python package for removing tracking fields from URLs
+* [Unalix-nim](https://github.com/AmanoTeam/Unalix-nim) small, dependency-free, fast Nim package and CLI tool for removing tracking fields from URLs
+* [UnalixAndroid](https://github.com/AmanoTeam/UnalixAndroid) simple Android app that removes link masking/tracking and optionally resolves shortened links

 ## Recommended by...
 *  [ghacks-user.js](https://github.com/ghacksuserjs/ghacks-user.js/wiki/4.1-Extensions)
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -20,7 +20,7 @@
        "description": "Dieser Statuscode besagt, dass beim Aktualisieren der ClearURLs-Regeln ein Fehler aufgetreten ist."
    },
    "log_redirect": {
-        "message": "Diese URL wurde weiter geleitet",
+        "message": "Diese URL wurde weitergeleitet",
        "description": "Diese Zeichenfolge wird für Umleitungen im ClearURL-Protokoll verwendet."
    },
    "log_domain_blocked": {
@@ -176,11 +176,11 @@
        "description": "Diese Zeichenfolge wird als Titel für die Schaltfläche zum Speichern und erneuten Laden auf der Einstellungsseite verwendet."
    },
    "setting_hash_url_label": {
-        "message": "Die Url zu der rules.hash Datei (Hash)",
-        "description": "Diese Zeichenfolge wird als Name für die rule.hash URL verwendet."
+        "message": "Die URL zu der rules.hash-Datei (Hash)",
+        "description": "Diese Zeichenfolge wird als Name für die rule.hash-URL verwendet."
    },
    "setting_types_label": {
-        "message": "<a href='https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/webRequest/ResourceType' target='_blank'>Request types</a> (Expertenniveau)",
+        "message": "<a href='https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/webRequest/ResourceType' target='_blank'>Anfragetypen</a> (Expertenniveau)",
        "description": "Diese Zeichenfolge wird als Name für die Typenbezeichnung verwendet."
    },
    "setting_report_server_label": {
@@ -312,11 +312,11 @@
        }
    },
    "domain_blocking_enabled": {
-        "message": "Erlaube Domain-Blocking (Kann zu Problemen auf Seiten führen, die AdBlocker nicht erlauben)",
+        "message": "Erlaube Domain-Blocking (kann zu Problemen auf Seiten führen, die AdBlocker nicht erlauben)",
        "description": "Diese Zeichenkette wird als Beschreibung für das Domain-Blocking verwendet."
    },
    "domain_blocking_enabled_title": {
-        "message": "Erlaube Domain-Blocking (Kann zu Problemen auf Seiten führen, die AdBlocker nicht erlauben)",
+        "message": "Erlaube Domain-Blocking (kann zu Problemen auf Seiten führen, die AdBlocker nicht erlauben)",
        "description": "Diese Zeichenkette wird als Titel für das Domain-Blocking verwendet."
    },
    "log_ping_blocked": {
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -1,7 +1,7 @@
 {
    "hash_status_code_1": {
        "message": "à jour",
-        "description": "Les règles ClearURLs sont parfaitement à jour."
+        "description": "Les règles ClearURLs sont à jour."
    },
    "hash_status_code_2": {
        "message": "mis à jour",
@@ -9,271 +9,271 @@
    },
    "hash_status_code_3": {
        "message": "mise à jour disponible",
-        "description": "Une mis à jour pour les règles de ClearURLs sont disponibles."
+        "description": "Une mise à jour des règles de ClearURLs est disponible."
    },
    "hash_status_code_4": {
        "message": "erreur",
-        "description": "ClearURLs n’a pas pu démarrer adéquatement pour son bon fonctionnement."
+        "description": "ClearURLs n’a pas pu démarrer correctement."
    },
    "hash_status_code_5": {
-        "message": "Quelque chose a dysfonctionné",
-        "description": "Pendant la mis à jour des règles ClearURLs un dysfonctionnement est survenue."
+        "message": "Oh non! Un problème est survenu!",
+        "description": "Un problème est survenu pendant la mis à jour des règles ClearURLs"
    },
    "log_redirect": {
        "message": "Cette URL a été redirigée",
-        "description": "Cette chaîne est utilisée pour les redirections dans le protocole ClearURL."
+        "description": "Cette ligne est pour les redirections par le protocole ClearURL."
    },
    "log_domain_blocked": {
        "message": "Ce domaine est bloqué",
-        "description": "Cette chaîne est utilisée sur les domaines bloqués dans le journal de ClearURLs."
+        "description": "Cette ligne est pour les domaines bloqués dans le journal de ClearURLs."
    },
    "check_os_log": {
        "message": "[ClearURLs]: Une base de données pour les URL a été ajoutée",
-        "description": "Cette chaîne est utilisée au démarrage du journal de ClearURL."
+        "description": "Cette ligne est utilisée au démarrage du journal de ClearURL."
    },
    "log_html_page_title": {
-        "message": "Journaux de ClearURLs",
-        "description": "Cette chaîne est utilisée comme en-tête sur la page de journal."
+        "message": "Journal d'événements de ClearURLs",
+        "description": "Cette ligne est utilisée comme en-tête sur la page de journal."
    },
    "log_html_table_head_1": {
        "message": "Avant traitement",
-        "description": "Cette chaîne est utilisée comme titre de tableau sur la page de journal."
+        "description": "Cette ligne est utilisée comme titre de tableau sur la page du journal."
    },
    "log_html_table_head_2": {
-        "message": "Après traitement. ",
-        "description": "Cette chaîne est utilisée comme titre de tableau sur la page de journal."
+        "message": "Après traitement",
+        "description": "Cette ligne est utilisée comme titre de tableau sur la page du journal."
    },
    "log_html_table_head_3": {
        "message": "Règle",
-        "description": "Cette chaîne est utilisée comme titre de tableau sur la page de journal."
+        "description": "Cette ligne est utilisée comme titre de tableau sur la page du journal."
    },
    "log_html_table_head_4": {
-        "message": "Temps",
-        "description": "Cette chaîne est utilisée comme titre de tableau sur la page de journal."
+        "message": "Date",
+        "description": "Cette ligne est utilisée comme titre de tableau sur la page du journal."
    },
    "log_html_reset_button": {
        "message": "Remise à zéro",
-        "description": "Cette chaîne est utilisée comme titre de tableau sur la page de journal."
+        "description": "Cette ligne est utilisée comme titre de tableau sur la page du journal."
    },
    "log_html_reset_button_title": {
-        "message": "Réinitialiser les journaux globaux",
-        "description": "Cette chaîne est utilisée comme titre pour le bouton de réinitialisation sur la page de journal."
+        "message": "Réinitialiser entièrement le journal",
+        "description": "Cette ligne est utilisée comme titre pour le bouton de réinitialisation sur la page de journal."
    },
    "popup_html_configs_head": {
-        "message": "Paramétrages",
-        "description": "Cette chaîne est utilisée comme titre pour les paramétrages sur la page qui affiche les options."
+        "message": "Paramétres",
+        "description": "Cette ligne est utilisée comme titre pour les paramétres de la page des options."
    },
    "popup_html_configs_switch_filter": {
        "message": "Filtre",
-        "description": "Cette chaîne est utilisée comme nom pour le bouton de changement de filtre sur la page qui affiche les options."
+        "description": "Cette ligne est utilisée comme nom pour le bouton de changement de filtre de la page des options."
    },
    "popup_html_configs_switch_filter_title": {
-        "message": "Le commutateur de l'extension active ou désactive la fonction de nettoyage de ClearURLs",
-        "description": "Cette chaîne est utilisée comme titre pour le bouton de changement de filtre sur la page qui affiche les options."
+        "message": "L'interrupteur de l'extension active ou désactive la fonction de nettoyage de ClearURLs",
+        "description": "Cette ligne est utilisée comme titre pour le bouton de changement de filtre sur la page des options."
    },
    "popup_html_configs_switch_log": {
        "message": "Journalisation",
-        "description": "Cette chaîne est utilisée comme nom pour le bouton du commutateur de journalisation sur la page qui affiche les options."
+        "description": "Cette ligne est utilisée comme nom pour le bouton du interrupteur de journalisation d'evenements sur la page des options."
    },
    "popup_html_configs_switch_log_title": {
-        "message": "Les journaux sont enregistrés localement. Si vous n’avez pas besoin de les consulter, nous déconseillons de les activer",
-        "description": "Cette chaîne est utilisée comme titre pour le bouton du commutateur de journalisation sur la page qui affiche les options."
+        "message": "Le journal est sauvé localement. Si vous n’avez pas besoin de le consulter, nous vous déconseillons de l'activer.",
+        "description": "Cette ligne est utilisée comme titre pour le bouton du interrupteur de journalisation sur la page des options."
    },
    "popup_html_configs_switch_badges": {
        "message": "Compteur",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_configs_switch_badges_title": {
        "message": "Afficher le nombre d'URL nettoyées",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_statistics_head": {
        "message": "Statistiques",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_statistics_elements": {
        "message": "Éléments",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la  de la fonction sur la page des options."
    },
    "popup_html_statistics_blocked": {
        "message": "Nb. de bloqués",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_statistics_percentage": {
        "message": "Pourcentage",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_statistics_reset_button": {
        "message": "Remettre à zéro",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_statistics_reset_button_title": {
        "message": "Remettre à zéro les statistiques globales",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_rules_status_head": {
        "message": "Règles de la base de données",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_log_head": {
-        "message": "Journaux",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "Journal",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_log_head_title": {
-        "message": "Ouvrir les journaux",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "Consulter le journal",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "popup_html_report_button": {
        "message": "Signaler cette URL",
        "description": "Annotation : actuellement non utilisé."
    },
    "popup_html_report_button_title": {
-        "message": "Signaler un dysfonctionnement sur cette URL",
+        "message": "Signaler un problème sur cette URL",
        "description": "actuellement non utilisé."
    },
    "core_save_on_disk": {
        "message": "[ClearURLs]: Sauvegarder sur le disque.",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "core_error": {
-        "message": "[ClearURLs]: L’extension n’a pu être démarrée.",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "[ClearURLs]: L’extension n’a pas pu démarrer.",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "configs_switch_statistics": {
        "message": "Statistiques",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "configs_switch_statistics_title": {
        "message": "Activer ou désactiver les statistiques",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la descriptio de la fonction sur la page des options."
    },
    "settings_html_page_title": {
        "message": "Paramétrages de ClearURLs",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "badged_color_label": {
        "message": "Couleur du compteur",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_html_reset_button": {
        "message": "Remettre à l’état initial",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_html_reset_button_title": {
        "message": "Réinitialisation de tous les paramètres",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_rule_url_label": {
        "message": "L'URL du fichier data.json (règles)",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "settings_html_save_button": {
        "message": "Sauvegarder et redémarrer l’extension",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "settings_html_save_button_title": {
-        "message": "Sauvegarde les paramétrages",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "Sauvegarde les paramétres",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_hash_url_label": {
        "message": "L'URL du fichier rules.hash (signature de contrôle)",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_types_label": {
        "message": "<a href='https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/webRequest/ResourceType' target='_blank'>Types de requête (webRequest)</a> (niveau expert)",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_report_server_label": {
        "message": "Serveur pour signaler des URL",
-        "description": "Annotation : actuellement non utilisé."
+        "description": "Note : actuellement non utilisé."
    },
    "success_report_url": {
        "message": "Nous avons reçu votre signalement. Nous allons vérifier cette URL.",
-        "description": "Annotation : actuellement non utilisé."
+        "description": "Note : actuellement non utilisé."
    },
    "error_report_url": {
-        "message": "Il semble que cette URL a déjà été signalée.",
-        "description": "Annotation : actuellement non utilisé."
+        "message": "Il semble que cette URL a déjà été signalé.",
+        "description": "Note : actuellement non utilisé."
    },
    "donate_button": {
-        "message": "Subventionner le créateur de ClearURLs.",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "Soutenir le créateur de ClearURLs.",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "clipboard_copy_link": {
-        "message": "Copier l’URL sans le traqueur",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "Copier l’URL sans les traqueurs",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "context_menu_enabled": {
        "message": "Activer ClearUrls dans le menu contextuel (le clic droit sur une page)",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "history_listener_enabled": {
        "message": "Empêcher les sites d’aller fouiner dans l'historique. (<a href='https://developer.mozilla.org/fr/docs/Web/Guide/DOM/Manipuler_historique_du_navigateur' target='_blank'>La méthode utilisée est replaceState()</a>)",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "cleaning_tool_page_title": {
        "message": "Outil de nettoyage pour ClearURLs",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "cleaning_tool_description": {
        "message": "Ici, vous pouvez déposer des URL et ClearURLs les nettoiera par un clic sur le bouton vert. Vous pouvez mettre plusieurs URL mais chaque URL devra être mise sur une ligne séparée.",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "cleaning_tool_btn": {
        "message": "Nettoyer les URL",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "cleaning_tool_dirty_urls_label": {
        "message": "Coller ici les URL à nettoyer :",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "cleaning_tool_clean_urls_label": {
        "message": "Vous trouverez ici les URL nettoyées :",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "local_hosts_skipping": {
-        "message": "Ignorer les IP sur les hôtes locaux, Box, routeur, serveur, etc. (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 100.64.0.0/10, 169.254.0.0/16, 127.0.0.1, localhost)",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "Ignorer les IP des hôtes locaux, Box, routeurs, serveurs, etc. (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 100.64.0.0/10, 169.254.0.0/16, 127.0.0.1, localhost)",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "local_hosts_skipping_title": {
        "message": "Ignorer les IP ou URL sur les hôtes locaux, Box, routeur, serveur ...",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "log_html_export_button": {
        "message": "Exporter",
-        "description": "Cette chaîne est utilisée pour le bouton d'exportation sur la page du journal."
+        "description": "Cette ligne est utilisée pour le bouton d'exportation sur la page du journal."
    },
    "log_html_export_button_title": {
        "message": "Exporter le journal",
-        "description": "Cette chaîne est utilisée comme titre pour le bouton d'exportation de la page du journal."
+        "description": "Cette ligne est utilisée comme titre pour le bouton d'exportation de la page du journal."
    },
    "log_html_import_button": {
        "message": "Importer",
-        "description": "Cette chaîne est utilisée pour le bouton d'importation sur la page de journal."
+        "description": "Cette ligne est utilisée pour le bouton d'importation sur la page de journal."
    },
    "log_html_import_button_title": {
        "message": "Importer le journal",
-        "description": "Cette chaîne est utilisée comme titre pour le bouton d'importation sur la page de journal."
+        "description": "Cette ligne est utilisée comme titre pour le bouton d'importation sur la page de journal."
    },
    "setting_html_export_button": {
        "message": "Exporter",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_html_export_button_title": {
        "message": "Tout exporter",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_html_import_button": {
        "message": "Importer",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_html_import_button_title": {
        "message": "Tout importer",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "setting_log_limit_label": {
        "message": "Nombre d’éléments à enregistrer dans le journal, $LIMIT$ de -1 à l’infini",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options.",
+        "description": "Sert à afficher la description de la fonction sur la page des options.",
        "placeholders": {
            "limit": {
                "content": "$1",
@@ -283,27 +283,27 @@
    },
    "blocked_html_title": {
        "message": "Site Internet bloqué par <b>ClearURLs</b>",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "blocked_html_body": {
-        "message": "Ce site Internet a été bloqué par l’extension <b>ClearURLs</b> ; il est identifié comme étant problématique, soit publicitaire, soit d’espionnage ; vous pouvez désactiver temporairement le blocage du site dans les paramétrages, soit l’extension, afin de vous y connecter. Il vous faudra recharger la page, soit par le navigateur, soit avec le bouton ci-dessous.",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "Ce site Internet a été bloqué par l’extension <b>ClearURLs</b> ; il est identifié comme étant problématique, soit publicitaire, soit d’espionnage ; vous pouvez désactiver temporairement le blocage du site soit dans les paramétres, soit dans l’extension afin de vous y connecter. Il vous faudra raffraichir la page, soit par le navigateur, soit avec le bouton ci-dessous.",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "blocked_html_button": {
        "message": "Se connecter",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "referral_marketing_enabled": {
        "message": "Permettre certaines actions commerciales",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "referral_marketing_enabled_title": {
        "message": "Permettre certaines actions commerciales",
-        "description": "Sert à afficher la signification de la fonction sur la switch"
+        "description": "Sert à afficher la description de la fonction sur la switch."
    },
    "watchdog": {
        "message": "[ClearURLs]: Watchdog, très petit programme qui surveille les attaques de la mémoire vive, a détecté $TIMES$ problème(s)",
-        "description": "Utilisé pour un texte explicatif du Watchdog",
+        "description": "Utilisé pour la description du Watchdog.",
        "placeholders": {
            "times": {
                "content": "$1",
@@ -312,39 +312,67 @@
        }
    },
    "domain_blocking_enabled": {
-        "message": "Bloquer les atteintes à la vie privée. Cependant, des sites décèlent la technique de protection et dysfonctionnent délibérément ou affichent des avertissements",
-        "description": "Sert à afficher la signification de la fonction sur la page qui affiche les options."
+        "message": "Bloquer les atteintes à la vie privée. Cependant, des sites peuvent detecter cette technique et refuser de marcher délibérément voire même afficher des avertissements",
+        "description": "Sert à afficher la description de la fonction sur la page des options."
    },
    "domain_blocking_enabled_title": {
-        "message": "Autoriser le blocage de domaine (ex : example.com) ; peut poser des problèmes d'affichage sur des sites refusant les bloqueurs de contenu",
-        "description": "Cette chaîne est utilisée comme titre pour le commutateur de blocage de domaine"
+        "message": "Autoriser le blocage par domaine (ex : example.com) ; peut poser des problèmes d'affichage sur des sites refusant les bloqueurs de contenu",
+        "description": "Cette ligne est utilisée comme titre pour le bouton de blocage de domaine."
    },
    "log_ping_blocked": {
-        "message": "Bloquer l’espionnage des clics souris sur les liens hypertextes",
-        "description": "Cette chaîne est utilisée pour de l'audit (espionnage) des liens hypertextes dans le journal ClearURLs."
+        "message": "Bloquer l'audit des clics souris sur les liens hypertextes",
+        "description": "Cette ligne est utilisée pour de l'audit (espionnage) des liens hypertextes dans le journal ClearURLs."
    },
    "ping_blocking_enabled": {
-        "message": "Bloquer l’espionnage des clics souris sur les liens hypertextes (voyez <a href='https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing' target='_blank'>cet article en anglais</a>)",
-        "description": "Utilisé pour le bouton activer/désactiver l'audit (espionnages) des liens hypertextes"
+        "message": "Bloquer l'audit des clics souris sur les liens hypertextes (voyez <a href='https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing' target='_blank'>cet article en anglais</a>)",
+        "description": "Utilisé pour le bouton activer/désactiver l'audit (espionnages) des liens hypertextes."
    },
    "ping_blocking_enabled_title": {
-        "message": "Bloquer l’espionnage auditing",
-        "description": "Utilisé comme titre pour le bouton, commutateur, de l’audit des liens hypertextes"
+        "message": "Bloquer l’espionnage par audit",
+        "description": "Utilisé comme titre pour le bouton de l’audit des liens hypertextes."
    },
    "extension_description": {
-        "message": "Retirer les espions dans les adresses Internet.",
-        "description": "Description des fonctions ; utilisez au maximum 132 caractères."
+        "message": "Retirer les traqueurs dans les adresses Internet.",
+        "description": "Description des fonctions ; utilisez maximum 132 caractères."
    },
    "eTag_filtering_log": {
        "message": "L’identification ETag a été supprimée",
-        "description": "Utilisé pour le journal de ClearUrls et indiquer ce qui a été nettoyé"
+        "description": "Utilisé par le journal de ClearUrls et indiquer ce qui a été nettoyé"
    },
    "eTag_filtering_enabled": {
-        "message": "Filtrer ETag ; les sites mettent dans le cache du Navigateur, ou Système d’Exploitation, un identifiant pour vous pister",
-        "description": "Titre pour le bouton de filtrage ETag"
+        "message": "Filtrer ETag ; les sites mettent dans le cache du Navigateur, ou Système d’Exploitation, un identifiant pour vous espionner",
+        "description": "Titre par le bouton de filtrage ETag"
    },
    "eTag_filtering_enabled_title": {
-        "message": "Filtre les identifications ETag, mais pour la première utilisation, veuillez vider le cache",
-        "description": "Titre pour le bouton de filtrage ETag"
+        "message": "Filtre les identifications ETag, vous devez vider le cache lors de la premiere utilisation",
+        "description": "Titre par le bouton de filtrage ETag"
+    },
+    "popup_html_rules_status_head_title": {
+        "message": " ",
+        "description": "pas nécessaire, seulement pour éviter les exceptions"
+    },
+    "popup_html_statistics_percentage_title": {
+        "message": " ",
+        "description": "pas nécessaire, seulement pour éviter les exceptions"
+    },
+    "popup_html_statistics_blocked_title": {
+        "message": " ",
+        "description": "pas nécessaire, seulement pour éviter les exceptions"
+    },
+    "popup_html_statistics_elements_title": {
+        "message": " ",
+        "description": "pas nécessaire, seulement pour éviter les exceptions"
+    },
+    "popup_html_statistics_head_title": {
+        "message": " ",
+        "description": "pas nécessaire, seulement pour éviter les exceptions"
+    },
+    "popup_html_configs_head_title": {
+        "message": " ",
+        "description": "pas nécessaire, seulement pour éviter les exceptions"
+    },
+    "context_menu_enabled_title": {
+        "message": " ",
+        "description": "pas nécessaire, seulement pour éviter les exceptions"
    }
-}
+}
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -1,38 +1,38 @@
 {
    "hash_status_code_1": {
-        "message": "atualizado",
+        "message": "Atualizadas",
        "description": "This status code says, that no update is available for the ClearURLs rules and everything is up to date."
    },
    "hash_status_code_2": {
-        "message": "atualizado",
+        "message": "Atualizadas",
        "description": "This status code says, that the ClearURLs rules are successfully updated."
    },
    "hash_status_code_3": {
-        "message": "atualização disponível",
-        "description": "Este código de status diz que uma atualização está disponível para as regras ClearURLs."
+        "message": "Atualização disponível",
+        "description": "This status code says, that an update is available for the ClearURLs rules."
    },
    "hash_status_code_4": {
-        "message": "erro",
-        "description": "Este código de estado diz que ClearURLs não pôde ser iniciado corretamente."
+        "message": "Erro",
+        "description": "This status code says, that the ClearURLs could not be started correctly."
    },
    "hash_status_code_5": {
-        "message": "Oops, algo deu errado!",
-        "description": "Este código de estado diz que ocorreu um erro ao atualizar as regras da ClearURLs."
+        "message": "Ops! Algo deu errado.",
+        "description": "This status code says, that an error occurred while updating the ClearURLs rules."
    },
    "log_redirect": {
-        "message": "Esta URL foi redirecionada",
+        "message": "URL redirecionado",
        "description": "This string is used on redirections in the ClearURLs log."
    },
    "log_domain_blocked": {
-        "message": "Este domínio foi bloqueado",
-        "description": "Esta string é usada em redirecionamentos no log ClearURLs. "
+        "message": "Domínio bloqueado",
+        "description": "This string is used on blocked domains in the ClearURLs log."
    },
    "check_os_log": {
-        "message": "[ClearURLs]: Examinador de registro (log) foi adicionado.",
+        "message": "[ClearURLs]: auditor de registros implementado.",
        "description": "This string is used on ClearURLs log startup."
    },
    "log_html_page_title": {
-        "message": "Registro (log) do ClearURLs",
+        "message": "Registros do ClearURLs",
        "description": "This string is used as header on the log page."
    },
    "log_html_table_head_1": {
@@ -52,11 +52,11 @@
        "description": "This string is used as table title on the log page."
    },
    "log_html_reset_button": {
-        "message": "Resetar",
+        "message": "Redefinir",
        "description": "This string is used for the reset button on the log page."
    },
    "log_html_reset_button_title": {
-        "message": "Resetar o registro global",
+        "message": "Redefinir o registro global",
        "description": "This string is used as title for the reset button on the log page."
    },
    "popup_html_configs_head": {
@@ -64,11 +64,11 @@
        "description": "This string is used as title for the configs on the popup page."
    },
    "popup_html_configs_switch_filter": {
-        "message": "Filtrar",
+        "message": "Filtro",
        "description": "This string is used as name for the filter switch button on the popup page."
    },
    "popup_html_configs_switch_filter_title": {
-        "message": "O switch de filtros ativa a funcionalidade de limpeza do ClearURLs. Se você desabilitar essa opção, toda a extensão será desativada",
+        "message": "O interruptor de filtros ativa a funcionalidade de limpeza do ClearURLs. Se essa opção for desativada, a extensão não funcionará.",
        "description": "This string is used as title for the filter switch button on the popup page."
    },
    "popup_html_configs_switch_log": {
@@ -76,7 +76,7 @@
        "description": "This string is used as name for the logging switch button on the popup page."
    },
    "popup_html_configs_switch_log_title": {
-        "message": "O registro (log) é salvo apenas localmente. Não recomendamos esse recurso se você não precisa dele",
+        "message": "O registro é salvo apenas localmente. Recomendamos desativá-lo caso não precise dele.",
        "description": "This string is used as title for the logging switch button on the popup page."
    },
    "popup_html_configs_switch_badges": {
@@ -84,7 +84,7 @@
        "description": "This string is used as name for the badges switch button on the popup page."
    },
    "popup_html_configs_switch_badges_title": {
-        "message": "Mostrar o número de URLs limpas",
+        "message": "Exibir a quantidade de URLs que foram limpos.",
        "description": "This string is used as title for the badges switch button on the popup page."
    },
    "popup_html_statistics_head": {
@@ -104,11 +104,11 @@
        "description": "This string is used as name for the percentage of blocked elements on the popup page."
    },
    "popup_html_statistics_reset_button": {
-        "message": "Resetar",
+        "message": "Redefinir",
        "description": "This string is used as name for the statistics reset button on the popup page."
    },
    "popup_html_statistics_reset_button_title": {
-        "message": "Resetar as estatísticas globais",
+        "message": "Redefinir as estatísticas globais",
        "description": "This string is used as title for the statistics reset button on the popup page."
    },
    "popup_html_rules_status_head": {
@@ -120,23 +120,23 @@
        "description": "This string is used as name for the log button on the popup page."
    },
    "popup_html_log_head_title": {
-        "message": "Abrir o registro (log)",
+        "message": "Abrir o registro",
        "description": "This string is used as title for the log button on the popup page."
    },
    "popup_html_report_button": {
-        "message": "Reportar URL atual",
+        "message": "Denunciar URL atual",
        "description": "Note: Currently not used."
    },
    "popup_html_report_button_title": {
-        "message": "Reportar a URL atual desta aba.",
+        "message": "Denunciar o URL atual desta aba.",
        "description": "Currently not used."
    },
    "core_save_on_disk": {
-        "message": "[ClearURLs]: Salvar no disco.",
+        "message": "[ClearURLs]: salvar no disco.",
        "description": "This string is used to tell the user, that ClearURLs saved the settings on disk."
    },
    "core_error": {
-        "message": "[ClearURLs]: A extensão não pôde ser inicializada.",
+        "message": "[ClearURLs]: a extensão não pôde ser inicializada.",
        "description": "This string is used to tell the user, that ClearURLs could not be started."
    },
    "configs_switch_statistics": {
@@ -144,7 +144,7 @@
        "description": "This string is used as name for the statistics switch button on the popup page."
    },
    "configs_switch_statistics_title": {
-        "message": "Ativar ou desativar função de estatísticas",
+        "message": "Ativar ou desativar a função de estatísticas.",
        "description": "This string is used as title for the statistics switch button on the popup page."
    },
    "settings_html_page_title": {
@@ -156,23 +156,23 @@
        "description": "This string is used as name for the badged color label."
    },
    "setting_html_reset_button": {
-        "message": "Resetar",
+        "message": "Redefinir",
        "description": "This string is used as name for the reset button on the settings page."
    },
    "setting_html_reset_button_title": {
-        "message": "Resetar tudo",
+        "message": "Redefinir tudo",
        "description": "This string is used as title for the reset button on the settings page."
    },
    "setting_rule_url_label": {
        "message": "URL do arquivo data.json (regras)",
-        "description": "Esta string é usada como nome para o rótulo da URL de regra."
+        "description": "This string is used as name for the rule url label."
    },
    "settings_html_save_button": {
        "message": "Salvar e recarregar extensão",
        "description": "This string is used as name for the save&reload button on the settings page."
    },
    "settings_html_save_button_title": {
-        "message": "Salva as configurações",
+        "message": "Salvar as configurações",
        "description": "This string is used as title for the save&reload button on the settings page."
    },
    "setting_hash_url_label": {
@@ -180,35 +180,35 @@
        "description": "This string is used as name for the rule.hash url label."
    },
    "setting_types_label": {
-        "message": "<a href='https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/webRequest/ResourceType' target='_blank'>Tipos de pedidos</a> (nível expert)",
+        "message": "<a href='https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/webRequest/ResourceType' target='_blank'>Tipos de solicitações</a> (nível expert) — em inglês",
        "description": "This string is used as name for the types label."
    },
    "setting_report_server_label": {
-        "message": "Reportar servidor para URLs",
+        "message": "Denunciar URLs deste servidor",
        "description": "Note: Currently not used."
    },
    "success_report_url": {
-        "message": "A URL foi reportada com sucesso. Verificaremos essa URL em breve.",
-        "description": "Nota: Atualmente não usado."
+        "message": "O URL foi denunciado com sucesso. Verificaremos em breve.",
+        "description": "Note: Currently not used."
    },
    "error_report_url": {
-        "message": "Parece que essa URL ja foi reportada.",
-        "description": "Nota: Atualmente não usado."
+        "message": "Parece que este URL já foi denunciado.",
+        "description": "Note: Currently not used."
    },
    "donate_button": {
        "message": "Uma doação para o criador do ClearURLs.",
        "description": "This string is used to refer to a donation page."
    },
    "clipboard_copy_link": {
-        "message": "Copiar local do link limpo",
+        "message": "Copiar endereço limpo do link",
        "description": "This string is used in the context menu to copy clean links."
    },
    "context_menu_enabled": {
-        "message": "Mostrar entrada do menu de contexto",
+        "message": "Exibir entrada no menu contextual",
        "description": "This string is used toggle the context menu entry to copy clean links."
    },
    "history_listener_enabled": {
-        "message": "Impedir a injeção de rastreamento sobre a API de histórico (vide: <a href='https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method' target='_blank'>Método replaceState()</a>)",
+        "message": "Impedir a injeção de rastreamento sobre a API de histórico (veja também: <a href='https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method' target='_blank'>O método replaceState()</a> — em inglês)",
        "description": "This string is used as name for the history API listener label."
    },
    "cleaning_tool_page_title": {
@@ -216,7 +216,7 @@
        "description": "This string is used as title on the cleaning tool page."
    },
    "cleaning_tool_description": {
-        "message": "Com esta ferramenta, você pode colar URLs e ClearURLs as limpará após um clique no botão verde. Você pode colar várias URLs de uma só vez, mas cada URL deve estar em uma linha separada.",
+        "message": "Com esta ferramenta, você pode colar URLs e o ClearURLs limpá-los-á após clicar no botão verde. É possível colar múltiplos URLs de uma só vez, mas cada URL deve estar em uma linha separada.",
        "description": "This string is used as description of the cleaning tool."
    },
    "cleaning_tool_btn": {
@@ -224,56 +224,56 @@
        "description": "This string is used as name for the clean url button."
    },
    "cleaning_tool_dirty_urls_label": {
-        "message": "Aqui você pode colar as URLs que deseja limpar:",
+        "message": "Cole aqui os URLs para limpeza:",
        "description": "This string is used as title on the cleaning tool page for the dirty URLs."
    },
    "cleaning_tool_clean_urls_label": {
-        "message": "Aqui você pode encontrar as URLs limpas:",
+        "message": "URLs limpos:",
        "description": "This string is used as title on the cleaning tool page for the clean URLs."
    },
    "local_hosts_skipping": {
-        "message": "Pular URLs em hosts locais (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 100.64.0.0/10, 169.254.0.0/16, 127.0.0.1, localhost)",
-        "description": "Esta string é usada como rótulo para o switch de salto do host local"
+        "message": "Ignorar URLs em hosts locais (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 100.64.0.0/10, 169.254.0.0/16, 127.0.0.1, localhost)",
+        "description": "This string is used as label for the local host skipping switch"
    },
    "local_hosts_skipping_title": {
-        "message": "Pula URLs em hosts locais",
-        "description": "Esta string é usada como título para o switch de salto do host local"
+        "message": "Ignorar URLs em hosts locais",
+        "description": "This string is used as title for the local host skipping switch"
    },
    "log_html_export_button": {
        "message": "Exportar",
-        "description": "Essa string é usada para o botão de exportação na página de log."
+        "description": "This string is used for the export button on the log page."
    },
    "log_html_export_button_title": {
-        "message": "Exporta o log global",
-        "description": "Essa string é usada como título para o botão de exportação na página de log."
+        "message": "Exportar o registro global",
+        "description": "This string is used as title for the export button on the log page."
    },
    "log_html_import_button": {
        "message": "Importar",
-        "description": "Essa string é usada para o botão de importação na página de log."
+        "description": "This string is used for the import button on the log page."
    },
    "log_html_import_button_title": {
        "message": "Importar o registro global",
-        "description": "Esta string é usada como título para o botão de importação na página de log."
+        "description": "This string is used as title for the import button on the log page."
    },
    "setting_html_export_button": {
        "message": "Exportar",
-        "description": "Essa string é usada como nome para o botão de exportação na página de configurações."
+        "description": "This string is used as name for the export button on the settings page."
    },
    "setting_html_export_button_title": {
-        "message": "Exporta tudo",
-        "description": "Esta string é usada como título para o botão de exportação na página de configurações."
+        "message": "Exportar tudo",
+        "description": "This string is used as title for the export button on the settings page."
    },
    "setting_html_import_button": {
        "message": "Importar",
-        "description": "Esta string é usada como nome para o botão de reset na página de configurações."
+        "description": "This string is used as name for the reset button on the settings page."
    },
    "setting_html_import_button_title": {
-        "message": "Importa tudo",
-        "description": "Esta string é usada como título para o botão de importação na página de configurações."
+        "message": "Importar tudo",
+        "description": "This string is used as title for the import button on the settings page."
    },
    "setting_log_limit_label": {
-        "message": "Limitar o registro (log) a $LIMIT$ itens.",
-        "description": "Essa string é usada como nome para o rótulo de limite de log.",
+        "message": "Limitar o registro a $LIMIT$ item(ns).",
+        "description": "This string is used as name for the log limit label.",
        "placeholders": {
            "limit": {
                "content": "$1",
@@ -282,28 +282,28 @@
        }
    },
    "blocked_html_title": {
-        "message": "Este site foi bloqueado por <b>ClearURLs</b>",
-        "description": "Essa string é usada como título na página do site bloqueada."
+        "message": "Este site foi bloqueado pelo <b>ClearURLs</b>",
+        "description": "This string is used as title on the blocked site page."
    },
    "blocked_html_body": {
-        "message": "Este site foi bloqueado pela extensão <b>ClearURLs</b> porque o identificamos como um serviço de publicidade ou rastreamento. Para visitar este site, você deve desativar temporariamente a extensão ou desabilitar o bloqueio de domínio nas configurações de ClearURLs. Depois disso, você pode clicar no botão abaixo para carregar a página.",
-        "description": "Essa string é usada como corpo na página do site bloqueado."
+        "message": "Este site foi bloqueado pela extensão <b>ClearURLs</b>, pois é considerado como um serviço de anúncios e/ou rastreamento. Para acessá-lo, será necessário desativar temporariamente a extensão ou desativar o bloqueio de domínios nas configurações do ClearURLs. Após isso, clique no botão abaixo para carregar a página.",
+        "description": "This string is used as body on the blocked site page."
    },
    "blocked_html_button": {
-        "message": "Visitar a página",
-        "description": "Essa string é usada como botão na página do site bloqueado."
+        "message": "Acessar página",
+        "description": "This string is used as button on the blocked site page."
    },
    "referral_marketing_enabled": {
        "message": "Permitir marketing de referência (\"referral\")",
-        "description": "Essa string é usada como rótulo para a opção de marketing de referência"
+        "description": "This string is used as label for the referral marketing switch"
    },
    "referral_marketing_enabled_title": {
-        "message": "Permite marketing de referência (\"referral\")",
-        "description": "Esta string é usada como título para a opção de marketing de referência"
+        "message": "Permitir marketing de referência (\"referral\")",
+        "description": "This string is used as title for the referral marketing switch"
    },
    "watchdog": {
-        "message": "[ClearURLs]: O watchdog detectou um problema e já falhou $TIMES$ vezes.",
-        "description": "Esta string é usada como texto para o watchdog",
+        "message": "[ClearURLs]: a vigilância encontrou um problema e já falhou $TIMES$ vez(es).",
+        "description": "This string is used as text for the watchdog",
        "placeholders": {
            "times": {
                "content": "$1",
@@ -312,67 +312,67 @@
        }
    },
    "domain_blocking_enabled": {
-        "message": "Permitir bloqueio de domínio (pode causar problemas em páginas que não permitem AdBlockers)",
-        "description": "Esta string é usada como rótulo para o switch de bloqueio de domínio"
+        "message": "Permitir bloqueio de domínios (pode causar problemas em páginas que não permitem bloqueadores de anúncios)",
+        "description": "This string is used as label for the domain blocking switch"
    },
    "domain_blocking_enabled_title": {
-        "message": "Permitir bloqueio de domínio (pode causar problemas em páginas que não permitem AdBlockers)",
-        "description": "Esta string é usada como título para a chave de bloqueio de domínio"
+        "message": "Permitir bloqueio de domínios (pode causar problemas em páginas que não permitem bloqueadores de anúncios)",
+        "description": "This string is used as title for the domain blocking switch"
    },
    "log_ping_blocked": {
-        "message": "Esta auditoria de hiperlink foi bloqueada",
-        "description": "Essa string é usada na auditoria de hiperlink no log ClearURLs."
+        "message": "Auditoria de hyperlink bloqueada",
+        "description": "This string is used on hyperlink auditing in the ClearURLs log."
    },
    "ping_blocking_enabled": {
-        "message": "Bloquear auditoria de hiperlink (vide <a href='https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing' target='_blank'>artigo sobre \"Hyperlink auditing\"</a>)",
-        "description": "Esta string é usada como rótulo para o switch de bloqueio de auditoria de hiperlink"
+        "message": "Bloquear auditoria de hyperlink (mais informações <a href='https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing' target='_blank'>aqui</a> — em inglês)",
+        "description": "This string is used as label for the hyperlink auditing blocking switch"
    },
    "ping_blocking_enabled_title": {
        "message": "Bloquear auditoria de hiperlink",
-        "description": "Esta string é usada como título para a chave de bloqueio de auditoria de hiperlink"
+        "description": "This string is used as title for the hyperlink auditing blocking switch"
    },
    "extension_description": {
-        "message": "Remover os elementos de rastreamento de URLs. ",
-        "description": "Descrição da extensão (máx. 132 caracteres)"
+        "message": "Remova elementos de rastreamento de URLs.",
+        "description": "Extension description (max. 132 characters)"
    },
    "eTag_filtering_log": {
-        "message": "O cabeçalho ETag foi removido deste pedido",
-        "description": "Essa string é usada na filtragem de cabeçalho ETag no log ClearURLs."
+        "message": "Cabeçalho ETag removido",
+        "description": "This string is used on ETag header filtering in the ClearURLs log."
    },
    "eTag_filtering_enabled": {
-        "message": "Filtra cabeçalhos ETag de pedidos (vide <a href='https://en.wikipedia.org/wiki/HTTP_ETag#Tracking_using_ETags' target='_blank'>artigo sobre \"HTTP ETag\"</a>)",
-        "description": "Esta string é usada como rótulo para a opção de filtragem de cabeçalho ETag"
+        "message": "Filtrar cabeçalhos ETag de solicitações (mais informações <a href='https://en.wikipedia.org/wiki/HTTP_ETag#Tracking_using_ETags' target='_blank'>aqui</a> — em inglês)",
+        "description": "This string is used as label for the ETag header filtering switch"
    },
    "eTag_filtering_enabled_title": {
-        "message": "Filtra cabeçalhos ETag de pedidos. Dica: o cache deve ser limpo antes do primeiro uso.",
-        "description": "Esta string é usada como título para a opção de filtragem de cabeçalho ETag"
+        "message": "Filtrar cabeçalhos ETag. Dica: o cache deve ser limpo antes do primeiro uso.",
+        "description": "This string is used as title for the ETag header filtering switch"
    },
    "popup_html_rules_status_head_title": {
        "message": " ",
-        "description": "não necessário, apenas para evitar exceções"
+        "description": "not needed, only to prevent exceptions"
    },
    "popup_html_statistics_percentage_title": {
        "message": " ",
-        "description": "não é necessário, apenas para evitar exceções"
+        "description": "not needed, only to prevent exceptions"
    },
    "popup_html_statistics_blocked_title": {
        "message": " ",
-        "description": "não é necessário, apenas para evitar exceções"
+        "description": "not needed, only to prevent exceptions"
    },
    "popup_html_statistics_elements_title": {
        "message": " ",
-        "description": "não é necessário, apenas para evitar exceções"
+        "description": "not needed, only to prevent exceptions"
    },
    "popup_html_statistics_head_title": {
        "message": " ",
-        "description": "não é necessário, apenas para evitar exceções"
+        "description": "not needed, only to prevent exceptions"
    },
    "popup_html_configs_head_title": {
        "message": " ",
-        "description": "não é necessário, apenas para evitar exceções"
+        "description": "not needed, only to prevent exceptions"
    },
    "context_menu_enabled_title": {
        "message": " ",
-        "description": "não é necessário, apenas para evitar exceções"
+        "description": "not needed, only to prevent exceptions"
    }
 }
--- a/_locales/uk/messages.json
+++ b/_locales/uk/messages.json
@@ -346,5 +346,26 @@
    "eTag_filtering_enabled_title": {
        "message": "Фільтри заголовків ETag. \nПідказка: Кеш повинен бути скинутим перед першим використанням.",
        "description": "Цей рядок використовується, як заголовок для перемикача фільтра заголовка ETag"
+    },
+    "popup_html_rules_status_head_title": {
+        "message": " "
+    },
+    "popup_html_statistics_percentage_title": {
+        "message": " "
+    },
+    "popup_html_statistics_blocked_title": {
+        "message": " "
+    },
+    "popup_html_statistics_elements_title": {
+        "message": " "
+    },
+    "popup_html_statistics_head_title": {
+        "message": " "
+    },
+    "popup_html_configs_head_title": {
+        "message": " "
+    },
+    "context_menu_enabled_title": {
+        "message": " "
    }
 }
--- a/clearurls.js
+++ b/clearurls.js
@@ -44,10 +44,10 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
    let fields = "";
    let rules = provider.getRules();
    let changes = false;
-    let cancel = false;
    let rawRules = provider.getRawRules();
+    let urlObject = new URL(url);

-    if (storage.localHostsSkipping && checkLocalURL(pureUrl)) {
+    if (storage.localHostsSkipping && checkLocalURL(urlObject)) {
        return {
            "changes": false,
            "url": url,
@@ -55,6 +55,37 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
        }
    }

+    /*
+    * Expand the url by provider redirections. So no tracking on
+    * url redirections form sites to sites.
+    */
+    let re = provider.getRedirection(url);
+    if (re !== null) {
+        url = decodeURL(re);
+
+        //Log the action
+        if (!quiet) {
+            pushToLog(pureUrl, url, translate('log_redirect'));
+            increaseTotalCounter(1);
+            increaseBadged(false, request)
+        }
+
+        return {
+            "redirect": true,
+            "url": url
+        }
+    }
+
+    if (provider.isCaneling() && storage.domainBlocking) {
+        if (!quiet) pushToLog(pureUrl, pureUrl, translate('log_domain_blocked'));
+        increaseTotalCounter(1);
+        increaseBadged(quiet, request);
+        return {
+            "cancel": true,
+            "url": url
+        }
+    }
+
    /*
    * Apply raw rules to the URL.
    */
@@ -73,90 +104,65 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
        }
    });

-    if (existsFragments(url)) {
-        domain = url.replace(new RegExp("#.*", "i"), "");
-    }
-    if (existsFields(url)) {
-        domain = url.replace(new RegExp("\\?.*", "i"), "");
-    }
-
-    /*
-    * Expand the url by provider redirections. So no tracking on
-    * url redirections form sites to sites.
-    */
-    let re = provider.getRedirection(url);
-    if (re !== null) {
-        url = decodeURL(re);
-
-        //Log the action
-        if (!quiet) {
-            pushToLog(pureUrl, url, translate('log_redirect'));
-            increaseGlobalURLCounter(1);
-            increaseBadged(false, request)
-        }
-
-        return {
-            "redirect": true,
-            "url": url
-        }
-    }
-
-    if (existsFields(url)) {
-        fields = "?" + extractFileds(url).rmEmpty().join("&");
-    }
-
-    if (existsFragments(url)) {
-        fragments = "#" + extractFragments(url).rmEmpty().join("&");
-    }
+    urlObject = new URL(url);
+    fields = urlObject.searchParams;
+    fragments = extractFragments(urlObject);
+    domain = urlWithoutParamsAndHash(urlObject).toString();

    /**
     * Only test for matches, if there are fields or fragments that can be cleaned.
     */
-    if (fields !== "" || fragments !== "") {
-        rules.forEach(function (rule) {
-            let beforeReplace = fields;
-            let beforeReplaceFragments = fragments;
-            fields = fields.replace(new RegExp(rule, "gi"), "");
-            fragments = fragments.replace(new RegExp(rule, "gi"), "");
+    if (fields.toString() !== "" || fragments.toString() !== "") {
+        rules.forEach(rule => {
+            const beforeFields = fields.toString();
+            const beforeFragments = fragments.toString();
+            let localChange = false;

-            if (beforeReplace !== fields || beforeReplaceFragments !== fragments) {
-                //Log the action
-                if (storage.loggingStatus) {
-                    let tempURL = domain;
-                    let tempBeforeURL = domain;
-
-                    if (fields !== "") tempURL += "?" + fields.replace("?&", "?").replace("?", "");
-                    if (fragments !== "") tempURL += "#" + fragments.replace("#&", "#").replace("#", "");
-                    if (beforeReplace !== "") tempBeforeURL += "?" + beforeReplace.replace("?&", "?").replace("?", "");
-                    if (beforeReplaceFragments !== "") tempBeforeURL += "#" + beforeReplaceFragments.replace("#&", "#").replace("#", "");
-
-                    if (!quiet) pushToLog(tempBeforeURL, tempURL, rule);
+            for (const field of fields.keys()) {
+                if (new RegExp("^"+rule+"$", "gi").test(field)) {
+                    fields.delete(field);
+                    changes = true;
+                    localChange = true;
                }
+            }
+
+            for (const fragment of fragments.keys()) {
+                if (new RegExp("^"+rule+"$", "gi").test(fragment)) {
+                    fragments.delete(fragment);
+                    changes = true;
+                    localChange = true;
+                }
+            }
+
+            //Log the action
+            if (localChange && storage.loggingStatus) {
+                let tempURL = domain;
+                let tempBeforeURL = domain;
+
+                if (fields.toString() !== "") tempURL += "?" + fields.toString();
+                if (fragments.toString() !== "") tempURL += "#" + fragments.toString();
+                if (beforeFields.toString() !== "") tempBeforeURL += "?" + beforeFields.toString();
+                if (beforeFragments.toString() !== "") tempBeforeURL += "#" + beforeFragments.toString();
+
+                if (!quiet) pushToLog(tempBeforeURL, tempURL, rule);

                increaseBadged(quiet, request);
-                changes = true;
            }
        });

        let finalURL = domain;

-        if (fields !== "") finalURL += "?" + fields.replace("?", "");
-        if (fragments !== "") finalURL += "#" + fragments.replace("#", "");
+        if (fields.toString() !== "") finalURL += "?" + fields.toString();
+        if (fragments.toString() !== "") finalURL += "#" + fragments.toString();

        url = finalURL.replace(new RegExp("\\?&"), "?").replace(new RegExp("#&"), "#");
    }

-    if (provider.isCaneling() && storage.domainBlocking) {
-        if (!quiet) pushToLog(pureUrl, pureUrl, translate('log_domain_blocked'));
-        increaseGlobalURLCounter(1);
-        increaseBadged(quiet, request);
-        cancel = true;
-    }
+

    return {
        "changes": changes,
-        "url": url,
-        "cancel": cancel
+        "url": url
    }
 }

@@ -240,7 +246,7 @@ function start() {
     * Deactivates ClearURLs, if no rules can be downloaded and also no old rules in storage
     */
    function deactivateOnFailure() {
-        if(storage.ClearURLsData.length === 0)  {
+        if (storage.ClearURLsData.length === 0) {
            storage.globalStatus = false;
            storage.dataHash = "";
            changeIcon();
@@ -430,8 +436,6 @@ function start() {
         * @param {boolean} isActive   Is this rule active?
         */
        this.addRule = function (rule, isActive = true) {
-            rule = "([\\/\\?#]|(&|&amp;))+(" + rule + "=[^&]*)";
-
            this.applyRule(enabled_rules, disabled_rules, rule, isActive);
        };

@@ -476,8 +480,6 @@ function start() {
         * @param {boolean} isActive   Is this rule active?
         */
        this.addReferralMarketing = function (rule, isActive = true) {
-            rule = "([\\/\\?#]|(&|&amp;))+(" + rule + "=[^&]*)";
-
            this.applyRule(enabled_referralMarketing, disabled_referralMarketing, rule, isActive);
        };

@@ -607,7 +609,7 @@ function start() {
        const URLbeforeReplaceCount = countFields(request.url);

        //Add Fields form Request to global url counter
-        increaseGlobalURLCounter(URLbeforeReplaceCount);
+        increaseTotalCounter(URLbeforeReplaceCount);

        if (storage.globalStatus) {
            let result = {
@@ -620,7 +622,7 @@ function start() {
            if (storage.pingBlocking && storage.pingRequestTypes.includes(request.type)) {
                pushToLog(request.url, request.url, translate('log_ping_blocked'));
                increaseBadged(false, request);
-                increaseGlobalURLCounter(1);
+                increaseTotalCounter(1);
                return {cancel: true};
            }

--- a/core_js/badgedHandler.js
+++ b/core_js/badgedHandler.js
@@ -27,7 +27,7 @@ let badges = {};
 * Increases the badged by one.
 */
 function increaseBadged(quiet = false, request) {
-    if (!quiet) increaseURLCounter();
+    if (!quiet) increaseCleanedCounter();

    if(request === null) return;

@@ -74,4 +74,4 @@ function handleUpdated(tabId, changeInfo, tabInfo) {
 /**
 * Call by each tab is updated.
 */
-browser.tabs.onUpdated.addListener(handleUpdated);
+browser.tabs.onUpdated.addListener(handleUpdated);
--- a/core_js/eTagFilter.js
+++ b/core_js/eTagFilter.js
@@ -23,24 +23,31 @@
 */
 function eTagFilter(requestDetails) {
    if(!requestDetails.responseHeaders || !storage.eTagFiltering
-        || storage.localHostsSkipping && checkLocalURL(requestDetails.url)) return {};
-    const responseHeaders = requestDetails.responseHeaders;
+        || storage.localHostsSkipping && checkLocalURL(new URL(requestDetails.url))) return {};
+    for(let i=0; i < requestDetails.responseHeaders.length; i++) {
+        const header = requestDetails.responseHeaders[i];

-    const filteredHeaders = responseHeaders.filter(header => {
-       return header.name.toLowerCase() !== "etag";
-    });
+        if(header.name.toString().toLowerCase() !== "etag") {
+            continue;
+        }
+
+        // insert dummy etag
+        requestDetails.responseHeaders[i].value = generateDummyEtag();

-    if(filteredHeaders.length < responseHeaders.length) {
        pushToLog(requestDetails.url, requestDetails.url, translate("eTag_filtering_log"));
-        increaseBadged(false, requestDetails);
-        increaseGlobalURLCounter(1);

-        return {responseHeaders: filteredHeaders};
+        break;
    }
+
+    return {responseHeaders: requestDetails.responseHeaders};
+}
+
+function generateDummyEtag() {
+    return Math.random().toString();
 }

 browser.webRequest.onHeadersReceived.addListener(
    eTagFilter,
    {urls: ["<all_urls>"]},
    ["blocking", "responseHeaders"]
-);
+);
--- a/core_js/popup.js
+++ b/core_js/popup.js
@@ -23,8 +23,8 @@ var elProgressbar_blocked = document.getElementById('progress_blocked');
 var elProgressbar_non_blocked = document.getElementById('progress_non_blocked');
 var elTotal = document.getElementById('statistics_total_elements');
 var globalPercentage = 0;
-var globalCounter;
-var globalurlcounter;
+var cleanedCounter;
+var totalCounter;
 var globalStatus;
 var badgedStatus;
 var hashStatus;
@@ -47,19 +47,19 @@ function init()
 }

 /**
-* Get the globalCounter and globalurlcounter value from the storage
+* Get the cleanedCounter and totalCounter value from the storage
 */
 function changeStatistics()
 {
-    globalPercentage = ((globalCounter/globalurlcounter)*100).toFixed(3);
+    globalPercentage = ((cleanedCounter/totalCounter)*100).toFixed(3);

    if(isNaN(Number(globalPercentage))) globalPercentage = 0;

-    element.textContent = globalCounter.toLocaleString();
+    element.textContent = cleanedCounter.toLocaleString();
    elGlobalPercentage.textContent = globalPercentage+"%";
    elProgressbar_blocked.style.width = globalPercentage+'%';
    elProgressbar_non_blocked.style.width = (100-globalPercentage)+'%';
-    elTotal.textContent = globalurlcounter.toLocaleString();
+    elTotal.textContent = totalCounter.toLocaleString();
 }

 /**
@@ -161,12 +161,12 @@ function setSwitchButton(id, varname)
 function resetGlobalCounter(){
    browser.runtime.sendMessage({
        function: "setData",
-        params: ['globalCounter', 0]
+        params: ['cleanedCounter', 0]
    }).catch(handleError);

    browser.runtime.sendMessage({
        function: "setData",
-        params: ['globalurlcounter', 0]
+        params: ['totalCounter', 0]
    }).catch(handleError);

    browser.runtime.sendMessage({
@@ -174,15 +174,15 @@ function resetGlobalCounter(){
        params: []
    }).catch(handleError);

-    globalCounter = 0;
-    globalurlcounter = 0;
+    cleanedCounter = 0;
+    totalCounter = 0;

    changeStatistics();
 }

 (function() {
-    loadData("globalCounter")
-        .then(() => loadData("globalurlcounter"))
+    loadData("cleanedCounter")
+        .then(() => loadData("totalCounter"))
        .then(() => loadData("globalStatus"))
        .then(() => loadData("badgedStatus"))
        .then(() => loadData("hashStatus"))
--- a/core_js/pureCleaning.js
+++ b/core_js/pureCleaning.js
@@ -46,7 +46,7 @@ function _cleaning(url, quiet = false) {

    if (!quiet) {
        //Add Fields form Request to global url counter
-        increaseGlobalURLCounter(URLbeforeReplaceCount);
+        increaseTotalCounter(URLbeforeReplaceCount);
    }

    for (let i = 0; i < providers.length; i++) {
--- a/core_js/storage.js
+++ b/core_js/storage.js
@@ -63,6 +63,13 @@ function storageDataAsString(key) {
    }
 }

+/**
+ * Delete key from browser storage.
+ */
+function deleteFromDisk(key) {
+    browser.storage.local.remove(key).catch(handleError);
+}
+
 /**
 * Save multiple keys on the disk.
 * @param  {String[]} keys
@@ -159,6 +166,20 @@ function setData(key, value) {
        case "logLimit":
            storage[key] = Math.max(0, Number(value));
            break;
+        case "globalurlcounter":
+            // migrate from old key
+            storage["totalCounter"] = value;
+            delete storage[key];
+            deleteFromDisk(key);
+            saveOnExit();
+            break;
+        case "globalCounter":
+            // migrate from old key
+            storage["cleanedCounter"] = value;
+            delete storage[key];
+            deleteFromDisk(key);
+            saveOnExit();
+            break;
        default:
            storage[key] = value;
    }
@@ -186,8 +207,8 @@ function initSettings() {
    storage.dataHash = "";
    storage.badgedStatus = true;
    storage.globalStatus = true;
-    storage.globalurlcounter = 0;
-    storage.globalCounter = 0;
+    storage.totalCounter = 0;
+    storage.cleanedCounter = 0;
    storage.hashStatus = "error";
    storage.loggingStatus = false;
    storage.log = {"log": []};
@@ -202,7 +223,7 @@ function initSettings() {
    storage.logLimit = 100;
    storage.domainBlocking = true;
    storage.pingBlocking = true;
-    storage.eTagFiltering = true;
+    storage.eTagFiltering = false;
    storage.watchDogErrorCount = 0;

    if (getBrowser() === "Firefox") {
--- a/core_js/tools.js
+++ b/core_js/tools.js
@@ -56,8 +56,7 @@ function isEmpty(obj) {
 * @param {string} string           Name of the attribute used for localization
 * @param {string[]} placeholders   Array of placeholders
 */
-function translate(string, ...placeholders)
-{
+function translate(string, ...placeholders) {
    return browser.i18n.getMessage(string, placeholders);
 }

@@ -84,24 +83,22 @@ async function checkOSAndroid() {

 /**
 * Extract the host without port from an url.
- * @param  {String} url URL as String
+ * @param  {URL} url URL as String
 * @return {String}     host as string
 */
 function extractHost(url) {
-    let parsed_url = new URL(url);
-
-    return parsed_url.hostname;
+    return url.hostname;
 }

 /**
 * Returns true if the url has a local host.
- * @param  {String} url URL as String
+ * @param  {URL} url URL as object
 * @return {boolean}
 */
 function checkLocalURL(url) {
    let host = extractHost(url);

-    if(!host.match(/^\d/) && host !== 'localhost') {
+    if (!host.match(/^\d/) && host !== 'localhost') {
        return false;
    }

@@ -117,72 +114,35 @@ function checkLocalURL(url) {
 * @return {int}        Number of Parameters
 */
 function countFields(url) {
-    return extractFileds(url).length;
-}
-
-/**
- * Returns true if fields exists.
- * @param  {String}     url URL as String
- * @return {boolean}
- */
-function existsFields(url) {
-    let matches = (url.match(/\?.+/i) || []);
-    let count = matches.length;
-
-    return (count > 0);
-}
-
-/**
- * Extract the fields from an url.
- * @param  {String} url URL as String
- * @return {Array}     Fields as array
- */
-function extractFileds(url) {
-    if (existsFields(url)) {
-        let fields = url.replace(new RegExp(".*?\\?", "i"), "");
-        if (existsFragments(url)) {
-            fields = fields.replace(new RegExp("#.*", "i"), "");
-        }
-
-        return (fields.match(/[^\/|\?|&]+=?[^&]*/gi) || []);
-    }
-
-    return [];
-}
-
-/**
- * Return the number of fragments query strings.
- * @param  {String}     url URL as String
- * @return {int}        Number of fragments
- */
-function countFragments(url) {
-    return extractFragments(url).length;
+    return [...new URL(url).searchParams].length
 }

 /**
 * Extract the fragments from an url.
- * @param  {String} url URL as String
- * @return {Array}     fragments as array
+ * @param  {URL} url URL as object
+ * @return {URLHashParams}     fragments as URLSearchParams object
 */
 function extractFragments(url) {
-    if (existsFragments(url)) {
-        let fragments = url.replace(new RegExp(".*?#", "i"), "");
-        return (fragments.match(/[^&]+=?[^&]*/gi) || []);
-    }
-
-    return [];
+    return new URLHashParams(url)
 }

 /**
- * Returns true if fragments exists.
- * @param  {String}     url URL as String
- * @return {boolean}
+ * Returns the given URL without searchParams and hash.
+ * @param {URL} url the URL as object
+ * @return {URL} the url without searchParams and hash
 */
-function existsFragments(url) {
-    let matches = (url.match(/\#.+/i) || []);
-    let count = matches.length;
+function urlWithoutParamsAndHash(url) {
+    let newURL = url.toString();

-    return (count > 0);
+    if (url.search) {
+        newURL = newURL.replace(url.search, "");
+    }
+
+    if (url.hash) {
+        newURL = newURL.replace(url.hash, "");
+    }
+
+    return new URL(newURL);
 }

 /**
@@ -194,23 +154,23 @@ function loadOldDataFromStore() {
 }

 /**
- * Increase by {number} the GlobalURLCounter
+ * Increase by {number} the total counter
 * @param  {int} number
 */
-function increaseGlobalURLCounter(number) {
+function increaseTotalCounter(number) {
    if (storage.statisticsStatus) {
-        storage.globalurlcounter += number;
-        deferSaveOnDisk('globalurlcounter');
+        storage.totalCounter += number;
+        deferSaveOnDisk('totalCounter');
    }
 }

 /**
- * Increase by one the URLCounter
+ * Increase by one the cleaned counter
 */
-function increaseURLCounter() {
+function increaseCleanedCounter() {
    if (storage.statisticsStatus) {
-        storage.globalCounter++;
-        deferSaveOnDisk('globalCounter');
+        storage.cleanedCounter++;
+        deferSaveOnDisk('cleanedCounter');
    }
 }

@@ -283,13 +243,13 @@ function getBrowser() {
 function decodeURL(url) {
    let rtn = decodeURIComponent(url);

-    while(isEncodedURI(rtn)) {
+    while (isEncodedURI(rtn)) {
        rtn = decodeURIComponent(rtn);
    }

    // Required (e.g., to fix https://github.com/ClearURLs/Addon/issues/71)
-    if(!rtn.startsWith('http')) {
-        rtn = 'http://'+rtn
+    if (!rtn.startsWith('http')) {
+        rtn = 'http://' + rtn
    }

    return rtn;
@@ -367,4 +327,4 @@ async function sha256(message) {
    const hashArray = Array.from(new Uint8Array(hashBuffer));

    return hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
-}
+}
--- a/core_js/utils/Multimap.d.ts
+++ b/core_js/utils/Multimap.d.ts
@@ -0,0 +1,21 @@
+/**
+ * Models a multimap backed by a {@link Set}.
+ */
+export default class Multimap<K, V> implements Iterable<[K, V]> {
+    private _map;
+    private _size;
+    constructor();
+    get size(): number;
+    get(key: K): Set<V>;
+    put(key: K, value: V): boolean;
+    has(key: K): boolean;
+    hasEntry(key: K, value: V): boolean;
+    delete(key: K): boolean;
+    deleteEntry(key: K, value: V): boolean;
+    clear(): void;
+    entries(): IterableIterator<[K, V]>;
+    values(): IterableIterator<V>;
+    keys(): IterableIterator<K>;
+    forEach<T>(callback: (this: T | this, key: K, value: V, map: this) => void, thisArg?: T): void;
+    [Symbol.iterator](): IterableIterator<[K, V]>;
+}
--- a/core_js/utils/Multimap.js
+++ b/core_js/utils/Multimap.js
@@ -0,0 +1,130 @@
+"use strict";
+/*
+ * ClearURLs
+ * Copyright (c) 2017-2022 Kevin Röbert.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Models a multimap backed by a {@link Set}.
+ */
+class Multimap {
+    constructor() {
+        Object.defineProperty(this, "_map", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_size", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this._size = 0;
+        this._map = new Map();
+    }
+    get size() {
+        return this._size;
+    }
+    get(key) {
+        const values = this._map.get(key);
+        if (values) {
+            return new Set(values);
+        }
+        else {
+            return new Set();
+        }
+    }
+    put(key, value) {
+        let values = this._map.get(key);
+        if (!values) {
+            values = new Set();
+        }
+        const count = values.size;
+        values.add(value);
+        if (values.size === count) {
+            return false;
+        }
+        this._map.set(key, values);
+        this._size++;
+        return true;
+    }
+    has(key) {
+        return this._map.has(key);
+    }
+    hasEntry(key, value) {
+        const values = this._map.get(key);
+        if (!values) {
+            return false;
+        }
+        return values.has(value);
+    }
+    delete(key) {
+        const values = this._map.get(key);
+        if (values && this._map.delete(key)) {
+            this._size -= values.size;
+            return true;
+        }
+        return false;
+    }
+    deleteEntry(key, value) {
+        const values = this._map.get(key);
+        if (values) {
+            if (!values.delete(value)) {
+                return false;
+            }
+            this._size--;
+            return true;
+        }
+        return false;
+    }
+    clear() {
+        this._map.clear();
+        this._size = 0;
+    }
+    entries() {
+        const self = this;
+        function* gen() {
+            for (const [key, values] of self._map.entries()) {
+                for (const value of values) {
+                    yield [key, value];
+                }
+            }
+        }
+        return gen();
+    }
+    values() {
+        const self = this;
+        function* gen() {
+            for (const [, value] of self.entries()) {
+                yield value;
+            }
+        }
+        return gen();
+    }
+    keys() {
+        return this._map.keys();
+    }
+    forEach(callback, thisArg) {
+        for (const [key, value] of this.entries()) {
+            callback.call(thisArg === undefined ? this : thisArg, key, value, this);
+        }
+    }
+    [Symbol.iterator]() {
+        return this.entries();
+    }
+}
--- a/core_js/utils/URLHashParams.d.ts
+++ b/core_js/utils/URLHashParams.d.ts
@@ -0,0 +1,13 @@
+/**
+ * Models a hash parameter of a given {@link URL}.
+ */
+export default class URLHashParams {
+    private _params;
+    constructor(url: URL);
+    append(name: string, value?: string | null): void;
+    delete(name: string): void;
+    get(name: string): string | null;
+    getAll(name: string): Set<string | null>;
+    keys(): IterableIterator<string>;
+    toString(): string;
+}
--- a/core_js/utils/URLHashParams.js
+++ b/core_js/utils/URLHashParams.js
@@ -0,0 +1,77 @@
+"use strict";
+/*
+ * ClearURLs
+ * Copyright (c) 2017-2022 Kevin Röbert.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Models a hash parameter of a given {@link URL}.
+ */
+class URLHashParams {
+    constructor(url) {
+        Object.defineProperty(this, "_params", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this._params = new Multimap();
+        const hash = url.hash.slice(1);
+        const params = hash.split('&');
+        for (const p of params) {
+            const param = p.split('=');
+            if (!param[0])
+                continue;
+            const key = param[0];
+            let value = null;
+            if (param.length === 2 && param[1]) {
+                value = param[1];
+            }
+            this._params.put(key, value);
+        }
+    }
+    append(name, value = null) {
+        this._params.put(name, value);
+    }
+    delete(name) {
+        this._params.delete(name);
+    }
+    get(name) {
+        const [first] = this._params.get(name);
+        if (first) {
+            return first;
+        }
+        return null;
+    }
+    getAll(name) {
+        return this._params.get(name);
+    }
+    keys() {
+        return this._params.keys();
+    }
+    toString() {
+        const rtn = [];
+        this._params.forEach((key, value) => {
+            if (value) {
+                rtn.push(key + '=' + value);
+            }
+            else {
+                rtn.push(key);
+            }
+        });
+        return rtn.join('&');
+    }
+}
--- a/core_js/watchdog.js
+++ b/core_js/watchdog.js
@@ -25,13 +25,12 @@
 * This watchdog restarts the whole Add-on, when the check fails.
 */
 const CHECK_INTERVAL = 60000;
+const __dirtyURL = "https://clearurls.roebert.eu?utm_source=addon";
+const __cleanURL = new URL("https://clearurls.roebert.eu").toString();

 setInterval(function() {
    if(isStorageAvailable() && storage.globalStatus) {
-        const dirtyURL = "https://clearurls.roebert.eu?utm_source=addon";
-        const cleanURL = "https://clearurls.roebert.eu";
-
-        if(pureCleaning(dirtyURL, true) !== cleanURL) {
+        if(new URL(pureCleaning(__dirtyURL, true)).toString() !== __cleanURL) {
            storage.watchDogErrorCount += 1;
            console.log(translate('watchdog', storage.watchDogErrorCount));
            saveOnExit();
@@ -41,4 +40,4 @@ setInterval(function() {
            saveOnExit();
        }
    }
-}, CHECK_INTERVAL);
+}, CHECK_INTERVAL);
--- a/css/core.css
+++ b/css/core.css
@@ -42,6 +42,10 @@ body {
    font-size: 14px;
 }

+table {
+    color: var(--page-fg-color) !important;
+}
+
 .form-control,
 .form-control:disabled,
 .form-control:focus,
@@ -75,18 +79,20 @@ body {
 }

 .btn-default {
-    color:#333;
-    background-color:#fff;
-    border-color:#ccc
+    color: #333;
+    background-color: #fff;
+    border-color: #ccc
 }
+
 .btn-default.focus,
 .btn-default:focus {
-    color:#333;
-    background-color:#e6e6e6;
-    border-color:#8c8c8c
+    color: #333;
+    background-color: #e6e6e6;
+    border-color: #8c8c8c
 }
+
 .btn-default:hover {
-    color:#333;
-    background-color:#e6e6e6;
-    border-color:#adadad
-}
+    color: #333;
+    background-color: #e6e6e6;
+    border-color: #adadad
+}
--- a/html/popup.html
+++ b/html/popup.html
@@ -136,7 +136,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
            <div class="col-sm-1">
                <h5><b id="rules_status_head"></b></h5>
                <div class="text-center">
-                    <a href="https://gitlab.com/anti-tracking/ClearURLs/rules/commits/master/data.min.json"
+                    <a href="https://gitlab.com/ClearURLs/rules/-/commits/master/data.min.json"
                    id="hashStatus" class="btn btn-primary btn-sm text-wrap" target="_blank"></a>
                </div>
                <div class="clearfix"></div>
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 2,
  "name": "ClearURLs",
-  "version": "1.23.1",
+  "version": "1.25.0",
  "author": "Kevin Roebert",
  "description": "__MSG_extension_description__",
  "homepage_url": "https://docs.clearurls.xyz",
@@ -57,6 +57,8 @@
  "background": {
    "scripts": [
      "browser-polyfill.js",
+      "core_js/utils/Multimap.js",
+      "core_js/utils/URLHashParams.js",
      "core_js/message_handler.js",
      "external_js/ip-range-check.js",
      "core_js/tools.js",
Author	SHA1	Message	Date
Kevin R	eef2bdb753	Merge branch 'master' into poeditor # Conflicts: # _locales/fr/messages.json	2022-07-27 00:57:26 +02:00
Kevin R	acfce04fcc	Updated changelog	2022-07-27 00:46:12 +02:00
Kevin R	dbdefbf434	Merge branch 'translation' # Conflicts: # _locales/fr/messages.json	2022-07-27 00:43:04 +02:00
Kevin	848b000ab7	Merge branch 'poeditor' into 'master' Poeditor See merge request KevinRoebert/ClearUrls!105	2022-07-26 22:37:59 +00:00
Kevin	7cd0505a46	Updated translations	2022-07-26 22:37:59 +00:00
Kevin	bd64e39e02	Update messages.json (POEditor.com)	2022-07-26 22:36:36 +00:00
Kevin	4a90d63539	Update messages.json (POEditor.com)	2022-07-26 22:36:35 +00:00
Kevin	6f76f2f167	Update messages.json (POEditor.com)	2022-07-26 22:36:34 +00:00
Kevin	8e1cba2eb7	Update messages.json (POEditor.com)	2022-07-26 22:36:33 +00:00
Kevin	1360111f15	Update messages.json (POEditor.com)	2022-07-26 22:36:32 +00:00
Kevin	f4e5ec70de	Update messages.json (POEditor.com)	2022-07-26 22:36:32 +00:00
Kevin	c1b2cdbda0	Update messages.json (POEditor.com)	2022-07-26 22:36:31 +00:00
Kevin	71484d1488	Update messages.json (POEditor.com)	2022-07-26 22:36:30 +00:00
Kevin	394dda1157	Update messages.json (POEditor.com)	2022-07-26 22:36:29 +00:00
Kevin	854460ef50	Update messages.json (POEditor.com)	2022-07-26 22:36:28 +00:00
Kevin	0d49080a52	Update messages.json (POEditor.com)	2022-07-26 22:36:27 +00:00
Kevin	08630fbb7b	Update messages.json (POEditor.com)	2022-07-26 22:36:26 +00:00
Kevin	93630cb8db	Update messages.json (POEditor.com)	2022-07-26 22:36:26 +00:00
Kevin	d8e0e9fe96	Update messages.json (POEditor.com)	2022-07-26 22:36:25 +00:00
Kevin	42117aff9c	Update messages.json (POEditor.com)	2022-07-26 22:36:24 +00:00
Kevin	ddc1dac829	Update messages.json (POEditor.com)	2022-07-26 22:36:23 +00:00
Kevin	2c12ce2def	Update messages.json (POEditor.com)	2022-07-26 22:36:22 +00:00
Kevin	1dd91ef59a	Update messages.json (POEditor.com)	2022-07-26 22:36:21 +00:00
Kevin	7ef8faef2f	Update messages.json (POEditor.com)	2022-07-26 22:36:20 +00:00
Kevin	acacd6e2c4	Update messages.json (POEditor.com)	2022-07-26 22:36:19 +00:00
Kevin	a0ec22affb	Update messages.json (POEditor.com)	2022-07-26 22:36:19 +00:00
Kevin	4d43f5cd07	Update messages.json (POEditor.com)	2022-07-26 22:36:18 +00:00
Kevin	7f8c096368	Update messages.json (POEditor.com)	2022-07-26 22:34:37 +00:00
Kevin	ba6fc13937	Update messages.json (POEditor.com)	2022-07-26 22:34:36 +00:00
Kevin	2cd54fcf28	Update messages.json (POEditor.com)	2022-07-26 22:34:36 +00:00
Kevin	8f5404c632	Update messages.json (POEditor.com)	2022-07-26 22:34:35 +00:00
Kevin	b4b2fe5bfe	Update messages.json (POEditor.com)	2022-07-26 22:34:34 +00:00
Kevin	4c0b953972	Update messages.json (POEditor.com)	2022-07-26 22:34:33 +00:00
Kevin	d3ddd31d02	Update messages.json (POEditor.com)	2022-07-26 22:34:32 +00:00
Kevin	8f547660b9	Update messages.json (POEditor.com)	2022-07-26 22:34:32 +00:00
Kevin	465b76dbb2	Update messages.json (POEditor.com)	2022-07-26 22:34:31 +00:00
Kevin	7bb4deb83a	Update messages.json (POEditor.com)	2022-07-26 22:34:30 +00:00
Kevin	b99263f85d	Update messages.json (POEditor.com)	2022-07-26 22:34:29 +00:00
Kevin	d81041afe4	Update messages.json (POEditor.com)	2022-07-26 22:34:28 +00:00
Kevin	09c4504e5e	Update messages.json (POEditor.com)	2022-07-26 22:34:27 +00:00
Kevin	1f7a471ec3	Update messages.json (POEditor.com)	2022-07-26 22:34:26 +00:00
Kevin	804e08098c	Update messages.json (POEditor.com)	2022-07-26 22:34:26 +00:00
Kevin	55581cc6b8	Update messages.json (POEditor.com)	2022-07-26 22:34:25 +00:00
Kevin	23279d0c70	Update messages.json (POEditor.com)	2022-07-26 22:34:24 +00:00
Kevin	cff3184751	Update messages.json (POEditor.com)	2022-07-26 22:34:23 +00:00
Kevin	3a45f0f3bd	Update messages.json (POEditor.com)	2022-07-26 22:34:22 +00:00
Kevin	39aef0bf19	Update messages.json (POEditor.com)	2022-07-26 22:34:22 +00:00
Kevin	56a91be236	Update messages.json (POEditor.com)	2022-07-26 22:34:21 +00:00
Kevin	99439f8dc9	Update messages.json (POEditor.com)	2022-07-26 22:34:20 +00:00
Kevin R	0d7381f02a	Fixed #191 Used first code snippets from ClearURLs v2: https://gitlab.com/ClearURLs/core/-/blob/master/src/utils/URLHashParams.ts	2022-07-27 00:28:15 +02:00
Kevin R	0f08b0f7e3	Fixed counter issue Fixed https://github.com/ClearURLs/Addon/issues/234	2022-07-26 21:48:08 +02:00
Kevin R	2096fa8382	Added changelog	2022-07-26 20:34:32 +02:00
Kevin	742a344a26	Merge branch 'master' into 'master' fix: table text color in dark mode See merge request KevinRoebert/ClearUrls!104	2022-07-26 18:15:45 +00:00
Sanjay Pavan	a930a94224	fix: table text color in dark mode	2022-07-10 22:06:31 +05:30
Kevin R	52fdc1db1c	Updated rules href	2022-06-30 21:15:02 +02:00
Kevin R	628faf0e85	Added new ETag filtering	2022-06-07 13:14:11 +02:00
Pineapples	89b2ba0a87	Add missing punctuation More details	2022-06-02 13:38:47 +00:00
Pineapples	be3b1bd557	Apply suggestions from code review Fix some of my oversights, thanks Co-authored-by: Suspense <suspensetm@gmail.com>	2022-06-02 13:27:06 +00:00
Pineapples	716566c20d	Update _locales/fr/messages.json Co-authored-by: Suspense <suspensetm@gmail.com>	2022-06-02 13:18:15 +00:00
Pineapples	441790c48f	Improve translation and clarify Just made some parts a bit more clear and less redundant, also, changed wording in some for better readability.	2022-05-19 08:34:51 +00:00
Kevin	82d987a08e	Merge branch 'update' into 'master' Update "Projects that use parts of ClearURLs" section See merge request KevinRoebert/ClearUrls!102	2022-04-11 14:28:48 +00:00
Kevin R	b67a656918	Version 1.24.1	2022-03-25 18:29:42 +01:00
Kevin R	63b557cf8c	Version 1.24.0	2022-03-25 18:01:59 +01:00
Kevin R	6f5a182c77	Added jq to CI	2022-03-23 14:22:26 +01:00
Kevin R	20dd141d3c	Merge branch 'master' into poeditor	2022-03-22 21:43:06 +01:00
Kevin	d4c50c037a	Update messages.json (POEditor.com)	2022-03-22 20:40:54 +00:00
Kevin	710c1ff527	Update messages.json (POEditor.com)	2022-03-22 20:40:53 +00:00
Kevin	c9be70d0e8	Update messages.json (POEditor.com)	2022-03-22 20:40:52 +00:00
Kevin	188f83b7a0	Update messages.json (POEditor.com)	2022-03-22 20:40:51 +00:00
Kevin	ee32041537	Update messages.json (POEditor.com)	2022-03-22 20:40:50 +00:00
Kevin	e016af23a9	Update messages.json (POEditor.com)	2022-03-22 20:40:49 +00:00
Kevin	003ed087f7	Update messages.json (POEditor.com)	2022-03-22 20:40:49 +00:00
Kevin	cb22c98074	Update messages.json (POEditor.com)	2022-03-22 20:40:48 +00:00
Kevin	f04da7c3b2	Update messages.json (POEditor.com)	2022-03-22 20:40:47 +00:00
Kevin	dde6a52e4b	Update messages.json (POEditor.com)	2022-03-22 20:40:46 +00:00
Kevin	d1950a12e8	Update messages.json (POEditor.com)	2022-03-22 20:40:45 +00:00
Kevin	d9c2e895c9	Update messages.json (POEditor.com)	2022-03-22 20:40:44 +00:00
Kevin	b60f46bd34	Update messages.json (POEditor.com)	2022-03-22 20:40:43 +00:00
Kevin	b2547e2564	Update messages.json (POEditor.com)	2022-03-22 20:40:42 +00:00
Kevin	d63727b8b7	Update messages.json (POEditor.com)	2022-03-22 20:40:41 +00:00
Kevin	c3e3148b88	Update messages.json (POEditor.com)	2022-03-22 20:40:40 +00:00
Kevin	ee8916d14a	Update messages.json (POEditor.com)	2022-03-22 20:40:39 +00:00
Kevin	7bb4e29768	Update messages.json (POEditor.com)	2022-03-22 20:40:38 +00:00
Kevin	f7fbbbbe88	Update messages.json (POEditor.com)	2022-03-22 20:40:37 +00:00
Kevin	355b724824	Update messages.json (POEditor.com)	2022-03-22 20:40:36 +00:00
Kevin	b53fbc5e76	Update messages.json (POEditor.com)	2022-03-22 20:40:35 +00:00
Kevin	e95a59e5cc	Update messages.json (POEditor.com)	2022-03-22 20:40:34 +00:00
SnwMds	d5dce95ba9	Update "Projects that use parts of ClearURLs" section	2022-02-24 15:12:31 -03:00