[Pkg-mozext-commits] [noscript] 01/05: Imported Upstream version 2.6.9.6
David Prévot
taffit at moszumanska.debian.org
Tue Dec 9 21:49:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository noscript.
commit 2081b07e976ab88595b4d9754bd88ffbf45ee812
Author: David Prévot <taffit at debian.org>
Date: Tue Dec 9 17:31:34 2014 -0400
Imported Upstream version 2.6.9.6
---
chrome/noscript.jar!/content/noscript/ABE.js | 2 +-
chrome/noscript.jar!/content/noscript/HTTPS.js | 5 +-
.../content/noscript/RequestWatchdog.js | 6 +-
.../content/noscript/ScriptlessBGThumbs.js | 35 +++++++
chrome/noscript.jar!/content/noscript/about.xul | 10 +-
.../noscript.jar!/content/noscript/clearClick.js | 4 +-
chrome/noscript.jar!/content/noscript/noscript.js | 4 +-
.../content/noscript/noscriptOptions.xul | 2 +-
.../content/noscript/noscriptOverlay.js | 39 ++++----
.../locale/bg-BG/noscript/noscript.dtd | 2 +-
.../locale/ca-AD/noscript/noscript.dtd | 2 +-
.../locale/cs-CZ/noscript/noscript.dtd | 2 +-
.../locale/cy-GB/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/da/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/de/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/el/noscript/noscript.dtd | 2 +-
.../locale/en-GB/noscript/noscript.dtd | 2 +-
.../locale/en-US/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/eo/noscript/noscript.dtd | 2 +-
.../locale/es-AR/noscript/noscript.dtd | 2 +-
.../locale/es-CL/noscript/noscript.dtd | 2 +-
.../locale/es-ES/noscript/noscript.dtd | 2 +-
.../locale/et-EE/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/eu/noscript/noscript.dtd | 2 +-
.../locale/fa-IR/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/fi/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/fr/noscript/noscript.dtd | 2 +-
.../locale/gl-ES/noscript/noscript.dtd | 2 +-
.../locale/he-IL/noscript/noscript.dtd | 2 +-
.../locale/hr-HR/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/hsb/noscript/noscript.dtd | 2 +-
.../locale/hu-HU/noscript/noscript.dtd | 2 +-
.../locale/id-ID/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/it/noscript/noscript.dtd | 2 +-
.../locale/ja-JP/noscript/noscript.dtd | 2 +-
.../locale/kk-KZ/noscript/noscript.dtd | 2 +-
.../locale/km-KH/noscript/noscript.dtd | 2 +-
.../locale/ko-KR/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/lt/noscript/noscript.dtd | 2 +-
.../locale/mk-MK/noscript/noscript.dtd | 2 +-
.../locale/ms-MY/noscript/noscript.dtd | 2 +-
.../locale/nb-NO/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/nl/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/pl/noscript/noscript.dtd | 2 +-
.../locale/pt-BR/noscript/noscript.dtd | 2 +-
.../locale/pt-PT/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/ro/noscript/noscript.dtd | 2 +-
.../locale/sk-SK/noscript/noscript.dtd | 2 +-
.../locale/sl-SI/noscript/noscript.dtd | 2 +-
.../locale/sr-RS/noscript/noscript.dtd | 2 +-
.../locale/sv-SE/noscript/noscript.dtd | 2 +-
.../locale/te-IN/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/th/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/tr/noscript/noscript.dtd | 2 +-
.../noscript.jar!/locale/vi/noscript/noscript.dtd | 2 +-
.../locale/zh-CN/noscript/noscript.dtd | 2 +-
.../locale/zh-TW/noscript/noscript.dtd | 2 +-
components/noscriptService.js | 111 ++++++++++++++-------
defaults/preferences/noscript.js | 13 ++-
install.rdf | 8 +-
mozilla.cfg | 2 +-
61 files changed, 213 insertions(+), 124 deletions(-)
diff --git a/chrome/noscript.jar!/content/noscript/ABE.js b/chrome/noscript.jar!/content/noscript/ABE.js
index 486c7c4..1caab41 100644
--- a/chrome/noscript.jar!/content/noscript/ABE.js
+++ b/chrome/noscript.jar!/content/noscript/ABE.js
@@ -1430,7 +1430,7 @@ const WAN = {
noResource: false,
logging: true,
fingerprintLogging: false,
- fingerprintUA: "Mozilla/5.0 (ABE, http://noscript.net/abe/wan)",
+ fingerprintUA: "Mozilla/5.0 (ABE, https://noscript.net/abe/wan)",
fingerprintHeader: "X-ABE-Fingerprint",
QueryInterface: xpcom_generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
diff --git a/chrome/noscript.jar!/content/noscript/HTTPS.js b/chrome/noscript.jar!/content/noscript/HTTPS.js
index 8b2f6d1..91434fd 100644
--- a/chrome/noscript.jar!/content/noscript/HTTPS.js
+++ b/chrome/noscript.jar!/content/noscript/HTTPS.js
@@ -73,6 +73,7 @@ const HTTPS = {
mustForce: function(uri) {
return (uri.schemeIs("http") &&
(this.httpsForced && this.httpsForced.test(uri.spec) ||
+ this.httpsForcedBuiltIn && this.httpsForcedBuiltIn.test(uri.spec) ||
STS.isSTSURI(uri)) &&
!(this.httpsForcedExceptions &&
this.httpsForcedExceptions.test(uri.spec)
@@ -351,7 +352,9 @@ const HTTPS = {
});
["secureCookies", "secureCookiesExceptions", "secureCookiesForced",
- "httpsForced", "httpsForcedExceptions", "STS.enabled"].forEach(function(p) {
+ "httpsForcedBuiltIn", "httpsForced", "httpsForcedExceptions",
+ "STS.enabled"]
+ .forEach(function(p) {
try {
ns.syncPrefs(ns.prefs, p);
} catch(e) {
diff --git a/chrome/noscript.jar!/content/noscript/RequestWatchdog.js b/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
index fc46887..2745da9 100644
--- a/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
+++ b/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
@@ -600,7 +600,7 @@ RequestWatchdog.prototype = {
return;
}
- if (/^https?:\/\/www\.youtube\.com$/.test(originSite) &&
+ if (originSite === "https://www.youtube.com" &&
/^https:\/\/(?:plus\.googleapis|apis\.google)\.com\/[\w/]+\/widget\/render\/comments\?/.test(originalSpec) &&
ns.getPref("filterXExceptions.yt_comments")
) {
@@ -610,6 +610,10 @@ RequestWatchdog.prototype = {
if (channel.requestMethod == "POST") {
+ if (originSite === "https://sso.post.ch" && targetSite === "https://app.swisspost.ch") {
+ return;
+ }
+
if (originSite === "https://twitter.com" && /^https:\/\/.*\.twitter.com$/.test(targetSite)) {
return;
}
diff --git a/chrome/noscript.jar!/content/noscript/ScriptlessBGThumbs.js b/chrome/noscript.jar!/content/noscript/ScriptlessBGThumbs.js
new file mode 100644
index 0000000..26f578a
--- /dev/null
+++ b/chrome/noscript.jar!/content/noscript/ScriptlessBGThumbs.js
@@ -0,0 +1,35 @@
+{
+ let scope = {};
+ Cu.import("resource://gre/modules/BackgroundPageThumbs.jsm", scope);
+
+
+ let bpt = scope.BackgroundPageThumbs;
+ if (!bpt._NoScript_capture) {
+ bpt._NoScript_capture = bpt.capture;
+ bpt.capture = function(url, options) {
+ Cu.import("resource://gre/modules/PageThumbs.jsm", scope);
+ let PageThumbs = scope.PageThumbs;
+ let e = PageThumbs._prefEnabled;
+ if (!ns.getPref("bgThumbs.allowed")) {
+ PageThumbs._prefEnabled = function() false;
+ }
+ try {
+ bpt._NoScript_capture.apply(bpt, arguments);
+ } finally {
+ PageThumbs._prefEnabled = e;
+ }
+ };
+
+ bpt._destroyBrowser();
+
+ bpt._NoScript_ensureBrowser = bpt._ensureBrowser;
+ bpt._ensureBrowser = function() {
+ if (!this._thumbBrowser) {
+ this._NoScript_ensureBrowser();
+ if (this._thumbBrowser && ns.getPref("bgThumbs.disableJS"))
+ this._thumbBrowser.messageManager.loadFrameScript(
+ "data:text/javascript,docShell.allowJavascript = false", false);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/chrome/noscript.jar!/content/noscript/about.xul b/chrome/noscript.jar!/content/noscript/about.xul
index ddbedcf..c14a14e 100644
--- a/chrome/noscript.jar!/content/noscript/about.xul
+++ b/chrome/noscript.jar!/content/noscript/about.xul
@@ -48,7 +48,7 @@ function about_onload() {
var str = getString("aboutTitle",["NoScript"]);
if(str) document.title = str;
- str = getString("version", ["2.6.9.4"]);
+ str = getString("version", ["2.6.9.6"]);
if(str) document.getElementById("extensionVersion").setAttribute("value", str);
setString("extensionDescription",null,"extensions.{73a6fe31-595d-460b-a920-fcc0f8843232}.description");
@@ -80,13 +80,13 @@ function about_open(url, features) {
<vbox id="clientBoxInternal" flex="1">
<hbox align="start">
<vbox id="logoBox">
-<image id="logo" src="chrome://noscript/skin/icon80.png" class="text-link" tooltiptext="Visit Extension Home Page" onclick="about_open('http://noscript.net')"/>
+<image id="logo" src="chrome://noscript/skin/icon80.png" class="text-link" tooltiptext="Visit Extension Home Page" onclick="about_open('https://noscript.net')"/>
</vbox>
<vbox flex="1">
<hbox id="headBox" align="end">
<vbox flex="1">
<label value="NoScript" id="extensionName" crop="right"/>
-<label value="Version 2.6.9.4" id="extensionVersion" crop="right"/>
+<label value="Version 2.6.9.6" id="extensionVersion" crop="right"/>
</vbox>
<vbox flex="1" align="end">
<hbox align="end">
@@ -164,9 +164,9 @@ function about_open(url, features) {
<hbox>
<label id="license" class="text-link" tooltiptext="Read end-user license" onclick="about_open('chrome://noscript/content/NoScript_License.txt')">License</label>
<spacer flex="1"/>
-<label id="changelog" class="text-link" align="center" tooltiptext="See Changelog" onclick="about_open('http://noscript.net/changelog#2.6.9.4')">Changelog</label>
+<label id="changelog" class="text-link" align="center" tooltiptext="See Changelog" onclick="about_open('https://noscript.net/changelog#2.6.9.6')">Changelog</label>
<spacer flex="1"/>
-<label id="extensionHomepage" class="text-link" tooltiptext="Visit Extension Home Page" onclick="about_open('http://noscript.net')">http://noscript.net</label>
+<label id="extensionHomepage" class="text-link" tooltiptext="Visit Extension Home Page" onclick="about_open('https://noscript.net')">https://noscript.net</label>
</hbox>
</vbox>
</vbox>
diff --git a/chrome/noscript.jar!/content/noscript/clearClick.js b/chrome/noscript.jar!/content/noscript/clearClick.js
index 0129a6e..d699a47 100644
--- a/chrome/noscript.jar!/content/noscript/clearClick.js
+++ b/chrome/noscript.jar!/content/noscript/clearClick.js
@@ -38,7 +38,7 @@ var ClearClick = {
},
disclosure: function() {
- noscriptUtil.browse("http://noscript.net/faq#clearclick", null);
+ noscriptUtil.browse("https://noscript.net/faq#clearclick", null);
this.dialog.cancelDialog();
},
@@ -87,7 +87,7 @@ var ClearClick = {
}
}, false);
- xhr.open("POST", "http://noscript.net/ws/clearclick/", true);
+ xhr.open("POST", "https://noscript.net/ws/clearclick/", true);
var p = this.params;
var data = {
diff --git a/chrome/noscript.jar!/content/noscript/noscript.js b/chrome/noscript.jar!/content/noscript/noscript.js
index 65782c3..d3d8451 100644
--- a/chrome/noscript.jar!/content/noscript/noscript.js
+++ b/chrome/noscript.jar!/content/noscript/noscript.js
@@ -110,11 +110,11 @@ var noscriptUtil = {
},
openFaq: function(which) {
- this.browse("http://noscript.net/faq#" + which);
+ this.browse("https://noscript.net/faq#" + which);
},
openHelp: function(section) {
- this.browse("http://noscript.net/help/" + section);
+ this.browse("https://noscript.net/help/" + section);
},
openDonate: function(src) {
diff --git a/chrome/noscript.jar!/content/noscript/noscriptOptions.xul b/chrome/noscript.jar!/content/noscript/noscriptOptions.xul
index db8703c..e475d73 100644
--- a/chrome/noscript.jar!/content/noscript/noscriptOptions.xul
+++ b/chrome/noscript.jar!/content/noscript/noscriptOptions.xul
@@ -327,7 +327,7 @@
<textbox id="xssEx-regexp" multiline="true" flex="1" />
<hbox align="center">
<label control="xssEx-sample" value="&noscriptMatchSample;" />
- <textbox id="xssEx-sample" flex="1" value="http://www.google.com/search?q=test" />
+ <textbox id="xssEx-sample" flex="1" value="https://www.google.com/search?q=test" />
</hbox>
</vbox>
</tabpanel>
diff --git a/chrome/noscript.jar!/content/noscript/noscriptOverlay.js b/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
index 66591a5..44f1c57 100644
--- a/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
+++ b/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
@@ -355,22 +355,11 @@ return noscriptUtil.service ? {
return tip;
},
- _customizableUIListener: {
- onWidgetAfterDOMChange: function(aWidget) {
- for each(let b in ['noscript-tbb', 'noscript-statusLabel']) {
- if(b == aWidget.id) {
- window.setTimeout(function() { noscriptOverlay.initPopups(); }, 0);
- return;
- }
- }
- }
- },
-
+
_popupsInitialized: false,
_initPopupsRecursion: false,
initPopups: function() {
- noscriptOverlay.ns.log("InitPopup: " + (this._initPopupsRecursion + ", " + this._popupsInitialized) + " - " + new Error().stack);
if (this._initPopupsRecursion) return;
this._initPopupsRecursion = true;
@@ -393,10 +382,6 @@ return noscriptUtil.service ? {
const buttons = [tbb, $("noscript-statusLabel")];
- if (install && "CustomizableUI" in window) {
- CustomizableUI.addListener(this._customizableUIListener);
- }
-
let statusIcon = $("noscript-statusIcon");
if ($("addon-bar")) {
@@ -2533,6 +2518,7 @@ return noscriptUtil.service ? {
},
onUnload: function(ev) {
window.removeEventListener("unload", arguments.callee, false);
+
noscriptOverlay.listeners.teardown();
window.browserDOMWindow = null;
noscriptOverlay.dispose();
@@ -2560,6 +2546,17 @@ return noscriptUtil.service ? {
noscriptOverlay.syncUI();
},
+ customizableUIListener: {
+ onWidgetAfterDOMChange: function(aWidget) {
+ for each(let b in ['noscript-tbb', 'noscript-statusLabel']) {
+ if(b == aWidget.id) {
+ window.setTimeout(function() { noscriptOverlay.initPopups(); }, 0);
+ return;
+ }
+ }
+ }
+ },
+
setup: function(delayed) {
if (!delayed) {
@@ -2644,12 +2641,20 @@ return noscriptUtil.service ? {
self.tapped = null;
}, true);
+ if ("CustomizableUI" in window) {
+ CustomizableUI.addListener(this.customizableUIListener);
+ }
+
},
teardown: function() {
+ if ("CustomizableUI" in window) {
+ CustomizableUI.removeListener(this.customizableUIListener);
+ }
+
var b = getBrowser();
if (b) {
b.removeEventListener("click", this.onBrowserClick, true);
@@ -2868,7 +2873,7 @@ return noscriptUtil.service ? {
window.setTimeout(function() {
alert("NoScript is not properly installed and cannot operate correctly.\n" +
"Please install it again and check the Install FAQ section on http://noscript.net/faq if this problem persists.");
- noscriptUtil.browse("http://noscript.net/faq#faqsec2", null);
+ noscriptUtil.browse("https://noscript.net/faq#faqsec2", null);
},10);
}, false);
diff --git a/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.dtd b/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.dtd
index ecb2955..bcd89a7 100644
--- a/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Настройки…">
<!ENTITY noscriptOptions.accesskey "Н">
<!ENTITY noscriptOptionsLong "Настройки на NoScript">
-<!ENTITY noscriptAbout "За NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "За NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Можете да зададете в кои уеб-сайтове е позволено да се използват скриптовете. Напишете адреса или домейна (например "http://www.site.com" или "site.com") на сайта, който искате да разрешите и натиснете Разреши.">
<!ENTITY noscriptWebAddress "Адрес на уеб-сайта:">
<!ENTITY noscriptAllow "Разреши">
diff --git a/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.dtd
index 8b87ac8..8515f3c 100644
--- a/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opcions...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opcions de NoScript">
-<!ENTITY noscriptAbout "Quant a NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Quant a NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Podeu especificar quins llocs web poden executar seqüències. El tipus d'adreça o el domini (p.ex. "http://www.site.com" o "site.com") del lloc al qual voleu donar permissos i feu clic a Permet.">
<!ENTITY noscriptWebAddress "Adreça del lloc web:">
<!ENTITY noscriptAllow "Permet">
diff --git a/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.dtd b/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.dtd
index 42485b5..4f366c4 100644
--- a/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Nastavení...">
<!ENTITY noscriptOptions.accesskey "N">
<!ENTITY noscriptOptionsLong "Nastavení NoScript">
-<!ENTITY noscriptAbout "O rozšíření NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "O rozšíření NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Můžete si zvolit, které webové stránky mají povoleno spouštět skripty. Zadejte adresu (např. http://www.site.com nebo site.com) na které se nachází stránka, pro kterou chcete skripty povolit a klepněte na Povolit.">
<!ENTITY noscriptWebAddress "Adresa webové stránky:">
<!ENTITY noscriptAllow "Povolit">
diff --git a/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.dtd b/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.dtd
index d090f52..0f341dd 100644
--- a/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opsiynau">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opsiynau NoScript">
-<!ENTITY noscriptAbout "Yngylch NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Yngylch NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Cewch enwi pa wefannau sy'n cael rhedeg sgriptiau. Teipiwch gyfeiriad neu barth (e.e. "http://www.site.com" neu "site.com") y safle rydych eisiau ei ganiatau ac wedyn cliciwch Caniatau.">
<!ENTITY noscriptWebAddress "Cyfeiriad wefan">
<!ENTITY noscriptAllow "Caniatau">
diff --git a/chrome/noscript.jar!/locale/da/noscript/noscript.dtd b/chrome/noscript.jar!/locale/da/noscript/noscript.dtd
index 057052a..bee4977 100644
--- a/chrome/noscript.jar!/locale/da/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/da/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Indstillinger…">
<!ENTITY noscriptOptions.accesskey "I">
<!ENTITY noscriptOptionsLong "NoScript Indstillinger">
-<!ENTITY noscriptAbout "Om NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Om NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Du kan angive hvilke websteder der må udføre scripts. Indtast adresse eller domæne (f.eks. "http://www.site.com" eller "site.com") på det websted du ønsker at tillade og klik på Tillad.">
<!ENTITY noscriptWebAddress "Webstedets adresse:">
<!ENTITY noscriptAllow "Tillad">
diff --git a/chrome/noscript.jar!/locale/de/noscript/noscript.dtd b/chrome/noscript.jar!/locale/de/noscript/noscript.dtd
index 2d38f7d..153b9fd 100644
--- a/chrome/noscript.jar!/locale/de/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/de/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Einstellungen…">
<!ENTITY noscriptOptions.accesskey "E">
<!ENTITY noscriptOptionsLong "NoScript - Einstellungen">
-<!ENTITY noscriptAbout "Über NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "Über NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "Sie können festlegen, welchen Websites Sie das Ausführen von Skripten erlauben möchten. Geben Sie bitte die exakte Adresse oder die Domain der Website ein (z.B. "http://www.site.com" oder "site.com"), für die Sie dies zulassen möchten, und klicken Sie dann auf "Erlauben".">
<!ENTITY noscriptWebAddress "Adresse der Website:">
<!ENTITY noscriptAllow "Erlauben">
diff --git a/chrome/noscript.jar!/locale/el/noscript/noscript.dtd b/chrome/noscript.jar!/locale/el/noscript/noscript.dtd
index 79cc985..890c5aa 100644
--- a/chrome/noscript.jar!/locale/el/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/el/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Επιλογές">
<!ENTITY noscriptOptions.accesskey "Ε">
<!ENTITY noscriptOptionsLong "Επιλογές NoScript">
-<!ENTITY noscriptAbout "Περί NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Περί NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Μπορείτε να καθορίσετε για ποιους ιστότοπους θα επιτρέπεται η εκτέλεση σεναρίων εντολών. Πληκτρολογήστε τη διεύθυνση τομέα (πχ. "http://www.site.com" or "site.com") του ιστότοπου που θέλετε και μετά κάντε κλικ στο «Να επιτρέπεται»">
<!ENTITY noscriptWebAddress "Διεύθυνση ιστότοπου">
<!ENTITY noscriptAllow "Να επιτρέπεται">
diff --git a/chrome/noscript.jar!/locale/en-GB/noscript/noscript.dtd b/chrome/noscript.jar!/locale/en-GB/noscript/noscript.dtd
index 783e56b..5fca7c5 100644
--- a/chrome/noscript.jar!/locale/en-GB/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/en-GB/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Options…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript Options">
-<!ENTITY noscriptAbout "About NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "About NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "You can specify which web sites are allowed to execute scripts. Type the address or the domain (e.g. "http://www.site.com" or "site.com") of the site you want to allow and then click Allow.">
<!ENTITY noscriptWebAddress "Address of web site:">
<!ENTITY noscriptAllow "Allow">
diff --git a/chrome/noscript.jar!/locale/en-US/noscript/noscript.dtd b/chrome/noscript.jar!/locale/en-US/noscript/noscript.dtd
index beeb1c7..f9f56a9 100644
--- a/chrome/noscript.jar!/locale/en-US/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/en-US/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Options…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript Options">
-<!ENTITY noscriptAbout "About NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "About NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "You can specify which web sites are allowed to execute scripts. Type the address or the domain (e.g. "http://www.site.com" or "site.com") of the site you want to allow and then click Allow.">
<!ENTITY noscriptWebAddress "Address of web site:">
<!ENTITY noscriptAllow "Allow">
diff --git a/chrome/noscript.jar!/locale/eo/noscript/noscript.dtd b/chrome/noscript.jar!/locale/eo/noscript/noscript.dtd
index 3d37715..050a025 100644
--- a/chrome/noscript.jar!/locale/eo/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/eo/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opcioj…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opcioj de NoScript">
-<!ENTITY noscriptAbout "Pri NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "Pri NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "Vi povas specifi, kiuj ttt-ejoj rajtu plenumigi skriptojn. Entajpu la adreson aŭ la domajnonomon (ekz. “http://www.retejo.org” aŭ “retejo.org”) de la ttt-ejo, kiun vi volas rajtigi, kaj poste alklaku “Rajtigi”.">
<!ENTITY noscriptWebAddress "Adreso de retpaĝaro:">
<!ENTITY noscriptAllow "Rajtigi">
diff --git a/chrome/noscript.jar!/locale/es-AR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/es-AR/noscript/noscript.dtd
index 10b0e39..d7aa024 100644
--- a/chrome/noscript.jar!/locale/es-AR/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/es-AR/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opciones…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opciones de NoScript">
-<!ENTITY noscriptAbout "Acerca de NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Puede especificar a cuáles sitios web le permitirá ejecutar scripts. Escriba la dirección o el dominio (por ejemplo, "http://www.sitio.com" o "sitio.com") del sitio y luego haga clic en Permitir.">
<!ENTITY noscriptWebAddress "Dirección del sitio web:">
<!ENTITY noscriptAllow "Permitir">
diff --git a/chrome/noscript.jar!/locale/es-CL/noscript/noscript.dtd b/chrome/noscript.jar!/locale/es-CL/noscript/noscript.dtd
index c51dae7..3dda519 100644
--- a/chrome/noscript.jar!/locale/es-CL/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/es-CL/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Options…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opciones de NoScript">
-<!ENTITY noscriptAbout "About NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "About NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "You can specify which web sites are allowed to execute scripts. Type the address or the domain (e.g. "http://www.site.com" or "site.com") of the site you want to allow and then click Allow.">
<!ENTITY noscriptWebAddress "Address of web site:">
<!ENTITY noscriptAllow "Allow">
diff --git a/chrome/noscript.jar!/locale/es-ES/noscript/noscript.dtd b/chrome/noscript.jar!/locale/es-ES/noscript/noscript.dtd
index f30b1e6..423dd4b 100644
--- a/chrome/noscript.jar!/locale/es-ES/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/es-ES/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opciones…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Configuración de NoScript">
-<!ENTITY noscriptAbout "Acerca de NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Aquí puede especificar las páginas web a las que va a permitir ejecutar código JavaScript. Escriba la dirección de la web que quiera incluir (ej. "http://www.paginaweb.com" o "paginaweb.com") y después pulse "Permitir".">
<!ENTITY noscriptWebAddress "Dirección de la página web:">
<!ENTITY noscriptAllow "Permitir">
diff --git a/chrome/noscript.jar!/locale/et-EE/noscript/noscript.dtd b/chrome/noscript.jar!/locale/et-EE/noscript/noscript.dtd
index d2c8d1a..b99edc3 100644
--- a/chrome/noscript.jar!/locale/et-EE/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/et-EE/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Sätted…">
<!ENTITY noscriptOptions.accesskey "S">
<!ENTITY noscriptOptionsLong "NoScripti sätted">
-<!ENTITY noscriptAbout "Täpsemalt lisast NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "Täpsemalt lisast NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "Sa saad määrata, millistel veebilehtedel lubatakse skripte käivitada. Kirjuta veebilehe aadress või domeeni, mida soovid lubada (nt "http://www.site.com" või "site.com") ja klõpsa Luba nuppu">
<!ENTITY noscriptWebAddress "Veebilehe aadress:">
<!ENTITY noscriptAllow "Luba">
diff --git a/chrome/noscript.jar!/locale/eu/noscript/noscript.dtd b/chrome/noscript.jar!/locale/eu/noscript/noscript.dtd
index 73a6710..1f20d9b 100644
--- a/chrome/noscript.jar!/locale/eu/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/eu/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Aukerak:">
<!ENTITY noscriptOptions.accesskey "A">
<!ENTITY noscriptOptionsLong "NoScript aukerak">
-<!ENTITY noscriptAbout "NoScript 2.6.9.4-eri buruz:">
+<!ENTITY noscriptAbout "NoScript 2.6.9.6-eri buruz:">
<!ENTITY noscriptPermissionsText "Zein webgunek script-ak exekuta ditzakeen zehaztu dezakezu. Idatzi script-ak erabiltzea onartzea nahi duzun domeinuaren izena (adib. "http://www.gunea.org" or "gunea.org") eta Onartu sakatu.">
<!ENTITY noscriptWebAddress "Webgunearen helbidea:">
<!ENTITY noscriptAllow "Onartu">
diff --git a/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.dtd
index ba309de..41382b2 100644
--- a/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "تنظیمات...">
<!ENTITY noscriptOptions.accesskey "ت">
<!ENTITY noscriptOptionsLong "تنظیمات NoScript">
-<!ENTITY noscriptAbout "درباره NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "درباره NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "شما می توانید سایت هایی را که اجازه اجرای اسکریپت دارند را مشخص کنید.آدرس سایت یا نام دامنه را وارد کنید.(به عنوان مثال "http://www.site.com" یا "site.com")">
<!ENTITY noscriptWebAddress "آدرس وب سایت :">
<!ENTITY noscriptAllow "اجازه دادن">
diff --git a/chrome/noscript.jar!/locale/fi/noscript/noscript.dtd b/chrome/noscript.jar!/locale/fi/noscript/noscript.dtd
index f8357b3..c3c8d38 100644
--- a/chrome/noscript.jar!/locale/fi/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/fi/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Asetukset…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript asetukset">
-<!ENTITY noscriptAbout "Tietoja NoScript 2.6.9.4istä…">
+<!ENTITY noscriptAbout "Tietoja NoScript 2.6.9.6istä…">
<!ENTITY noscriptPermissionsText "Voit määrittää verkkosivut joiden sallitaan suorittaa scriptejä. Kirjoita verkko-osoite tai verkkonimi (esim. "http://www.site.com" tai "site.com") jonka haluat sallia ja paina Salli.">
<!ENTITY noscriptWebAddress "Verkkosivun osoite:">
<!ENTITY noscriptAllow "Salli">
diff --git a/chrome/noscript.jar!/locale/fr/noscript/noscript.dtd b/chrome/noscript.jar!/locale/fr/noscript/noscript.dtd
index 726727e..42f5b30 100644
--- a/chrome/noscript.jar!/locale/fr/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/fr/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Options">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Options de NoScript">
-<!ENTITY noscriptAbout "À propos de NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "À propos de NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "Il est possible de spécifier quels sites Web sont autorisés à exécuter des scripts. Saisissez l'adresse exacte du site que vous désirez autoriser puis cliquez sur Autoriser.">
<!ENTITY noscriptWebAddress "Adresse du site Web :">
<!ENTITY noscriptAllow "Autoriser">
diff --git a/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.dtd b/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.dtd
index 7513004..9c2ce34 100644
--- a/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opcións...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opcións de NoScript">
-<!ENTITY noscriptAbout "Acerca de NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Podes especificar que páxinas web poden executar scripts. Teclea o enderezo ou o dominio (por exemplo "http://www.paxina.com" ou "paxina.com") do sitio que queres autorizar e despois preme en "Permitir".">
<!ENTITY noscriptWebAddress "Enderezo web:">
<!ENTITY noscriptAllow "Permitir">
diff --git a/chrome/noscript.jar!/locale/he-IL/noscript/noscript.dtd b/chrome/noscript.jar!/locale/he-IL/noscript/noscript.dtd
index 50dc489..a64181d 100644
--- a/chrome/noscript.jar!/locale/he-IL/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/he-IL/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "הגדרות...">
<!ENTITY noscriptOptions.accesskey "">
<!ENTITY noscriptOptionsLong "NoScript הגדרות של">
-<!ENTITY noscriptAbout "אודות NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "אודות NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "ציין אילו אתרים יכולים לקבל היתר להפעלת קבצי Script. הקלד את כתובת האתר או את שם התחום (כגון: "http://www.site.com" או "site.com") ולאחר מכן לחץ על התר.">
<!ENTITY noscriptWebAddress "כתובת/תחום:">
<!ENTITY noscriptAllow "התר">
diff --git a/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.dtd
index 3cf5143..125d617 100644
--- a/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opcije...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript Opcije">
-<!ENTITY noscriptAbout "O NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "O NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Možete odrediti koje web stranice imaju dopuštenje za izvođenje skripti. Upišite adresu ili domenu (npr. "http://www.stranica.hr" ili "stranica.hr") stranice kojoj želite dopustiti i kliknite na Dopusti.">
<!ENTITY noscriptWebAddress "Adresa web stranice:">
<!ENTITY noscriptAllow "Dopusti">
diff --git a/chrome/noscript.jar!/locale/hsb/noscript/noscript.dtd b/chrome/noscript.jar!/locale/hsb/noscript/noscript.dtd
index c8ee3fe..687f1b9 100644
--- a/chrome/noscript.jar!/locale/hsb/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/hsb/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opcije…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opcije NoScript">
-<!ENTITY noscriptAbout "Wo NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "Wo NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "Móžeće podać, kotre websydła smědźa skripty wuwjesć. Zapisajće adresu abo domenu (na př. "http://www.site.com" abo "site.com") websydła, kotremuž chceće to dowolić a klikńće potom na "Dowolić".">
<!ENTITY noscriptWebAddress "Adresa websydła:">
<!ENTITY noscriptAllow "Dowolić">
diff --git a/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.dtd b/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.dtd
index 008e835..a0f78be 100644
--- a/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Beállítások…">
<!ENTITY noscriptOptions.accesskey "B">
<!ENTITY noscriptOptionsLong "A NoScript beállításai">
-<!ENTITY noscriptAbout "A NoScript 2.6.9.4 névjegye">
+<!ENTITY noscriptAbout "A NoScript 2.6.9.6 névjegye">
<!ENTITY noscriptPermissionsText "Megadhatja, hogy mely webhelyek számára engedélyezi a parancsfájlok futtatását. Írja be az engedélyezni kívánt webhely címét vagy tartomány nevét (pl. "http://www.webhely.hu" vagy "webhely.hu"), majd kattintson az Engedélyezés gombra.">
<!ENTITY noscriptWebAddress "A webhely címe:">
<!ENTITY noscriptAllow "Engedélyezés">
diff --git a/chrome/noscript.jar!/locale/id-ID/noscript/noscript.dtd b/chrome/noscript.jar!/locale/id-ID/noscript/noscript.dtd
index 1fc6791..249f1e8 100644
--- a/chrome/noscript.jar!/locale/id-ID/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/id-ID/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Pilihan...">
<!ENTITY noscriptOptions.accesskey "P">
<!ENTITY noscriptOptionsLong "Pilihan NoScript">
-<!ENTITY noscriptAbout "Tentang NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Tentang NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Anda dapat menentukan situs web mana yang diijinkan menjalankan naskah. Masukkan alamat atau domain (contoh: "http://www.site.com" atau "site.com") yang akan diberi ijin kemudian klik Ijinkan.">
<!ENTITY noscriptWebAddress "Alamat situs web:">
<!ENTITY noscriptAllow "Ijinkan">
diff --git a/chrome/noscript.jar!/locale/it/noscript/noscript.dtd b/chrome/noscript.jar!/locale/it/noscript/noscript.dtd
index fe8a2db..8f9c9af 100644
--- a/chrome/noscript.jar!/locale/it/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/it/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opzioni…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opzioni NoScript">
-<!ENTITY noscriptAbout "Informazioni su NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "Informazioni su NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "Qui si possono indicare i siti per i quali l'esecuzione degli script è consentita. Digitare l'indirizzo o il dominio (es. "http://www.sito.com" oppure "sito.com") e fare clic su Permetti.">
<!ENTITY noscriptWebAddress "Indirizzo del sito:">
<!ENTITY noscriptAllow "Permetti">
diff --git a/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.dtd
index 69cf8d3..077860e 100644
--- a/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "オプション...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript オプション">
-<!ENTITY noscriptAbout "NoScript 2.6.9.4について...">
+<!ENTITY noscriptAbout "NoScript 2.6.9.6について...">
<!ENTITY noscriptPermissionsText "JavaScriptを許可するサイトを指定する事ができます。許可したいサイトのアドレスかドメインを入力して、ボタンを押してください。(例: "http://www.site.com" または "site.com")">
<!ENTITY noscriptWebAddress "ウェブサイトのアドレス:">
<!ENTITY noscriptAllow "許可する">
diff --git a/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.dtd b/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.dtd
index 76795f5..953114b 100644
--- a/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Баптаулары">
<!ENTITY noscriptOptions.accesskey "Б">
<!ENTITY noscriptOptionsLong "NoScript баптаулары">
-<!ENTITY noscriptAbout "NoScript 2.6.9.4 туралы...">
+<!ENTITY noscriptAbout "NoScript 2.6.9.6 туралы...">
<!ENTITY noscriptPermissionsText "Қай сайттарға JavaScript орындауға рұқсат екенін көрсете аласыз. Рұқсат етілетін сайттың домен адресін енгізіңіз (мысалы, "http://www.site.com" немесе "site.com"), содан кейін Рұқсат ету басыңыз.">
<!ENTITY noscriptWebAddress "Веб-сайт адресі:">
<!ENTITY noscriptAllow "Рұқсат ету">
diff --git a/chrome/noscript.jar!/locale/km-KH/noscript/noscript.dtd b/chrome/noscript.jar!/locale/km-KH/noscript/noscript.dtd
index 17d2cf6..bb40188 100644
--- a/chrome/noscript.jar!/locale/km-KH/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/km-KH/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Options...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript Options">
-<!ENTITY noscriptAbout "About NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "About NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "You can specify which web sites are allowed to execute scripts. Type the address or the domain (e.g. "http://www.site.com" or "site.com") of the site you want to allow and then click Allow.">
<!ENTITY noscriptWebAddress "Address of web site:">
<!ENTITY noscriptAllow "Allow">
diff --git a/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.dtd
index ae36bf9..7eb0801 100644
--- a/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "옵션...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript 옵션">
-<!ENTITY noscriptAbout "NoScript 2.6.9.4 정보...">
+<!ENTITY noscriptAbout "NoScript 2.6.9.6 정보...">
<!ENTITY noscriptPermissionsText "스크립트 실행을 허용할 웹 사이트를 지정할 수 있습니다. 스크립트를 허용할 사이트의 주소나 도메인 (예를 들면, "http://www.site.com" 또는 "site.com")을 입력한 후 [허용] 버튼을 클릭합니다.">
<!ENTITY noscriptWebAddress "웹 사이트 주소">
<!ENTITY noscriptAllow "허용">
diff --git a/chrome/noscript.jar!/locale/lt/noscript/noscript.dtd b/chrome/noscript.jar!/locale/lt/noscript/noscript.dtd
index 41a9e2d..a54b965 100644
--- a/chrome/noscript.jar!/locale/lt/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/lt/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Nuostatos...">
<!ENTITY noscriptOptions.accesskey "N">
<!ENTITY noscriptOptionsLong "NoScript nuostatos">
-<!ENTITY noscriptAbout "Apie NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Apie NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Jūs galite nurodyti, kurioms interneto svetainėms suteikiamas leidimas vykdyti programinius kodus. Įveskite adresą arba domeną (pvz., "http://www.svetaine.lt" arba "svetaine.lt") svetainės, kuriai norite suteikti leidimą ir spauskite Leisti.">
<!ENTITY noscriptWebAddress "Interneto svetainės adresas:">
<!ENTITY noscriptAllow "Leisti">
diff --git a/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.dtd b/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.dtd
index efff2df..5b842ad 100644
--- a/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Опции...">
<!ENTITY noscriptOptions.accesskey "О">
<!ENTITY noscriptOptionsLong "NoScript Опции">
-<!ENTITY noscriptAbout "За NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "За NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Можете да ги назначите страните, на кои што скриптите ќе бидат дозволени. Напишете ја дозволената адреса (на пример http://www.site.com или site.com) и кликнете „Дозволи“">
<!ENTITY noscriptWebAddress "Адреса на дозволената веб страна:">
<!ENTITY noscriptAllow "Дозволи">
diff --git a/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.dtd
index 1acbb23..85f3b9b 100644
--- a/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Tetapan...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Tetapan NoScript">
-<!ENTITY noscriptAbout "Tentang NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Tentang NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Anda boleh menentukan laman web yang anda benarkan skripnya diproses. Taipkan alamat atau domain(contoh:"http://www.tapak.com" atau "tapak.com") laman web yang diingini dan klik Benarkan">
<!ENTITY noscriptWebAddress "Alamat laman web:">
<!ENTITY noscriptAllow "Benarkan">
diff --git a/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.dtd b/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.dtd
index 367acc3..529a1c8 100644
--- a/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Innstillinger">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript Innstillinger">
-<!ENTITY noscriptAbout "Om NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Om NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Du kan spesifisere hvilke websider som har tillatelse til å kjøre scritper. Skriv inn adresse, eller domene (F.eks: "http://www.side.no", eller "side.no") du ønsker å gi tillatelse til, og klikk Tillat.">
<!ENTITY noscriptWebAddress "Webadresse:">
<!ENTITY noscriptAllow "Tillat">
diff --git a/chrome/noscript.jar!/locale/nl/noscript/noscript.dtd b/chrome/noscript.jar!/locale/nl/noscript/noscript.dtd
index 6b9c565..8eac607 100644
--- a/chrome/noscript.jar!/locale/nl/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/nl/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opties...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript opties">
-<!ENTITY noscriptAbout "Over NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Over NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Webadressen in deze lijst hebben toestemming om JavaScript te gebruiken. Type het adres of domein in (bijv. "http://www.site.com" of "site.com") van de door u toegestane site; klik daarna op Toestaan.">
<!ENTITY noscriptWebAddress "Webadres:">
<!ENTITY noscriptAllow "Toestaan">
diff --git a/chrome/noscript.jar!/locale/pl/noscript/noscript.dtd b/chrome/noscript.jar!/locale/pl/noscript/noscript.dtd
index 738e78f..c8cd3ab 100644
--- a/chrome/noscript.jar!/locale/pl/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/pl/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Ustawienia">
<!ENTITY noscriptOptions.accesskey "U">
<!ENTITY noscriptOptionsLong "NoScript – ustawienia">
-<!ENTITY noscriptAbout "NoScript 2.6.9.4 – informacje">
+<!ENTITY noscriptAbout "NoScript 2.6.9.6 – informacje">
<!ENTITY noscriptPermissionsText "Tutaj można określić witryny internetowe, które będą mogły uruchamiać skrypty. Proszę wprowadzić adres lub domenę witryny (np: „http://www.witryna.pl” lub „witryna.pl”) i nacisnąć przycisk Pozwól.">
<!ENTITY noscriptWebAddress "Adres witryny:">
<!ENTITY noscriptAllow "Pozwól">
diff --git a/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.dtd
index 91d47b4..3940d3d 100644
--- a/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opções">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opções do NoScript">
-<!ENTITY noscriptAbout "Sobre o NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "Sobre o NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "Você pode especificar os sites que podem executar JavaScripts. Escreva o endereço ou o domínio (ex "http://www.site.com" ou "site.com") do site que deseja permitir e depois clique em Permitir.">
<!ENTITY noscriptWebAddress "Endereço:">
<!ENTITY noscriptAllow "Permitir">
diff --git a/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.dtd b/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.dtd
index 71641b9..321d2ee 100644
--- a/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opções">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opções do NoScript">
-<!ENTITY noscriptAbout "Sobre o NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Sobre o NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Pode especificar os sítios que podem executar scripts. Escreva o endereço ou o domínio (ex: "http://www.sitio.com" ou "sitio.com") do sítio que deseja permitir e depois pressione em Permitir.">
<!ENTITY noscriptWebAddress "Endereço:">
<!ENTITY noscriptAllow "Permitir">
diff --git a/chrome/noscript.jar!/locale/ro/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ro/noscript/noscript.dtd
index 034fbac..b81b2b0 100644
--- a/chrome/noscript.jar!/locale/ro/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/ro/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Opțiuni...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "Opțiuni NoScript">
-<!ENTITY noscriptAbout "Despre NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Despre NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Puteți specifica saiturile cărora li se permite să execute scripturi. Scrieți adresa sau domeniul paginii (exemplu: „http://www.sait.ro“ sau „sait.ro“), apoi apăsați pe butonul „Permite“.">
<!ENTITY noscriptWebAddress "Adresă sait:">
<!ENTITY noscriptAllow "Permite">
diff --git a/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.dtd b/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.dtd
index 4ed1418..85cf64a 100644
--- a/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Možnosti...">
<!ENTITY noscriptOptions.accesskey "M">
<!ENTITY noscriptOptionsLong "NoScript – Možnosti">
-<!ENTITY noscriptAbout "O rozšírení NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "O rozšírení NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Môžete určiť, ktoré webové stránky majú povolené spúšťať JavaScript. Zadajte adresu alebo doménu (napríklad "http://www.site.com" alebo "site.com") stránky, ktorú chcete povoliť, a potom kliknite na tlačidlo Povoliť.">
<!ENTITY noscriptWebAddress "Adresa webovej stránky:">
<!ENTITY noscriptAllow "Povoliť">
diff --git a/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.dtd b/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.dtd
index e5d9e96..183de09 100644
--- a/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Možnosti...">
<!ENTITY noscriptOptions.accesskey "M">
<!ENTITY noscriptOptionsLong "NoScript Možnosti">
-<!ENTITY noscriptAbout "O NoScript 2.6.9.4 programu...">
+<!ENTITY noscriptAbout "O NoScript 2.6.9.6 programu...">
<!ENTITY noscriptPermissionsText "Določite lahko na katerih straneh bo izvajanje skript dovoljeno. Vnesite naslov ali domeno (pr. "http://www.domena.com" or "domena.com") strani, na kateri želite omogočiti izvajanje skript in kliknite Dovoli.">
<!ENTITY noscriptWebAddress "Naslov strani:">
<!ENTITY noscriptAllow "Dovoli">
diff --git a/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.dtd b/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.dtd
index d1ef9ed..142ec33 100644
--- a/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Подешавања...">
<!ENTITY noscriptOptions.accesskey "П">
<!ENTITY noscriptOptionsLong "NoScript подешавања">
-<!ENTITY noscriptAbout "О NoScript 2.6.9.4-у">
+<!ENTITY noscriptAbout "О NoScript 2.6.9.6-у">
<!ENTITY noscriptPermissionsText "Можете да наведете којим веб странама је дозвољено да извршавају скриптове. Унесите адресу или домен (нпр. "http://www.site.com" или "site.com") стране којој желите да дате дозволу и онда кликните Дозволи.">
<!ENTITY noscriptWebAddress "Адреса веб стране:">
<!ENTITY noscriptAllow "Дозволи">
diff --git a/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.dtd b/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.dtd
index 324c1a9..cd617a2 100644
--- a/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Alternativ...">
<!ENTITY noscriptOptions.accesskey "A">
<!ENTITY noscriptOptionsLong "NoScript-alternativ">
-<!ENTITY noscriptAbout "Om NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Om NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Ange vilka webbplatser som får köra skript. Skriv webbadressen eller domänen (t ex. "http://www.webbplats.se" eller "webbplats.se") för den webbplats där skript ska tillåtas. Klicka sedan på "Tillåt".">
<!ENTITY noscriptWebAddress "Sidans adress:">
<!ENTITY noscriptAllow "Tillåt">
diff --git a/chrome/noscript.jar!/locale/te-IN/noscript/noscript.dtd b/chrome/noscript.jar!/locale/te-IN/noscript/noscript.dtd
index 2ae6120..4293f05 100644
--- a/chrome/noscript.jar!/locale/te-IN/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/te-IN/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Options…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript Options">
-<!ENTITY noscriptAbout "About NoScript 2.6.9.4…">
+<!ENTITY noscriptAbout "About NoScript 2.6.9.6…">
<!ENTITY noscriptPermissionsText "You can specify which web sites are allowed to execute scripts. Type the address or the domain (e.g. "http://www.site.com" or "site.com") of the site you want to allow and then click Allow.">
<!ENTITY noscriptWebAddress "Address of web site:">
<!ENTITY noscriptAllow "Allow">
diff --git a/chrome/noscript.jar!/locale/th/noscript/noscript.dtd b/chrome/noscript.jar!/locale/th/noscript/noscript.dtd
index 93bfa29..33b18dc 100644
--- a/chrome/noscript.jar!/locale/th/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/th/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "ตัวเลือก...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "ตัวเลือก NoScript">
-<!ENTITY noscriptAbout "เกี่ยวกับ NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "เกี่ยวกับ NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "คุณสามารถกำหนดเว็บไซต์ที่จะอนุญาตดำเนินการสคริปต์ พิมพ์ที่อยู่หรือโดเมน (เช่น "http://www.site.com" หรือ "site.com") ของไซต์ที่คุณต้องการอนุญาตและคลิกอนุญาต">
<!ENTITY noscriptWebAddress "ที่อยู่เว็บไซต์:">
<!ENTITY noscriptAllow "อนุญาต">
diff --git a/chrome/noscript.jar!/locale/tr/noscript/noscript.dtd b/chrome/noscript.jar!/locale/tr/noscript/noscript.dtd
index 7749873..74e60d1 100644
--- a/chrome/noscript.jar!/locale/tr/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/tr/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Seçenekler">
<!ENTITY noscriptOptions.accesskey "S">
<!ENTITY noscriptOptionsLong "NoScript Seçenekleri">
-<!ENTITY noscriptAbout "NoScript 2.6.9.4 Hakkında">
+<!ENTITY noscriptAbout "NoScript 2.6.9.6 Hakkında">
<!ENTITY noscriptPermissionsText "Hangi web sayfalarında JavaScript'e izni vereceğinizi kolayca seçebilirsiniz. Lütfen adresi tam olarak girin ve 'İzin ver' düğmesine tıklayarak sayfanın JavaScript kullanmasına izin verin.">
<!ENTITY noscriptWebAddress "Site adresi:">
<!ENTITY noscriptAllow "İzin ver">
diff --git a/chrome/noscript.jar!/locale/vi/noscript/noscript.dtd b/chrome/noscript.jar!/locale/vi/noscript/noscript.dtd
index 54e26b1..8744791 100644
--- a/chrome/noscript.jar!/locale/vi/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/vi/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "Tùy chọn">
<!ENTITY noscriptOptions.accesskey "y">
<!ENTITY noscriptOptionsLong "Tùy chọn cho NoScript">
-<!ENTITY noscriptAbout "Thông tin về NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "Thông tin về NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "Bạn có thể chỉ định trang web nào được phép chạy script. Gõ địa chỉ hay tên miền (v.d. "http://www.nhaccodien.com" hay "nhaccodien.com") của trang mà bạn muốn cho phép, rồi nhấn Cho phép.">
<!ENTITY noscriptWebAddress "Địa chỉ của trang web:">
<!ENTITY noscriptAllow "Cho phép">
diff --git a/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.dtd b/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.dtd
index c0742b3..9858569 100644
--- a/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "选项...">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript 选项">
-<!ENTITY noscriptAbout "关于 NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "关于 NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "您可以指定允许执行脚本的网站。请输入您想要允许的网站地址或域名(例如: “http://www.site.com”或者“site.com”)然后单击“允许”。">
<!ENTITY noscriptWebAddress "网站地址:">
<!ENTITY noscriptAllow "允许">
diff --git a/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.dtd b/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.dtd
index 7844c3f..685728c 100644
--- a/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.dtd
+++ b/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.dtd
@@ -1,7 +1,7 @@
<!ENTITY noscriptOptions "選項…">
<!ENTITY noscriptOptions.accesskey "O">
<!ENTITY noscriptOptionsLong "NoScript 選項">
-<!ENTITY noscriptAbout "關於 NoScript 2.6.9.4">
+<!ENTITY noscriptAbout "關於 NoScript 2.6.9.6">
<!ENTITY noscriptPermissionsText "您可以指定允許執行 JavaScript 的網站。輸入您要允許的網址或網域（例如 "http://www.site.com" 或 "site.com"），然後按下允許.">
<!ENTITY noscriptWebAddress "網址：">
<!ENTITY noscriptAllow "允許">
diff --git a/components/noscriptService.js b/components/noscriptService.js
index d9cc8e8..0abb9bb 100644
--- a/components/noscriptService.js
+++ b/components/noscriptService.js
@@ -5,7 +5,7 @@ const Cc = Components.classes;
const Cu = Components.utils;
const Cr = Components.results;
-const VERSION = "2.6.9.4";
+const VERSION = "2.6.9.6";
const SERVICE_CTRID = "@maone.net/noscript-service;1";
const SERVICE_ID = "{31aec909-8e86-4397-9380-63a59e0c5ff5}";
const EXTENSION_ID = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
@@ -2313,7 +2313,7 @@ var ns = {
_isProxiedSite: function(uri) { // Gecko < 2 has no proxyConfigType, so we must resolve per URI
try {
if (!(uri instanceof Ci.nsIURI)) {
- uri = IOS.newURI(uri || "http://noscript.net/", null, null);
+ uri = IOS.newURI(uri || "https://noscript.net/", null, null);
}
return this.proxyService.resolve(uri, 0).type != "direct";
} catch(e) {
@@ -2336,8 +2336,13 @@ var ns = {
enabled = enabled || this.globalHttpsWhitelist && s.indexOf("https:") === 0 && this.isGlobalHttps(window);
if (enabled ? this.restrictSubdocScripting : this.cascadePermissions) {
- let topSite = this.getSite(window.top.document.nodePrincipal.origin);
- if (topSite !== s) enabled = this.isJSEnabled(topSite);
+ let topOrigin = window.top.document.nodePrincipal.origin;
+ if (this.isBrowserOrigin(topOrigin)) {
+ enabled = true;
+ } else {
+ let topSite = this.getSite(topOrigin);
+ if (topSite !== s) enabled = this.isJSEnabled(topSite);
+ }
}
}
@@ -3815,27 +3820,35 @@ var ns = {
var url = this.getObjectURLWithDOM(obj, objectURL, parentURL);
if (url) this.allowObject(url, mime, originSite || this.getSite(parentURL));
},
- getObjectURLWithDOM: function(obj, objectURL, parentURL) {
- var id = obj.id;
- if (!id) {
- try {
- let parents = [], ss = [];
- for (; obj;) {
- let t = obj.tagName;
- if (t) ss.push(t);
- let node = obj.previousSibling;
- if (!node) {
- parents.push(ss.join("-"));
- ss.length = 0;
- node = obj.parentNode;
+ getObjectURLWithDOM: function(obj, objectURL, parentURL) {
+ let doc = obj.ownerDocument;
+ let suffix = encodeURIComponent(parentURL);
+ if (!doc) return objectURL + "#!#@" + suffix;
+
+ let id = obj.id || "";
+ let t = obj.tagName.toUpperCase();
+
+ const ytFrameURL = "https://www.youtube.com/embed/";
+ ns.log("IFRAME" === t + ","+ objectURL.substring(0, ytFrameURL))
+ if ("IFRAME" === t && objectURL.substring(0, ytFrameURL.length) === ytFrameURL) {
+ objectURL = ytFrameURL;
+ id = "(ytFrame)";
+ } else {
+ objectURL = objectURL.replace(/[\?#].*/, '');
+ if (!id) {
+ let ee = doc.getElementsByTagName(t);
+
+ for (let j = ee.length; j-- > 0;) {
+ if (ee[j] === obj) {
+ id = t + "(" + j + ")";
+ break;
}
- obj = node;
}
- id = parents.join(".");
- } catch (e) {}
+ }
}
- return objectURL.replace(/[\?#].*/, '') + "#!#" + id + "@" + encodeURIComponent(parentURL);
+ return objectURL + "#!#" + id + "@" + suffix;
},
+
resetAllowedObjects: function() {
this.objectWhitelist = {};
this.objectWhitelistLen = 0;
@@ -4399,7 +4412,7 @@ var ns = {
node = null;
var self = this;
return !this.__ns.handleBookmark(url, function(url) {
- method.caller.apply(self, method.caller.arguments);
+ if (method.caller) method.caller.apply(self, method.caller.arguments);
self = null;
});
} finally {
@@ -4457,10 +4470,12 @@ var ns = {
this._patchTimeouts(window, true);
}
- if ((fromURLBar || noJS) && /^javascript:/i.test(url) && this.geckoVersionCheck("24") > 0) {
+ let gecko24 = this.geckoVersionCheck("24") >= 0;
+ if ((fromURLBar || noJS) && /^javascript:/i.test(url) && gecko24) {
JSURL.load(url, doc);
} else {
- openCallback();
+ if (gecko24) openCallback();
+ else window.location.href = url;
}
Thread.yieldAll();
if (noJS) {
@@ -5067,7 +5082,7 @@ var ns = {
}
},
- checkAndEnableObject: function(ctx) {
+ checkAndEnableObject: function(ctx) {
var extras = ctx.extras;
if (!this.confirmEnableObject(ctx.window, extras)) return;
@@ -5076,17 +5091,18 @@ var ns = {
var url = extras.url;
this.allowObject(url, mime, extras.originSite);
- var doc = ctx.anchor.ownerDocument;
+ let a = ctx.anchor;
+ var doc = a.ownerDocument;
var isLegacyFrame = this.isLegacyFrameReplacement(ctx.object);
if (isLegacyFrame || (mime == doc.contentType && doc.body &&
- (ctx.anchor == doc.body.firstChild &&
- ctx.anchor == doc.body.lastChild ||
+ (a === doc.body.firstChild &&
+ a === doc.body.lastChild ||
(ctx.object instanceof Ci.nsIDOMHTMLEmbedElement) && ctx.object.src != url))
) { // stand-alone plugin or frame
- doc.body.removeChild(ctx.anchor); // TODO: add a throbber
+ doc.body.removeChild(a); // TODO: add a throbber
if (isLegacyFrame) {
this.setExpando(doc.defaultView.frameElement, "allowed", true);
// doc.defaultView.frameElement.src = url;
@@ -5109,7 +5125,7 @@ var ns = {
return;
}
- this.setExpando(ctx.anchor, "removedNode", null);
+ this.setExpando(a, "removedNode", null);
extras.allowed = true;
extras.placeholder = null;
this.delayExec(function() {
@@ -5120,8 +5136,10 @@ var ns = {
function reload(slow) {
- ns.allowObjectByDOM(ctx.anchor, url, doc.documentURI, mime);
+ ns.log( ns. getObjectURLWithDOM(obj, url, doc.documentURI));
+ ns.allowObjectByDOM(obj, url, doc.documentURI, mime);
if (slow) {
+ ns.log("RELOAD")
DOM.getDocShellForWindow(doc.defaultView).reload(0);
} else {
ns.quickReload(doc.defaultView);
@@ -5168,20 +5186,34 @@ var ns = {
obj.autoplay = true;
}
- let parent = ctx.anchor.parentNode;
+ let parent = a.parentNode;
- if (parent && parent.ownerDocument == ctx.anchor.ownerDocument) {
- this.setExpando(obj, "allowed", true);
+ if (parent && parent.ownerDocument == doc) {
if (jsEnabled) {
+
+ if (/IFRAME/i.test(extras.tag) && /^https:\/\/www\.youtube\.com\/embed\//.test(url)) {
+ reload();
+ return;
+ }
+
ScriptSurrogate.executeSandbox(doc,
"env.a.__noSuchMethod__ = env.o.__noSuchMethod__ = function(m, a) { return env.n[m].apply(env.n, a) }",
- { a: ctx.anchor, o: ctx.object, n: obj }
+ { a: a, o: ctx.object, n: obj }
);
}
- parent.replaceChild(obj, ctx.anchor);
+ this.setExpando(obj, "allowed", true);
+ parent.replaceChild(obj, a);
var style = doc.defaultView.getComputedStyle(obj, '');
+
+ let body = doc.body;
+ if (body && body.clientWidth === obj.offsetWidth && body.clientHeight === obj.offsetHeight) {
+ // full size applet/movie
+ reload();
+ return;
+ }
+
if (jsEnabled && ((obj.offsetWidth || parseInt(style.width)) < 2 || (obj.offsetHeight || parseInt(style.height)) < 2)
&& !/frame/i.test(extras.tag)) {
@@ -6126,6 +6158,7 @@ var ns = {
_onWindowCreatedReal: function(window, site) {
let document = window.document;
let origin = document.nodePrincipal.origin;
+
if (this.isBrowserOrigin(origin)) return;
let blockIt;
let blocker = WinScript.supported ? WinScript : DocShellScript;
@@ -6181,7 +6214,9 @@ var ns = {
},
beforeScripting: function(subj, url) { // early stub
+ INCLUDE("ScriptlessBGThumbs");
if (!this.httpStarted) {
+
let url = subj.location || subj.documentURI;
if (/^(?:about|resource|chrome|file|moz-nullprincipal):/.test(url)) {
@@ -6974,7 +7009,7 @@ var ns = {
const name = "noscript";
const domain = name.toLowerCase() + ".net";
- IOS.newChannel("http://" + domain + "/-", null, null).asyncOpen({ // DNS prefetch
+ IOS.newChannel("https://" + domain + "/-", null, null).asyncOpen({ // DNS prefetch
onStartRequest: function() {},
onStopRequest: function(req, ctx) {
if (req.status && req.status !== NS_BINDING_REDIRECTED) {
@@ -6987,7 +7022,7 @@ var ns = {
if (typeof(browser.addTab) != "function") return;
- var url = "http://" + domain + "/?ver=" + ver;
+ var url = "https://" + domain + "/?ver=" + ver;
var hh = "X-IA-Post-Install: " + name + " " + ver;
if (prevVer) {
url += "&prev=" + prevVer;
diff --git a/defaults/preferences/noscript.js b/defaults/preferences/noscript.js
index 37be2ed..265d979 100644
--- a/defaults/preferences/noscript.js
+++ b/defaults/preferences/noscript.js
@@ -34,6 +34,9 @@ pref("noscript.default", "about:blank addons.mozilla.org persona.org mozilla.net
pref("noscript.eraseFloatingElements", true);
+pref("noscript.bgThumbs.allowed", false);
+pref("noscript.bgThumbs.disableJS", true);
+
pref("noscript.forbidJava", true);
pref("noscript.forbidFlash", true);
pref("noscript.forbidSilverlight", true);
@@ -211,6 +214,7 @@ pref("noscript.secureCookies.recycle", false);
pref("noscript.secureCookies.perTab", false);
pref("noscript.httpsForced", "");
+pref("noscript.httpsForcedBuiltIn", "www.youtube.com");
pref("noscript.allowHttpsOnly", 0);
pref("noscript.https.showInConsole", true);
@@ -282,8 +286,12 @@ pref("noscript.surrogate.imagebam.replacement", "(function(){if(\"over18\" in wi
pref("noscript.surrogate.imagebam.sources", "!@*.imagebam.com");
pref("noscript.surrogate.imagehaven.replacement", "['agreeCont','TransparentBlack'].forEach(function(id){var o=document.getElementById(id);if(o)o.style.display='none'})");
pref("noscript.surrogate.imagehaven.sources", "!@*.imagehaven.net");
+pref("noscript.surrogate.imgreserve.sources", "!imgreserve.com");
+pref("noscript.surrogate.imgreserve.replacement", "let b=document.querySelector('input[value=\"YES\"]');if(b)b.addEventListener('click',function(){document.cookie='AgeVerification=1';location.href=location},true)");
pref("noscript.surrogate.interstitialBox.replacement", "__defineSetter__('interstitialBox',function(){});__defineGetter__('interstitialBox',function(){return{}})");
pref("noscript.surrogate.interstitialBox.sources", "@*.imagevenue.com");
+pref("noscript.surrogate.invodo.sources", ".invodo.com");
+pref("noscript.surrogate.invodo.replacement", "Invodo={__noSuchMethod__:function(){}}");
pref("noscript.surrogate.googleThumbs.replacement", "(function(){var ss=document.getElementsByTagName('script');var s,t,m,id,i;for(var j=ss.length;j-->0;)if(((s=ss[j])&&(t=s.firstChild&&s.firstChild.nodeValue)&&(id=t.match(/\w+thumb\d+/))&&(m=t.match(/['\"](data:[^'\"]+)/)))&&(i=document.getElementById(id)))i.src=m[1].replace(/\\\\(u[0-9a-f]{4}|x[0-9a-f]{2})/ig,function(a,b){return String.fromCharCode(parseInt(b.substring(1), 16))})})()");
pref("noscript.surrogate.googleThumbs.sources", "!^https?://www\\.google\\.[a-z]+/search");
pref("noscript.surrogate.amo.replacement", "addEventListener('click',function(e){if(e.button)return;var a=e.target.parentNode;var hash=a.getAttribute('data-hash');if(hash){var b=a.parentNode.parentNode;InstallTrigger.install({x:{URL:a.href,IconURL:b.getAttribute('data-icon'),Hash:hash,toString:function(){return a.href}}});e.preventDefault()}},false)");
@@ -309,7 +317,7 @@ pref("noscript.surrogate.revsci.replacement", "rsinetsegs=[];DM_addEncToLoc=DM_t
pref("noscript.surrogate.adriver.sources", "ad.adriver.ru/cgi-bin/erle.cgi");
pref("noscript.surrogate.adriver.replacement", "if(top!==self&&top.location.href===location.href)setTimeout('try{document.close();}catch(e){}',100)");
pref("noscript.surrogate.twitter.sources", "platform.twitter.com");
-pref("noscript.surrogate.twitter.replacement", "twttr=(function(){var f=arguments.callee;return f.__noSuchMethod__=f.events=f.anywhere=f})();");
+pref("noscript.surrogate.twitter.replacement", "twttr=(function(){var f=arguments.callee; var ro = f.__noSuchMethod__=f.events=f.anywhere=f; ro.widgets={__noSuchMethod__:function(){}}; return ro})();");
pref("noscript.surrogate.plusone.sources", "apis.google.com/js/plusone.js");
pref("noscript.surrogate.plusone.replacement", "gapi=(function(){var f=arguments.callee;return f.__noSuchMethod__=f.plusone=f;})();");
pref("noscript.surrogate.disqus-theme.sources", ">.disqus.com/*/build/themes/t_c4ca4238a0b923820dcc509a6f75849b.js*");
@@ -322,7 +330,6 @@ pref("noscript.surrogate.imagebunk.sources", "!http://imagebunk.com/image/*");
pref("noscript.surrogate.imagebunk.replacement", "document.body.insertBefore(document.getElementById('img_obj'), document.body.firstChild)");
pref("noscript.surrogate.personaorg.sources", "login.persona.org");
pref("noscript.surrogate.personaorg.replacement", "if(typeof navigator.id==='undefined'){navigator.id={__noSuchMethod__:function(){},watch:function(){}}}");
-
pref("noscript.surrogate.picsee.sources", "!^https?://picsee\\.net/2\\d.*\\.html");
pref("noscript.surrogate.picsee.replacement", "location.replace(location.href.replace(/(\\/2\\d{3}[^\\/]*)(.*)\\.html/, '/upload$1/$2'));");
@@ -379,7 +386,7 @@ pref("noscript.subscription.checkInterval", 24);
pref("noscript.subscription.trustedURL", "");
pref("noscript.subscription.untrustedURL", "");
-pref("noscript.siteInfoProvider", "http://noscript.net/about/%utf8%;%ace%");
+pref("noscript.siteInfoProvider", "https://noscript.net/about/%utf8%;%ace%");
pref("noscript.alwaysShowObjectSources", false);
pref("noscript.ef.enabled", false);
diff --git a/install.rdf b/install.rdf
index 59f532f..94a80d9 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
<em:id>{73a6fe31-595d-460b-a920-fcc0f8843232}</em:id>
<em:name>NoScript</em:name>
- <em:version>2.6.9.4</em:version>
+ <em:version>2.6.9.6</em:version>
<em:description>Extra protection for your Firefox: NoScript allows JavaScript, Java (and other plugins) only for trusted domains of your choice (e.g. your home-banking web site). This whitelist based pre-emptive blocking approach prevents exploitation of security vulnerabilities (known and even unknown!) with no loss of functionality... Experts will agree: Firefox is really safer with NoScript :-)</em:description>
<em:creator>Giorgio Maone</em:creator>
<em:type>2</em:type>
@@ -61,7 +61,7 @@
<em:contributor>Xavier Robin & BlackJack (French translation)</em:contributor>
<em:contributor>X.F Mao & George C. Tsoi (Simplified Chinese)</em:contributor>
<em:optionsURL>chrome://noscript/content/noscriptOptions.xul</em:optionsURL>
- <em:homepageURL>http://noscript.net</em:homepageURL>
+ <em:homepageURL>https://noscript.net</em:homepageURL>
<em:iconURL>chrome://noscript/skin/icon32.png</em:iconURL>
<em:icon64URL>chrome://noscript/skin/icon64.png</em:icon64URL>
<em:aboutURL>chrome://noscript/content/about.xul</em:aboutURL>
@@ -70,7 +70,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.0.9</em:minVersion>
- <em:maxVersion>36.0</em:maxVersion>
+ <em:maxVersion>37.0</em:maxVersion>
</Description>
</em:targetApplication>
@@ -88,7 +88,7 @@
<Description>
<em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
<em:minVersion>2.0</em:minVersion>
- <em:maxVersion>2.33</em:maxVersion>
+ <em:maxVersion>2.34</em:maxVersion>
</Description>
</em:targetApplication>
diff --git a/mozilla.cfg b/mozilla.cfg
index badd39e..cac13e4 100644
--- a/mozilla.cfg
+++ b/mozilla.cfg
@@ -5,7 +5,7 @@
// you'd better copy the site list from the "capability.policy.maonoscript.sites"
// key in the prefs.js file found in a test profile
-lockPref("noscript.default", "informaction.com http://informaction.com https://informaction.com flashgot.net http://flashgot.net https://flashgot.net noscript.net http://noscript.net https://noscript.net");
+lockPref("noscript.default", "informaction.com https://informaction.com flashgot.net https://flashgot.net noscript.net https://noscript.net");
lockPref("noscript.ctxMenu", false); // hide context menu
lockPref("noscript.statusIcon", false); // hide statusIcon
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/noscript.git
More information about the Pkg-mozext-commits
mailing list