From de88721132eb22f118a015d214073554714457a4 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 18 Jan 2015 19:17:36 -0500 Subject: [PATCH 1/8] Re. #540: disabling local mirroring for the time being --- src/js/storage.js | 5 +++++ src/js/traffic.js | 34 +++++++++++++++++++++++++--------- src/js/ublock.js | 4 +++- src/settings.html | 2 +- 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/js/storage.js b/src/js/storage.js index dcca33ddc..aec5a98f5 100644 --- a/src/js/storage.js +++ b/src/js/storage.js @@ -658,7 +658,12 @@ µb.assets.allowRemoteFetch = false; µb.assets.autoUpdate = userSettings.autoUpdate; µb.fromSelfie(onSelfieReady); + + // https://github.com/gorhill/uBlock/issues/540 + // Disabling local mirroring for the time being + userSettings.experimentalEnabled = false; µb.mirrors.toggle(userSettings.experimentalEnabled); + µb.contextMenu.toggle(userSettings.contextMenuEnabled); µb.dynamicNetFilteringEngine.fromString(userSettings.dynamicFilteringString); diff --git a/src/js/traffic.js b/src/js/traffic.js index cc77076bf..ed6e3995e 100644 --- a/src/js/traffic.js +++ b/src/js/traffic.js @@ -120,13 +120,14 @@ var onBeforeRequest = function(details) { // https://code.google.com/p/chromium/issues/detail?id=387198 // Not all redirects will succeed, until bug above is fixed. - var redirectURL = pageStore.toMirrorURL(requestURL); - if ( redirectURL !== '' ) { - pageStore.logBuffer.writeOne(requestContext, 'ma:'); - + // https://github.com/gorhill/uBlock/issues/540 + // Disabling local mirroring for the time being + //var redirectURL = pageStore.toMirrorURL(requestURL); + //if ( redirectURL !== '' ) { + // pageStore.logBuffer.writeOne(requestContext, 'ma:'); //console.debug('"%s" redirected to "%s..."', requestURL.slice(0, 50), redirectURL.slice(0, 50)); - return { redirectUrl: redirectURL }; - } + // return { redirectUrl: redirectURL }; + //} pageStore.logBuffer.writeOne(requestContext, result); @@ -251,9 +252,11 @@ var onHeadersReceived = function(details) { } // https://github.com/gorhill/uBlock/issues/384 - if ( details.parentFrameId === -1 ) { - pageStore.skipLocalMirroring = headerValue(details.responseHeaders, 'content-security-policy'); - } + // https://github.com/gorhill/uBlock/issues/540 + // Disabling local mirroring for the time being + //if ( details.parentFrameId === -1 ) { + // pageStore.skipLocalMirroring = headerStartWith(details.responseHeaders, 'content-security-policy') !== ''; + //} var requestURL = details.url; var requestHostname = µb.URI.hostnameFromURI(requestURL); @@ -321,6 +324,19 @@ var headerValue = function(headers, name) { /******************************************************************************/ +var headerStartWith = function(headers, prefix) { + var prefixLen = prefix.length; + var i = headers.length; + while ( i-- ) { + if ( headers[i].name.slice(0, prefixLen).toLowerCase() === prefix ) { + return headers[i].value; + } + } + return ''; +}; + +/******************************************************************************/ + vAPI.net.onBeforeRequest = { urls: [ 'http://*/*', diff --git a/src/js/ublock.js b/src/js/ublock.js index a0be4c09d..ac4bd2397 100644 --- a/src/js/ublock.js +++ b/src/js/ublock.js @@ -267,7 +267,9 @@ var matchWhitelistDirective = function(url, hostname, directive) { break; case 'experimentalEnabled': if ( typeof this.mirrors === 'object' ) { - this.mirrors.toggle(value); + // https://github.com/gorhill/uBlock/issues/540 + // Disabling local mirroring for the time being + this.mirrors.toggle(false /* value */); } break; default: diff --git a/src/settings.html b/src/settings.html index fa5fb1e2b..fe376538c 100644 --- a/src/settings.html +++ b/src/settings.html @@ -24,7 +24,7 @@ ul {
  • -
  • +
    From 61f7049540483ee9714bdbaa5407f81fd44a5faa Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 18 Jan 2015 19:40:08 -0500 Subject: [PATCH 2/8] fix for https://adblockplus.org/forum/viewtopic.php?f=10&t=27509 --- assets/checksums.txt | 2 +- assets/ublock/filters.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/checksums.txt b/assets/checksums.txt index b0098f2ca..960ae33e7 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -1,5 +1,5 @@ 7edb2a585b445f28aa5ab06306f1a23f assets/ublock/privacy.txt -fe515f111b45b39aafdc560ff29649c5 assets/ublock/filters.txt +f40d926a5770f00c45be14a3e1ef9cb0 assets/ublock/filters.txt dcf3e05bae803343c9d632f0baf8bedd assets/ublock/mirror-candidates.txt 9947b5510d67e47ea59ce876e4fc67be assets/ublock/filter-lists.json 132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt index 4fd95d17d..066a28f9e 100644 --- a/assets/ublock/filters.txt +++ b/assets/ublock/filters.txt @@ -226,4 +226,8 @@ ovh.strim.io#@##tweets # https://adblockplus.org/forum/viewtopic.php?f=10&t=24896&start=15#p114675 # Until fixed in EasyList -@@||cdn.turner.com/ads/nba/adfuel.js$domain=www.nba.com \ No newline at end of file +@@||cdn.turner.com/ads/nba/adfuel.js$domain=www.nba.com + +# https://adblockplus.org/forum/viewtopic.php?f=10&t=27509 +# To counter [a.]visualrevenue.com in Dan Pollock's, hpHosts, Peter Lowe's, MVPS +@@||a.visualrevenue.com/vrs.js$domain=www.ebaumsworld.com \ No newline at end of file From 9593dc30ddd8e273c5ae4f1ac5f3c3180848d4ae Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 18 Jan 2015 21:41:49 -0500 Subject: [PATCH 3/8] translation work from crowdin --- src/_locales/ar/messages.json | 16 +++++++- src/_locales/ca/messages.json | 16 +++++++- src/_locales/cs/messages.json | 16 +++++++- src/_locales/da/messages.json | 20 ++++++++-- src/_locales/de/messages.json | 16 +++++++- src/_locales/el/messages.json | 16 +++++++- src/_locales/es/messages.json | 16 +++++++- src/_locales/et/messages.json | 16 +++++++- src/_locales/fi/messages.json | 16 +++++++- src/_locales/fil/messages.json | 16 +++++++- src/_locales/fr/messages.json | 18 +++++++-- src/_locales/he/messages.json | 16 +++++++- src/_locales/hi/messages.json | 16 +++++++- src/_locales/hr/messages.json | 18 +++++++-- src/_locales/hu/messages.json | 16 +++++++- src/_locales/id/messages.json | 16 +++++++- src/_locales/it/messages.json | 16 +++++++- src/_locales/ja/messages.json | 32 +++++++++++----- src/_locales/mr/messages.json | 16 +++++++- src/_locales/nb/messages.json | 58 +++++++++++++++++----------- src/_locales/nl/messages.json | 16 +++++++- src/_locales/pl/messages.json | 18 +++++++-- src/_locales/pt_BR/messages.json | 16 +++++++- src/_locales/pt_PT/messages.json | 16 +++++++- src/_locales/ro/messages.json | 16 +++++++- src/_locales/ru/messages.json | 66 +++++++++++++++++++------------- src/_locales/sv/messages.json | 16 +++++++- src/_locales/tr/messages.json | 16 +++++++- src/_locales/uk/messages.json | 16 +++++++- src/_locales/vi/messages.json | 16 +++++++- src/_locales/zh_CN/messages.json | 16 +++++++- src/_locales/zh_TW/messages.json | 16 +++++++- 32 files changed, 507 insertions(+), 123 deletions(-) diff --git a/src/_locales/ar/messages.json b/src/_locales/ar/messages.json index f6be9a89d..bb4dd13f6 100644 --- a/src/_locales/ar/messages.json +++ b/src/_locales/ar/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"الإحصائيات", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"معلومات عني", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"لستتك الخاصه فيك التي سوف يتم منعها من قبل الاداة. رابط واحد كل سطر, الروابط الغير صحيحه سوف يتم تجاهلها.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"لا يوجد اي طلب غير ممنوع في هذي الصفحه.", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"سجل التغيير", "description":"English: Change log" diff --git a/src/_locales/ca/messages.json b/src/_locales/ca/messages.json index 0d0f59d5e..c0729c2cc 100644 --- a/src/_locales/ca/messages.json +++ b/src/_locales/ca/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Estadístiques", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Quant a", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"La seva llista de noms de servidors per als quals es desactivarà µBlock. Una entrada per línia. Els noms de servidors no vàlids s'ignoraran.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"No hi ha peticions no bloquejades per a aquesta pàgina", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Registre de canvis", "description":"English: Change log" diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json index 2abe421d3..2d588737f 100644 --- a/src/_locales/cs/messages.json +++ b/src/_locales/cs/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistiky", - "description":"appears as tab name in dashboard" + "message":"µBlock — Záznamy síťových požadavků", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"O rozšíření", @@ -351,6 +351,14 @@ "message":"ublock-ma-dynamicka-pravidla_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Seznam vašich pravidel pro dynamické filtrování.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Syntaxe pravidel: zdroj destinace typ akce<\/code> (kompletní dokumentace<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Váš seznam názvů hostitelů, pro které bude zakázán µBlock. Jedna položka na řádek. Neplatné názvy hostitelů budou tiše ignorovány.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Žádné nezablokované požadavky pro tuto stránku", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Za oponou", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Change log", "description":"English: Change log" diff --git a/src/_locales/da/messages.json b/src/_locales/da/messages.json index 8939b0b9d..95a1e2c06 100644 --- a/src/_locales/da/messages.json +++ b/src/_locales/da/messages.json @@ -4,7 +4,7 @@ "description":"extension name." }, "extShortDesc":{ - "message":"Endelig, en effektiv blocker. Let på CPU og hukommelse.", + "message":"Endelig en effektiv blocker til Chromium-baserede browsere. Lavt CPU- og hukommelsesbrug.", "description":"this will be in the chrome web store: must be 132 characters or less" }, "dashboardName":{ @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistik", - "description":"appears as tab name in dashboard" + "message":"µBlock — Netværkslog", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Om", @@ -351,6 +351,14 @@ "message":"mine-ublock-dynamiske-regler_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Liste af dine dynamiske filtreringsregler.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Regelsyntaks: kilde destination type handling<\/code> (Fuld dokumentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Din liste over sider hvor µBlock vil være deaktiveret. Kun én adresse pr. linje. Ugyldige værtsnavne ignoreres lydløst.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Ingen ikke-blokerede forespørgsler fra denne side er blevet logget", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Bag kulisserne", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Changelog", "description":"English: Change log" @@ -432,7 +444,7 @@ "description":"English: Backup to file" }, "aboutBackupFilename":{ - "message":"ublock-sikkerhedskopi_{{datetime}}.txt", + "message":"min-ublock-sikkerhedskopi_{{datetime}}.txt", "description":"English: my-ublock-backup_{{datetime}}.txt" }, "aboutRestoreDataButton":{ diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index ae37c9a5c..bfc85bbc3 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistiken", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Über", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Deine Liste von Hostnamen, für die µBlock deaktiviert ist. Ein Eintrag pro Zeile. Ungültige Hostnamen werden stillschweigend ignoriert.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Keine blockierten Anfragen für diese Seite gefunden", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Änderungsprotokoll", "description":"English: Change log" diff --git a/src/_locales/el/messages.json b/src/_locales/el/messages.json index 60e8c311c..837fb0e37 100644 --- a/src/_locales/el/messages.json +++ b/src/_locales/el/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Στατιστικά", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Σχετικά με", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Η λίστα με τα ονόματα κόμβων στα οποία το µBlock θα είναι απενεργοποιημένο. Μια καταχώρηση ανά γραμμή. Άκυρα ονόματα κόμβων θα παρακάμπτονται σιωπηλά.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Δεν καταγράφηκαν μη-αποκλεισμένες αιτήσεις για αυτήν τη σελίδα", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Change log", "description":"English: Change log" diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json index 0a254e140..40b7a2153 100644 --- a/src/_locales/es/messages.json +++ b/src/_locales/es/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Estadísticas", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Acerca de", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Su lista de nombres de servidores para los cuales se deshabilitará µBlock. Una entrada por línea. Se omitirán los nombres de servidores no válidos.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"No hay peticiones no bloqueadas registradas para esta página", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Cambios", "description":"English: Change log" diff --git a/src/_locales/et/messages.json b/src/_locales/et/messages.json index c1302059d..66199a17b 100644 --- a/src/_locales/et/messages.json +++ b/src/_locales/et/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistika", - "description":"appears as tab name in dashboard" + "message":"µBlock — Võrgutaotluste logi", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Teave", @@ -351,6 +351,14 @@ "message":"minu-ublocki-dünaamilised-reeglid_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Sinu dünaamiliste filtrite reeglide nimekiri.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Reegli süntaks: allikas sihtkoht tüüp tegevus<\/code> (kogu dokumentatsioon<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Nimekiri domeenidest, millel µBlock keelatakse. Üks domeen rea kohta, vigaseid domeeninimesid eiratakse.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Sellel lehel pole logitud ühtegi blokeerimata päringut", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Telgitagus", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Muudatuste logi", "description":"English: Change log" diff --git a/src/_locales/fi/messages.json b/src/_locales/fi/messages.json index fb12c70ef..78868ae7f 100644 --- a/src/_locales/fi/messages.json +++ b/src/_locales/fi/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Tilastot", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Tietoja", @@ -351,6 +351,14 @@ "message":"omat-dynaamiset-ublock-saannot.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Oma listasi osoitteista, joissa µBlock on pois päältä. Kirjoita yksi osoite kullekin riville. Epäkelvot osoitteet ohitetaan ilman ilmoitusta.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"No non-blocked requests logged for this page", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Change log", "description":"English: Change log" diff --git a/src/_locales/fil/messages.json b/src/_locales/fil/messages.json index f9610d846..44b26b3b8 100644 --- a/src/_locales/fil/messages.json +++ b/src/_locales/fil/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Mga Istatistika", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"About", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Your list of host names for which µBlock will be disabled. One entry per line. Invalid host names will be silently ignored.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"No non-blocked requests logged for this page", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Change log", "description":"English: Change log" diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json index 2bfcc839e..fc14b695b 100644 --- a/src/_locales/fr/messages.json +++ b/src/_locales/fr/messages.json @@ -4,7 +4,7 @@ "description":"extension name." }, "extShortDesc":{ - "message":"Enfin un bloqueur de pubs et de pisteurs efficace pour les navigateurs basés sur Chromium, qui est léger en CPU et en RAM", + "message":"Voici un bloqueur de nuisances efficace, qui ne sollicitera pas outre mesure votre processeur et votre mémoire vive.", "description":"this will be in the chrome web store: must be 132 characters or less" }, "dashboardName":{ @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistiques", - "description":"appears as tab name in dashboard" + "message":"µBlock — Journal des requêtes réseau", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"À propos", @@ -351,6 +351,14 @@ "message":"mes-regles-dynamiques-ublock-{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Liste de vos règles de filtrage dynamique", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Syntaxe des règles : source destination type action<\/code> (Documentation complète en Anglais<\/a>)", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Ici se trouve votre liste d'hôtes à autoriser. Un nom d'hôte par ligne. Les noms d'hôte invalides seront ignorés et vous n'en serez pas averti(e).", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Aucune requête non-bloquée sur cette page n'a été consignée dans le journal", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Requêtes en coulisses", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Journal des changements (en Anglais)", "description":"English: Change log" diff --git a/src/_locales/he/messages.json b/src/_locales/he/messages.json index 5d65c3234..77ea1ec0d 100644 --- a/src/_locales/he/messages.json +++ b/src/_locales/he/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"סטטיסטיקה", - "description":"appears as tab name in dashboard" + "message":"µBlock — מתעד בקשות רשת", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"אודות", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"רשימת חוקי המסננים הדינאמיים שלך.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"סינטקס חוק: פעולה סוג יעד מקור<\/code> (תיעוד מלא<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"רשימת שמות המתחם שלך בהם µBlock לא יהיה פעיל. רשומה אחת בכל שורה. שמות מתחם לא חוקיים לא יפורשו ולא תהיה התראה לכך.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"אין בקשות לא חסומות שתועדו עבור דף זה", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"מאחורי הקלעים", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"רשימת שינויים", "description":"English: Change log" diff --git a/src/_locales/hi/messages.json b/src/_locales/hi/messages.json index ff37fb4c0..2d367556f 100644 --- a/src/_locales/hi/messages.json +++ b/src/_locales/hi/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"आंकड़े", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"जानकारी", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Your list of host names for which µBlock will be disabled. One entry per line. Invalid host names will be silently ignored.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"No non-blocked requests logged for this page", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Change log", "description":"English: Change log" diff --git a/src/_locales/hr/messages.json b/src/_locales/hr/messages.json index 2c181899a..11c5bd5ae 100644 --- a/src/_locales/hr/messages.json +++ b/src/_locales/hr/messages.json @@ -4,7 +4,7 @@ "description":"extension name." }, "extShortDesc":{ - "message":"Konačno, efikasan bloker za preglednike bazirane na Chromium kôdu. Lak na CPU i memoriji.", + "message":"Konačno, efikasan blokator. Lak na CPU i memoriji.", "description":"this will be in the chrome web store: must be 132 characters or less" }, "dashboardName":{ @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistika", - "description":"appears as tab name in dashboard" + "message":"µBlock — Zapisnik mrežnih zahtjeva", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"O programu", @@ -351,6 +351,14 @@ "message":"moja-ublock-dinamicna-pravila_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Popis dinamičkih pravila filtriranja.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Pravila sintakse: akcija tipa izvornog odredišta<\/code> (sva dokumentacija<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Popis host naziva za koje će µBlock biti onemogućen. Jedan zapis po retku. Nevaljani host nazivi će tiho biti ignorirani.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Nema neblokiranih zahtjeva zapisanih za ovu stranicu", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Iza scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Popis promjena", "description":"English: Change log" diff --git a/src/_locales/hu/messages.json b/src/_locales/hu/messages.json index e32095d3e..75d1558e4 100644 --- a/src/_locales/hu/messages.json +++ b/src/_locales/hu/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statisztika", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Névjegy", @@ -351,6 +351,14 @@ "message":"ublock-dinamikus_szabalyaim.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Az álábbi listában felsorolt hosztokon a kiegészítő nem fog működni. Egy sor egy bejegyzés. Érvénytelen hosztnevek figyelmen kívül maradnak.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Nincs engedélyezett kérés ezen a lapon", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Változások listája", "description":"English: Change log" diff --git a/src/_locales/id/messages.json b/src/_locales/id/messages.json index 3969bd5b4..039e61b91 100644 --- a/src/_locales/id/messages.json +++ b/src/_locales/id/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistik", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Tentang", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Daftar nama host yang mana µBlock dinonaktifkan. Satu entri per baris. Nama host yang tidak valid akan diabaikan.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Tidak ada permintaan yang tidak diblokir tercatat untuk halaman ini", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Catatan perubahan", "description":"English: Change log" diff --git a/src/_locales/it/messages.json b/src/_locales/it/messages.json index e2850a26e..e97a1a4b7 100644 --- a/src/_locales/it/messages.json +++ b/src/_locales/it/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistiche", - "description":"appears as tab name in dashboard" + "message":"µBlock — registro richieste di rete", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Info", @@ -351,6 +351,14 @@ "message":"ublock-filtri-dinamici-personalizzati_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Lista delle regole di filtraggio dinamiche personalizzate.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Sintassi per le regole: sorgente destinazione tipo azione<\/code> (documentazione completa<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Lista dei siti dove µBlock è disattivato. Un sito per ogni riga. Le voci non valide verranno silenziosamente ignorate.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Nel registro, non ci sono richieste non bloccate per questa pagina", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Dietro le quinte", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Change log", "description":"English: Change log" diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json index bc0fec08d..58fa78792 100644 --- a/src/_locales/ja/messages.json +++ b/src/_locales/ja/messages.json @@ -20,11 +20,11 @@ "description":"appears as tab name in dashboard" }, "1pPageName":{ - "message":"あなたのフィルター", + "message":"Myフィルター", "description":"appears as tab name in dashboard" }, "rulesPageName":{ - "message":"My rules", + "message":"Myルール", "description":"appears as tab name in dashboard" }, "whitelistPageName":{ @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"統計", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"このプロジェクトについて", @@ -328,29 +328,37 @@ "description":"English: Apply changes" }, "rulesEdit":{ - "message":"Edit", + "message":"編集", "description":"Will enable manual-edit mode (textarea)" }, "rulesEditSave":{ - "message":"Save", + "message":"保存", "description":"Will save manually-edited content and exit manual-edit mode" }, "rulesEditDiscard":{ - "message":"Discard", + "message":"破棄", "description":"Will discard manually-edited content and exit manual-edit mode" }, "rulesImport":{ - "message":"Import from file...", + "message":"ファイルからインポート", "description":"" }, "rulesExport":{ - "message":"Export to file...", + "message":"ファイルへエクスポート", "description":"" }, "rulesDefaultFileName":{ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"このエクステンションホスト名のリストは無効になります。１ 行につき １ つのエントリ。無効なホスト名はサイレント モードで無視されます。", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"このページでブロックされたリクエストは在りません", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"の変更履歴", "description":"English: Change log" @@ -440,7 +452,7 @@ "description":"English: Restore from file..." }, "aboutResetDataButton":{ - "message":"最初から", + "message":"デフォルトの設定に戻す", "description":"English: Reset to default settings..." }, "aboutRestoreDataConfirm":{ diff --git a/src/_locales/mr/messages.json b/src/_locales/mr/messages.json index c6215dd3d..3655472f3 100644 --- a/src/_locales/mr/messages.json +++ b/src/_locales/mr/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"सांख्यिकी", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"माहिती", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"आपली होस्ट नावांची यादी ज्याचासाठी म्यूब्लॉक अक्षम केले जाईल. प्रति ओळ एक प्रविष्टी. अवैध होस्ट नावांकडे शांतपणे दुर्लक्ष केले जाईल.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"या पृष्ठावर कोणतेही न-अवरोधित विनंत्या लॉग होत नाही", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"बदल नोंदी", "description":"English: Change log" diff --git a/src/_locales/nb/messages.json b/src/_locales/nb/messages.json index c3837dd05..614b42180 100644 --- a/src/_locales/nb/messages.json +++ b/src/_locales/nb/messages.json @@ -4,7 +4,7 @@ "description":"extension name." }, "extShortDesc":{ - "message":"Endelig en effektiv blokkeringsutvidelse for Chromium-baserte nettlesere. Lavt CPU- og minnebruk.", + "message":"Endelig en effektiv blokkeringsutvidelse. Lavt CPU- og minnebruk.", "description":"this will be in the chrome web store: must be 132 characters or less" }, "dashboardName":{ @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistikk", - "description":"appears as tab name in dashboard" + "message":"µBlock — Logg for nettverksforespørsler", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Om", @@ -72,83 +72,83 @@ "description":"English: Go to request log" }, "popupSiteInlineScriptEnabled":{ - "message":"Integrerte skript<\/code>-koder er tillatt<\/b> på dette nettstedet", + "message":"Integrerte skript<\/code>-koder tillates<\/b> på dette nettstedet", "description":"" }, "popupSiteInlineScriptDisabled":{ - "message":"Integrerte skript<\/code>-koder er blokkert<\/b> på dette nettstedet", + "message":"Integrerte skript<\/code>-koder blokkeres<\/b> på dette nettstedet", "description":"" }, "popupSite1pScriptEnabled":{ - "message":"Førsteparts skript er tillatt<\/b> på dette nettstedet", + "message":"Førsteparts skript tillates<\/b> på dette nettstedet", "description":"" }, "popupSite1pScriptDisabled":{ - "message":"Førsteparts skript er blokkert<\/b> på dette nettstedet", + "message":"Førsteparts skript blokkeres<\/b> på dette nettstedet", "description":"" }, "popupSite3pScriptEnabled":{ - "message":"Tredjeparts skript er tillatt<\/b> på dette nettstedet", + "message":"Tredjeparts skript tillates<\/b> på dette nettstedet", "description":"" }, "popupSite3pScriptDisabled":{ - "message":"Tredjeparts skript er blokkert<\/b> på dette nettstedet", + "message":"Tredjeparts skript blokkeres<\/b> på dette nettstedet", "description":"" }, "popupSite1pFrameEnabled":{ - "message":"Førsteparts iframe-koder er tillatt<\/b> på dette nettstedet", + "message":"Førsteparts iframe-koder tillates<\/b> på dette nettstedet", "description":"" }, "popupSite1pFrameDisabled":{ - "message":"Førsteparts iframe-koder er blokkert<\/b> på dette nettstedet", + "message":"Førsteparts iframe-koder blokkeres<\/b> på dette nettstedet", "description":"" }, "popupSite3pFrameEnabled":{ - "message":"Tredjeparts iframe-koder er tillatt<\/b> på dette nettstedet", + "message":"Tredjeparts iframe-koder tillates<\/b> på dette nettstedet", "description":"" }, "popupSite3pFrameDisabled":{ - "message":"Tredjeparts iframe-koder er blokkert<\/b> på dette nettstedet", + "message":"Tredjeparts iframe-koder blokkeres<\/b> på dette nettstedet", "description":"" }, "popupDefaultInlineScriptEnabled":{ - "message":"Integrerte skript<\/code>-koder er tillatt<\/b> overalt som standard", + "message":"Integrerte skript<\/code>-koder tillates<\/b> overalt som standard", "description":"" }, "popupDefaultInlineScriptDisabled":{ - "message":"Integrerte skript<\/code>-koder er blokkert<\/b> overalt som standard", + "message":"Integrerte skript<\/code>-koder blokkeres<\/b> overalt som standard", "description":"" }, "popupDefault1pScriptEnabled":{ - "message":"Førsteparts skript er tillatt<\/b> overalt som standard", + "message":"Førsteparts skript tillates<\/b> overalt som standard", "description":"" }, "popupDefault1pScriptDisabled":{ - "message":"Førsteparts skript er blokkert<\/b> overalt som standard", + "message":"Førsteparts skript blokkeres<\/b> overalt som standard", "description":"" }, "popupDefault3pScriptEnabled":{ - "message":"Tredjeparts skript er tillatt<\/b> overalt som standard", + "message":"Tredjeparts skript tillates<\/b> overalt som standard", "description":"" }, "popupDefault3pScriptDisabled":{ - "message":"Tredjeparts skript er blokkert<\/b> overalt som standard", + "message":"Tredjeparts skript blokkeres<\/b> overalt som standard", "description":"" }, "popupDefault1pFrameEnabled":{ - "message":"Førsteparts iframe-koder er tillatt<\/b> overalt som standard", + "message":"Førsteparts iframe-koder tillates<\/b> overalt som standard", "description":"" }, "popupDefault1pFrameDisabled":{ - "message":"Førsteparts iframe-koder er blokkert<\/b> overalt som standard", + "message":"Førsteparts iframe-koder blokkeres<\/b> overalt som standard", "description":"" }, "popupDefault3pFrameEnabled":{ - "message":"Tredjeparts iframe-koder er tillatt<\/b> overalt som standard", + "message":"Tredjeparts iframe-koder tillates<\/b> overalt som standard", "description":"" }, "popupDefault3pFrameDisabled":{ - "message":"Tredjeparts iframe-koder er blokkert<\/b> overalt som standard", + "message":"Tredjeparts iframe-koder blokkeres<\/b> overalt som standard", "description":"" }, "popupImageRulePrompt":{ @@ -351,6 +351,14 @@ "message":"mine-ublock-dynamiske-regler_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Liste over dine dynamiske filtreringsregler.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Regelsyntaks: kilde destinasjon type handling<\/code> (full dokumentasjon<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Din liste over vertsnavn hvor µBlock blir deaktivert. Én oppføring per linje. Ugyldige vertsnavn blir stille ignorert.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Ingen ikke-blokkerte forespørsler logget for denne siden", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Bak kulissene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Endringslogg", "description":"English: Change log" diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json index 9cdd71aab..bf45cfd3e 100644 --- a/src/_locales/nl/messages.json +++ b/src/_locales/nl/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistieken", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Over", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Je lijst van hostnamen waarop µBlock uitgeschakeld is. Één per lijn ingeven. Ongeldige hostnamen worden genegeerd zonder melding.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Geen niet-geblokkeerde verzoeken zijn gelogd voor deze pagina", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Veranderingenlogboek", "description":"English: Change log" diff --git a/src/_locales/pl/messages.json b/src/_locales/pl/messages.json index 9761f2d67..e68222f6f 100644 --- a/src/_locales/pl/messages.json +++ b/src/_locales/pl/messages.json @@ -4,7 +4,7 @@ "description":"extension name." }, "extShortDesc":{ - "message":"Nareszcie, wydajne blokowanie reklam dla przeglądarek opartych na Chromium. Niskie użycie procesora i pamięci.", + "message":"Nareszcie, wydajne blokowanie reklam. Niskie użycie procesora i pamięci.", "description":"this will be in the chrome web store: must be 132 characters or less" }, "dashboardName":{ @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statystyki", - "description":"appears as tab name in dashboard" + "message":"µBlock — Log żądań sieciowych", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"O rozszerzeniu", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Lista twoich reguł dynamicznego filtrowania.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Składnia reguły: źródło przeznaczenie typ akcja<\/code> (pełna dokumentacja<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Twoja lista nazw hostów, na których µBlock zostanie wyłączony. Jeden wpis na linię. Błędne nazwy hostów zostaną zignorowane.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Nie zarejestrowano nieblokowanych żądań dla tej strony", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Za kulisami", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Dziennik zmian", "description":"English: Change log" diff --git a/src/_locales/pt_BR/messages.json b/src/_locales/pt_BR/messages.json index 66b47b976..e42de5908 100644 --- a/src/_locales/pt_BR/messages.json +++ b/src/_locales/pt_BR/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Estatísticas", - "description":"appears as tab name in dashboard" + "message":"µBlock — Registro de solicitações de rede", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Sobre", @@ -351,6 +351,14 @@ "message":"minhas-regras-dinâmicas-do-ublock.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Lista de suas regras de filtragem dinâmica.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Regras de Sintaxe: Ação de tipo origem destino<\/code> (documentação completa<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Sua lista de exceções de nomes de host para qual o μBlock será desativado. Uma entrada por linha. hostnames inválidos serão silenciosamente ignorados.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Não há solicitações não-bloqueadas registrados para esta página", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Por trás da cena", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Registro de alterações", "description":"English: Change log" diff --git a/src/_locales/pt_PT/messages.json b/src/_locales/pt_PT/messages.json index 2369c39d1..f7750a06e 100644 --- a/src/_locales/pt_PT/messages.json +++ b/src/_locales/pt_PT/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Estatísticas", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Sobre", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Lista pessoal de hostnames para os quais o µBlock será desactivado. Uma entrada por linha. Hostnames inválidos serão ignorados silenciosamente.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Não há pedidos de não bloqueados registados para esta página", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Registo de alterações", "description":"English: Change log" diff --git a/src/_locales/ro/messages.json b/src/_locales/ro/messages.json index 9d06e2488..87d2e9831 100644 --- a/src/_locales/ro/messages.json +++ b/src/_locales/ro/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistici", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Despre", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Lista ta de nume de gazde unde µBlock va fi dezactivat. Fiecare adresă pe o singura linie. Adresele nevalide vor fi ignorate automat.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Nicio cerere ne-blocată pentru această pagină", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Jurnalul de modificări", "description":"English: Change log" diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index e9c5575b9..938b4c0f4 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -4,7 +4,7 @@ "description":"extension name." }, "extShortDesc":{ - "message":"Эффективный блокировщик для браузеров на базе Chromium, не нагружающий ЦП и память.", + "message":"Наконец-то, эффективный блокировщик для браузеров, не нагружающий ЦП и оперативную память.", "description":"this will be in the chrome web store: must be 132 characters or less" }, "dashboardName":{ @@ -20,7 +20,7 @@ "description":"appears as tab name in dashboard" }, "1pPageName":{ - "message":"Ваши фильтры", + "message":"Мои фильтры", "description":"appears as tab name in dashboard" }, "rulesPageName":{ @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Статистика", - "description":"appears as tab name in dashboard" + "message":"µBlock — Журнал сетевых запросов", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"О расширении", @@ -72,23 +72,23 @@ "description":"English: Go to request log" }, "popupSiteInlineScriptEnabled":{ - "message":"Встроенные теги script<\/code> включены<\/b> для этого сайта", + "message":"Встроенные теги скриптов<\/code> включены<\/b> для этого сайта", "description":"" }, "popupSiteInlineScriptDisabled":{ - "message":"Встроенные теги script<\/code> отключены<\/b> для этого сайта", + "message":"Встроенные теги скриптов<\/code> заблокированы<\/b> для этого сайта", "description":"" }, "popupSite1pScriptEnabled":{ - "message":"Пользовательские скрипты доступны<\/b> на этом сайте", + "message":"Пользовательские скрипты разрешены<\/b> на этом сайте", "description":"" }, "popupSite1pScriptDisabled":{ - "message":"Пользовательские скрипты не доступны<\/b> на этом сайте", + "message":"Пользовательские скрипты заблокированы<\/b> на этом сайте", "description":"" }, "popupSite3pScriptEnabled":{ - "message":"Сторонние скрипты включены<\/b> для этого сайта", + "message":"Сторонние скрипты разрешены<\/b> для этого сайта", "description":"" }, "popupSite3pScriptDisabled":{ @@ -96,67 +96,67 @@ "description":"" }, "popupSite1pFrameEnabled":{ - "message":"Пользовательские фреймы включены<\/b> для этого сайта", + "message":"Пользовательские фреймы разрешены<\/b> для этого сайта", "description":"" }, "popupSite1pFrameDisabled":{ - "message":"Пользовательские фреймы отключены<\/b> для этого сайта", + "message":"Пользовательские фреймы заблокированы<\/b> для этого сайта", "description":"" }, "popupSite3pFrameEnabled":{ - "message":"Сторонние фреймы включены<\/b> для этого сайта", + "message":"Сторонние фреймы разрешены<\/b> для этого сайта", "description":"" }, "popupSite3pFrameDisabled":{ - "message":"Сторонние фреймы отключены<\/b> для этого сайта", + "message":"Сторонние фреймы заблокированы<\/b> для этого сайта", "description":"" }, "popupDefaultInlineScriptEnabled":{ - "message":"Встроенные теги script<\/code> включены<\/b> везде по умолчанию", + "message":"Встроенные теги скриптов<\/code> разрешены<\/b> везде по умолчанию", "description":"" }, "popupDefaultInlineScriptDisabled":{ - "message":"Встроенные теги script<\/code> отключены<\/b> везде по умолчанию", + "message":"Встроенные теги скриптов<\/code> заблокированы<\/b> везде по умолчанию", "description":"" }, "popupDefault1pScriptEnabled":{ - "message":"Пользовательские скрипты включены<\/b> везде по умолчанию", + "message":"Пользовательские скрипты разрешены<\/b> везде по умолчанию", "description":"" }, "popupDefault1pScriptDisabled":{ - "message":"Пользовательские скрипты отключены<\/b> везде по умолчанию", + "message":"Пользовательские скрипты заблокированы<\/b> везде по умолчанию", "description":"" }, "popupDefault3pScriptEnabled":{ - "message":"Сторонние скрипты включены<\/b> везде по умолчанию", + "message":"Сторонние скрипты разрешены<\/b> везде по умолчанию", "description":"" }, "popupDefault3pScriptDisabled":{ - "message":"Сторонние скрипты отключены<\/b> везде по умолчанию", + "message":"Сторонние скрипты заблокированы<\/b> везде по умолчанию", "description":"" }, "popupDefault1pFrameEnabled":{ - "message":"Пользовательские фреймы включены<\/b> везде по умолчанию", + "message":"Пользовательские фреймы разрешены<\/b> везде по умолчанию", "description":"" }, "popupDefault1pFrameDisabled":{ - "message":"Пользовательские фреймы отключены<\/b> везде по умолчанию", + "message":"Пользовательские фреймы заблокированы<\/b> везде по умолчанию", "description":"" }, "popupDefault3pFrameEnabled":{ - "message":"Сторонние фреймы включены<\/b> везде по умолчанию", + "message":"Сторонние фреймы разрешены<\/b> везде по умолчанию", "description":"" }, "popupDefault3pFrameDisabled":{ - "message":"Сторонние фреймы отключены<\/b> везде по умолчанию", + "message":"Сторонние фреймы заблокированы<\/b> везде по умолчанию", "description":"" }, "popupImageRulePrompt":{ - "message":"Изображения", + "message":"изображения", "description":"" }, "popupInlineScriptRulePrompt":{ - "message":"Встроенные скрипты", + "message":"встроенные скрипты", "description":"" }, "popup1pScriptRulePrompt":{ @@ -172,7 +172,7 @@ "description":"" }, "popupHitDomainCountPrompt":{ - "message":"Подключено к {{count}} отдельному(-ым) домену(-ам)", + "message":"Подключено к {{count}} отдельному(-ым) домену(-ам) из {{total}}", "description":"appear in dynamic filtering pane" }, "pickerCreate":{ @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Список динамических правил фильтрации.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Синтаксис правил: источник назначение тип действие<\/code> (полная документация<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Список имён узлов, для которых µBlock будет отключен. Одна запись на строку. Неправильные имена будут тихо проигнорированы.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Нет незаблокированных запросов на этой странице", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"За кулисами", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Список изменений", "description":"English: Change log" @@ -448,7 +460,7 @@ "description":"Message asking user to confirm restore" }, "aboutRestoreDataError":{ - "message":"Данные ошибочны или не могут быть прочитаны", + "message":"Данные не могут быть прочитаны или ошибочны", "description":"Message to display when an error occurred during restore" }, "aboutResetDataConfirm":{ diff --git a/src/_locales/sv/messages.json b/src/_locales/sv/messages.json index b9569ed56..ac5fefe35 100644 --- a/src/_locales/sv/messages.json +++ b/src/_locales/sv/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Statistik", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Om", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Din lista över värdnamn för vilka μBlock inaktiveras. En post per rad. Ogiltiga värdnamn kommer att ignoreras.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Inga icke-blockerade förfrågningar loggade för denna sida", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Ändringslogg", "description":"English: Change log" diff --git a/src/_locales/tr/messages.json b/src/_locales/tr/messages.json index fdc3fba07..166aa1365 100644 --- a/src/_locales/tr/messages.json +++ b/src/_locales/tr/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"İstatistikler", - "description":"appears as tab name in dashboard" + "message":"µBlock — Ağ istek günlüğü", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Hakkında", @@ -351,6 +351,14 @@ "message":"dinamik-ublock-kurallarım_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"Dinamik filtre kurallarınızın listesi.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Kural dizimi: kaynak hedefi türü işlemi<\/code> (bütün belgeler<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Hangi alan adları için µBlock'un devre dışı olacağını belirten listeniz. Satır başına bir girdi. Geçersiz alan adları sessizce yok sayılır.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Bu sayfa için kayıtlı engellenmemiş istek yok", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Sahne arkası", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Değişiklikler", "description":"English: Change log" diff --git a/src/_locales/uk/messages.json b/src/_locales/uk/messages.json index c511f6de9..b7c765301 100644 --- a/src/_locales/uk/messages.json +++ b/src/_locales/uk/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Статистика", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Про програму", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"Список тих доменів, для яких µBlock буде вимикатись. Один запис на рядок. Недопустимі назви будуть ігноруватись.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"На цій сторінці блокуються всі запити", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Журнал змін", "description":"English: Change log" diff --git a/src/_locales/vi/messages.json b/src/_locales/vi/messages.json index 9d844e03c..e86577001 100644 --- a/src/_locales/vi/messages.json +++ b/src/_locales/vi/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"Thống kê", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"Giới thiệu", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "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.", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"Không có những yêu cầu không bị chặn được ghi lại cho trang này", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"Thay đổi", "description":"English: Change log" diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index 75d127cdb..b33f966a2 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"统计", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"关于", @@ -351,6 +351,14 @@ "message":"ublock 规则.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"列表里的主机名将被 µBlock 禁用。每行一条规则。无效的主机名将被忽略掉。", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"该页面没有未拦截记录", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"更新日志", "description":"English: Change log" diff --git a/src/_locales/zh_TW/messages.json b/src/_locales/zh_TW/messages.json index 782ae4af1..5040c62c0 100644 --- a/src/_locales/zh_TW/messages.json +++ b/src/_locales/zh_TW/messages.json @@ -32,8 +32,8 @@ "description":"appears as tab name in dashboard" }, "statsPageName":{ - "message":"統計", - "description":"appears as tab name in dashboard" + "message":"µBlock — Network request log", + "description":"Title for the network request log window" }, "aboutPageName":{ "message":"關於", @@ -351,6 +351,14 @@ "message":"my-ublock-dynamic-rules_{{datetime}}.txt", "description":"default file name to use" }, + "rulesHint":{ + "message":"List of your dynamic filtering rules.", + "description":"English: List of your dynamic filtering rules." + }, + "rulesFormatHint":{ + "message":"Rule syntax: source destination type action<\/code> (full documentation<\/a>).", + "description":"English: dynamic rule syntax and full documentation." + }, "whitelistPrompt":{ "message":"列表裡的主機名稱將被 μBlock 停用。每行一個規則。無效的主機名稱將被忽略掉。", "description":"English: Your list of host names for which µBlock will be disabled. One host name per line. Invalid host names will be silently ignored." @@ -411,6 +419,10 @@ "message":"該頁面沒有未封鎖記錄", "description":"English: No non-blocked requests logged for this page" }, + "logBehindTheScene":{ + "message":"Behind the scene", + "description":"Pretty name for behind-the-scene network requests" + }, "aboutChangelog":{ "message":"更新日誌", "description":"English: Change log" From 5ee417e1103c02e7c695a2532cfe63951baec53b Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 18 Jan 2015 22:26:07 -0500 Subject: [PATCH 4/8] new revision --- platform/chromium/manifest.json | 2 +- platform/firefox/vapi-background.js | 2 +- platform/safari/Update.plist | 2 +- src/js/storage.js | 2 +- src/js/traffic.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index e8b1eb112..2e7e33c19 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "µBlock", - "version": "0.8.5.6", + "version": "0.8.5.7", "default_locale": "en", "description": "__MSG_extShortDesc__", diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index d257f26dc..5d9b30bb0 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -45,7 +45,7 @@ vAPI.firefox = true; // TODO: read these data from somewhere... vAPI.app = { name: 'µBlock', - version: '0.8.5.6' + version: '0.8.5.7' }; /******************************************************************************/ diff --git a/platform/safari/Update.plist b/platform/safari/Update.plist index e9a130f3d..f5574ae33 100644 --- a/platform/safari/Update.plist +++ b/platform/safari/Update.plist @@ -14,7 +14,7 @@ CFBundleVersion {buildNumber} URL - https://chrismatic.io/ublock/ublock-0.8.5.6.safariextz + https://chrismatic.io/ublock/ublock-0.8.5.7.safariextz diff --git a/src/js/storage.js b/src/js/storage.js index aec5a98f5..ac87a64e3 100644 --- a/src/js/storage.js +++ b/src/js/storage.js @@ -662,7 +662,7 @@ // https://github.com/gorhill/uBlock/issues/540 // Disabling local mirroring for the time being userSettings.experimentalEnabled = false; - µb.mirrors.toggle(userSettings.experimentalEnabled); + µb.mirrors.toggle(false /* userSettings.experimentalEnabled */); µb.contextMenu.toggle(userSettings.contextMenuEnabled); µb.dynamicNetFilteringEngine.fromString(userSettings.dynamicFilteringString); diff --git a/src/js/traffic.js b/src/js/traffic.js index ed6e3995e..86d8cc45c 100644 --- a/src/js/traffic.js +++ b/src/js/traffic.js @@ -255,7 +255,7 @@ var onHeadersReceived = function(details) { // https://github.com/gorhill/uBlock/issues/540 // Disabling local mirroring for the time being //if ( details.parentFrameId === -1 ) { - // pageStore.skipLocalMirroring = headerStartWith(details.responseHeaders, 'content-security-policy') !== ''; + // pageStore.skipLocalMirroring = headerStartsWith(details.responseHeaders, 'content-security-policy') !== ''; //} var requestURL = details.url; @@ -324,7 +324,7 @@ var headerValue = function(headers, name) { /******************************************************************************/ -var headerStartWith = function(headers, prefix) { +var headerStartsWith = function(headers, prefix) { var prefixLen = prefix.length; var i = headers.length; while ( i-- ) { From 11bb0e963895c0c6f219979e6bb32e175f271731 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 19 Jan 2015 01:50:10 -0700 Subject: [PATCH 5/8] Massive overhaul/fixes to core Safari event capturing --- platform/safari/vapi-background.js | 52 ++++++++++++------------------ platform/safari/vapi-client.js | 42 +++++++----------------- 2 files changed, 33 insertions(+), 61 deletions(-) diff --git a/platform/safari/vapi-background.js b/platform/safari/vapi-background.js index 6769855fa..26b865923 100644 --- a/platform/safari/vapi-background.js +++ b/platform/safari/vapi-background.js @@ -190,21 +190,32 @@ vAPI.tabs = { vAPI.tabs.registerListeners = function() { var onNavigation = this.onNavigation; - this.onNavigation = function(e) { - // e.url is not present for local files or data URIs, - // or probably for those URLs which we don't have access to - if ( !e.target || !e.target.url ) { + safari.application.addEventListener('beforeNavigate', function(e) { + if ( !e.target || !e.target.url || e.target.url === 'about:blank' ) { return; } - + var url = e.target.url, tabId = vAPI.tabs.getTabId(e.target); + if ( vAPI.tabs.popupCandidate ) { + var details = { + url: url, + tabId: tabId, + sourceTabId: vAPI.tabs.popupCandidate + }; + vAPI.tabs.popupCandidate = false; + if ( vAPI.tabs.onPopup(details) ) { + e.preventDefault(); + if ( vAPI.tabs.stack[details.sourceTabId] ) { + vAPI.tabs.stack[details.sourceTabId].activate(); + } + return; + } + } onNavigation({ + url: url, frameId: 0, - tabId: vAPI.tabs.getTabId(e.target), - url: e.target.url + tabId: tabId }); - }; - - safari.application.addEventListener('navigate', this.onNavigation, true); + }, true); // onClosed handled in the main tab-close event // onUpdated handled via monitoring the history.pushState on web-pages @@ -577,27 +588,6 @@ vAPI.messaging.broadcast = function(message) { /******************************************************************************/ -safari.application.addEventListener('beforeNavigate', function(e) { - if ( !vAPI.tabs.popupCandidate || e.url === 'about:blank' ) { - return; - } - - var details = { - url: e.url, - tabId: vAPI.tabs.getTabId(e.target), - sourceTabId: vAPI.tabs.popupCandidate - }; - - vAPI.tabs.popupCandidate = null; - - if ( vAPI.tabs.onPopup(details) ) { - e.preventDefault(); - - if ( vAPI.tabs.stack[details.sourceTabId] ) { - vAPI.tabs.stack[details.sourceTabId].activate(); - } - } -}, true); /******************************************************************************/ diff --git a/platform/safari/vapi-client.js b/platform/safari/vapi-client.js index 9adde80fd..958e8dc64 100644 --- a/platform/safari/vapi-client.js +++ b/platform/safari/vapi-client.js @@ -191,47 +191,31 @@ if ( location.protocol === 'safari-extension:' ) { /******************************************************************************/ -window.MutationObserver = window.MutationObserver || window.WebKitMutationObserver; - -if ( !window.MutationObserver ) { - // Dummy, minimalistic shim for older versions (<6) - // only supports node insertions, but currently we don't use it for anything else - window.MutationObserver = function(handler) { - this.observe = function(target) { - target.addEventListener('DOMNodeInserted', function(e) { - handler([{ addedNodes: [e.target] }]); - }, true); - }; - }; -} - -/******************************************************************************/ - var beforeLoadEvent = document.createEvent('Event'); beforeLoadEvent.initEvent('beforeload'); /******************************************************************************/ var frameId = window === window.top ? 0 : Date.now() % 1E5; +var parentFrameId = frameId ? 0 : -1; var linkHelper = document.createElement('a'); var onBeforeLoad = function(e, details) { - if ( e.url && e.url.slice(0, 5) === 'data:' ) { + if ( e.url && e.url.lastIndexOf('data:', 0) == 0 ) { return; } linkHelper.href = details ? details.url : e.url; + var url = linkHelper.href; - if ( linkHelper.protocol !== 'http:' && linkHelper.protocol !== 'https:' ) { - if ( !(details && details.type === 'popup') ) { - return; - } + if ( url.lastIndexOf('http:', 0) === -1 && url.lastIndexOf('https:', 0) === -1) { + return; } if ( details ) { - details.url = linkHelper.href; + details.url = url; } else { details = { - url: linkHelper.href + url: url }; switch ( e.target.nodeName.toLowerCase() ) { @@ -274,7 +258,7 @@ var onBeforeLoad = function(e, details) { // tabId is determined in the background script // details.tabId = null; details.frameId = frameId; - details.parentFrameId = frameId ? 0 : -1; + details.parentFrameId = parentFrameId; details.timeStamp = Date.now(); var response = safari.self.tab.canLoad(e, details); @@ -316,11 +300,10 @@ var onBeforeLoad = function(e, details) { document.addEventListener('beforeload', onBeforeLoad, true); /******************************************************************************/ - // block pop-ups, intercept xhr requests, and apply site patches var firstMutation = function() { document.removeEventListener('DOMSubtreeModified', firstMutation, true); - firstMutation = null; + firstMutation = false; var randEventName = uniqueId(); @@ -337,11 +320,10 @@ var firstMutation = function() { var tmpJS = document.createElement('script'); var tmpScript = ['(function() {', 'var block = function(u, t) {', - 'var e = document.createEvent("CustomEvent"),', - 'd = {url: u, type: t};', - 'e.initCustomEvent("' + randEventName + '", false, false, d);', + 'var e = new CustomEvent("' + randEventName +'",', + '{detail: {url: u, type: t}, bubbles: false});', 'dispatchEvent(e);', - 'return d.url === false;', + 'return e.detail.url === false;', '}, wo = open, xo = XMLHttpRequest.prototype.open;', 'open = function(u) {', 'return block(u, "popup") ? null : wo.apply(this, arguments);', From 15488d7396d646f159c7305f8dbbd96427ce8746 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 19 Jan 2015 01:55:24 -0700 Subject: [PATCH 6/8] Update extension info with update manifest and info to match signing cert --- platform/safari/Info.plist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/safari/Info.plist b/platform/safari/Info.plist index 938976a51..62498d5ef 100644 --- a/platform/safari/Info.plist +++ b/platform/safari/Info.plist @@ -3,7 +3,7 @@ Author - {author} + Chris Aljoudi (core by gorhill) Builder Version 534.57.2 CFBundleDisplayName @@ -83,8 +83,8 @@ All - + Update Manifest URL + https://chrismatic.io/ublock/Update.plist Website https://github.com/gorhill/uBlock From a65b63ca85f58270fb3a65dca4f27e2a4e28c434 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 19 Jan 2015 10:47:37 -0700 Subject: [PATCH 7/8] Fix equality (change to strict) --- platform/safari/vapi-client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/safari/vapi-client.js b/platform/safari/vapi-client.js index 958e8dc64..46b9d385b 100644 --- a/platform/safari/vapi-client.js +++ b/platform/safari/vapi-client.js @@ -200,7 +200,7 @@ var frameId = window === window.top ? 0 : Date.now() % 1E5; var parentFrameId = frameId ? 0 : -1; var linkHelper = document.createElement('a'); var onBeforeLoad = function(e, details) { - if ( e.url && e.url.lastIndexOf('data:', 0) == 0 ) { + if ( e.url && e.url.lastIndexOf('data:', 0) === 0 ) { return; } From 9174400787857f1427eadaaf6c41bb06110edec9 Mon Sep 17 00:00:00 2001 From: gorhill Date: Mon, 19 Jan 2015 15:00:29 -0500 Subject: [PATCH 8/8] to fix http://www.vd.nl/, Chrome store feedback --- assets/checksums.txt | 2 +- assets/ublock/filters.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/checksums.txt b/assets/checksums.txt index 960ae33e7..91a531c3f 100644 --- a/assets/checksums.txt +++ b/assets/checksums.txt @@ -1,5 +1,5 @@ 7edb2a585b445f28aa5ab06306f1a23f assets/ublock/privacy.txt -f40d926a5770f00c45be14a3e1ef9cb0 assets/ublock/filters.txt +b6137d537764a06c17f721addf6a7579 assets/ublock/filters.txt dcf3e05bae803343c9d632f0baf8bedd assets/ublock/mirror-candidates.txt 9947b5510d67e47ea59ce876e4fc67be assets/ublock/filter-lists.json 132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt index 066a28f9e..b01140e84 100644 --- a/assets/ublock/filters.txt +++ b/assets/ublock/filters.txt @@ -228,6 +228,6 @@ ovh.strim.io#@##tweets # Until fixed in EasyList @@||cdn.turner.com/ads/nba/adfuel.js$domain=www.nba.com -# https://adblockplus.org/forum/viewtopic.php?f=10&t=27509 -# To counter [a.]visualrevenue.com in Dan Pollock's, hpHosts, Peter Lowe's, MVPS -@@||a.visualrevenue.com/vrs.js$domain=www.ebaumsworld.com \ No newline at end of file +# From Chrome store: Go to site http://www.vd.nl/ ... links from dropdown top menu do not work +# To counter Dan Pollock's, hpHosts, MVPS, Peter Lowe's +@@||google-analytics.com/analytics.js$domain=www.vd.nl \ No newline at end of file