From 962dbaadba690da7c65934d9cc9e992434867d88 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 2 Jul 2017 11:27:02 -0400 Subject: [PATCH 001/132] forgot to add `commands` permissions [opera] --- platform/opera/manifest.json | 37 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json index 17b2bd97f..3f54dcdb8 100644 --- a/platform/opera/manifest.json +++ b/platform/opera/manifest.json @@ -1,16 +1,5 @@ { - "manifest_version": 2, - - "name": "uBlock Origin", - "version": "1.9.15.101", - - "default_locale": "en", - "description": "__MSG_extShortDesc__", - "icons": { - "16": "img/icon_16.png", - "128": "img/icon_128.png" - }, - + "author": "All uBlock Origin contributors", "browser_action": { "default_icon": { "19": "img/browsericons/icon19.png", @@ -19,11 +8,20 @@ "default_title": "uBlock Origin", "default_popup": "popup.html" }, - - "author": "All uBlock Origin contributors", "background": { "page": "background.html" }, + "commands": { + "launch-element-zapper": { + "description": "__MSG_popupTipZapper__" + }, + "launch-element-picker": { + "description": "__MSG_popupTipPicker__" + }, + "launch-logger": { + "description": "__MSG_popupTipLog__" + } + }, "content_scripts": [ { "matches": ["http://*/*", "https://*/*"], @@ -38,8 +36,16 @@ "all_frames": false } ], + "default_locale": "en", + "description": "__MSG_extShortDesc__", + "icons": { + "16": "img/icon_16.png", + "128": "img/icon_128.png" + }, "incognito": "split", + "manifest_version": 2, "minimum_chrome_version": "38.0", + "name": "uBlock Origin", "optional_permissions": [ "file:///*" ], "options_page": "dashboard.html", "permissions": [ @@ -53,5 +59,6 @@ "webRequestBlocking", "" ], - "short_name": "uBlock₀" + "short_name": "uBlock₀", + "version": "1.9.15.101" } From 07ef347734f8f2753952c8327222d4f7439c3df9 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 2 Jul 2017 11:43:07 -0400 Subject: [PATCH 002/132] new revision for dev build --- platform/chromium/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index 7d5b3871d..f3a3ca230 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.13.4", + "version": "1.13.7.0", "commands": { "launch-element-zapper": { From 20346ef0edd44a827c27148b66d0a2cc7b5be55e Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 3 Jul 2017 09:08:46 -0400 Subject: [PATCH 003/132] auto-convert removed stock list into an imported list --- src/js/storage.js | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/js/storage.js b/src/js/storage.js index 8a13bc2ee..9d32ac351 100644 --- a/src/js/storage.js +++ b/src/js/storage.js @@ -467,7 +467,7 @@ listKey = importedListKeys[i]; entry = { content: 'filters', - contentURL: importedListKeys[i], + contentURL: listKey, external: true, group: 'custom', submitter: 'user', @@ -477,6 +477,31 @@ this.assets.registerAssetSource(listKey, entry); } + // Convert a no longer existing stock list into an imported list. + var customListFromStockList = function(assetKey) { + var oldEntry = oldAvailableLists[assetKey]; + if ( oldEntry === undefined || oldEntry.off === true ) { return; } + var listURL = oldEntry.contentURL; + if ( Array.isArray(listURL) ) { + listURL = listURL[0]; + } + var newEntry = { + content: 'filters', + contentURL: listURL, + external: true, + group: 'custom', + submitter: 'user', + title: oldEntry.title || '' + }; + newAvailableLists[listURL] = newEntry; + µb.assets.registerAssetSource(listURL, newEntry); + importedListKeys.push(listURL); + µb.userSettings.externalLists += '\n' + listURL; + µb.userSettings.externalLists = µb.userSettings.externalLists.trim(); + vAPI.storage.set({ externalLists: µb.userSettings.externalLists }); + µb.saveSelectedFilterLists([ listURL ], true); + }; + // Final steps: // - reuse existing list metadata if any; // - unregister unreferenced imported filter lists if any. @@ -487,8 +512,13 @@ for ( assetKey in oldAvailableLists ) { oldEntry = oldAvailableLists[assetKey]; newEntry = newAvailableLists[assetKey]; + // List no longer exists. If a stock list, try to convert to + // imported list if it was selected. if ( newEntry === undefined ) { µb.removeFilterList(assetKey); + if ( assetKey.indexOf('://') === -1 ) { + customListFromStockList(assetKey); + } continue; } if ( oldEntry.entryCount !== undefined ) { From a8382e821ddcac04e0948bb7375b51479b23a68c Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 3 Jul 2017 09:51:34 -0400 Subject: [PATCH 004/132] work around for #2734 until fixed in Nightly --- platform/chromium/vapi-background.js | 2 +- platform/webext/manifest.json | 3 --- src/js/popup.js | 13 ++++++++++++- src/popup.html | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js index 6f8540865..7ee4c5f7a 100644 --- a/platform/chromium/vapi-background.js +++ b/platform/chromium/vapi-background.js @@ -478,12 +478,12 @@ vAPI.tabs.open = function(details) { var targetURLWithoutHash = pos === -1 ? targetURL : targetURL.slice(0, pos); chrome.tabs.query({ url: targetURLWithoutHash }, function(tabs) { + if ( chrome.runtime.lastError ) { /* noop */ } var tab = tabs[0]; if ( !tab ) { wrapper(); return; } - var _details = { active: true, url: undefined diff --git a/platform/webext/manifest.json b/platform/webext/manifest.json index 72d1a14e2..e44cb2aef 100644 --- a/platform/webext/manifest.json +++ b/platform/webext/manifest.json @@ -14,19 +14,16 @@ "commands": { "launch-element-zapper": { "suggested_key": { - "default": "Alt+Z" }, "description": "__MSG_popupTipZapper__" }, "launch-element-picker": { "suggested_key": { - "default": "Alt+X" }, "description": "__MSG_popupTipPicker__" }, "launch-logger": { "suggested_key": { - "default": "Alt+L" }, "description": "__MSG_popupTipLog__" } diff --git a/src/js/popup.js b/src/js/popup.js index 84ce67fdb..37c10eccf 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -999,7 +999,6 @@ var onHideTooltip = function() { uDom('#switch').on('click', toggleNetFilteringSwitch); uDom('#gotoZap').on('click', gotoZap); uDom('#gotoPick').on('click', gotoPick); - uDom('a[href]').on('click', gotoURL); uDom('h2').on('click', toggleFirewallPane); uDom('#refresh').on('click', reloadTab); uDom('.hnSwitch').on('click', toggleHostnameSwitch); @@ -1009,6 +1008,18 @@ var onHideTooltip = function() { uDom('body').on('mouseenter', '[data-tip]', onShowTooltip) .on('mouseleave', '[data-tip]', onHideTooltip); + + // https://github.com/gorhill/uBlock/issues/2734 + // Workaround until fixed in Firefox Nightly. + if ( typeof chrome.runtime.getBrowserInfo !== 'function' ) { + uDom('a[href]').on('click', gotoURL); + } else { + chrome.runtime.getBrowserInfo().then(function(info) { + if ( info.name !== 'Firefox' ) { + uDom('a[href]').on('click', gotoURL); + } + }); + } })(); /******************************************************************************/ diff --git a/src/popup.html b/src/popup.html index d8a1223d0..3b303eced 100644 --- a/src/popup.html +++ b/src/popup.html @@ -17,8 +17,8 @@

- - + +

 

From 2cb8ddbe0307d2f88532c017b14de76bbfff679b Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 3 Jul 2017 10:20:47 -0400 Subject: [PATCH 005/132] fix #2740 --- src/js/logger-ui.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js index 56f407a7a..b6132781e 100644 --- a/src/js/logger-ui.js +++ b/src/js/logger-ui.js @@ -701,16 +701,22 @@ var netFilteringManager = (function() { }; var parseStaticInputs = function() { - var filter = ''; - var options = []; - var block = selectValue('select.static.action') === ''; + var filter = '', + options = [], + block = selectValue('select.static.action') === ''; if ( !block ) { filter = '@@'; } var value = selectValue('select.static.url'); if ( value !== '' ) { - filter += '||' + value; + if ( value.slice(-1) === '/' ) { + value += '*'; + } else if ( /[/?]/.test(value) === false ) { + value += '^'; + } + value = '||' + value; } + filter += value; value = selectValue('select.static.type'); if ( value !== '' ) { options.push(uglyTypeFromSelector('static')); @@ -974,7 +980,7 @@ var netFilteringManager = (function() { if ( pos === -1 ) { pos = path.length; } - urls.unshift(rootURL + path.slice(0, pos)); + urls.unshift(rootURL + path.slice(0, pos + 1)); } var query = matches[4] || ''; if ( query !== '') { @@ -1042,7 +1048,7 @@ var netFilteringManager = (function() { var rePlaceholder = /\{\{[^}]+?\}\}/g; var nodes = []; var match, pos = 0; - var select, option, i, value; + var select, option, n, i, value; for (;;) { match = rePlaceholder.exec(template); if ( match === null ) { @@ -1088,8 +1094,8 @@ var netFilteringManager = (function() { case '{{url}}': select = document.createElement('select'); select.className = 'static url'; - for ( i = 0; i < targetURLs.length; i++ ) { - value = targetURLs[i].replace(/^[a-z]+:\/\//, ''); + for ( i = 0, n = targetURLs.length; i < n; i++ ) { + value = targetURLs[i].replace(/^[a-z-]+:\/\//, ''); option = document.createElement('option'); option.setAttribute('value', value); option.textContent = shortenLongString(value, 128); From 414765f52608d00a9db4221c34c944ed8ccd5a1d Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 3 Jul 2017 10:50:47 -0400 Subject: [PATCH 006/132] code review: fix workaround for legacy FF --- src/js/popup.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/js/popup.js b/src/js/popup.js index 37c10eccf..696cf5afe 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1011,7 +1011,10 @@ var onHideTooltip = function() { // https://github.com/gorhill/uBlock/issues/2734 // Workaround until fixed in Firefox Nightly. - if ( typeof chrome.runtime.getBrowserInfo !== 'function' ) { + if ( + self.chrome instanceof Object === false || + typeof chrome.runtime.getBrowserInfo !== 'function' + ) { uDom('a[href]').on('click', gotoURL); } else { chrome.runtime.getBrowserInfo().then(function(info) { From 186c119202540fe85c646509d75ae12b51523537 Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 3 Jul 2017 10:54:30 -0400 Subject: [PATCH 007/132] fix #2753 --- src/css/logger-ui.css | 2 +- src/js/logger-ui.js | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/css/logger-ui.css b/src/css/logger-ui.css index a1a371b5c..355c2f11e 100644 --- a/src/css/logger-ui.css +++ b/src/css/logger-ui.css @@ -578,12 +578,12 @@ body.colorBlind #netFilteringDialog .dialog > div.containers > div.dynamic tr.e #filterFinderDialog .dialog { padding: 1em; + word-break: break-all; } #filterFinderDialog .dialog code { background: #eee; font-size: 85%; padding: 3px; - word-break: break-all; } #filterFinderDialog .dialog ul { font-size: larger; diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js index b6132781e..c29565061 100644 --- a/src/js/logger-ui.js +++ b/src/js/logger-ui.js @@ -1227,8 +1227,8 @@ var reverseLookupManager = (function() { if ( Array.isArray(lists) === false || lists.length === 0 ) { return null; } - var node; - var p = document.createElement('p'); + var node, + p = document.createElement('p'); reSentence1.lastIndex = 0; var matches = reSentence1.exec(sentence1Template); @@ -1237,7 +1237,10 @@ var reverseLookupManager = (function() { } else { node = uDom.nodeFromSelector('#filterFinderDialogSentence1 > span').cloneNode(true); node.childNodes[0].textContent = sentence1Template.slice(0, matches.index); - node.childNodes[1].textContent = filter; + // https://github.com/gorhill/uBlock/issues/2753 + node.childNodes[1].textContent = filter.length <= 1024 + ? filter + : filter.slice(0, 1023) + '…'; node.childNodes[2].textContent = sentence1Template.slice(reSentence1.lastIndex); } p.appendChild(node); @@ -1273,9 +1276,7 @@ var reverseLookupManager = (function() { for ( var filter in response ) { var p = nodeFromFilter(filter, response[filter]); - if ( p === null ) { - continue; - } + if ( p === null ) { continue; } dialog.appendChild(p); } From 6328a63c2b5702ac919623225df06145cf60a3ec Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 3 Jul 2017 11:08:25 -0400 Subject: [PATCH 008/132] new revision for dev build --- platform/chromium/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index f3a3ca230..f25c576ae 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.13.7.0", + "version": "1.13.7.1", "commands": { "launch-element-zapper": { From 432818df4fc372c96aa025af1eaed224ff03da31 Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 3 Jul 2017 12:25:13 -0400 Subject: [PATCH 009/132] fix popup panel width issue when photon disabled [firefox] --- platform/firefox/vapi-background.js | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index b5901ec8b..7a85730ff 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -3125,6 +3125,7 @@ vAPI.toolbarButton = { '#' + this.viewId + ',', '#' + this.viewId + ' > iframe {', 'height: 290px;', + 'max-width: none !important;', 'min-width: 0 !important;', 'overflow: hidden !important;', 'padding: 0 !important;', From 6a53e6d0ac53db7d484890b7a2160338bbab164e Mon Sep 17 00:00:00 2001 From: gorhill Date: Tue, 4 Jul 2017 09:33:03 -0400 Subject: [PATCH 010/132] minor code review --- platform/chromium/vapi-background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js index 7ee4c5f7a..34e8d1c12 100644 --- a/platform/chromium/vapi-background.js +++ b/platform/chromium/vapi-background.js @@ -479,7 +479,7 @@ vAPI.tabs.open = function(details) { chrome.tabs.query({ url: targetURLWithoutHash }, function(tabs) { if ( chrome.runtime.lastError ) { /* noop */ } - var tab = tabs[0]; + var tab = Array.isArray(tabs) && tabs[0]; if ( !tab ) { wrapper(); return; From 6273b5d7bf987194fbd539213de4cc17cf237613 Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 5 Jul 2017 11:01:02 -0400 Subject: [PATCH 011/132] translation work from https://crowdin.com/project/ublock --- dist/description/description-ca.txt | 2 +- dist/description/description-tr.txt | 14 ++++----- src/_locales/eu/messages.json | 2 +- src/_locales/fa/messages.json | 16 +++++----- src/_locales/he/messages.json | 2 +- src/_locales/id/messages.json | 2 +- src/_locales/nl/messages.json | 2 +- src/_locales/sl/messages.json | 2 +- src/_locales/sr/messages.json | 2 +- src/_locales/tr/messages.json | 48 ++++++++++++++--------------- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dist/description/description-ca.txt b/dist/description/description-ca.txt index dd83d6d98..5966fd2b4 100644 --- a/dist/description/description-ca.txt +++ b/dist/description/description-ca.txt @@ -1,4 +1,4 @@ -Un bloquejador eficient: el consum de memòria i de processador és baix però, no obstant això, pot carregar i aplicar milers de filtres més que altres bloquejadors coneguts. +Un blocador eficient: Amb un consum discret de memòria i de processador, pot carregar i aplicar milers de filtres més que altres aplicacions semblants. Gràfic de l'eficiència: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared diff --git a/dist/description/description-tr.txt b/dist/description/description-tr.txt index ce9b49b4b..b0debbe30 100644 --- a/dist/description/description-tr.txt +++ b/dist/description/description-tr.txt @@ -1,13 +1,13 @@ -Etkili bir engelleyici: Belleği ve işlemciyi yormaz, yine de diğer popüler engelleyicilere göre binlerce daha fazla süzgeci yükleyip uygulayabilir. +Etkili bir engelleyici: Belleği ve işlemciyi yormaz, yine de diğer popüler engelleyicilere göre binlerce daha çok süzgeci yükleyip uygulayabilir. Verimliliğine örneklendirilmiş genel bakış: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared -Kullanımı: Arayüzdeki büyük güç düğmesi mevcut web sitesinde uBlock'u kalıcı olarak etkisiz/etkin kılmak içindir. Bu yalnızca mevcut web sitesine uygulanır, evrensel bir güç düğmesi değildir. +Kullanımı: Arayüzdeki büyük güç düğmesi o anki web sitesinde, uBlock'u kalıcı olarak devre dışı bırakmak/etkinleştirmek içindir. Bu yalnızca o anki web sitesine uygulanır, evrensel bir güç düğmesi değildir. *** -Esnek, bir "reklam engelleyici"den daha fazlası: Alan adları dosyalarınızdan süzgeçleri okuyabilir ve oluşturabilir. +Esnek, bir "reklam engelleyici"den daha fazlası: Ayrıca alan adları dosyalarınızdan süzgeçleri okuyabilir ve oluşturabilir. Hazır olarak şu süzgeç listeleri yüklüdür ve uygulanır: @@ -23,21 +23,21 @@ Hazır olarak şu süzgeç listeleri yüklüdür ve uygulanır: - hpHosts'un Reklam ve izleyici sunucuları - MVPS HOSTS - Spam404 -- Ve daha birçoğu +- Ve daha başkaları -Tabii ki, daha fazla süzgeç etkinleştirildikçe, bellek kullanımı da yükselir. Ama, Fanboy'un iki ekstra listesi, hpHosts'un reklam ve izleyici sunucuları ekledikten sonra dahi uBlock diğer oldukça popüler olan engelleyicilere göre daha az bellek kullanır. +Elbette, daha çok süzgeç etkinleştirildikçe, bellek kullanımı da artar. Yine de, Fanboy'un iki ekstra listesi, hpHosts'un reklam ve izleyici sunucuları ekledikten sonra bile uBlock diğer oldukça popüler engelleyicilere göre daha az bellek kullanır. Ayrıca, bazı ekstra listelerin seçilmesinin web sitelerinin bozulması olasılığını artırabileceğini unutmayın -- özellikle normalde alan adları dosyası olarak kullanılan listelerin. *** -Ön yüklü gelen süzgeç listeleri olmadan, bu eklenti hiçbir işe yaramaz. Eğer gerçekten bir şekilde katkıda bulunmak isterseniz, herkes tarafından özgürce kullanıma imkan veren, kullandığınız süzgeç listelerini oluşturmak için uğraşan insanları düşünün. +Ön yüklü gelen süzgeç listeleri olmadan, bu eklenti bir işe yaramaz. Bu yüzden, gerçekten bir şekilde katkıda bulunmak isterseniz, herkesin özgürce kullanması için sunulan kullandığınız süzgeç listelerini oluşturmak için uğraşan insanları düşünün. *** Özgür. Açık kaynak kamu lisanslı (GPLv3) -Kullanıcılar tarafından kullanıcılar için. +Kullanıcılardan kullanıcılara. Katkıda bulunanlar @ Github: https://github.com/gorhill/uBlock/graphs/contributors Katkıda bulunanlar @ Crowdin: https://crowdin.net/project/ublock diff --git a/src/_locales/eu/messages.json b/src/_locales/eu/messages.json index d6a03d17d..a0ecb8c3a 100644 --- a/src/_locales/eu/messages.json +++ b/src/_locales/eu/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"Klik kontrol panela irekitzeko", + "message":"Ireki kontrol panela", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ diff --git a/src/_locales/fa/messages.json b/src/_locales/fa/messages.json index 71b3a61f6..d769279dd 100644 --- a/src/_locales/fa/messages.json +++ b/src/_locales/fa/messages.json @@ -40,7 +40,7 @@ "description":"appears as tab name in dashboard" }, "advancedSettingsPageName":{ - "message":"Advanced settings", + "message":"تنظیمات پیشرفته", "description":"Title for the advanced settings page" }, "popupPowerSwitchInfo":{ @@ -68,11 +68,11 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"برای باز کردن داشبورد کلیک کنید", + "message":"باز کردن داشبورد", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ - "message":"Enter element zapper mode", + "message":"ورود به حالت انتخاب اشیاء", "description":"Tooltip for the element-zapper icon in the popup panel" }, "popupTipPicker":{ @@ -80,7 +80,7 @@ "description":"English: Enter element picker mode" }, "popupTipLog":{ - "message":"بازنمایی ثبت درخواست", + "message":"رفتن به لاگ درخواست", "description":"Tooltip used for the logger icon in the panel" }, "popupTipNoPopups":{ @@ -216,7 +216,7 @@ "description":"" }, "settingsAdvancedUserSettings":{ - "message":"advanced settings", + "message":"تنظیمات پیشرفته", "description":"For the tooltip of a link which gives access to advanced settings" }, "settingsPrefetchingDisabledPrompt":{ @@ -348,11 +348,11 @@ "description":"used as a tooltip for the clock icon beside a list" }, "3pUpdating":{ - "message":"Updating...", + "message":"درحال بروزرسانی...", "description":"used as a tooltip for the spinner icon beside a list" }, "3pNetworkError":{ - "message":"A network error prevented the resource from being updated.", + "message":"یک خطای شبکه از بروزشدن منابع جلوگیری کرد.", "description":"used as a tooltip for error icon beside a list" }, "1pFormatHint":{ @@ -680,7 +680,7 @@ "description":"used as a prompt for the user to provide a custom device name" }, "advancedSettingsWarning":{ - "message":"Warning! Change these advanced settings at your own risk.", + "message":"هشدار! این تنظیمات پیشرفته را با مسئولیت خود تغییر دهید.", "description":"A warning to users at the top of 'Advanced settings' page" }, "genericSubmit":{ diff --git a/src/_locales/he/messages.json b/src/_locales/he/messages.json index 0026edbc6..ca742bd18 100644 --- a/src/_locales/he/messages.json +++ b/src/_locales/he/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"לחץ כדי לפתוח את לוח המחוונים", + "message":"פתח את פאנל הקונפיגורציות", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ diff --git a/src/_locales/id/messages.json b/src/_locales/id/messages.json index 832b21f6d..380d46174 100644 --- a/src/_locales/id/messages.json +++ b/src/_locales/id/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"Klik untuk membuka dasbor", + "message":"Buka dasbor", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json index c82bd13ef..8b165636e 100644 --- a/src/_locales/nl/messages.json +++ b/src/_locales/nl/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"Klik om het dashboard te openen", + "message":"Dashboard openen", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ diff --git a/src/_locales/sl/messages.json b/src/_locales/sl/messages.json index 010da7b9c..ca51f8d68 100644 --- a/src/_locales/sl/messages.json +++ b/src/_locales/sl/messages.json @@ -208,7 +208,7 @@ "description":"English: Color-blind friendly" }, "settingsCloudStorageEnabledPrompt":{ - "message":"Omogoči podporo za shrambo v oblako", + "message":"Omogoči podporo za shrambo v oblaku", "description":"" }, "settingsAdvancedUserPrompt":{ diff --git a/src/_locales/sr/messages.json b/src/_locales/sr/messages.json index c36ae532a..17bc77e07 100644 --- a/src/_locales/sr/messages.json +++ b/src/_locales/sr/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"Кликните за отварање контролне табле", + "message":"Отвори контролну таблу", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ diff --git a/src/_locales/tr/messages.json b/src/_locales/tr/messages.json index 1c543b649..cd2ab836d 100644 --- a/src/_locales/tr/messages.json +++ b/src/_locales/tr/messages.json @@ -68,15 +68,15 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"Kontrol panelini aç", + "message":"Kontrol panelini açar", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ - "message":"Öğe silme moduna gir", + "message":"Öge silme moduna gir", "description":"Tooltip for the element-zapper icon in the popup panel" }, "popupTipPicker":{ - "message":"Öğe seçme moduna gir", + "message":"Öge seçme moduna gir", "description":"English: Enter element picker mode" }, "popupTipLog":{ @@ -88,7 +88,7 @@ "description":"Tooltip for the no-popups per-site switch" }, "popupTipNoLargeMedia":{ - "message":"Bu site için büyük medya öğelerini engellemeyi aç\/kapa", + "message":"Bu site için büyük medya ögelerini engellemeyi aç\/kapa", "description":"Tooltip for the no-large-media per-site switch" }, "popupTipNoCosmeticFiltering":{ @@ -184,7 +184,7 @@ "description":"English: Click, Ctrl-click" }, "pickerContextMenuEntry":{ - "message":"Ögeyi engelle", + "message":"Öge engelle", "description":"English: Block element" }, "settingsCollapseBlockedPrompt":{ @@ -244,7 +244,7 @@ "description":"" }, "settingsNoLargeMediaPrompt":{ - "message":"Belirlenenden büyük medya öğelerini engelle {{input:number}} kB", + "message":"Belirlenenden büyük medya ögelerini engelle {{input:number}} kB", "description":"" }, "settingsNoRemoteFontsPrompt":{ @@ -252,7 +252,7 @@ "description":"" }, "settingsStorageUsed":{ - "message":"Kullanılan Alan: {{value}} bayt", + "message":"Kullanılan Alan: {{value}} byte", "description":"English: Storage used: {{}} bytes" }, "settingsLastRestorePrompt":{ @@ -280,7 +280,7 @@ "description":"A button in the in the _3rd-party filters_ pane" }, "3pPurgeAll":{ - "message":"Tüm önbelleği temizle", + "message":"Tüm önbellekleri temizle", "description":"A button in the in the _3rd-party filters_ pane" }, "3pParseAllABPHideFiltersPrompt1":{ @@ -288,11 +288,11 @@ "description":"English: Parse and enforce Adblock+ element hiding filters." }, "3pParseAllABPHideFiltersInfo":{ - "message":"

Bu seçenek Adblock Plus-uyumlu “öğe gizleme” süzgeçlerinin<\/a> işlenmesini ve uygulanmasını sağlar. Bu süzgeçler aslında kozmetiktir, bir web sayfasında görsel rahatsızlık yaratan ve ağ isteği-tabanlı süzme motoru tarafından engellenemeyecek olan öğelerin gizlenmesine yarar.<\/p>

Bu özelliği etkinleştirmek uBlock₀'in bellek kullanımını artırır.<\/p>", + "message":"

Bu seçenek Adblock Plus-uyumlu “öge gizleme” süzgeçlerinin<\/a> işlenmesini ve uygulanmasını sağlar. Bu süzgeçler aslında kozmetiktir, bir web sayfasında görsel rahatsızlık yaratan ve ağ isteği-tabanlı süzme motoru tarafından engellenemeyecek olan ögelerin gizlenmesine yarar.<\/p>

Bu özelliği etkinleştirmek uBlock₀'in bellek kullanımını artırır.<\/p>", "description":"Describes the purpose of the 'Parse and enforce cosmetic filters' feature." }, "3pIgnoreGenericCosmeticFilters":{ - "message":"Genel kozmetik süzgeçleri yoksay.", + "message":"Genel kozmetik süzgeçleri yok say", "description":"This will cause uBO to ignore all generic cosmetic filters." }, "3pIgnoreGenericCosmeticFiltersInfo":{ @@ -336,7 +336,7 @@ "description":"English: Custom" }, "3pExternalListsHint":{ - "message":"Her satırda bir URL. ‘!’ ile başlayan satırlar göz ardı edilir. Geçersiz URL'ler sessizce yoksayılır.", + "message":"Her satırda bir URL. ‘!’ ile başlayan satırlar göz ardı edilir. Geçersiz URL'ler sessizce yok sayılır.", "description":"English: One URL per line. Lines prefixed with ‘!’ will be ignored. Invalid URLs will be silently ignored." }, "3pExternalListObsolete":{ @@ -464,15 +464,15 @@ "description":"Appears in the logger's tab selector" }, "logBehindTheScene":{ - "message":"Sahne arkası", + "message":"Perde arkası", "description":"Pretty name for behind-the-scene network requests" }, "logFilterPrompt":{ - "message":"günlük kayıtlarını süz", + "message":"günlük girişlerini süz", "description":"English: filter log entries" }, "logMaxEntriesTip":{ - "message":"Maksimum günlük kayıt sayısı", + "message":"Maksimum günlük giriş sayısı", "description":"Tooltip informaing that the input field is to set the maximum number of entries in the log" }, "loggerURLFilteringContextLabel":{ @@ -568,11 +568,11 @@ "description":"English: Reset to default settings..." }, "aboutRestoreDataConfirm":{ - "message":"Tüm ayarlarınız {{time}} tarihinde yedeklenmiş veriler kullanarak değiştirilecek ve uBlock₀ yeniden başlayacak. \n\nYedeklenmiş verileriniz kullanılarak mevcut tüm ayarlarınız değiştirilsin mi?", + "message":"Tüm ayarlarınız {{time}} tarihinde yedeklenmiş veriler kullanarak değiştirilecek ve uBlock₀ yeniden başlayacak. \n\nYedeklenmiş verileriniz kullanılarak var olan tüm ayarlarınız değiştirilsin mi?", "description":"Message asking user to confirm restore" }, "aboutRestoreDataError":{ - "message":"Veri okunamıyor ya da geçersiz", + "message":"Veri okunamadı veya geçersiz", "description":"Message to display when an error occurred during restore" }, "aboutResetDataConfirm":{ @@ -588,7 +588,7 @@ "description":"English: The message seen by the user to confirm subscription to a ABP filter list" }, "elapsedOneMinuteAgo":{ - "message":"1 dakika önce", + "message":"bir dakika önce", "description":"English: a minute ago" }, "elapsedManyMinutesAgo":{ @@ -596,7 +596,7 @@ "description":"English: {{value}} minutes ago" }, "elapsedOneHourAgo":{ - "message":"1 saat önce", + "message":"bir saat önce", "description":"English: an hour ago" }, "elapsedManyHoursAgo":{ @@ -604,7 +604,7 @@ "description":"English: {{value}} hours ago" }, "elapsedOneDayAgo":{ - "message":"1 gün önce", + "message":"bir gün önce", "description":"English: a day ago" }, "elapsedManyDaysAgo":{ @@ -628,7 +628,7 @@ "description":"English: uBlock₀ has prevented the following page from loading:" }, "docblockedPrompt2":{ - "message":"Aşağıdaki süzgeçten dolayı", + "message":"Bu süzgeç nedeniyle", "description":"English: Because of the following filter" }, "docblockedNoParamsPrompt":{ @@ -640,7 +640,7 @@ "description":"English: List of filter list names follows" }, "docblockedBack":{ - "message":"Geri dön", + "message":"Geri git", "description":"English: Go back" }, "docblockedClose":{ @@ -664,11 +664,11 @@ "description":"tooltip" }, "cloudPull":{ - "message":"Bulut depodan içe aktar", + "message":"Bulut depodan al", "description":"tooltip" }, "cloudPullAndMerge":{ - "message":"Bulut depodan içe aktar ve şu anki ayarlarla birleştir", + "message":"Bulut depodan al ve şu anki ayarlarla birleştir", "description":"tooltip" }, "cloudNoData":{ @@ -700,7 +700,7 @@ "description":"" }, "contextMenuTemporarilyAllowLargeMediaElements":{ - "message":"Geçici olarak büyük medya öğelerine izin ver", + "message":"Geçici olarak büyük medya ögelerine izin ver", "description":"A context menu entry, present when large media elements have been blocked on the current site" }, "dummy":{ From b9bf155a3085348622f38c9fc25f62f062bb410a Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 5 Jul 2017 11:02:22 -0400 Subject: [PATCH 012/132] new revision for release candidate --- platform/chromium/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index f25c576ae..c68f9dfd4 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.13.7.1", + "version": "1.13.7.100", "commands": { "launch-element-zapper": { From 9ac4dc9f81d0cc66ed67adf9ec247076c8ad67ed Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 7 Jul 2017 11:23:24 -0400 Subject: [PATCH 013/132] fix #2768 --- src/js/popup.js | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index 696cf5afe..41f698343 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1009,20 +1009,7 @@ var onHideTooltip = function() { uDom('body').on('mouseenter', '[data-tip]', onShowTooltip) .on('mouseleave', '[data-tip]', onHideTooltip); - // https://github.com/gorhill/uBlock/issues/2734 - // Workaround until fixed in Firefox Nightly. - if ( - self.chrome instanceof Object === false || - typeof chrome.runtime.getBrowserInfo !== 'function' - ) { - uDom('a[href]').on('click', gotoURL); - } else { - chrome.runtime.getBrowserInfo().then(function(info) { - if ( info.name !== 'Firefox' ) { - uDom('a[href]').on('click', gotoURL); - } - }); - } + uDom('a[href]').on('click', gotoURL); })(); /******************************************************************************/ From efffa5e183dbda2cbea8a204303b3e3cf0555591 Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 7 Jul 2017 11:31:37 -0400 Subject: [PATCH 014/132] trashcan instead of X to remove an imported list --- src/3p-filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3p-filters.html b/src/3p-filters.html index 714052ece..062b24fab 100644 --- a/src/3p-filters.html +++ b/src/3p-filters.html @@ -45,7 +45,7 @@ ​​​​​​​

From 3a1113b768630ef349f89d6a001442b25d9d2476 Mon Sep 17 00:00:00 2001 From: gorhill Date: Tue, 8 Aug 2017 13:40:00 -0400 Subject: [PATCH 065/132] new revision for dev build --- platform/chromium/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index 00a9f0695..e726e1da8 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.13.9.6", + "version": "1.13.9.7", "commands": { "launch-element-zapper": { From 90470414e861353ed202c6ed549f767860d3d883 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 8 Aug 2017 19:02:44 -0400 Subject: [PATCH 066/132] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad1223385..0b8352baf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,7 @@ # Submitting issues +Please stop opening invalid issues regarding the "Legacy" label of uBlock Origin on AMO, it's all explained in the [Release notes](https://github.com/gorhill/uBlock/releases). + For **support/discussions/help**, there is [/r/uBlockOrigin](https://www.reddit.com/r/uBlockOrigin/) on Reddit -- this is where I see the most activity for people helping each other regarding uBlock Origin. For **filter-related issues**, report on the respective filter list support site, or at [uBlockOrigin/uAssets](https://github.com/uBlockOrigin/uAssets/issues). Use [the logger](https://github.com/gorhill/uBlock/wiki/The-logger) to diagnose/confirm filter-related issues. If something does not work properly with uBO enabled, the **first step** is to rule out filter-related issues. From 04718be3fd262908a5d5822580b1e26b29a3f30a Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 9 Aug 2017 10:52:27 -0400 Subject: [PATCH 067/132] translation work from https://crowdin.com/project/ublock --- dist/description/description-sr.txt | 8 ++++---- src/_locales/et/messages.json | 2 +- src/_locales/fi/messages.json | 8 ++++---- src/_locales/fil/messages.json | 20 ++++++++++---------- src/_locales/fy/messages.json | 2 +- src/_locales/hi/messages.json | 6 +++--- src/_locales/hu/messages.json | 2 +- src/_locales/id/messages.json | 2 +- src/_locales/ja/messages.json | 20 ++++++++++---------- src/_locales/ru/messages.json | 2 +- src/_locales/sr/messages.json | 16 ++++++++-------- src/_locales/vi/messages.json | 6 +++--- src/_locales/zh_CN/messages.json | 2 +- 13 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dist/description/description-sr.txt b/dist/description/description-sr.txt index 0a201b0c3..84f7c96bb 100644 --- a/dist/description/description-sr.txt +++ b/dist/description/description-sr.txt @@ -1,4 +1,4 @@ -Ефикасан блокатор: ниски процесорски и меморијски захтеви и може учитати и применити хиљаде филтера више него остали популарни блокатори. +Ефикасан блокатор: ниски процесорски и меморијски захтеви а може учитати и применити хиљаде филтера више него остали популарни блокатори. Илустровани преглед његове ефикасности: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared @@ -6,7 +6,7 @@ *** -Флексибилан је, више је од блокатора реклама: може читати и стварати филтере из хост датотека. +Флексибилан је, више је од блокатора реклама: може читати и креирати филтере из хост датотека. Одмах по инсталирању, следећи спискови филтера су учитани и спроведени: @@ -30,7 +30,7 @@ *** -Без предефинисаних спискова филтера, ово проширење је ништа. Тако да ако икад желите да допринесете нешто, размислите о људима који напорно раде одржавајући спискове филтера које користите и који су доступни за бесплатно коришћење свима. +Без предефинисаних спискова филтера, ово проширење је ништа. Тако да ако икад желите да допринесете нечим, размислите о људима који напорно раде одржавајући спискове филтера које користите и који су доступни за бесплатно коришћење свима. *** @@ -45,5 +45,5 @@ Ово је рана верзија, имајте то на уму када будете оцењивали. -Листа измена: +Евиденција промена: https://github.com/gorhill/uBlock/releases diff --git a/src/_locales/et/messages.json b/src/_locales/et/messages.json index ae327f4ba..4adc76131 100644 --- a/src/_locales/et/messages.json +++ b/src/_locales/et/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"Klõpsa, et avada töölaud", + "message":"Ava töölaud", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ diff --git a/src/_locales/fi/messages.json b/src/_locales/fi/messages.json index c91b47cc9..630835777 100644 --- a/src/_locales/fi/messages.json +++ b/src/_locales/fi/messages.json @@ -68,11 +68,11 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"Avaa hallintapaneeli napsauttamalla", + "message":"Hallintapaneelityökaluun", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ - "message":"Enter element zapper mode", + "message":"Aktivoi elementtien piilotus\/palautus -poimintatyökalu", "description":"Tooltip for the element-zapper icon in the popup panel" }, "popupTipPicker":{ @@ -148,7 +148,7 @@ "description":"" }, "popupHitDomainCountPrompt":{ - "message":"yhdistetyt verkkotunnukset", + "message":"aktiiviset verkkotunnusyhteydet", "description":"appears in popup" }, "popupHitDomainCount":{ @@ -204,7 +204,7 @@ "description":"English: Make use of context menu where appropriate" }, "settingsColorBlindPrompt":{ - "message":"Mukauta värisokeille", + "message":"Aktivoi vaihtoehtoiset värit puna-vihervärien sijaan", "description":"English: Color-blind friendly" }, "settingsCloudStorageEnabledPrompt":{ diff --git a/src/_locales/fil/messages.json b/src/_locales/fil/messages.json index 1139ad675..62dd3c8a9 100644 --- a/src/_locales/fil/messages.json +++ b/src/_locales/fil/messages.json @@ -92,11 +92,11 @@ "description":"Tooltip for the no-large-media per-site switch" }, "popupTipNoCosmeticFiltering":{ - "message":"Toggle cosmetic filtering for this site", + "message":"Palit-ayos ng panala ng itsura para sa site na ito", "description":"Tooltip for the no-cosmetic-filtering per-site switch" }, "popupTipNoRemoteFonts":{ - "message":"Toggle the blocking of remote fonts for this site", + "message":"Palit-ayos sa paghalang ng malayuang itsura ng titik para sa site na ito", "description":"Tooltip for the no-remote-fonts per-site switch" }, "popupTipGlobalRules":{ @@ -116,15 +116,15 @@ "description":"Tooltip when hovering over the eraser in the dynamic filtering pane." }, "popupAnyRulePrompt":{ - "message":"all", + "message":"lahat", "description":"" }, "popupImageRulePrompt":{ - "message":"images", + "message":"mga imahe", "description":"" }, "popup3pAnyRulePrompt":{ - "message":"3rd-party", + "message":"Pang-tatlo na personalidad", "description":"" }, "popup3pPassiveRulePrompt":{ @@ -156,19 +156,19 @@ "description":"appears in popup" }, "pickerCreate":{ - "message":"Create", + "message":"Gumawa", "description":"English: Create" }, "pickerPick":{ - "message":"Pick", + "message":"Pili", "description":"English: Pick" }, "pickerQuit":{ - "message":"Quit", + "message":"Tumigil", "description":"English: Quit" }, "pickerPreview":{ - "message":"Preview", + "message":"Paunang-tingin", "description":"Element picker preview mode: will cause the elements matching the current filter to be removed from the page" }, "pickerNetFilters":{ @@ -184,7 +184,7 @@ "description":"English: Click, Ctrl-click" }, "pickerContextMenuEntry":{ - "message":"Block element", + "message":"Paghalang sa elemento", "description":"English: Block element" }, "settingsCollapseBlockedPrompt":{ diff --git a/src/_locales/fy/messages.json b/src/_locales/fy/messages.json index e46ccbb44..d259a1e8c 100644 --- a/src/_locales/fy/messages.json +++ b/src/_locales/fy/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"Klik om it dashboerd te iepenjen", + "message":"Dashboerd iepenje", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ diff --git a/src/_locales/hi/messages.json b/src/_locales/hi/messages.json index 7933b27fa..f70d8dcd3 100644 --- a/src/_locales/hi/messages.json +++ b/src/_locales/hi/messages.json @@ -168,7 +168,7 @@ "description":"English: Quit" }, "pickerPreview":{ - "message":"Preview", + "message":"पूर्वावलोकन", "description":"Element picker preview mode: will cause the elements matching the current filter to be removed from the page" }, "pickerNetFilters":{ @@ -216,7 +216,7 @@ "description":"" }, "settingsAdvancedUserSettings":{ - "message":"advanced settings", + "message":"उन्नत सेटिंग्स", "description":"For the tooltip of a link which gives access to advanced settings" }, "settingsPrefetchingDisabledPrompt":{ @@ -272,7 +272,7 @@ "description":"Appears aside each filter list in the _3rd-party filters_ pane" }, "3pAutoUpdatePrompt1":{ - "message":"Auto-update filter lists", + "message":"स्व-अद्यतन फ़िल्टर सूचियां", "description":"A checkbox in the _3rd-party filters_ pane" }, "3pUpdateNow":{ diff --git a/src/_locales/hu/messages.json b/src/_locales/hu/messages.json index 3e0bf95cd..52b7148f5 100644 --- a/src/_locales/hu/messages.json +++ b/src/_locales/hu/messages.json @@ -72,7 +72,7 @@ "description":"English: Click to open the dashboard" }, "popupTipZapper":{ - "message":"Elemváltó mód aktiválása", + "message":"Elem eltávolító mód", "description":"Tooltip for the element-zapper icon in the popup panel" }, "popupTipPicker":{ diff --git a/src/_locales/id/messages.json b/src/_locales/id/messages.json index 380d46174..e8c798e5b 100644 --- a/src/_locales/id/messages.json +++ b/src/_locales/id/messages.json @@ -72,7 +72,7 @@ "description":"English: Click to open the dashboard" }, "popupTipZapper":{ - "message":"Enter element zapper mode", + "message":"Memasuki mode penghapus elemen", "description":"Tooltip for the element-zapper icon in the popup panel" }, "popupTipPicker":{ diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json index 535e2f24b..57d88ed5d 100644 --- a/src/_locales/ja/messages.json +++ b/src/_locales/ja/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"クリックしてダッシュボードを開く", + "message":"ダッシュボードを開く", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ @@ -92,7 +92,7 @@ "description":"Tooltip for the no-large-media per-site switch" }, "popupTipNoCosmeticFiltering":{ - "message":"このサイトの要素隠蔽フィルターを切り替える", + "message":"このサイトの要素隠蔽フィルターを切り替えます", "description":"Tooltip for the no-cosmetic-filtering per-site switch" }, "popupTipNoRemoteFonts":{ @@ -176,7 +176,7 @@ "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ - "message":"要素隠蔽フィルター", + "message":"要素隠蔽フィルタ", "description":"English: Cosmetic filters" }, "pickerCosmeticFiltersHint":{ @@ -204,7 +204,7 @@ "description":"English: Make use of context menu where appropriate" }, "settingsColorBlindPrompt":{ - "message":"uBlock₀を優しい色使いにする", + "message":"uBlock₀を色盲の方に優しい色にする", "description":"English: Color-blind friendly" }, "settingsCloudStorageEnabledPrompt":{ @@ -240,7 +240,7 @@ "description":"" }, "settingsNoCosmeticFilteringPrompt":{ - "message":"要素隠蔽フィルターを無効にする", + "message":"要素隠蔽フィルタを無効にする", "description":"" }, "settingsNoLargeMediaPrompt":{ @@ -252,7 +252,7 @@ "description":"" }, "settingsStorageUsed":{ - "message":"使用中のストレージ: {{value}} bytes", + "message":"使用中のストレージ: {{value}} バイト", "description":"English: Storage used: {{}} bytes" }, "settingsLastRestorePrompt":{ @@ -264,7 +264,7 @@ "description":"English: Last backup:" }, "3pListsOfBlockedHostsPrompt":{ - "message":"{{netFilterCount}} ネットワークフィルター＋{{cosmeticFilterCount}} 要素隠蔽フィルター：", + "message":"{{netFilterCount}}ネットワークフィルタ＋{{cosmeticFilterCount}}コスメチックフィルタ：", "description":"Appears at the top of the _3rd-party filters_ pane" }, "3pListsOfBlockedHostsPerListStats":{ @@ -284,7 +284,7 @@ "description":"A button in the in the _3rd-party filters_ pane" }, "3pParseAllABPHideFiltersPrompt1":{ - "message":"要素隠蔽フィルターを解析、施行する", + "message":"要素隠蔽フィルタを解析、施行する。", "description":"English: Parse and enforce Adblock+ element hiding filters." }, "3pParseAllABPHideFiltersInfo":{ @@ -340,11 +340,11 @@ "description":"English: One URL per line. Lines prefixed with ‘!’ will be ignored. Invalid URLs will be silently ignored." }, "3pExternalListObsolete":{ - "message":"新しいバージョンがあります", + "message":"古いバージョンです", "description":"used as a tooltip for the out-of-date icon beside a list" }, "3pLastUpdate":{ - "message":"最終更新: {{ago}}\nクリックすると強制的に更新します", + "message":"最終更新: {{ago}}", "description":"used as a tooltip for the clock icon beside a list" }, "3pUpdating":{ diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index a36c1cec5..7e30a7429 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -76,7 +76,7 @@ "description":"Tooltip for the element-zapper icon in the popup panel" }, "popupTipPicker":{ - "message":"Войти в режим выбора элемента", + "message":"Войти в режим выбора элементов", "description":"English: Enter element picker mode" }, "popupTipLog":{ diff --git a/src/_locales/sr/messages.json b/src/_locales/sr/messages.json index 17bc77e07..92a645cab 100644 --- a/src/_locales/sr/messages.json +++ b/src/_locales/sr/messages.json @@ -96,7 +96,7 @@ "description":"Tooltip for the no-cosmetic-filtering per-site switch" }, "popupTipNoRemoteFonts":{ - "message":"Укључи\/искључи блокирање спољних фонтова за овај сајт", + "message":"Укључи\/искључи блокирање удаљених фонтова за овај сајт", "description":"Tooltip for the no-remote-fonts per-site switch" }, "popupTipGlobalRules":{ @@ -108,11 +108,11 @@ "description":"Tooltip when hovering the top-most cell of the local-rules column." }, "popupTipSaveRules":{ - "message":"Кликните да бисте измене учинили трајним.", + "message":"Кликните да бисте промене учинили трајним.", "description":"Tooltip when hovering over the padlock in the dynamic filtering pane." }, "popupTipRevertRules":{ - "message":"Кликните да бисте вратили измене.", + "message":"Кликните да бисте вратили промене.", "description":"Tooltip when hovering over the eraser in the dynamic filtering pane." }, "popupAnyRulePrompt":{ @@ -304,7 +304,7 @@ "description":"English: Lists of blocked hosts" }, "3pApplyChanges":{ - "message":"Примени измене", + "message":"Примени промене", "description":"English: Apply changes" }, "3pGroupAds":{ @@ -372,7 +372,7 @@ "description":"English: my-ublock-static-filters_{{datetime}}.txt" }, "1pApplyChanges":{ - "message":"Примени измене", + "message":"Примени промене", "description":"English: Apply changes" }, "rulesPermanentHeader":{ @@ -440,7 +440,7 @@ "description":"English: my-ublock-whitelist_{{datetime}}.txt" }, "whitelistApply":{ - "message":"Примени измене", + "message":"Примени промене", "description":"English: Apply changes" }, "logRequestsHeaderType":{ @@ -532,7 +532,7 @@ "description":"Below this sentence, the filter lists in which the filter was found" }, "aboutChangelog":{ - "message":"Дневник измена", + "message":"Евиденција промена", "description":"English: Change log" }, "aboutWiki":{ @@ -688,7 +688,7 @@ "description":"for generic 'Submit' buttons" }, "genericApplyChanges":{ - "message":"Примени измене", + "message":"Примени промене", "description":"for generic 'Apply changes' buttons" }, "genericRevert":{ diff --git a/src/_locales/vi/messages.json b/src/_locales/vi/messages.json index e3e27ec16..199336316 100644 --- a/src/_locales/vi/messages.json +++ b/src/_locales/vi/messages.json @@ -72,7 +72,7 @@ "description":"English: Click to open the dashboard" }, "popupTipZapper":{ - "message":"Chọn chế độ zapper", + "message":"Chuyển sang chế độ chọn phần tử", "description":"Tooltip for the element-zapper icon in the popup panel" }, "popupTipPicker":{ @@ -424,7 +424,7 @@ "description":"English: dynamic rule syntax and full documentation." }, "whitelistPrompt":{ - "message":"Danh sách tên các máy chủ mà µBlock₀ sẽ bị vô hiệu. Một mục nhập trên mỗi dòng. Tên máy chủ không hợp lệ sẽ được tự động bỏ qua.", + "message":"Danh sách tên các máy chủ mà uBlock₀ sẽ bị chặn. Một mục nhập trên mỗi dòng. Tên máy chủ không hợp lệ sẽ được tự động bỏ qua.", "description":"English: An overview of the content of the dashboard's Whitelist pane." }, "whitelistImport":{ @@ -580,7 +580,7 @@ "description":"Message asking user to confirm reset" }, "errorCantConnectTo":{ - "message":"Không thể kết nối đến {{url}}", + "message":"Lỗi kết nối: {{msg}}", "description":"English: Network error: {{msg}}" }, "subscriberConfirm":{ diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index c0c311348..261c98a43 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -68,7 +68,7 @@ "description":"English: or" }, "popupTipDashboard":{ - "message":"单击打开控制面板", + "message":"打开控制面板", "description":"English: Click to open the dashboard" }, "popupTipZapper":{ From 78d61eba867e28d2fbf8726a4ac85f67dd21524d Mon Sep 17 00:00:00 2001 From: gorhill Date: Thu, 10 Aug 2017 18:36:58 -0400 Subject: [PATCH 068/132] new revision for dev build --- platform/chromium/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index e726e1da8..b3ad5cda8 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.13.9.7", + "version": "1.13.9.8", "commands": { "launch-element-zapper": { From 04057d40ea929da3c6433ac9e968b8b234da505f Mon Sep 17 00:00:00 2001 From: gorhill Date: Thu, 10 Aug 2017 18:50:23 -0400 Subject: [PATCH 069/132] fix #2855 --- tools/make-webext-meta.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/make-webext-meta.py b/tools/make-webext-meta.py index 15df315fb..45e7c0208 100644 --- a/tools/make-webext-meta.py +++ b/tools/make-webext-meta.py @@ -2,6 +2,7 @@ import os import json +import re import sys if len(sys.argv) == 1 or not sys.argv[1]: @@ -22,7 +23,14 @@ webext_manifest_file = os.path.join(build_dir, 'manifest.json') with open(webext_manifest_file) as f2: webext_manifest = json.load(f2) -webext_manifest['version'] = chromium_manifest['version'] +match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', chromium_manifest['version']) +if match: + buildtype = int(match.group(2)[1:]) + if buildtype < 100: + builttype = 'b' + str(buildtype) + else: + builttype = 'rc' + str(buildtype - 100) + webext_manifest['version'] = match.group(1) + builttype with open(webext_manifest_file, 'w') as f2: json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True) From 502dd89d531f72b68b90595adffa4c78caa42187 Mon Sep 17 00:00:00 2001 From: gorhill Date: Thu, 10 Aug 2017 18:55:36 -0400 Subject: [PATCH 070/132] fix AMO validation warning re. invalid CSS --- src/about.html | 1 - src/css/about.css | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 src/css/about.css diff --git a/src/about.html b/src/about.html index d8acdca4c..e470c21b5 100644 --- a/src/about.html +++ b/src/about.html @@ -6,7 +6,6 @@ uBlock — About - diff --git a/src/css/about.css b/src/css/about.css deleted file mode 100644 index 20d78cbf7..000000000 --- a/src/css/about.css +++ /dev/null @@ -1,4 +0,0 @@ -ul { - padding-__MSG_@@bidi_start_edge__: 1em; - margin-__MSG_@@bidi_start_edge__: 1em; - } From ccc4324583a4a6839a170d0045ac575479f10478 Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 11 Aug 2017 00:41:53 -0400 Subject: [PATCH 071/132] fix non-dev build versioning --- tools/make-webext-meta.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/make-webext-meta.py b/tools/make-webext-meta.py index 45e7c0208..b74b06e19 100644 --- a/tools/make-webext-meta.py +++ b/tools/make-webext-meta.py @@ -31,6 +31,8 @@ if match: else: builttype = 'rc' + str(buildtype - 100) webext_manifest['version'] = match.group(1) + builttype +else: + webext_manifest['version'] = chromium_manifest['version'] with open(webext_manifest_file, 'w') as f2: json.dump(webext_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True) From 0f9cd6c8c46093dbe6609fad249e1bd28bcfb279 Mon Sep 17 00:00:00 2001 From: Mike Tzou Date: Fri, 11 Aug 2017 13:35:28 +0800 Subject: [PATCH 072/132] README.md: use crowdin svg icon (#2857) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d1e6924b..2564914f3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build](https://travis-ci.org/gorhill/uBlock.svg?branch=master)](https://travis-ci.org/gorhill/uBlock) -[![Crowdin](https://d322cqt584bo4o.cloudfront.net/ublock/localized.png)](https://crowdin.com/project/ublock) +[![Crowdin](https://d322cqt584bo4o.cloudfront.net/ublock/localized.svg)](https://crowdin.com/project/ublock) [![License](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://github.com/gorhill/uBlock/blob/master/LICENSE.txt) *** From 0e078e536d8630e0823a488c6d1cdb222b0b01bb Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 11 Aug 2017 14:26:15 -0400 Subject: [PATCH 073/132] eliminate validation warning on AMO: avoid innerHTML --- platform/chromium/vapi-common.js | 6 ----- platform/firefox/vapi-common.js | 24 ----------------- src/cloud-ui.html | 20 ++++++++++++++ src/document-blocked.html | 1 + src/js/cloud-ui.js | 46 +++++++++++++++++--------------- 5 files changed, 45 insertions(+), 52 deletions(-) create mode 100644 src/cloud-ui.html diff --git a/platform/chromium/vapi-common.js b/platform/chromium/vapi-common.js index 28419f3ca..f49f5e420 100644 --- a/platform/chromium/vapi-common.js +++ b/platform/chromium/vapi-common.js @@ -67,12 +67,6 @@ vAPI.download = function(details) { /******************************************************************************/ -vAPI.insertHTML = function(node, html) { - node.innerHTML = html; -}; - -/******************************************************************************/ - vAPI.getURL = chrome.runtime.getURL; /******************************************************************************/ diff --git a/platform/firefox/vapi-common.js b/platform/firefox/vapi-common.js index 1ee769987..d5b0abae3 100644 --- a/platform/firefox/vapi-common.js +++ b/platform/firefox/vapi-common.js @@ -75,30 +75,6 @@ vAPI.download = function(details) { /******************************************************************************/ -vAPI.insertHTML = (function() { - const parser = Components.classes['@mozilla.org/parserutils;1'] - .getService(Components.interfaces.nsIParserUtils); - - // https://github.com/gorhill/uBlock/issues/845 - // Apparently dashboard pages execute with `about:blank` principal. - - return function(node, html) { - while ( node.firstChild ) { - node.removeChild(node.firstChild); - } - - node.appendChild(parser.parseFragment( - html, - parser.SanitizerAllowStyle, - false, - Services.io.newURI('about:blank', null, null), - document.documentElement - )); - }; -})(); - -/******************************************************************************/ - vAPI.getURL = function(path) { return 'chrome://' + location.host + '/content/' + path.replace(/^\/+/, ''); }; diff --git a/src/cloud-ui.html b/src/cloud-ui.html new file mode 100644 index 000000000..0d11edeab --- /dev/null +++ b/src/cloud-ui.html @@ -0,0 +1,20 @@ + + + + + + + + + +  + + +
+
+

+

+

+
+ + diff --git a/src/document-blocked.html b/src/document-blocked.html index ca24ee7b1..40c03aa3b 100644 --- a/src/document-blocked.html +++ b/src/document-blocked.html @@ -1,6 +1,7 @@ +