Add an updated build

Close !91

.gitignore

@@ -1,14 +1,14 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules
+.web-extension-id
+web-ext-artifacts/
+sign-firefox-extension.sh
 
 # testing
 /coverage
 
-# production
-/build
-
 # misc
 .DS_Store
 .env
@@ -17,4 +17,4 @@ yarn-debug.log*
 yarn-error.log*
 
 # WebStorm
-.idea/
+.idea/

.gitlab/issue_templates/Bug.md

@@ -14,9 +14,9 @@ possible. Thank you!
 <!--
 You do not have to reinstall Firefox or disable all addons. You can just create a new profile that only has ClearURLs installed and where no settings are changed. Instructions can be found here: https://support.mozilla.org/en-US/kb/profile-manager-create-and-remove-firefox-profiles
 -->
-* [ ] Can you reproduce the problem in a **fresh** firefox profile with **only** ClearURLs?
+* [ ] Can you reproduce the problem in a **fresh** Firefox profile with **only** ClearURLs?
 * [ ] Are you running the latest version of ClearURLs?
-* [ ] Are you have changed settings under `about:config`?
+* [ ] Have you changed settings under `about:config`?
 
 ### Description
 
@@ -33,10 +33,10 @@ You do not have to reinstall Firefox or disable all addons. You can just create
 **Actual behavior:** [What actually happened]
 
 ### System
-* **Version**: [compulsory. you must provide your version]
+* **Version**: [compulsory. You must provide your version]
 * **Platform**: [either `uname -a` output, or if Windows, version and 32-bit or
   64-bit]
