Skip to content
This repository has been archived by the owner on Oct 11, 2020. It is now read-only.

Commit

Permalink
Merge tag '1.9.12' of https://github.com/gorhill/uBlock
Browse files Browse the repository at this point in the history
  • Loading branch information
nicole-ashley committed Oct 17, 2016
2 parents f35a411 + ca1e2ce commit b02646c
Show file tree
Hide file tree
Showing 56 changed files with 83 additions and 76 deletions.
12 changes: 6 additions & 6 deletions dist/description/description-de.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Ein illustrierter Überblick über seine Effizienz: https://github.com/gorhill/u

Benutzung: Der An-/Ausschaltknopf beim Klicken des Erweiterungssymbols dient zum An-/Ausschalten von uBlock auf der aktuellen Webseite. Dies wirkt sich also nur auf die aktuelle Webseite aus und nicht global.

***

uBlock ist flexibel, denn es ist mehr als ein "Werbeblocker": Es verarbeitet auch Filter aus mehreren hosts-Dateien.

Expand All @@ -28,11 +28,11 @@ Natürlich ist der Speicherbedarf umso höher, desto mehr Filter angewandt werde

Bedenke allerdings, dass durch die Wahl zusätzlicher Listen die Wahrscheinlichkeit größer wird, dass bestimmte Webseiten nicht richtig geladen werden - vor allem bei Listen, die normalerweise als hosts-Dateien verwendet werden.

***

Ohne die vorgegebenen Filterlisten ist diese Erweiterung nichts. Wenn du also etwas beitragen möchtest, dann denke an die Menschen, die hart dafür arbeiten, die von dir benutzten Filterlisten zu pflegen, und diese für uns alle frei verfügbar gemacht haben.
Wenn du etwas beitragen möchtest, dann denke an die Menschen, die hart dafür arbeiten, die von dir benutzten Filterlisten zu pflegen, und diese für uns alle frei verfügbar gemacht haben.

***

Frei.
Open-Source-Software unter der General Public License (GPLv3)
Expand All @@ -41,9 +41,9 @@ Für Benutzer von Benutzern.
Mitwirkende @ Github: https://github.com/gorhill/uBlock/graphs/contributors
Mitwirkende @ Crowdin: https://crowdin.net/project/ublock

***

Dies ist eine ziemlich frühe Version - bitte denke daran, wenn du sie bewertest.

Änderungsprotokoll:
https://github.com/gorhill/uBlock/releases
2 changes: 1 addition & 1 deletion dist/description/description-sr.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Ефикасан блокатор: ниски процесорски и меморијски захтеви и може учитати и применити хиљаде више филтера него остали популарни блокатори.
Ефикасан блокатор: ниски процесорски и меморијски захтеви и може учитати и применити хиљаде филтера више него остали популарни блокатори.

Илустровани преглед његове ефикасности: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared

Expand Down
2 changes: 1 addition & 1 deletion platform/chromium/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,

"name": "uBlock Origin",
"version": "1.9.11.101",
"version": "1.9.12",

"default_locale": "en",
"description": "__MSG_extShortDesc__",
Expand Down
2 changes: 1 addition & 1 deletion platform/edge/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,

"name": "uBlock Origin",
"version": "1.9.11.101",
"version": "1.9.12",

"default_locale": "en",
"description": "__MSG_extShortDesc__",
Expand Down
9 changes: 8 additions & 1 deletion platform/firefox/processScript.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,14 @@
null
);

processObserver.start();
// https://developer.mozilla.org/en-US/Firefox/Multiprocess_Firefox/Message_Manager/Frame_script_loading_and_lifetime#Unloading_frame_scripts
// There is no way to unload a frame script, so when the extension will
// update, it may happen `processObserver` is not available because of
// trying to import from an older module version.
// TODO: remove the test once everybody is updated to 1.9.10+.
if ( processObserver ) {
processObserver.start();
}
})();

/******************************************************************************/
2 changes: 1 addition & 1 deletion platform/opera/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,

"name": "uBlock Origin",
"version": "1.9.11.101",
"version": "1.9.12",

