From d721b83e21c0d5e481c2ea3367ecb85c9751b552 Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 28 Sep 2016 08:43:40 -0400 Subject: [PATCH 1/7] code review #2014: gracefully deal with importing from a pre-1.9.12 module --- platform/firefox/processScript.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/firefox/processScript.js b/platform/firefox/processScript.js index b5625736cf89c..f0ea54f354832 100644 --- a/platform/firefox/processScript.js +++ b/platform/firefox/processScript.js @@ -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(); + } })(); /******************************************************************************/ From a14dba51620ca321dc61d0cfa1d24ee5bef9ad81 Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 28 Sep 2016 08:55:02 -0400 Subject: [PATCH 2/7] translation work from https://crowdin.com/project/ublock --- dist/description/description-de.txt | 12 ++++++------ dist/description/description-sr.txt | 2 +- src/_locales/sv/messages.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/description/description-de.txt b/dist/description/description-de.txt index 2b80cdf6d6d99..dd9126968750d 100644 --- a/dist/description/description-de.txt +++ b/dist/description/description-de.txt @@ -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. @@ -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) @@ -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 diff --git a/dist/description/description-sr.txt b/dist/description/description-sr.txt index 816020f213ae6..0a201b0c38b8b 100644 --- a/dist/description/description-sr.txt +++ b/dist/description/description-sr.txt @@ -1,4 +1,4 @@ -Ефикасан блокатор: ниски процесорски и меморијски захтеви и може учитати и применити хиљаде више филтера него остали популарни блокатори. +Ефикасан блокатор: ниски процесорски и меморијски захтеви и може учитати и применити хиљаде филтера више него остали популарни блокатори. Илустровани преглед његове ефикасности: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-efficiency-compared diff --git a/src/_locales/sv/messages.json b/src/_locales/sv/messages.json index 6709003da3aa6..d4763c97f3056 100644 --- a/src/_locales/sv/messages.json +++ b/src/_locales/sv/messages.json @@ -188,7 +188,7 @@ "description":"English: Show the number of blocked requests on the icon" }, "settingsTooltipsPrompt":{ - "message":"Visa inte inforutor", + "message":"Visa inte tipsrutor", "description":"A checkbox in the Settings pane" }, "settingsContextMenuPrompt":{ @@ -284,7 +284,7 @@ "description":"This will cause uBO to ignore all generic cosmetic filters." }, "3pIgnoreGenericCosmeticFiltersInfo":{ - "message":"

Allmänna kosmetiska filter är de kosmetiska filter som är menade att användas på alla webbsidor.

Även om de hanteras effektivt av uBlock₀ så använder de upp mätbart med minne- och processoranvändning på vissa webbsidor, särskilt stora samt sidor som är öppna en länge tid.

Aktiveringen av denna inställning eliminerar den extra minnes- och processoranvändningen på webbsidorna med allmänna kosmetiska filter och minskar minnesanvändningen för uBlock₀ i helhet.

Det är rekommenderat att aktivera denna inställning på mindre kraftfulla enheter.", + "message":"

Allmänna kosmetiska filter är de kosmetiska filter som är menade att användas på alla webbplatser.

Även om de hanteras effektivt av uBlock₀ så kan de bidra mätbart till en högre minnes- och processoranvändning på vissa webbsidor, särskilt stora sidor och sidor som är öppna en länge tid.

Aktiverar du den här inställning så eliminerar du den extra minnes- och processoranvändningen som allmänna kosmetiska filter medför och minskar också minnesanvändningen för uBlock₀ som sådant.