-* **Country**: [The country from which you called the page. You can found your country here: https://ipapi.co//country_capital]
+* **Country**: [The country from which you called the page. You can find your country here: https://ipapi.co//country_capital]
 
 ### Log
 <!-- Please enable the log functionality of ClearURLs and attach the exported log to this bug report. -->

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "rules"]
-	path = data
-	url = https://gitlab.com/anti-tracking/ClearURLs/rules.git
-	branch = master

CHANGELOG.md

@@ -9,6 +9,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add features from the milestone [%1](https://gitlab.com/KevinRoebert/ClearUrls/-/milestones/1)
 - Dedicated documentation page like [docs.drasyl.org](https://docs.drasyl.org)
 
+## [1.21.0] - 2021-03-24
+
+### Compatibility note
+- Require Firefox >= 55
+- Require Chrome >= 37
+
+### Changed
+- Updated Polish translation by Kityn
+
+### Removed
+- Removed `clipboardWrite` permission
+- Removed noisy background of popup
+
+### Fixed
+- Fixed [#771](https://gitlab.com/KevinRoebert/ClearUrls/-/issues/771)
+- Fixed [#466](https://gitlab.com/KevinRoebert/ClearUrls/-/issues/466) by [@aethanyc](https://gitlab.com/aethanyc) in MR [!85](https://gitlab.com/KevinRoebert/ClearUrls/-/merge_requests/85)
+
 ## [1.20.0] - 2020-11-21
 
 ### Compatibility note

PRIVACY.md

@@ -1,6 +1,6 @@
 ClearURLs protects and respects your privacy. 
-We do not collect any of your usage data. Furthermore ClearURLs has no home server nor embed any kind of analytic hooks in its code.
+We do not collect any of your usage data. Furthermore, ClearURLs has no home server nor embed any kind of analytic hooks in its code.
 
-The only time ClearURLs connects to a remote server (gitlab.io) is to update the rules file and the associated hash file. You can replace the default update address with your own address at any time in the settings.
+The only time ClearURLs connects to a remote server (gitlab.io or github.io) is to update the rules file and the associated hash file. You can replace the default update address (_rules1.clearurls.xyz_/_rules2.clearurls.xyz_) with your address at any time in the settings.
 
-The project and the rule file is currently hosted on gitlab.com, which is owned by GitLab Inc. and thus is unrelated to ClearURLs.
+The project and the rule file are currently hosted on gitlab.com and github.com, which is owned by GitLab Inc. and GitHub Inc. Thus they are unrelated to ClearURLs. The _rules1.clearurls.xyz_ and _rules2.clearurls.xyz_ addresses are just CNAME records and thus we got no information about the request.

README.md

@@ -1,105 +1,87 @@
-<a href="https://www.paypal.me/KevinRoebert" target="_blank"><img src="https://raw.githubusercontent.com/KevinRoebert/DonateButtons/master/Paypal.png" alt="Buy Me A Coffee" height="55"></a>
+This is a fork of [ClearURLs/Addon](https://github.com/ClearURLs/Addon) with some modifications. The
-<a href="https://liberapay.com/kroeb" target="_blank"><img src="https://raw.githubusercontent.com/KevinRoebert/DonateButtons/master/LiberaPay.png" alt="Buy Me A Coffee" height="55"></a>
+main change is moving the data/rule files to this repo instead of loading them from a gitlab page
-<a href="https://www.buymeacoffee.com/KevinRoebert" target="_blank"><img src="https://raw.githubusercontent.com/KevinRoebert/DonateButtons/master/BuyMeACoffee.png" alt="Buy Me A Coffee" height="55"></a>
+that the original author hosts. This removes the risk of a bad actor gaining control over that URL
-
+and making changes that lead to arbitrary code execution or redirecting your browser to arbitrary
-[<img src="https://blog.mozilla.org/addons/files/2020/04/get-the-addon-fx-apr-2020.svg" alt="for Firefox" height="60px">](https://addons.mozilla.org/firefox/addon/clearurls/) [<img src="https://gitlab.com/KevinRoebert/ClearUrls/-/raw/master/promotion/MEA-button.png" alt="for Edge" height="60px">](https://microsoftedge.microsoft.com/addons/detail/mdkdmaickkfdekbjdoojfalpbkgaddei) [<img src="https://developer.chrome.com/webstore/images/ChromeWebStore_BadgeWBorder_v2_206x58.png" alt="for Chrome" height="60px">](https://chrome.google.com/webstore/detail/clearurls/lckanjgmijmafbedllaakclkaicjfmnk)
+URLs.
-
+
-# <sub><img src="https://gitlab.com/KevinRoebert/ClearUrls/raw/master/img/clearurls.svg" width="64px" height="64px"></sub> ClearURLs [![Gitter](https://badges.gitter.im/ClearURLs/ClearURLs.svg)](https://gitter.im/ClearURLs/ClearURLs)
+## Install
-
+
-**ClearURLs** is an add-on based on the new WebExtensions technology and is optimized for *Firefox* and *Chrome* based browsers.
+**Firefox**
-
+* I have a signed xpi that you can immediately install. Open `build/` and drag the xpi into Firefox.
-This extension will automatically remove tracking elements from URLs to help protect your privacy when browse through the Internet, 
+  It may take a few seconds for the browser to display the extension installation dialog box.
-which is regularly updated by us and can be found [here](https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.min.json).
+* You can also find the signed Firefox files in the project's [Releases page](https://github.com/sir-pinecone/clear-urls-browser-extension/releases).
-
+
-## Application
+**Chrome**
-Many websites use tracking elements in the URL (e.g. `https://example.com?utm_source=newsletter1&utm_medium=email&utm_campaign=sale`) to mark your online activity. 
+* Go to Chrome extensions page.
-All that tracking code is not necessary for a website to be displayed or work correctly and can therefore be removed—that is exactly what ClearURLs does.
+* Toggle the developer mode (top-right of page).
-
+* Click `Load unpacked`.
-Another common example are Amazon URLs. If you search for a product on Amazon you will see a very long URL, such as: 
+* Select this project's root folder.
-```
+
-https://www.amazon.com/dp/exampleProduct/ref=sxin_0_pb?__mk_de_DE=ÅMÅŽÕÑ&keywords=tea&pd_rd_i=exampleProduct&pd_rd_r=8d39e4cd-1e4f-43db-b6e7-72e969a84aa5&pd_rd_w=1pcKM&pd_rd_wg=hYrNl&pf_rd_p=50bbfd25-5ef7-41a2-68d6-74d854b30e30&pf_rd_r=0GMWD0YYKA7XFGX55ADP&qid=1517757263&rnid=2914120011
+## Development
-```
+
-
+### Local Testing
-Indeed most of the above URL is tracking code. Once ClearURLs has cleaned the address, it will look like this:
+
-`https://www.amazon.com/dp/exampleProduct`
+* Firefox: open about:debugging and click `Load Temporary Add-on...` then select `manifest.json` file.
-
+* Chrome: follow the install steps from above.
-## Features
+
-
+## Signing and Building
-* Removes tracking from URLs automatically in the background
+
-* Blocks some common ad domains (optional)
+### Firefox
-* Has a built-in tool to clean up multiple URLs at once
+* Install web-ext with `$ npm install --global web-ext`
-* Supports redirection to the destination, without tracking services as middleman
+* Generate an unlisted xpi with:
-* Adds an entry to the context menu so that links can be copied quickly and cleanly
+  `web-ext sign --api-key <your JWT issuer> --api-secret <your JWT secret>`
-* Blocks hyperlink auditing, also known as *ping tracking* (see also [this article](https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing))
+    * You can obtain these keys from https://addons.mozilla.org/en-US/developers/addon/api/key/
-* Prevents ETag tracking
+* The signed xpi will be in `web-ext-artifacts/`. Drag this into Firefox to install it.
-* Prevents tracking injection over history API (see also: [The replaceState() method](https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method))
+* Alternatively use the private sign-firefox-extension.sh script (not included in the repo) which places the xpi in `build/`.
-* Prevents Google from rewriting the search results (to include tracking elements)
+
-* Prevents Yandex from rewriting the search results (to include tracking elements)
+---
-
+
-## Permissons
+**ClearURLs** is an add-on based on the new WebExtensions technology and is optimized for *Firefox* and *Chrome* based browsers.
-Reasoning for needed permissions can be found under [here](https://gitlab.com/KevinRoebert/ClearUrls/issues/159).
+
-
+This extension will automatically remove tracking elements from URLs to help protect your privacy when browse through the Internet,
-## Screenshot
+which is regularly updated by us and can be found [here](https://gitlab.com/anti-tracking/ClearURLs/rules/-/raw/master/data.min.json).
-![Interface (version 1.14.0)](https://gitlab.com/KevinRoebert/ClearUrls/raw/master/promotion/screens/Popup_v_1.14.0.png)
+
-
+## Application
-## CI/CD Artifacts Download (for Firefox- and Chrome-Dev only)
+Many websites use tracking elements in the URL (e.g. `https://example.com?utm_source=newsletter1&utm_medium=email&utm_campaign=sale`) to mark your online activity.
-Here you can download the packed files for the Firefox- and Chrome-Dev:
+All that tracking code is not necessary for a website to be displayed or work correctly and can therefore be removed—that is exactly what ClearURLs does.
-
+
-[<img src="promotion/download-128.png"/>](https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/ClearUrls.zip?job=bundle%20addon)
+Another common example are Amazon URLs. If you search for a product on Amazon you will see a very long URL, such as:
-
+```
-## Test
+https://www.amazon.com/dp/exampleProduct/ref=sxin_0_pb?__mk_de_DE=ÅMÅŽÕÑ&keywords=tea&pd_rd_i=exampleProduct&pd_rd_r=8d39e4cd-1e4f-43db-b6e7-72e969a84aa5&pd_rd_w=1pcKM&pd_rd_wg=hYrNl&pf_rd_p=50bbfd25-5ef7-41a2-68d6-74d854b30e30&pf_rd_r=0GMWD0YYKA7XFGX55ADP&qid=1517757263&rnid=2914120011
-If you want to test whether ClearURLs works correctly on your system, you can go to this test page: [https://test.clearurls.xyz/](https://test.clearurls.xyz/)
+```
-
+
-## Contribute
+Indeed most of the above URL is tracking code. Once ClearURLs has cleaned the address, it will look like this:
-If you have any suggestions or complaints, please [create an issue.](https://gitlab.com/KevinRoebert/ClearUrls/issues/new)
+`https://www.amazon.com/dp/exampleProduct`
-
+
-**Note: If you have any suggestions or complaints regarding the rules, please [create an issue in this repo](https://gitlab.com/anti-tracking/ClearURLs/rules/-/issues/new) or email us rules.support (at) clearurls.xyz (this mail will automatically create a new issue in this repo).**
+## Features
-
+
-### Translate ClearURLs
+* Removes tracking from URLs automatically in the background
-You want to help translating ClearURLs into many languages? – Nice
+* Blocks some common ad domains (optional)
-
+* Has a built-in tool to clean up multiple URLs at once
-You can choose between two options to contribute. You can create a merge request, or you can use the POEditor to translate ClearURLs.
+* Supports redirection to the destination, without tracking services as middleman
-
+* Adds an entry to the context menu so that links can be copied quickly and cleanly
-*Hint: The description field in the translation files are only an information for what the translation is used. 
+* Blocks hyperlink auditing, also known as *ping tracking* (see also [this article](https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing))
-It is not necessary to translate the description field; in the most cases it is empty.*
+* Prevents ETag tracking
-
+* Prevents tracking injection over history API (see also: [The replaceState() method](https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method))
-#### Merge request
+* Prevents Google from rewriting the search results (to include tracking elements)
-If you want to create a merge request, you must open the path [`_locales/en/messages.json`](https://github.com/KevinRoebert/ClearUrls/blob/master/_locales/en/messages.json) in the ClearURLs repo 
+* Prevents Yandex from rewriting the search results (to include tracking elements)
-and translate the english terms into terms of your language. Once you have translated all the terms, you make a pull request of your translation. 
+
-Please push your translation into the folder `_locales/{country code}/messages.json`.
+## Permissons
-
+Reasoning for needed permissions can be found under [here](https://gitlab.com/KevinRoebert/ClearUrls/issues/159).
-#### POEditor
+
-[<img src="https://poeditor.com/public/images/logo/logo.svg" alt="https://poeditor.com/join/project/vKTpQWWvk2" width="150">](https://poeditor.com/join/project/vKTpQWWvk2)
+## Copyright
-
+We use some third-party scripts in our add-on. The authors and licenses are listed below.
-## Projects that use parts of ClearURLs
+-   [WebExtension browser API Polyfill](https://github.com/mozilla/webextension-polyfill) |
-
+    Copyright by Mozilla |
-* [Uroute](https://github.com/walterl/uroute) used ClearURLs to filter/clean URL before launching browser
+    [MPL-2.0](https://github.com/mozilla/webextension-polyfill/blob/master/LICENSE)
-* [Scrub](https://gitlab.com/CrunchBangDev/cbd-cogs/-/tree/master/Scrub) used ClearURLs to filter/clean URLs as cog for the Red Discord bot
+-   [Bootstrap v4.3.1](https://github.com/twbs/bootstrap/tree/v4.3.1) |
-* [Unalix](https://github.com/AmanoTeam/Unalix) a simple Python module that removes tracking fields from URLs and unshort shortened URLs
+    Copyright 2011-2016 Twitter, Inc. |
-* [Unalix-nim](https://github.com/AmanoTeam/Unalix-nim) a simple Nim library that removes tracking fields from URLs and unshort shortened URLs
+    [MIT](https://github.com/twbs/bootstrap/blob/master/LICENSE)
-
+-   [jQuery v3.4.1](https://github.com/jquery/jquery/tree/3.4.1) |
-## Recommended by...
+    Copyright JS Foundation and other contributors |
-*  [ghacks-user.js](https://github.com/ghacksuserjs/ghacks-user.js/wiki/4.1-Extensions)
+    [MIT](https://jquery.org/license/)
-*  [Awesome Humane Tech List](https://github.com/humanetech-community/awesome-humane-tech#tracking)
+-   [DataTables v1.10.20](https://github.com/DataTables/DataTables/tree/master) |  Copyright (c) 2008-2015 SpryMedia Limited | [MIT](https://datatables.net/license/)
-*  [PrivacyTools](https://www.privacytools.io/browsers/#addons)
+-   [Pickr v1.7.0](https://github.com/Simonwep/pickr/tree/1.7.0) | Copyright (c) 2018 - 2020 Simon Reinisch |
-*  ClearURLs is part of Mozilla's recommended extensions program
+    [MIT](https://github.com/Simonwep/pickr/blob/master/LICENSE)
-
+-   [Font Awesome v5.12.0](https://github.com/FortAwesome/Font-Awesome/tree/5.12.0) | Copyright (c) @fontawesome |
-## Permissions
+    [Font Awesome Free License](https://github.com/FortAwesome/Font-Awesome/blob/master/LICENSE.txt)
-Reasoning for needed permissions you can find under [this discussion](https://gitlab.com/KevinRoebert/ClearUrls/issues/159).
-
-## Copyright
-We use some third-party scripts in our add-on. The authors and licenses are listed below.
--   [WebExtension browser API Polyfill](https://github.com/mozilla/webextension-polyfill) |
-    Copyright by Mozilla |
-    [MPL-2.0](https://github.com/mozilla/webextension-polyfill/blob/master/LICENSE)
--   [Bootstrap v4.3.1](https://github.com/twbs/bootstrap/tree/v4.3.1) |
-    Copyright 2011-2016 Twitter, Inc. |
-    [MIT](https://github.com/twbs/bootstrap/blob/master/LICENSE)
--   [jQuery v3.4.1](https://github.com/jquery/jquery/tree/3.4.1) |
-    Copyright JS Foundation and other contributors |
-    [MIT](https://jquery.org/license/)
--   [DataTables v1.10.20](https://github.com/DataTables/DataTables/tree/master) |  Copyright (c) 2008-2015 SpryMedia Limited | [MIT](https://datatables.net/license/)
--   [Pickr v1.7.0](https://github.com/Simonwep/pickr/tree/1.7.0) | Copyright (c) 2018 - 2020 Simon Reinisch |
-    [MIT](https://github.com/Simonwep/pickr/blob/master/LICENSE)
--   [Font Awesome v5.12.0](https://github.com/FortAwesome/Font-Awesome/tree/5.12.0) | Copyright (c) @fontawesome |
-    [Font Awesome Free License](https://github.com/FortAwesome/Font-Awesome/blob/master/LICENSE.txt)

_locales/pl/messages.json

@@ -4,7 +4,7 @@
         "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": "zaktualizowane",
+        "message": "zaktualizowano",
         "description": "This status code says, that the ClearURLs rules are successfully updated."
     },
     "hash_status_code_3": {
@@ -20,7 +20,7 @@
         "description": "This status code says, that an error occurred while updating the ClearURLs rules."
     },
     "log_redirect": {
-        "message": "Ten url jest przekierowany",
+        "message": "Ten adres URL jest przekierowany",
         "description": "This string is used on redirections in the ClearURLs log."
     },
     "log_domain_blocked": {
@@ -76,15 +76,15 @@
         "description": "This string is used as name for the logging switch button on the popup page."
     },
     "popup_html_configs_switch_log_title": {
-        "message": "Dziennik zapisywany jest wyłącznie lokalnie. Zalecamy nie używanie tej funkcji jeśli nie jest ci potrzebna.",
+        "message": "Dziennik zapisywany jest wyłącznie lokalnie. Nie zalecamy używania tej funkcji, jeśli nie jest potrzebna.",
         "description": "This string is used as title for the logging switch button on the popup page."
     },
     "popup_html_configs_switch_badges": {
-        "message": "Znacznik",
+        "message": "Znaczniki",
         "description": "This string is used as name for the badges switch button on the popup page."
     },
     "popup_html_configs_switch_badges_title": {
-        "message": "Pokazuje liczbę oczyszczonych url",
+        "message": "Pokazuje liczbę oczyszczonych adresów URL",
         "description": "This string is used as title for the badges switch button on the popup page."
     },
     "popup_html_statistics_head": {
@@ -96,7 +96,7 @@
         "description": "This string is used as name for the elements on the popup page."
     },
     "popup_html_statistics_blocked": {
-        "message": "Zablokowano",
+        "message": "Zablokowane",
         "description": "This string is used as name for the blocked elements on the popup page."
     },
     "popup_html_statistics_percentage": {
@@ -112,7 +112,7 @@
         "description": "This string is used as title for the statistics reset button on the popup page."
     },
     "popup_html_rules_status_head": {
-        "message": "Status–Reguł",
+        "message": "Stan reguł",
         "description": "This string is used as title for the rules-status section on the popup page."
     },
     "popup_html_log_head": {
@@ -124,11 +124,11 @@
         "description": "This string is used as title for the log button on the popup page."
     },
     "popup_html_report_button": {
-        "message": "Raportuj aktualny URL",
+        "message": "Raportuj bieżący adres URL",
         "description": "Note: Currently not used."
     },
     "popup_html_report_button_title": {
-        "message": "Raportuj aktualny URL z tej karty.",
+        "message": "Raportuj bieżący adres URL z tej karty.",
         "description": "Currently not used."
     },
     "core_save_on_disk": {
@@ -160,35 +160,39 @@
         "description": "This string is used as name for the reset button on the settings page."
     },
     "setting_html_reset_button_title": {
-        "message": "Wyczyść wszystko",
+        "message": "Wyczyszcza wszystko",
         "description": "This string is used as title for the reset button on the settings page."
     },
     "setting_rule_url_label": {
-        "message": "Url do pliku data.json (reguły)",
+        "message": "Adres URL do pliku data.json (reguły)",
         "description": "This string is used as name for the rule url label."
     },
     "settings_html_save_button": {
-        "message": "Zapisz i załaduj dodatek ponownie",
+        "message": "Zapisz i załaduj ponownie dodatek",
         "description": "This string is used as name for the save&reload button on the settings page."
     },
     "settings_html_save_button_title": {
-        "message": "Zapisz ustawienia",
+        "message": "Zapisuje ustawienia",
         "description": "This string is used as title for the save&reload button on the settings page."
     },
     "setting_hash_url_label": {
-        "message": "Url do pliku rules.hash (hash)",
+        "message": "Adres URL do pliku rules.hash (hash)",
         "description": "This string is used as name for the rule.hash url label."
     },
+    "setting_types_label": {
+        "message": "<a href='https://developer.mozilla.org/pl/docs/Mozilla/Add-ons/WebExtensions/API/webRequest/ResourceType' target='_blank'>Typy żądań</a> (poziom ekspercki)",
+        "description": "This string is used as name for the types label."
+    },
     "setting_report_server_label": {
         "message": "Serwer raportów dla adresów URL",
         "description": "Note: Currently not used."
     },
     "success_report_url": {
-        "message": "URL został zaraportowany z powodzeniem. Wkrótce sprawdzimy ten raport.",
+        "message": "Adres URL został zaraportowany z powodzeniem. Wkrótce sprawdzimy ten raport.",
         "description": "Note: Currently not used."
     },
     "error_report_url": {
-        "message": "Ten Url już był raportowany.",
+        "message": "Ten adres URL już był raportowany.",
         "description": "Note: Currently not used."
     },
     "donate_button": {
@@ -196,7 +200,7 @@
         "description": "This string is used to refer to a donation page."
     },
     "clipboard_copy_link": {
-        "message": "Kopiuj Oczyszczony Odnośnik",
+        "message": "Kopiuj oczyszczony odnośnik",
         "description": "This string is used in the context menu to copy clean links."
     },
     "context_menu_enabled": {
@@ -204,27 +208,143 @@
         "description": "This string is used toggle the context menu entry to copy clean links."
     },
     "history_listener_enabled": {
-        "message": "Zapobiegaj iniekcji śledzenia w API historii (Zobacz także: <a href='https://developer.mozilla.org/en-US/docs/Web/API/History_API#The_replaceState()_method' target='_blank'>The replaceState() method</a>)",
+        "message": "Zapobiegaj wstrzykiwaniu śledzenia przez interfejs API historii (Zobacz także: <a href='https://developer.mozilla.org/pl/docs/Web/API/History_API#The_replaceState()_method' target='_blank'>metoda replaceState()</a>)",
         "description": "This string is used as name for the history API listener label."
     },
     "cleaning_tool_page_title": {
-        "message": "Narzędzie do oczyszczania URL",
+        "message": "Narzędzie do czyszczenia ClearURLs",
         "description": "This string is used as title on the cleaning tool page."
     },
     "cleaning_tool_description": {
-        "message": "To narzędzie pozwoli wkleić URL, a po wciśnięciu zielonego przycisku ClearURLs oczyści go. Można wkleić wiele URL jednocześnie, ale każdy pojedyńczy winien być w osobnej linii.",
+        "message": "To narzędzie pozwala wkleić adres URL, a po wciśnięciu zielonego przycisku ClearURLs oczyści go. Można wkleić wiele adresów URL jednocześnie, ale każdy pojedynczy powinien być w osobnej linii.",
         "description": "This string is used as description of the cleaning tool."
     },
     "cleaning_tool_btn": {
-        "message": "Oczyść",
+        "message": "Oczyść adresy URL",
         "description": "This string is used as name for the clean url button."
     },
     "cleaning_tool_dirty_urls_label": {
-        "message": "Tu możesz wkleić brudne URL:",
+        "message": "Tu możesz wkleić zabrudzone adresy URL:",
         "description": "This string is used as title on the cleaning tool page for the dirty URLs."
     },
     "cleaning_tool_clean_urls_label": {
-        "message": "Tu możesz znaleźć oczyszczone URL:",
+        "message": "Tu możesz znaleźć oczyszczone adresy URL:",
         "description": "This string is used as title on the cleaning tool page for the clean URLs."
+    },
+    "local_hosts_skipping": {
+        "message": "Pomijaj adresy URL lokalnych hostów (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": "Pomija adresy URL lokalnych hostów",
+        "description": "This string is used as title for the local host skipping switch"
+    },
+    "log_html_export_button": {
+        "message": "Eksportuj",
+        "description": "This string is used for the export button on the log page."
+    },
+    "log_html_export_button_title": {
+        "message": "Eksportuje cały dziennik",
+        "description": "This string is used as title for the export button on the log page."
+    },
+    "log_html_import_button": {
+        "message": "Importuj",
+        "description": "This string is used for the import button on the log page."
+    },
+    "log_html_import_button_title": {
+        "message": "Importuje cały dziennik",
+        "description": "This string is used as title for the import button on the log page."
+    },
+    "setting_html_export_button": {
+        "message": "Eksportuj",
+        "description": "This string is used as name for the export button on the settings page."
+    },
+    "setting_html_export_button_title": {
+        "message": "Eksportuje wszystko",
+        "description": "This string is used as title for the export button on the settings page."
+    },
+    "setting_html_import_button": {
+        "message": "Importuj",
+        "description": "This string is used as name for the reset button on the settings page."
+    },
+    "setting_html_import_button_title": {
+        "message": "Importuje wszystko",
+        "description": "This string is used as title for the import button on the settings page."
+    },
+    "setting_log_limit_label": {
+        "message": "Ogranicz dziennik do $LIMIT$ wpisów",
+        "description": "This string is used as name for the log limit label.",
+        "placeholders": {
+            "limit": {
+                "content": "$1",
+                "example": "100"
+            }
+        }
+    },
+    "blocked_html_title": {
+        "message": "Ta strona została zablokowana przez <b>ClearURLs</b>",
+        "description": "This string is used as title on the blocked site page."
+    },
+    "blocked_html_body": {
+        "message": "Ta strona została zablokowana przez dodatek <b>ClearURLs</b>, ponieważ identyfikujemy tę witrynę jako usługę reklamową i/lub śledzenia. Aby odwiedzić tę witrynę, musisz tymczasowo dezaktywować dodatek lub wyłączyć blokowanie domeny w ustawieniach ClearURLs. Następnie możesz kliknąć przycisk poniżej, aby załadować stronę.",
+        "description": "This string is used as body on the blocked site page."
+    },
+    "blocked_html_button": {
+        "message": "Odwiedź stronę",
+        "description": "This string is used as button on the blocked site page."
+    },
+    "referral_marketing_enabled": {
+        "message": "Zezwalaj na marketing referencyjny",
+        "description": "This string is used as label for the referral marketing switch"
+    },
+    "referral_marketing_enabled_title": {
+        "message": "Zezwala na marketing referencyjny",
+        "description": "This string is used as title for the referral marketing switch"
+    },
+    "watchdog": {
+        "message": "[ClearURLs]: Strażnik wykrył problem i już zawiódł $TIMES$ razy.",
+        "description": "This string is used as text for the watchdog",
+        "placeholders": {
+            "times": {
+                "content": "$1",
+                "example": "3"
+            }
+        }
+    },
+    "domain_blocking_enabled": {
+        "message": "Zezwalaj na blokowanie domen (może prowadzić do problemów na stronach, które nie zezwalają na blokery reklam)",
+        "description": "This string is used as label for the domain blocking switch"
+    },
+    "domain_blocking_enabled_title": {
+        "message": "Zezwala na blokowanie domen (może prowadzić do problemów na stronach, które nie zezwalają na blokery reklam)",
+        "description": "This string is used as title for the domain blocking switch"
+    },
+    "log_ping_blocked": {
+        "message": "Ta inspekcja hiperłączy została zablokowana",
+        "description": "This string is used on hyperlink auditing in the ClearURLs log."
+    },
+    "ping_blocking_enabled": {
+        "message": "Blokuj inspekcję hiperłączy (Zobacz także <a href='https://html.spec.whatwg.org/multipage/links.html#hyperlink-auditing' target='_blank'>ten artykuł</a>)",
+        "description": "This string is used as label for the hyperlink auditing blocking switch"
+    },
+    "ping_blocking_enabled_title": {
+        "message": "Blokuje inspekcję hiperłączy",
+        "description": "This string is used as title for the hyperlink auditing blocking switch"
+    },
+    "extension_description": {
+        "message": "Usuwaj elementy śledzące z adresów URL.",
+        "description": "Extension description (max. 132 characters)"
+    },
+    "eTag_filtering_log": {
+        "message": "Nagłówek ETag został usunięty z tego żądania",
+        "description": "This string is used on ETag header filtering in the ClearURLs log."
+    },
+    "eTag_filtering_enabled": {
+        "message": "Filtruj nagłówki ETag z żądań (Zobacz także <a href='https://en.wikipedia.org/wiki/HTTP_ETag#Tracking_using_ETags' target='_blank'>ten artykuł</a>)",
+        "description": "This string is used as label for the ETag header filtering switch"
+    },
+    "eTag_filtering_enabled_title": {
+        "message": "Filtruje nagłówki ETag. Wskazówka: pamięć podręczną należy wyczyścić przed pierwszym użyciem.",
+        "description": "This string is used as title for the ETag header filtering switch"
     }
 }

_locales/pt_PT/messages.json

@@ -102,7 +102,7 @@
         "message": "[ClearURLs]: Guardar definições no disco."
     },
     "core_error": {
-        "message": "[ClearURLs]: Não foi possível iniciar a extensão"
+        "message": "[ClearURLs]: Não foi possível iniciar a extensão."
     },
     "configs_switch_statistics": {
         "message": "Estatísticas"
@@ -204,7 +204,13 @@
         "message": "Importa tudo"
     },
     "setting_log_limit_label": {
-        "message": "Limitar o registo a $LIMIT$ entradas. (-1 significa ∞)"
+        "message": "Limitar o registo a $LIMIT$ entradas",
+        "placeholders": {
+            "limit": {
+                "content": "$1",
+                "example": "100"
+            }
+        }
     },
     "blocked_html_title": {
         "message": "Este site foi bloqueado pelo <b>ClearURLs</b>"

_locales/tr/messages.json

@@ -272,7 +272,7 @@
         "description": "Bu dize, ayarlar sayfasındaki alma düğmesinin adı olarak kullanılır."
     },
     "setting_log_limit_label": {
-        "message": "Günlüğü $ LIMIT $ girişleriyle sınırlar. (-1: = ∞)",
+        "message": "Günlüğü $ LIMIT $ girişleriyle sınırlar",
         "description": "Bu dize, günlük sınırı etiketinin adı olarak kullanılır.",
         "placeholders": {
             "limit": {

_locales/zh_TW/messages.json

@@ -261,7 +261,13 @@
         "message": "匯入各項設定"
     },
     "setting_log_limit_label": {
-        "message": "最多保存 $LIMIT$ 筆記錄檔"
+        "message": "最多保存 $LIMIT$ 筆記錄檔",
+        "placeholders": {
+            "limit": {
+                "content": "$1",
+                "example": "100"
+            }
+        }
     },
     "blocked_html_title": {
         "message": "這個網站已由 <b>ClearURLs</b> 封鎖"

clearurls.js

@@ -1,20 +1,20 @@
 /*
-* ClearURLs
+ * ClearURLs
-* Copyright (c) 2017-2020 Kevin Röbert
+ * Copyright (c) 2017-2021 Kevin Röbert
-*
+ *
-* This program is free software: you can redistribute it and/or modify
+ * 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
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
+ * (at your option) any later version.
-*
+ *
-* This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+ * GNU Lesser General Public License for more details.
-*
+ *
-* You should have received a copy of the GNU Lesser General Public License
+ * 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/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ */
 
 /*jshint esversion: 6 */
 /*
@@ -52,7 +52,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
             "changes": false,
             "url": url,
             "cancel": false
-        };
+        }
     }
 
     /*
@@ -93,12 +93,12 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
             pushToLog(pureUrl, url, translate('log_redirect'));
             increaseGlobalURLCounter(1);
             increaseBadged(false, request)
-        };
+        }
 
         return {
             "redirect": true,
             "url": url
-        };
+        }
     }
 
     if (existsFields(url)) {
@@ -157,7 +157,7 @@ function removeFieldsFormURL(provider, pureUrl, quiet = false, request = null) {
         "changes": changes,
         "url": url,
         "cancel": cancel
-    };
+    }
 }
 
 function start() {
@@ -255,7 +255,7 @@ function start() {
             return {
                 hash: (await response.text()).trim(),
                 status: response.status
-            };
+            }
         });
 
         response.then(result => {
@@ -290,7 +290,7 @@ function start() {
                 data: (await response.clone().text()).trim(),
                 hash: await sha256((await response.text()).trim()),
                 status: response.status
-            };
+            }
         })
 
         response.then(result => {
@@ -468,7 +468,7 @@ function start() {
          * @param {boolean} isActive   Is this rule active?
          */
         this.addReferralMarketing = function (rule, isActive = true) {
-            rule = "([\\/\\?#]|(&|&amp;))+(" + rule + "=[^\\/\\?&]*)";
+            rule = "([\\/\\?#]|(&|&amp;))+(" + rule + "=[^&]*)";
 
             this.applyRule(enabled_referralMarketing, disabled_referralMarketing, rule, isActive);
         };
@@ -478,7 +478,7 @@ function start() {
          * and replace old with new exception.
          *
          * @param {String} exception   RegExp as string
-         * @param {Boolean} isActive   Is this exception acitve?
+         * @param {Boolean} isActive   Is this exception active?
          */
         this.addException = function (exception, isActive = true) {
             if (isActive) {

core_js/storage.js

@@ -193,8 +193,8 @@ function initSettings() {
     storage.log = {"log": []};
     storage.statisticsStatus = true;
     storage.badged_color = "#ffa500";
-    storage.hashURL = "https://rules2.clearurls.xyz/rules.minify.hash";
+    storage.hashURL = "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/rules.minify.hash";
-    storage.ruleURL = "https://rules2.clearurls.xyz/data.minify.json";
+    storage.ruleURL = "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/data.minify.json";
     storage.contextMenuEnabled = true;
     storage.historyListenerEnabled = true;
     storage.localHostsSkipping = true;
@@ -221,27 +221,23 @@ function initSettings() {
 function replaceOldURLs(url) {
     switch (url) {
         case "https://raw.githubusercontent.com/KevinRoebert/ClearUrls/master/data/rules.hash?flush_cache=true":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/rules.minify.hash";
         case "https://raw.githubusercontent.com/KevinRoebert/ClearUrls/master/data/data.json?flush_cache=true":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/data.minify.json";
         case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/rules.hash":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/rules.minify.hash";
         case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.json":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/data.minify.json";
         case "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.min.hash?job=hash%20rules":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/rules.minify.hash";
         case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.min.json":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/data.minify.json";
         case "https://gitlab.com/KevinRoebert/ClearUrls/raw/master/data/data.minify.json":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/data.minify.json";
         case "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/data.minify.json?job=hash%20rules":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/data.minify.json";
         case "https://gitlab.com/KevinRoebert/ClearUrls/-/jobs/artifacts/master/raw/rules.minify.hash?job=hash%20rules":
-            return "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash";
+            return "https://git.michael.is/michael/clear-urls-browser-extension/raw/branch/master/data/rules.minify.hash";
-        case "https://kevinroebert.gitlab.io/ClearUrls/data/data.minify.json":
-            return "https://rules2.clearurls.xyz/data.minify.json";
-        case "https://kevinroebert.gitlab.io/ClearUrls/data/rules.minify.hash":
-            return "https://rules2.clearurls.xyz/rules.minify.hash";
         default:
             return url;
     }

css/switchButtons.css

@@ -82,6 +82,7 @@ input:checked + .slider:before {
 .switch label {
     position: absolute;
     left: 60px;
+    word-break: keep-all;
 }
 
 label {

data

@@ -1 +0,0 @@
-Subproject commit 30c9f66515e2c1a6f26ede24cada9ce800a36922

data/rules.minify.hash

@@ -0,0 +1 @@
+18ece9513135aefb68fdffa0e4d18b1ae441dc57076d1715bffb4bee27ec8963

html/popup.html

@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 </head>
 <body>
         <div class="container-fluid"
-        style="background: url('../img/img-noise-361x370.png');background-size: auto;min-width: 200px;">
+        style="min-width: 200px;">
         <div class="row">
             <nav class="col-sm-1 navbar-margin navbar navbar-dark bg-dark">
                 <div class="container">

manifest.json

@@ -1,10 +1,10 @@
 {
     "manifest_version": 2,
     "name": "ClearURLs",
-    "version": "1.20.0",
+    "version": "1.22.0",
     "author": "Kevin Röbert",
-    "description": "__MSG_extension_description__",
+    "description": "Removes tracking info from URLs. Forked from github.com/ClearURLs/Addon",
-    "homepage_url": "https://gitlab.com/KevinRoebert/ClearUrls",
+    "homepage_url": "https://git.michael.is/michael/clear-urls-browser-extension",
     "default_locale": "en",
     "icons": {
         "16": "img/clearurls_16x16.png",
@@ -19,6 +19,11 @@
         "96": "img/clearurls_96x96.png",
         "128": "img/clearurls_128x128.png"
     },
+    "browser_specific_settings": {
+        "gecko": {
+            "id": "{8460283f-b310-4e55-8c07-ebd5eefdc9b3}"
+        }
+    },
     "browser_action": {
         "browser_style": true,
         "default_icon": {
@@ -44,7 +49,6 @@
         "storage",
         "unlimitedStorage",
         "contextMenus",
-        "clipboardWrite",
         "webNavigation",
         "tabs",
         "downloads"

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "clear-urls",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}