"default_locale": "en",
"description": "__MSG_extShortDesc__",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"فلاتر النت",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"فلاتر تجميليه",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/bg/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Мрежови филтри",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Козметични филтри",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/bn/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"নেট ফিল্টার",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"প্রসাধনী ফিল্টার",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/ca/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Filtres de xarxa",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Filtres cosmètics",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/cs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Síťové filtry",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Kosmetické filtry",
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/cv/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@
"description":"Element picker preview mode: will cause the elements matching the current filter to be removed from the page"
},
"pickerNetFilters":{
"message":"Net filters",
"description":"English: Net filters"
"message":"Network filters",
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Cosmetic filters",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/da/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Netfiltre",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Kosmetiske filtre",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Netzwerkfilter",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Kosmetische Filter",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/el/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Φίλτρα δικτύου",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Κοσμητικά φίλτρα",
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@
"description":"Element picker preview mode: will cause the elements matching the current filter to be removed from the page"
},
"pickerNetFilters":{
"message":"Net filters",
"description":"English: Net filters"
"message":"Network filters",
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Cosmetic filters",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/eo/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Retaj filtriloj",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Ornamaj filtriloj",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Filtros de red",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Filtros cosméticos",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/et/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Võrgufiltrid",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Ilufiltrid",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/eu/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Sare iragazkiak",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Iragazki kosmetikoak",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/fa/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"فیلترهای شبکه",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"فیلترهای انتخابی",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/fi/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Verkkosuodattimet",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Kosmeettiset suodattimet",
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/fil/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@
"description":"Element picker preview mode: will cause the elements matching the current filter to be removed from the page"
},
"pickerNetFilters":{
"message":"Net filters",
"description":"English: Net filters"
"message":"Network filters",
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Cosmetic filters",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Filtres de réseau",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Filtres esthétiques",
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/fy/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"description":"English: Click to open the dashboard"
},
"popupTipPicker":{
"message":"Elemintkiesmoadus iepenje",
"message":"Elemintkiesmodus iepenje",
"description":"English: Enter element picker mode"
},
"popupTipLog":{
Expand Down Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Netfilters",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Kosmetyske filters",
Expand Down
10 changes: 5 additions & 5 deletions src/_locales/gl/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Filtros da rede",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Filtros cosméticos",
Expand Down Expand Up @@ -228,11 +228,11 @@
"description":""
},
"settingsNoCosmeticFilteringPrompt":{
"message":"Desactivar filtrado cosmético",
"message":"Desactivar o filtrado cosmético",
"description":""
},
"settingsNoLargeMediaPrompt":{
"message":"Bloquear elementos audiovisuais meirandes de {{input:number}} kB",
"message":"Bloquear elementos os audiovisuais meirandes de {{input:number}} kB",
"description":""
},
"settingsNoRemoteFontsPrompt":{
Expand Down Expand Up @@ -284,7 +284,7 @@
"description":"This will cause uBO to ignore all generic cosmetic filters."
},
"3pIgnoreGenericCosmeticFiltersInfo":{
"message":"<p>Os filtros cosméticos xenéricos estanche pensados para ser aplicados en todas as páxinas.<p>Aínda que o uBlock₀ os xestiona dun xeito eficiente, algúns deles precisan de altas cantidades de memoria é sobreemprego da CPU, especialmente nas páxinas grandes e nas máis duradeiras.<p>Activar esta opción suprimirá os requerimentos de memoria e CPU por causa destes filtros cosméticos xenéricos, así como reducirá a cantidade de memoria ocupada polo uBlock₀ mesmo.<p>Recomendámosche activar esta opción sobre todo nos dispositivos menos potentes.",
"message":"<p>Os filtros cosméticos xenéricos estanche pensados para seren aplicados en todas as páxinas.<p>Aínda que o uBlock₀ os xestiona dun xeito eficiente, algúns deles precisan de altas cantidades de memoria e sobreemprego da CPU, especialmente nas páxinas grandes e nas máis duradeiras.<p>Activar esta opción suprimirá os requerimentos de memoria e CPU por causa destes filtros cosméticos xenéricos, así como reducirá a cantidade de memoria ocupada polo uBlock₀ mesmo.<p>Recomendámosche activar esta opción sobre todo nos dispositivos menos potentes.",
"description":"Describes the purpose of the 'Ignore generic cosmetic filters' feature."
},
"3pListsOfBlockedHostsHeader":{
Expand Down Expand Up @@ -684,7 +684,7 @@
"description":""
},
"contextMenuTemporarilyAllowLargeMediaElements":{
"message":"Permitir temporalmente elementos multimedia grandes",
"message":"Permitir temporalmente os elementos multimedia grandes",
"description":"A context menu entry, present when large media elements have been blocked on the current site"
},
"dummy":{
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/he/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"מסנני רשת",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"מסננים קוסמטיים",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/hi/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"नेट फिलटर्स",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"सुंदरता के लिए फिलटरें",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/hr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Mrežni filteri",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Estetski filteri",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/hu/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Hálózati szűrők",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Kozmetikai szűrők",
Expand Down
2 changes: 1 addition & 1 deletion src/_locales/id/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Filter jaringan",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Filter tampilan",
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/it/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
},
"pickerNetFilters":{
"message":"Filtri di rete",
"description":"English: Net filters"
"description":"English: header for a type of filter in the element picker dialog"
},
"pickerCosmeticFilters":{
"message":"Filtri cosmetici",
Expand Down Expand Up @@ -284,7 +284,7 @@
"description":"This will cause uBO to ignore all generic cosmetic filters."
},
"3pIgnoreGenericCosmeticFiltersInfo":{
"message":"<p>I filtri cosmetici generici sono i filtri cosmetici intesi per essere applicati a tutti i siti Web.<p>Benché questi siano gestiti in modo efficiente da uBlock₀, i filtri cosmetici generici potrebbero contribuire a un overhead misurabile in termini di memoria e CPU su alcune pagine Web, in particolare quelle di notevoli dimensioni e a lunga scadenza.<p>L'attivazione di quest'opzione eliminerà l'overhead in termini di memoria e CPU aggiunto alle pagine Web in conseguenza della gestione dei filtri cosmetici generici, e inoltre ridurrà l'impatto sulla memoria di uBlock₀ stesso.<p>È raccomandato abilitare quest'opzione sui dispositivi meno potenti.",
"message":"<p>I filtri cosmetici generici sono i filtri cosmetici intesi per essere applicati a tutti i siti Web.<p>Benché questi siano gestiti in modo efficiente da uBlock₀, i filtri cosmetici generici potrebbero contribuire a un carico elevato in termini di memoria e CPU su alcune pagine Web, in particolare quelle di notevoli dimensioni e a lunga scadenza.<p>L'attivazione di quest'opzione eliminerà il carico elevato in termini di memoria e CPU aggiunto alle pagine Web in conseguenza della gestione dei filtri cosmetici generici, e inoltre ridurrà l'impatto sulla memoria di uBlock₀ stesso.<p>È raccomandato abilitare quest'opzione sui dispositivi meno potenti.",
"description":"Describes the purpose of the 'Ignore generic cosmetic filters' feature."
},
"3pListsOfBlockedHostsHeader":{
Expand Down
Loading

0 comments on commit b02646c

Please sign in to comment.