Merge branch 'master' of https://gitlab.com/KevinRoebert/ClearUrls

Load the icon settings at boot

.gitlab/issue_templates/Bug.md

@@ -36,6 +36,7 @@ You do not have to reinstall Firefox or disable all addons. You can just create
 * **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: http://ip-api.com/json/?fields=country]
 
 ### Log
 <!-- Please enable the log functionality of ClearURLs and copy your log into this table. -->

README.md

@@ -5,7 +5,7 @@
 
 [![Mozilla Add-on](https://img.shields.io/amo/users/clearurls.svg)](https://addons.mozilla.org/en-US/firefox/addon/clearurls/statistics/?last=30)
 
-**ClearURLs** is an add-on based on the new WebExtensions technology and is optimized for *Firefox*.
+**ClearURLs** is an add-on based on the new WebExtensions technology and is optimized for *Firefox* and now also available for *Chrome* based browsers.
 
 This add-on will remove the tracking fields from all URLs which are visited by the browser and use a rule file, namely `data.json`.
 
@@ -15,7 +15,9 @@ This add-on protects your privacy and block the request from advertising service
 Large (and small) webpages use elements in the URL, e.g.: https://example.com?source=thisIstheSiteIvisitedBefore to track your online activities. In this example, the source field tells the provider which page you visited before. The add-on will remove these tracking fields from the URL.
 
 ## Installation
-[![Mozilla Add-on](https://img.shields.io/amo/d/clearurls.svg)](https://addons.mozilla.org/en-US/firefox/addon/clearurls/)
+Mozilla Add-on: [![Mozilla Add-on](https://img.shields.io/amo/d/clearurls.svg)](https://addons.mozilla.org/en-US/firefox/addon/clearurls/)
+
+[Chrome Add-on](https://gitlab.com/KevinRoebert/ClearUrls/tags?utf8=%E2%9C%93&search=_cv)
 
 ## Contribute
 If you have any suggestions or complaints, please [create an issue.](https://gitlab.com/KevinRoebert/ClearUrls/issues/new)
@@ -25,6 +27,9 @@ If you have any suggestions or complaints, please [create an issue.](https://git
 
 ## 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 v3.3.7 ](http://getbootstrap.com) |
     Copyright 2011-2016 Twitter, Inc. |
     [MIT](https://github.com/twbs/bootstrap/blob/master/LICENSE)

_locales/de/messages.json

@@ -242,5 +242,10 @@
     "error_report_url": {
         "message": "Es schaut so aus, als ob diese URL schon gemeldet wurde.",
         "description": ""
+    },
+
+    "donate_button": {
+        "message": "Eine Spende (Schenkung) für den ClearURLs Urheber.",
+        "description": ""
     }
 }

_locales/en/messages.json

@@ -242,5 +242,10 @@
     "error_report_url": {
         "message": "It seems like this URL has already been reported.",
         "description": ""
+    },
+
+    "donate_button": {
+        "message": "A donation for the ClearURLs creator.",
+        "description": ""
     }
 }

_locales/ja/messages.json

@@ -0,0 +1,246 @@
+{
+    "hash_status_code_1": {
+        "description": "up to date",
+        "message": "最新の"
+    },
+
+    "hash_status_code_2": {
+        "description": "updated",
+        "message": "更新する"
+    },
+
+    "hash_status_code_3": {
+        "description": "update available",
+        "message": "利用可能な更新"
+    },
+
+    "hash_status_code_4": {
+        "description": "error",
+        "message": "エラー"
+    },
+
+    "hash_status_code_5": {
+        "description": "Oops something went wrong!",
+        "message": "おっと！何かが間違っていた！"
+    },
+
+    "log_redirect": {
+        "description": "This url is redirected",
+        "message": "この URL はリダイレクトされます"
+    },
+
+    "log_domain_blocked": {
+        "description": "This domain is blocked",
+        "message": "このドメインはブロックされています"
+    },
+
+    "check_os_log": {
+        "description": "[ClearURLs]: Log listener is added.",
+        "message": "[ClearURLs]：ログリスナーが追加されました。"
+    },
+
+    "log_html_page_title": {
+        "description": "Log from ClearURLs",
+        "message": "ClearURLs からのログ"
+    },
+
+    "log_html_table_head_1": {
+        "description": "Before processing",
+        "message": "処理する前に"
+    },
+
+    "log_html_table_head_2": {
+        "description": "After processing",
+        "message": "処理後"
+    },
+
+    "log_html_table_head_3": {
+        "description": "Rule",
+        "message": "規則"
+    },
+
+    "log_html_table_head_4": {
+        "description": "Time",
+        "message": "時間"
+    },
+
+    "log_html_reset_button": {
+        "description": "Reset",
+        "message": "リセットする"
+    },
+
+    "log_html_reset_button_title": {
+        "description": "Reset the global log",
+        "message": "グローバルログをリセットする"
+    },
+
+    "popup_html_configs_head": {
+        "description": "Configs",
+        "message": "設定"
+    },
+
+    "popup_html_configs_switch_filter": {
+        "description": "Filter",
+        "message": "フィルター"
+    },
+
+    "popup_html_configs_switch_filter_title": {
+        "description": "The filters switch activates the cleaning functionality of ClearURLs. If you disable this option, the whole addon is disabled",
+        "message": "フィルタースイッチは、ClearURL のクリーニング機能を有効にします。 このオプションを無効にすると、アドオン全体が無効になります。"
+    },
+
+    "popup_html_configs_switch_log": {
+        "description": "Logging",
+        "message": "追跡記録"
+    },
+
+    "popup_html_configs_switch_log_title": {
+        "description": "The log is saved only locally. We advise against this feature if you do not need it",
+        "message": "ログはローカルにのみ保存されます。この機能が必要ない場合は、この機能を無効にすることをおすすめします。"
+    },
+
+    "popup_html_configs_switch_badges": {
+        "description": "Badges",
+        "message": "バッジ"
+    },
+
+    "popup_html_configs_switch_badges_title": {
+        "description": "Show number of cleaned urls",
+        "message": "消去された URL の数を表示する"
+    },
+
+    "popup_html_statistics_head": {
+        "description": "Statistics",
+        "message": "統計"
+    },
+
+    "popup_html_statistics_elements": {
+        "description": "Elements",
+        "message": "要素"
+    },
+
+    "popup_html_statistics_blocked": {
+        "description": "Blocked",
+        "message": "ブロックされた"
+    },
+
+    "popup_html_statistics_percentage": {
+        "description": "Percentage",
+        "message": "パーセンテージ"
+    },
+
+    "popup_html_statistics_reset_button": {
+        "description": "Reset",
+        "message": "リセットする"
+    },
+
+    "popup_html_statistics_reset_button_title": {
+        "description": "Reset the global statistics",
+        "message": "グローバル統計をリセットする"
+    },
+
+    "popup_html_rules_status_head": {
+        "description": "Rules-Status",
+        "message": "ルール・ステータス"
+    },
+
+    "popup_html_log_head": {
+        "description": "Log",
+        "message": "記録を取る"
+    },
+
+    "popup_html_log_head_title": {
+        "description": "Open the log",
+        "message": "記録を開く"
+    },
+
+    "popup_html_report_button": {
+        "description": "Report current URL",
+        "message": "現在の URL を報告する"
+    },
+
+    "popup_html_report_button_title": {
+        "description": "Report the current URL from this tab.",
+        "message": "このタブから現在の URL を報告してください。"
+    },
+
+    "core_save_on_disk": {
+        "description": "[ClearURLs]: Save on disk.",
+        "message": "[ClearURLs]：ディスクに保存します。"
+    },
+
+    "core_error": {
+        "description": "[ClearURLs]: The addon could not started.",
+        "message": "[ClearURLs]：アドオンを開始できませんでした。"
+    },
+
+    "configs_switch_statistics": {
+        "description": "Statistics",
+        "message": "統計"
+    },
+
+    "configs_switch_statistics_title": {
+        "description": "Activate or deactivate the statistics function",
+        "message": "統計機能を有効または無効にする"
+    },
+
+    "settings_html_page_title": {
+        "description": "Settings from ClearURLs",
+        "message": "ClearURL からの設定"
+    },
+
+    "badged_color_label": {
+        "description": "Badged color",
+        "message": "バッジの色"
+    },
+
+    "setting_html_reset_button": {
+        "description": "Reset",
+        "message": "リセットする"
+    },
+
+    "setting_html_reset_button_title": {
+        "description": "Reset everything",
+        "message": "すべてをリセットする"
+    },
+
+    "setting_rule_url_label": {
+        "description": "The url to the data.json file (rules)",
+        "message": "data.json ファイルへの URL（ルール）"
+    },
+
+    "settings_html_save_button": {
+        "description": "Save & reload addon",
+        "message": "アドオンの保存と再読み込み"
+    },
+
+    "settings_html_save_button_title": {
+        "description": "Saves the settings",
+        "message": "設定を保存します。"
+    },
+
+    "setting_hash_url_label": {
+        "description": "The url to the rules.hash file (hash)",
+        "message": "rules.hash ファイル（ハッシュ）への URL"
+    },
+
+    "setting_types_label": {
+        "description": "<a href='https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/webRequest/ResourceType' target='_blank'>Request types</a> (expert level)",
+        "message": "<a href='https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/webRequest/ResourceType' target='_blank'> リクエストタイプ</a> （エキスパートレベル）"
+    },
+
+    "setting_report_server_label": {
+        "description": "Report server for URLs",
+        "message": "URL のサーバーを報告する"
+    },
+
+    "success_report_url": {
+        "description": "The URL was successfully reported. We will check this URL soon.",
+        "message": "URL は正常に報告されました。 我々はすぐに、この URL をチェックします。"
+    },
+
+    "error_report_url": {
+        "description": "It seems like this URL has already been reported.",
+        "message": "この URL は既に報告されているようです。"
+    }
+}

clearurls.js

@@ -20,6 +20,7 @@ getDataFromDisk();
 function start(items)
 {
     initStorage(items);
+    changeIcon();
 
     /**
     * Save OS Version

core_js/popup_new.js

@@ -208,6 +208,7 @@ function setText()
     injectText('configs_head','popup_html_configs_head');
     injectText('configs_switch_statistics','configs_switch_statistics');
     injectText('reportButton', 'popup_html_report_button', true);
+    $('#donate').prop('title', translate('donate_button'));
 }
 
 /**

css/core.css

@@ -14,3 +14,13 @@ body {
 .col-sm-1 {
     margin-top: -10px;
 }
+
+#donate {
+    transition: 0.3s;
+    opacity: 0.8;
+    color: red;
+}
+
+#donate:hover {
+    opacity: 1;
+}

data/data.json

@@ -63,20 +63,20 @@
                 "sa=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 "dpr=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 "hl=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
-                "btnG=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
+                "btn[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
             ],
             "exceptions": [
-                ".*(mail\\.google\\.).*(\\/mail\\/u\\/0)\\/.*",
-                ".*(mail\\.google\\.).*(\\/mail\\/u\\/0)\\/.*",
+                ".*(mail\\.google\\.).*(\\/mail\\/u\\/0).*",
                 ".*(google\\.).*(\\/upload)?(\\/drive)\\/.*",
                 ".*(docs\\.google\\.).*\\/.*",
                 ".*(accounts\\.google\\.).*",
                 ".*(google\\.).*\\/searchbyimage\\?image_url=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 ".*(hangouts\\.google\\.).*\\/webchat.*zx=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 ".*(client-channel\\.google\\.).*\\/client-channel.*zx=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
-                ".*(google\\.).*\\/complete\\/search\\?client=youtube.*gs_gbg=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
+                ".*(google\\.).*\\/complete\\/search\\?.*gs_[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
                 ".*(google\\.).*\\/s\\?tbm=map.*gs_[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
-                ".*(news\\.google\\.).*\\?hl=.*"
+                ".*(news\\.google\\.).*\\?hl=.*",
+                ".*(google\\.).*\\/setprefs\\?.*hl=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
             ],
             "redirections": [
                 ".*google\\..*\\/.*url\\?.*url=([^&]*)"
@@ -186,7 +186,8 @@
             "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-]*\\.)?(facebook)(\\.[a-zA-Z]{2,})(.*\\?.*)",
             "completeProvider": false,
             "rules": [
-                "hc_location=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
+                "hc_[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
+                "ref=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
             ],
             "exceptions": [
                 ".*(facebook\\.)\\w{2,}.*(\\/plugins\\/).*"
@@ -217,7 +218,8 @@
             "completeProvider": false,
             "rules": [
                 "trackId=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
-                "tctx=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
+                "tctx=[^\\/|\\?|&]*(\\/|&(amp;)?)?",
+                "jb[a-zA-Z]*=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
             ],
             "exceptions": [],
             "redirections": []
@@ -353,6 +355,24 @@
             ],
             "exceptions": [],
             "redirections": []
+        },
+        "net-parade.it": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-]*\\.)?(net\\-parade\\.it)(.*\\?.*)",
+            "completeProvider": false,
+            "rules": [
+                "pl=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
+            ],
+            "exceptions": [],
+            "redirections": []
+        },
+        "prvnizpravy.cz": {
+            "urlPattern": "(https:\\/\\/|http:\\/\\/)([a-zA-Z0-9-]*\\.)?(prvnizpravy\\.cz)(.*\\?.*)",
+            "completeProvider": false,
+            "rules": [
+                "xid=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
+            ],
+            "exceptions": [],
+            "redirections": []
         }
     }
 }

data/rules.hash

@@ -1 +1 @@
-010ce5f572473cb89c93397e9f925086c3bd1908320fdc16e167b87f3e291c28
+a95e87aada0aa139767457391cfbfb7480638dd29b5872f97030844a9eb69db6

html/popup.html

@@ -28,12 +28,14 @@
                                 </span><br />
                                 <span class="label label-warning pull-left small-version"
                                 id="version"></span>
+                                <a id="donate" target="_blank" href="https://www.paypal.me/KevinRoebert">
+                                    <span class="pull-right glyphicon glyphicon-heart"></span>
+                                </a>
                             </span>
                         </div>
                     </div>
                 </nav>
             </div>
-
             <div class="row" id="incognito" style="display:none;">
                 <div class="col-sm-1">
                     <b class="text-justify word-wrap" style="color: #FF7800;">

manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "ClearURLs",
-    "version": "1.3.3.13",
+    "version": "1.3.3.18",
     "author": "Kevin R.",
     "description": "Remove tracking elements form URLs.",
     "homepage_url": "https://gitlab.com/KevinRoebert/ClearUrls",