diff --git a/_locales/de/messages.json b/_locales/de/messages.json index ffb62a5cb..a7b1fb068 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -259,52 +259,12 @@ "message":"Quellcode (GPLv3)", "description":"English: Source code (GPLv3)" }, - "aboutExtensionDataHeader":{ - "message":"Externe Ressourcen dieser Erweiterung", - "description":"English: Extension data" - }, - "aboutAssetsUpdatePrompt":{ - "message":"Von µBlock<\/i> benutzte externe Ressourcen können hier upgedatet werden, ohne auf eine neue Version dieser Erweiterung warten zu müssen. Diese Ressourcen werden bezogen vom Github Repository dieses Projekts<\/a>.", - "description":"Short descriptive text of the update feature" - }, - "aboutAssetsUpdateColPath":{ - "message":"Pfad", - "description":"Path column header" - }, - "aboutAssetsUpdateColStatus":{ - "message":"Status", - "description":"Status column header" - }, - "aboutAssetsUpdateGetListError":{ - "message":"Ein Fehler ist aufgetreten. Ist XHR<\/b> blockiert für raw2.github.com<\/b>?", - "description":"Successful outcome of clicking 'update' button" - }, - "aboutAssetsUpdateStatusAdded":{ - "message":"Hinzufügen", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusChanged":{ - "message":"Neue Version verfügbar", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusUnchanged":{ - "message":"Aktuell", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusRemoved":{ - "message":"Entfernen", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateButton":{ - "message":"Aktualisieren", - "description":"Update button" - }, - "aboutAssetsUpdatingButton":{ - "message":"Wird aktualisiert...", - "description":"Updating..." + "aboutContributors":{ + "message":"Contributors", + "description":"English: Contributors" }, "dummy":{ "message":"Dieser Eintrag muss der letzte sein", "description":"so we dont need to deal with comma for last entry" } -} +} \ No newline at end of file diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 9d6a101d1..57b053d8d 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -259,49 +259,9 @@ "message":"Source code (GPLv3)", "description":"English: Source code (GPLv3)" }, - "aboutExtensionDataHeader":{ - "message":"Extension data", - "description":"English: Extension data" - }, - "aboutAssetsUpdatePrompt":{ - "message":"µBlock<\/i> assets can be updated here without having to wait for the next release of the extension. These assets are pulled from the project's Github repository<\/a>.", - "description":"Short descriptive text of the update feature" - }, - "aboutAssetsUpdateColPath":{ - "message":"Path", - "description":"Path column header" - }, - "aboutAssetsUpdateColStatus":{ - "message":"Status", - "description":"Status column header" - }, - "aboutAssetsUpdateGetListError":{ - "message":"An error occurred. Is XHR<\/b> blocked for raw2.github.com<\/b>?", - "description":"Successful outcome of clicking 'update' button" - }, - "aboutAssetsUpdateStatusAdded":{ - "message":"To add", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusChanged":{ - "message":"New version available", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusUnchanged":{ - "message":"Up to date", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusRemoved":{ - "message":"To remove", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateButton":{ - "message":"Update", - "description":"Update button" - }, - "aboutAssetsUpdatingButton":{ - "message":"Updating...", - "description":"Updating..." + "aboutContributors":{ + "message":"Contributors", + "description":"English: Contributors" }, "dummy":{ "message":"This entry must be the last one", diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index 53b9e2b3e..abc970b58 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -259,52 +259,12 @@ "message":"Code Source (Licence GPLv3, en Anglais)", "description":"English: Source code (GPLv3)" }, - "aboutExtensionDataHeader":{ - "message":"Données de l'extension", - "description":"English: Extension data" - }, - "aboutAssetsUpdatePrompt":{ - "message":"Les éléments dynamiques, comprenant entre autres listes d'hôtes à bloquer et recettes prédéfinies, peuvent être mis à jour ici sans avoir à attendre la prochaine version de µBlock. Le processus s'effectue à partir de la page du projet sur Github<\/a>.", - "description":"Short descriptive text of the update feature" - }, - "aboutAssetsUpdateColPath":{ - "message":"Élément dynamique", - "description":"Path column header" - }, - "aboutAssetsUpdateColStatus":{ - "message":"État", - "description":"Status column header" - }, - "aboutAssetsUpdateGetListError":{ - "message":"Une erreur est survenue. Veuillez vous assurer que les requêtes de type XHR<\/b> ne soient pas bloquées pour raw2.github.com<\/b>", - "description":"Successful outcome of clicking 'update' button" - }, - "aboutAssetsUpdateStatusAdded":{ - "message":"À ajouter", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusChanged":{ - "message":"Nouvelle version disponible", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusUnchanged":{ - "message":"À jour", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateStatusRemoved":{ - "message":"À supprimer", - "description":"Displayed in the status column for each entry" - }, - "aboutAssetsUpdateButton":{ - "message":"Mettre à jour", - "description":"Update button" - }, - "aboutAssetsUpdatingButton":{ - "message":"Mise à jour en cours...", - "description":"Updating..." + "aboutContributors":{ + "message":"Contributeurs", + "description":"English: Contributors" }, "dummy":{ "message":"This entry must be the last one", "description":"so we dont need to deal with comma for last entry" } -} +} \ No newline at end of file diff --git a/about.html b/about.html index eed05b25f..aea69f4ee 100644 --- a/about.html +++ b/about.html @@ -16,8 +16,13 @@ ul {

µBlock

diff --git a/dist/description/description-zh_CN.txt b/dist/description/description-zh_CN.txt index 1022e2942..262eed497 100644 --- a/dist/description/description-zh_CN.txt +++ b/dist/description/description-zh_CN.txt @@ -41,7 +41,7 @@ https://github.com/gorhill/uBlock/wiki/%C2%B5Block-vs.-ABP:-efficiency-compared 开放源代码与公共许可证 (GPLv3) 一切为了用户。 -贡献者@ Github: +贡献者 @ Github: https://github.com/gorhill/uBlock/graphs/contributors 贡献者 @ Crowdin: https://crowdin.net/project/ublock diff --git a/js/3p-filters.js b/js/3p-filters.js index cb3da2162..cfff9e18f 100644 --- a/js/3p-filters.js +++ b/js/3p-filters.js @@ -319,7 +319,7 @@ var onListLinkClicked = function(ev) { /******************************************************************************/ -var onPurgeClicked = function(ev) { +var onPurgeClicked = function() { var button = uDom(this); var li = button.parent(); var href = li.find('a').first().attr('href'); diff --git a/js/messaging.js b/js/messaging.js index 86c230937..95c175d07 100644 --- a/js/messaging.js +++ b/js/messaging.js @@ -19,6 +19,8 @@ Home: https://github.com/gorhill/uBlock */ +/* global chrome, µBlock */ + // So there might be memory leaks related to the direct use of sendMessage(), // as per https://code.google.com/p/chromium/issues/detail?id=320723. The issue // is not marked as resolved, and the last message from chromium dev is: diff --git a/js/start.js b/js/start.js index aef9f4a0b..8f140ab00 100644 --- a/js/start.js +++ b/js/start.js @@ -19,7 +19,7 @@ Home: https://github.com/gorhill/uBlock */ -// ORDER IS IMPORTANT +/* global µBlock */ /******************************************************************************/ diff --git a/manifest.json b/manifest.json index 4bfcbb859..9ca11b11b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "__MSG_extName__", "short_name": "µBlock", - "version": "0.4.0.2", + "version": "0.4.1.0", "description": "__MSG_extShortDesc__", "icons": { "16": "img/icon_16.png",