Vi rekommenderar att du aktiverar inställningen på mindre kraftfulla enheter.", "description":"Describes the purpose of the 'Ignore generic cosmetic filters' feature." }, "3pListsOfBlockedHostsHeader":{ From 93001a8635794b012164ababd06b55597b2c1342 Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 30 Sep 2016 09:48:31 -0400 Subject: [PATCH 3/7] fix issue raised on https://crowdin.com/project/ublock: missing ability to translate "by" --- src/_locales/en/messages.json | 8 ++++++-- src/about.html | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 262c43535a475..c3b5522934d57 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -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", @@ -683,6 +683,10 @@ "message": "bytes", "description": "" }, + "genericBy": { + "message": "by", + "description": "to be used in sentences such as '{what} by {whom}, i.e. 'Font Awesome by Dave Gandy'" + }, "contextMenuTemporarilyAllowLargeMediaElements": { "message": "Temporarily allow large media elements", "description": "A context menu entry, present when large media elements have been blocked on the current site" diff --git a/src/about.html b/src/about.html index 855170e966206..6502e3a357369 100644 --- a/src/about.html +++ b/src/about.html @@ -21,8 +21,8 @@

  • Github
  • Crowdin -
  • Punycode.js by Mathias Bynens -
  • Font Awesome by Dave Gandy +
  • Punycode.js Mathias Bynens +
  • Font Awesome Dave Gandy From 7e23aae8798adf815a6557ddc3b384c6c48669f3 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sat, 1 Oct 2016 12:44:08 -0400 Subject: [PATCH 4/7] reverse part of 93001a86, apparently translating "by" is more complicating than first thought --- src/_locales/en/messages.json | 4 ---- src/about.html | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index c3b5522934d57..890e4d4279f4b 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -683,10 +683,6 @@ "message": "bytes", "description": "" }, - "genericBy": { - "message": "by", - "description": "to be used in sentences such as '{what} by {whom}, i.e. 'Font Awesome by Dave Gandy'" - }, "contextMenuTemporarilyAllowLargeMediaElements": { "message": "Temporarily allow large media elements", "description": "A context menu entry, present when large media elements have been blocked on the current site" diff --git a/src/about.html b/src/about.html index 6502e3a357369..855170e966206 100644 --- a/src/about.html +++ b/src/about.html @@ -21,8 +21,8 @@
  • Github
  • Crowdin -
  • Punycode.js Mathias Bynens -
  • Font Awesome Dave Gandy +
  • Punycode.js by Mathias Bynens +
  • Font Awesome by Dave Gandy From 68dcdb7dee0cbbbca3cb17566a62eda22f5a1d55 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sat, 1 Oct 2016 12:49:43 -0400 Subject: [PATCH 5/7] translation from https://crowdin.com/project/ublock --- src/_locales/ar/messages.json | 2 +- src/_locales/bg/messages.json | 2 +- src/_locales/bn/messages.json | 2 +- src/_locales/ca/messages.json | 2 +- src/_locales/cs/messages.json | 2 +- src/_locales/cv/messages.json | 4 ++-- src/_locales/da/messages.json | 2 +- src/_locales/de/messages.json | 2 +- src/_locales/el/messages.json | 2 +- src/_locales/eo/messages.json | 2 +- src/_locales/es/messages.json | 2 +- src/_locales/et/messages.json | 2 +- src/_locales/eu/messages.json | 2 +- src/_locales/fa/messages.json | 2 +- src/_locales/fi/messages.json | 2 +- src/_locales/fil/messages.json | 4 ++-- src/_locales/fr/messages.json | 2 +- src/_locales/fy/messages.json | 4 ++-- src/_locales/gl/messages.json | 10 +++++----- src/_locales/he/messages.json | 2 +- src/_locales/hi/messages.json | 2 +- src/_locales/hr/messages.json | 2 +- src/_locales/hu/messages.json | 2 +- src/_locales/id/messages.json | 2 +- src/_locales/it/messages.json | 4 ++-- src/_locales/ja/messages.json | 8 ++++---- src/_locales/ko/messages.json | 2 +- src/_locales/lt/messages.json | 2 +- src/_locales/lv/messages.json | 2 +- src/_locales/mr/messages.json | 2 +- src/_locales/nb/messages.json | 2 +- src/_locales/nl/messages.json | 2 +- src/_locales/pl/messages.json | 2 +- src/_locales/pt_BR/messages.json | 2 +- src/_locales/pt_PT/messages.json | 2 +- src/_locales/ro/messages.json | 2 +- src/_locales/ru/messages.json | 2 +- src/_locales/sk/messages.json | 2 +- src/_locales/sl/messages.json | 2 +- src/_locales/sq/messages.json | 2 +- src/_locales/sr/messages.json | 2 +- src/_locales/sv/messages.json | 2 +- src/_locales/ta/messages.json | 2 +- src/_locales/te/messages.json | 2 +- src/_locales/tr/messages.json | 2 +- src/_locales/uk/messages.json | 2 +- src/_locales/vi/messages.json | 2 +- src/_locales/zh_CN/messages.json | 4 ++-- src/_locales/zh_TW/messages.json | 2 +- 49 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/_locales/ar/messages.json b/src/_locales/ar/messages.json index 3f9210c644fd1..10c63a4d0d2c1 100644 --- a/src/_locales/ar/messages.json +++ b/src/_locales/ar/messages.json @@ -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":"فلاتر تجميليه", diff --git a/src/_locales/bg/messages.json b/src/_locales/bg/messages.json index b9add1ecf0fb4..1d3fcc19ab2f5 100644 --- a/src/_locales/bg/messages.json +++ b/src/_locales/bg/messages.json @@ -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":"Козметични филтри", diff --git a/src/_locales/bn/messages.json b/src/_locales/bn/messages.json index 862efd8d6d2e1..575fbf156309b 100644 --- a/src/_locales/bn/messages.json +++ b/src/_locales/bn/messages.json @@ -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":"প্রসাধনী ফিল্টার", diff --git a/src/_locales/ca/messages.json b/src/_locales/ca/messages.json index e110898fbb8b2..7718205dbf38c 100644 --- a/src/_locales/ca/messages.json +++ b/src/_locales/ca/messages.json @@ -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", diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json index cb79b46533839..e7fe0b05dba84 100644 --- a/src/_locales/cs/messages.json +++ b/src/_locales/cs/messages.json @@ -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", diff --git a/src/_locales/cv/messages.json b/src/_locales/cv/messages.json index e862597eed8d6..f05cf6713b50d 100644 --- a/src/_locales/cv/messages.json +++ b/src/_locales/cv/messages.json @@ -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", diff --git a/src/_locales/da/messages.json b/src/_locales/da/messages.json index ab11ac4197aed..f4340d1bd2d0d 100644 --- a/src/_locales/da/messages.json +++ b/src/_locales/da/messages.json @@ -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", diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index b8af575494f41..e3351b96079e6 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -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", diff --git a/src/_locales/el/messages.json b/src/_locales/el/messages.json index f291764f3d2ef..44b7952ee7eee 100644 --- a/src/_locales/el/messages.json +++ b/src/_locales/el/messages.json @@ -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":"Κοσμητικά φίλτρα", diff --git a/src/_locales/eo/messages.json b/src/_locales/eo/messages.json index b163589cbd029..424806c12b24c 100644 --- a/src/_locales/eo/messages.json +++ b/src/_locales/eo/messages.json @@ -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", diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json index ce2ecb538013d..121a574986008 100644 --- a/src/_locales/es/messages.json +++ b/src/_locales/es/messages.json @@ -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", diff --git a/src/_locales/et/messages.json b/src/_locales/et/messages.json index 547675eda4838..882d4bde1832b 100644 --- a/src/_locales/et/messages.json +++ b/src/_locales/et/messages.json @@ -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", diff --git a/src/_locales/eu/messages.json b/src/_locales/eu/messages.json index a4aec6efd61cc..efc646cd66313 100644 --- a/src/_locales/eu/messages.json +++ b/src/_locales/eu/messages.json @@ -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", diff --git a/src/_locales/fa/messages.json b/src/_locales/fa/messages.json index 606bc01c7f5fe..5837c04a41740 100644 --- a/src/_locales/fa/messages.json +++ b/src/_locales/fa/messages.json @@ -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":"فیلترهای انتخابی", diff --git a/src/_locales/fi/messages.json b/src/_locales/fi/messages.json index 309c00d856492..6ef2fe892e02c 100644 --- a/src/_locales/fi/messages.json +++ b/src/_locales/fi/messages.json @@ -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", diff --git a/src/_locales/fil/messages.json b/src/_locales/fil/messages.json index bbab43db00e4f..7984c676f348a 100644 --- a/src/_locales/fil/messages.json +++ b/src/_locales/fil/messages.json @@ -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", diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json index 188a62e7a7544..845998c12c351 100644 --- a/src/_locales/fr/messages.json +++ b/src/_locales/fr/messages.json @@ -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", diff --git a/src/_locales/fy/messages.json b/src/_locales/fy/messages.json index beacae0831ce2..3f6abd84fba0b 100644 --- a/src/_locales/fy/messages.json +++ b/src/_locales/fy/messages.json @@ -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":{ @@ -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", diff --git a/src/_locales/gl/messages.json b/src/_locales/gl/messages.json index 15cc1170c68c0..613c59c30ea39 100644 --- a/src/_locales/gl/messages.json +++ b/src/_locales/gl/messages.json @@ -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", @@ -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":{ @@ -284,7 +284,7 @@ "description":"This will cause uBO to ignore all generic cosmetic filters." }, "3pIgnoreGenericCosmeticFiltersInfo":{ - "message":"

    Os filtros cosméticos xenéricos estanche pensados para ser aplicados en todas as páxinas.

    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.

    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.

    Recomendámosche activar esta opción sobre todo nos dispositivos menos potentes.", + "message":"

    Os filtros cosméticos xenéricos estanche pensados para seren aplicados en todas as páxinas.

    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.

    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.

    Recomendámosche activar esta opción sobre todo nos dispositivos menos potentes.", "description":"Describes the purpose of the 'Ignore generic cosmetic filters' feature." }, "3pListsOfBlockedHostsHeader":{ @@ -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":{ diff --git a/src/_locales/he/messages.json b/src/_locales/he/messages.json index 2c5599f486516..74a17146da742 100644 --- a/src/_locales/he/messages.json +++ b/src/_locales/he/messages.json @@ -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":"מסננים קוסמטיים", diff --git a/src/_locales/hi/messages.json b/src/_locales/hi/messages.json index 76bbd4bd2792f..db1638d9468ce 100644 --- a/src/_locales/hi/messages.json +++ b/src/_locales/hi/messages.json @@ -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":"सुंदरता के लिए फिलटरें", diff --git a/src/_locales/hr/messages.json b/src/_locales/hr/messages.json index 8abb249fee09b..7bd9cf38675a3 100644 --- a/src/_locales/hr/messages.json +++ b/src/_locales/hr/messages.json @@ -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", diff --git a/src/_locales/hu/messages.json b/src/_locales/hu/messages.json index 4609e24ce2253..6cba6ff2af2c9 100644 --- a/src/_locales/hu/messages.json +++ b/src/_locales/hu/messages.json @@ -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", diff --git a/src/_locales/id/messages.json b/src/_locales/id/messages.json index 6d54211952ce2..6f81a1ab89bea 100644 --- a/src/_locales/id/messages.json +++ b/src/_locales/id/messages.json @@ -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", diff --git a/src/_locales/it/messages.json b/src/_locales/it/messages.json index c10f039aaf2cb..a419f4d14964c 100644 --- a/src/_locales/it/messages.json +++ b/src/_locales/it/messages.json @@ -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", @@ -284,7 +284,7 @@ "description":"This will cause uBO to ignore all generic cosmetic filters." }, "3pIgnoreGenericCosmeticFiltersInfo":{ - "message":"

    I filtri cosmetici generici sono i filtri cosmetici intesi per essere applicati a tutti i siti Web.

    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.

    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.

    È raccomandato abilitare quest'opzione sui dispositivi meno potenti.", + "message":"

    I filtri cosmetici generici sono i filtri cosmetici intesi per essere applicati a tutti i siti Web.

    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.

    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.

    È raccomandato abilitare quest'opzione sui dispositivi meno potenti.", "description":"Describes the purpose of the 'Ignore generic cosmetic filters' feature." }, "3pListsOfBlockedHostsHeader":{ diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json index d0b92b915b3c5..f963d53d88100 100644 --- a/src/_locales/ja/messages.json +++ b/src/_locales/ja/messages.json @@ -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":"要素隠蔽フィルタ", @@ -184,7 +184,7 @@ "description":"English: Hide placeholders of blocked elements" }, "settingsIconBadgePrompt":{ - "message":"ブロックされたリクエスト数をアイコンに表示", + "message":"ブロックされたリクエスト数をアイコンに表示する", "description":"English: Show the number of blocked requests on the icon" }, "settingsTooltipsPrompt":{ @@ -192,7 +192,7 @@ "description":"A checkbox in the Settings pane" }, "settingsContextMenuPrompt":{ - "message":"適切な場合コンテキストメニューを使用", + "message":"コンテキストメニューを適切な場合に使用する", "description":"English: Make use of context menu where appropriate" }, "settingsColorBlindPrompt":{ @@ -208,7 +208,7 @@ "description":"English: " }, "settingsPrefetchingDisabledPrompt":{ - "message":"先読みを無効にする（塞がれたネットワークへの接続を防止するため）", + "message":"先読みを無効にする (ブロックされたネットワークへの接続を防止するため)", "description":"English: " }, "settingsHyperlinkAuditingDisabledPrompt":{ diff --git a/src/_locales/ko/messages.json b/src/_locales/ko/messages.json index 0ba4406251944..4536049f4653a 100644 --- a/src/_locales/ko/messages.json +++ b/src/_locales/ko/messages.json @@ -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":"표면 필터", diff --git a/src/_locales/lt/messages.json b/src/_locales/lt/messages.json index e0de97ea81399..fdc1f1fbac1d0 100644 --- a/src/_locales/lt/messages.json +++ b/src/_locales/lt/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Tinklo filtrai", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Kosmetiniai filtrai", diff --git a/src/_locales/lv/messages.json b/src/_locales/lv/messages.json index 17bd594035185..10aabe3dbc6db 100644 --- a/src/_locales/lv/messages.json +++ b/src/_locales/lv/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Resursu filtri", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Vizuālie filtri", diff --git a/src/_locales/mr/messages.json b/src/_locales/mr/messages.json index 93d0e03ec5a98..098a869e46336 100644 --- a/src/_locales/mr/messages.json +++ b/src/_locales/mr/messages.json @@ -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":"उटणे फिल्टर", diff --git a/src/_locales/nb/messages.json b/src/_locales/nb/messages.json index 9d47ca65e9b79..f86792a4fecbd 100644 --- a/src/_locales/nb/messages.json +++ b/src/_locales/nb/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Nettfiltre", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Kosmetiske filtre", diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json index f4db40f622f84..a2544128b9486 100644 --- a/src/_locales/nl/messages.json +++ b/src/_locales/nl/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Netwerkfilters", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Cosmetische filters", diff --git a/src/_locales/pl/messages.json b/src/_locales/pl/messages.json index b793976760d00..ce316b6cbb8d7 100644 --- a/src/_locales/pl/messages.json +++ b/src/_locales/pl/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Filtry sieciowe", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Filtry kosmetyczne", diff --git a/src/_locales/pt_BR/messages.json b/src/_locales/pt_BR/messages.json index 22990f82cbcf8..0c88eb702b2d5 100644 --- a/src/_locales/pt_BR/messages.json +++ b/src/_locales/pt_BR/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Filtros de rede", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Filtros cosméticos", diff --git a/src/_locales/pt_PT/messages.json b/src/_locales/pt_PT/messages.json index 2932c04abbdc6..1a99d0426347e 100644 --- a/src/_locales/pt_PT/messages.json +++ b/src/_locales/pt_PT/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Filtros de rede", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Filtros cosméticos", diff --git a/src/_locales/ro/messages.json b/src/_locales/ro/messages.json index e3582c9568a7c..7ac7cc091ecbb 100644 --- a/src/_locales/ro/messages.json +++ b/src/_locales/ro/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Filtre de rețea", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Filtre vizuale", diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index 9d919a819beac..66baa6c11e42f 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -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":"Косметические фильтры", diff --git a/src/_locales/sk/messages.json b/src/_locales/sk/messages.json index 60a4f7e81067c..029c3cfc5b868 100644 --- a/src/_locales/sk/messages.json +++ b/src/_locales/sk/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Sieťové filtre", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Kozmetické filtre", diff --git a/src/_locales/sl/messages.json b/src/_locales/sl/messages.json index ca901df3c67bb..cc538497962c0 100644 --- a/src/_locales/sl/messages.json +++ b/src/_locales/sl/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Omrežni filtri", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Kozmetični filtri", diff --git a/src/_locales/sq/messages.json b/src/_locales/sq/messages.json index c680507f40220..f9f14e7b33dad 100644 --- a/src/_locales/sq/messages.json +++ b/src/_locales/sq/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Filtrat e rrjetit", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Filtrat kozmetikë", diff --git a/src/_locales/sr/messages.json b/src/_locales/sr/messages.json index 67da815559484..3de48415980f6 100644 --- a/src/_locales/sr/messages.json +++ b/src/_locales/sr/messages.json @@ -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":"Естетски филтери", diff --git a/src/_locales/sv/messages.json b/src/_locales/sv/messages.json index d4763c97f3056..c9c5960cfe007 100644 --- a/src/_locales/sv/messages.json +++ b/src/_locales/sv/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Nätfilter", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Kosmetiska filter", diff --git a/src/_locales/ta/messages.json b/src/_locales/ta/messages.json index 9bf391e6fee60..4ee6dc1a96b46 100644 --- a/src/_locales/ta/messages.json +++ b/src/_locales/ta/messages.json @@ -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":"ஒப்பனை வடிகட்டி", diff --git a/src/_locales/te/messages.json b/src/_locales/te/messages.json index 10b851c8d684d..5ff233709a30b 100644 --- a/src/_locales/te/messages.json +++ b/src/_locales/te/messages.json @@ -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":"కాస్మెటిక్ వడపోతలు", diff --git a/src/_locales/tr/messages.json b/src/_locales/tr/messages.json index 53807e1fcc230..0e0e595b45a1c 100644 --- a/src/_locales/tr/messages.json +++ b/src/_locales/tr/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Ağ süzgeçleri", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Kozmetik süzgeçler", diff --git a/src/_locales/uk/messages.json b/src/_locales/uk/messages.json index c9ac9df42df0d..88482903fcac5 100644 --- a/src/_locales/uk/messages.json +++ b/src/_locales/uk/messages.json @@ -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":"Косметичні фільтри", diff --git a/src/_locales/vi/messages.json b/src/_locales/vi/messages.json index c9e28223db330..9cda652aa1e15 100644 --- a/src/_locales/vi/messages.json +++ b/src/_locales/vi/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"Các bộ lọc mạng", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"Bộ lọc phần tử ẩn", diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index 75060631f064b..58f715be47e2b 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -165,7 +165,7 @@ }, "pickerNetFilters":{ "message":"URL 过滤规则", - "description":"English: Net filters" + "description":"English: header for a type of filter in the element picker dialog" }, "pickerCosmeticFilters":{ "message":"元素过滤规则", @@ -532,7 +532,7 @@ "description":"English: project' wiki on Github" }, "aboutSupport":{ - "message":"支持", + "message":"帮助", "description":"A link for where to get support" }, "aboutCode":{ diff --git a/src/_locales/zh_TW/messages.json b/src/_locales/zh_TW/messages.json index 048bce7a7ead6..b5758fe600e48 100644 --- a/src/_locales/zh_TW/messages.json +++ b/src/_locales/zh_TW/messages.json @@ -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":"元素隱藏過濾規則", From 33cdf3ba8c4d02a77d11f36076235b5fd7647d0d Mon Sep 17 00:00:00 2001 From: gorhill Date: Sat, 1 Oct 2016 12:53:42 -0400 Subject: [PATCH 6/7] new release candidate --- platform/chromium/manifest.json | 2 +- platform/opera/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index 12b79485a1765..2c58db6ca883d 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.9.11.101", + "version": "1.9.11.102", "default_locale": "en", "description": "__MSG_extShortDesc__", diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json index a8b744c60a1c7..f81598fb228d7 100644 --- a/platform/opera/manifest.json +++ b/platform/opera/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.9.11.101", + "version": "1.9.11.102", "default_locale": "en", "description": "__MSG_extShortDesc__", From ca1e2cef1cf68809c2066790998d5013f27a9dc8 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 2 Oct 2016 07:47:37 -0400 Subject: [PATCH 7/7] new revision for stable --- platform/chromium/manifest.json | 2 +- platform/opera/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index 2c58db6ca883d..5f293f92310eb 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.9.11.102", + "version": "1.9.12", "default_locale": "en", "description": "__MSG_extShortDesc__", diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json index f81598fb228d7..81bca3563f50f 100644 --- a/platform/opera/manifest.json +++ b/platform/opera/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.9.11.102", + "version": "1.9.12", "default_locale": "en", "description": "__MSG_extShortDesc__",