[Pkg-mozext-commits] [noscript] 01/06: Imported Upstream version 2.6.8.35~rc1
David Prévot
taffit at moszumanska.debian.org
Thu Jul 24 16:50:25 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 9c18d6659bbf5a72d73e531d205331d057c02e2d
Author: David Prévot <taffit at debian.org>
Date: Thu Jul 24 10:00:46 2014 -0400
Imported Upstream version 2.6.8.35~rc1
---
chrome/noscript.jar!/content/noscript/DOM.js | 2 +-
.../content/noscript/RequestWatchdog.js | 6 +-
chrome/noscript.jar!/content/noscript/about.xul | 6 +-
.../content/noscript/noscriptOverlay.js | 44 +-
.../content/noscript/overlay-mobile.xul | 2 +-
.../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 +-
chrome/noscript.jar!/scripts/noscript/ga.js | 37 ++
chrome/noscript.jar!/scripts/noscript/jsencoder.js | 17 +
chrome/noscript.jar!/scripts/noscript/localeqa.sh | 18 +
.../scripts/noscript/maf-scratchpad.js | 41 ++
chrome/noscript.jar!/scripts/noscript/revert.sh | 12 +
chrome/noscript.jar!/scripts/noscript/urchin.js | 652 +++++++++++++++++++++
components/noscriptService.js | 22 +-
install.rdf | 2 +-
61 files changed, 876 insertions(+), 81 deletions(-)
diff --git a/chrome/noscript.jar!/content/noscript/DOM.js b/chrome/noscript.jar!/content/noscript/DOM.js
index c8359d4..0556dc2 100644
--- a/chrome/noscript.jar!/content/noscript/DOM.js
+++ b/chrome/noscript.jar!/content/noscript/DOM.js
@@ -75,7 +75,7 @@ const DOM = {
getChromeWindow: function(window) {
try {
- return this.getDocShellForWindow(window)
+ return this.getDocShellForWindow(window.top)
.QueryInterface(Ci.nsIDocShellTreeItem).rootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow).window;
diff --git a/chrome/noscript.jar!/content/noscript/RequestWatchdog.js b/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
index 89d9e2e..63ffa65 100644
--- a/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
+++ b/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
@@ -479,8 +479,8 @@ RequestWatchdog.prototype = {
const globalJS = ns.globalJS;
let trustedTarget = globalJS;
if(!trustedTarget) {
+ window = window || abeReq.window;
if(ns.autoAllow) {
- window = window || abeReq.window;
if (window && window == window.top) {
targetSite = ns.getQuickSite(originalSpec, ns.autoAllow);
if(targetSite && !ns.isJSEnabled(targetSite)) {
@@ -496,8 +496,8 @@ RequestWatchdog.prototype = {
if (ns.checkShorthands(targetSite)) {
ns.autoTemp(targetSite);
trustedTarget = true;
- } else {
- ns.recordBlocked(targetSite);
+ } else if (window) {
+ ns.recordBlocked(window, targetSite, originSite);
}
}
}
diff --git a/chrome/noscript.jar!/content/noscript/about.xul b/chrome/noscript.jar!/content/noscript/about.xul
index 6f69d2a..297d4ab 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.8.34"]);
+ str = getString("version", ["2.6.8.35rc1"]);
if(str) document.getElementById("extensionVersion").setAttribute("value", str);
setString("extensionDescription",null,"extensions.{73a6fe31-595d-460b-a920-fcc0f8843232}.description");
@@ -86,7 +86,7 @@ function about_open(url, features) {
<hbox id="headBox" align="end">
<vbox flex="1">
<label value="NoScript" id="extensionName" crop="right"/>
-<label value="Version 2.6.8.34" id="extensionVersion" crop="right"/>
+<label value="Version 2.6.8.35rc1" id="extensionVersion" crop="right"/>
</vbox>
<vbox flex="1" align="end">
<hbox align="end">
@@ -164,7 +164,7 @@ 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.8.34')">Changelog</label>
+<label id="changelog" class="text-link" align="center" tooltiptext="See Changelog" onclick="about_open('http://noscript.net/changelog#2.6.8.35rc1')">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>
</hbox>
diff --git a/chrome/noscript.jar!/content/noscript/noscriptOverlay.js b/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
index 4b7fa9d..a702571 100644
--- a/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
+++ b/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
@@ -7,6 +7,7 @@ const Ci = Components.interfaces;
return noscriptUtil.service ? {
ns: noscriptUtil.service,
+ recentlyBlocked: [],
getString: function(key, parms) {
return noscriptUtil.getString(key, parms);
@@ -768,10 +769,10 @@ return noscriptUtil.service ? {
let max = ns.getPref("recentlyBlockedCount");
let dejaVu = [],
count = 0,
- recent = ns.recentlyBlocked,
+ recent = this.recentlyBlocked,
current = false;
- let tooltip = noscriptOverlay.getSiteTooltip(false, !!ns.getPref("siteInfoProvider"));
+ let tooltip = this.getSiteTooltip(false, !!ns.getPref("siteInfoProvider"));
for (let j = recent.length; j-- > 0;) {
@@ -2112,24 +2113,29 @@ return noscriptUtil.service ? {
this.ns.applyPreset(menulist.selectedItem.value);
},
- prefsObserver: {
+ observer: {
ns: noscriptUtil.service,
QueryInterface: noscriptUtil.service.generateQI([
Ci.nsIObserver,
Ci.nsISupportsWeakReference])
,
observe: function(subject, topic, data) {
-
- if (topic == "noscript:sync-ui") {
- noscriptOverlay.syncUI(subject);
- return;
- }
-
if (subject == this.ns.caps) {
noscriptOverlay.syncUI();
return;
}
+ switch(topic) {
+ case "noscript:sync-ui":
+ noscriptOverlay.syncUI(subject);
+ return;
+ case "browser:purge-session-history":
+ noscriptOverlay.recentlyBlocked = [];
+ return;
+ }
+
+ // prefs
+
switch (data) {
case "preset":
if (data == "off") noscriptOverlay.statusIcon.setAttribute("hidden", "true");
@@ -2174,12 +2180,17 @@ return noscriptUtil.service ? {
noscriptOverlay.initPopups();
break;
+
}
},
_registered: false,
+ _topics: ["noscript:sync-ui", "browser:purge-session-history"],
register: function() {
const ns = this.ns;
- ns.os.addObserver(this, "noscript:sync-ui", true);
+ const os = ns.os;
+ for each (let t in this._topics){
+ os.addObserver(this, t, true);
+ }
ns.prefs.addObserver("", this, true);
ns.caps.addObserver("", this, true);
const initPrefs = [
@@ -2190,14 +2201,17 @@ return noscriptUtil.service ? {
"stickyUI.liveReload",
"hoverUI"
];
- for (var j = 0; j < initPrefs.length; j++) {
- this.observe(null, null, initPrefs[j]);
+ for each (let p in initPrefs) {
+ this.observe(null, null, p);
}
this._registered = true;
},
remove: function() {
const ns = this.ns;
- ns.os.removeObserver(this, "noscript:sync-ui");
+ const os = ns.os;
+ for each (let t in this._topics){
+ os.removeObserver(this, t);
+ }
ns.prefs.removeObserver("", this);
ns.caps.removeObserver("", this);
}
@@ -2547,7 +2561,7 @@ return noscriptUtil.service ? {
noscriptOverlay.shortcutKeys.register();
- noscriptOverlay.prefsObserver.register();
+ noscriptOverlay.observer.register();
let self = this;
@@ -2615,7 +2629,7 @@ return noscriptUtil.service ? {
window.removeEventListener("pageshow", this.onPageShow, true);
window.removeEventListener("DOMContentLoaded", this.onContentLoad, false);
- noscriptOverlay.prefsObserver.remove();
+ noscriptOverlay.observer.remove();
noscriptOverlay.shortcutKeys.remove();
$("contentAreaContextMenu").removeEventListener("popupshowing", this.onMainContextMenu, false);
diff --git a/chrome/noscript.jar!/content/noscript/overlay-mobile.xul b/chrome/noscript.jar!/content/noscript/overlay-mobile.xul
index 889fe66..2793445 100644
--- a/chrome/noscript.jar!/content/noscript/overlay-mobile.xul
+++ b/chrome/noscript.jar!/content/noscript/overlay-mobile.xul
@@ -91,7 +91,7 @@
label="&noscriptReset;"
class="menuitem-iconic"
accesskey="&noscriptReset.accesskey;"
- oncommand="noscriptOverlay.ns.recentlyBlocked = []"
+ oncommand="noscriptOverlay.recentlyBlocked = []"
/>
</menupopup>
</menu>
diff --git a/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.dtd b/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.dtd
index b0cd1ad..608fe7c 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.8.34">
+<!ENTITY noscriptAbout "За NoScript 2.6.8.35rc1">
<!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 383ae8c..c5afb2d 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.8.34">
+<!ENTITY noscriptAbout "Quant a NoScript 2.6.8.35rc1">
<!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 8a864be..c115cad 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.8.34">
+<!ENTITY noscriptAbout "O rozšíření NoScript 2.6.8.35rc1">
<!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 0be5466..e6c1bac 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.8.34">
+<!ENTITY noscriptAbout "Yngylch NoScript 2.6.8.35rc1">
<!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 6bcef32..c424c2b 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.8.34">
+<!ENTITY noscriptAbout "Om NoScript 2.6.8.35rc1">
<!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 01997c1..0bb3c92 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.8.34…">
+<!ENTITY noscriptAbout "Über NoScript 2.6.8.35rc1…">
<!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 cebb4b7..ad4269a 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.8.34">
+<!ENTITY noscriptAbout "Περί NoScript 2.6.8.35rc1">
<!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 773d1a8..8765081 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.8.34…">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.35rc1…">
<!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 68d033a..0ba06e7 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.8.34…">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.35rc1…">
<!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 f7e6ff2..67d1b2c 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.8.34…">
+<!ENTITY noscriptAbout "Pri NoScript 2.6.8.35rc1…">
<!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 05ee66b..719196c 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.8.34">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.8.35rc1">
<!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 1418b36..ad71133 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.8.34…">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.35rc1…">
<!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 3858814..d30db3b 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.8.34">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.8.35rc1">
<!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 c9453a5..af1c8a5 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.8.34…">
+<!ENTITY noscriptAbout "Täpsemalt lisast NoScript 2.6.8.35rc1…">
<!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 199edcc..eacabdc 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.8.34-eri buruz:">
+<!ENTITY noscriptAbout "NoScript 2.6.8.35rc1-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 f2eca4d..4cfaa54 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.8.34">
+<!ENTITY noscriptAbout "درباره NoScript 2.6.8.35rc1">
<!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 deade9a..62a77c1 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.8.34istä…">
+<!ENTITY noscriptAbout "Tietoja NoScript 2.6.8.35rc1istä…">
<!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 d2ce2f3..015a53b 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.8.34…">
+<!ENTITY noscriptAbout "À propos de NoScript 2.6.8.35rc1…">
<!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 4a96ab6..4fef235 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.8.34">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.8.35rc1">
<!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 682eb43..4dea1d6 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.8.34">
+<!ENTITY noscriptAbout "אודות NoScript 2.6.8.35rc1">
<!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 ba5fc7f..cddb61c 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.8.34">
+<!ENTITY noscriptAbout "O NoScript 2.6.8.35rc1">
<!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 5c810e4..70d0edd 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.8.34…">
+<!ENTITY noscriptAbout "Wo NoScript 2.6.8.35rc1…">
<!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 48bf30c..061b324 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.8.34 névjegye">
+<!ENTITY noscriptAbout "A NoScript 2.6.8.35rc1 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 650ac3e..627c372 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.8.34">
+<!ENTITY noscriptAbout "Tentang NoScript 2.6.8.35rc1">
<!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 73cfaac..b54d597 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.8.34…">
+<!ENTITY noscriptAbout "Informazioni su NoScript 2.6.8.35rc1…">
<!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 fb6797d..3b2d94c 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.8.34について...">
+<!ENTITY noscriptAbout "NoScript 2.6.8.35rc1について...">
<!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 3d05fbf..17cbab7 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.8.34 туралы...">
+<!ENTITY noscriptAbout "NoScript 2.6.8.35rc1 туралы...">
<!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 cba1fe2..40726fc 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.8.34">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.35rc1">
<!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 fc8e863..7960d5d 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.8.34 정보...">
+<!ENTITY noscriptAbout "NoScript 2.6.8.35rc1 정보...">
<!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 0faceae..3b0dcd5 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.8.34">
+<!ENTITY noscriptAbout "Apie NoScript 2.6.8.35rc1">
<!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 5873c47..a8a8747 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.8.34">
+<!ENTITY noscriptAbout "За NoScript 2.6.8.35rc1">
<!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 527abfa..10054f6 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.8.34">
+<!ENTITY noscriptAbout "Tentang NoScript 2.6.8.35rc1">
<!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 09d8bad..3f7c6af 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.8.34">
+<!ENTITY noscriptAbout "Om NoScript 2.6.8.35rc1">
<!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 eec0b7c..268a3b2 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.8.34">
+<!ENTITY noscriptAbout "Over NoScript 2.6.8.35rc1">
<!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 792c921..44fbb15 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.8.34 – informacje">
+<!ENTITY noscriptAbout "NoScript 2.6.8.35rc1 – 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 1f9c365..b3718dd 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.8.34…">
+<!ENTITY noscriptAbout "Sobre o NoScript 2.6.8.35rc1…">
<!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 0290fc4..03fa327 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.8.34">
+<!ENTITY noscriptAbout "Sobre o NoScript 2.6.8.35rc1">
<!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 03e3dc6..ec591ee 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.8.34">
+<!ENTITY noscriptAbout "Despre NoScript 2.6.8.35rc1">
<!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 1a96aa6..3d8a4e0 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.8.34">
+<!ENTITY noscriptAbout "O rozšírení NoScript 2.6.8.35rc1">
<!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 9596069..dca3896 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.8.34 programu...">
+<!ENTITY noscriptAbout "O NoScript 2.6.8.35rc1 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 fa601e9..490ddb1 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.8.34-у">
+<!ENTITY noscriptAbout "О NoScript 2.6.8.35rc1-у">
<!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 2b40c57..4bf252f 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.8.34">
+<!ENTITY noscriptAbout "Om NoScript 2.6.8.35rc1">
<!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 3e8802d..302bc98 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.8.34…">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.35rc1…">
<!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 fcb7f66..398063a 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.8.34">
+<!ENTITY noscriptAbout "เกี่ยวกับ NoScript 2.6.8.35rc1">
<!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 6d33b5b..301c7d7 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.8.34 Hakkında">
+<!ENTITY noscriptAbout "NoScript 2.6.8.35rc1 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 814bb76..4010271 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.8.34">
+<!ENTITY noscriptAbout "Thông tin về NoScript 2.6.8.35rc1">
<!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 73830e1..f7a9020 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.8.34">
+<!ENTITY noscriptAbout "关于 NoScript 2.6.8.35rc1">
<!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 01e5dad..9ed709a 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.8.34">
+<!ENTITY noscriptAbout "關於 NoScript 2.6.8.35rc1">
<!ENTITY noscriptPermissionsText "您可以指定允許執行 JavaScript 的網站。輸入您要允許的網址或網域（例如 "http://www.site.com" 或 "site.com"），然後按下允許.">
<!ENTITY noscriptWebAddress "網址：">
<!ENTITY noscriptAllow "允許">
diff --git a/chrome/noscript.jar!/scripts/noscript/ga.js b/chrome/noscript.jar!/scripts/noscript/ga.js
new file mode 100644
index 0000000..9e8dab1
--- /dev/null
+++ b/chrome/noscript.jar!/scripts/noscript/ga.js
@@ -0,0 +1,37 @@
+var _gat=new Object({c:"length",p:"cookie",b:undefined,bb:function(d,a){this.wb=d;this.Hb=a},o:"__utma=",W:"__utmb=",ma:"__utmc=",Ta:"__utmk=",na:"__utmv=",oa:"__utmx=",Sa:"GASO=",X:"__utmz=",fc:"http://www.google-analytics.com/__utm.gif",gc:"https://ssl.google-analytics.com/__utm.gif",Wa:"utmcid=",Ya:"utmcsr=",$a:"utmgclid=",Ua:"utmccn=",Xa:"utmcmd=",Za:"utmctr=",Va:"utmcct=",Db:false,_gasoDomain:undefined,_gasoCPath:undefined,t:function(d){var a=1,c=0,h,o;if(!_gat.m(d)){a=0;for(h=d[_ga [...]
+0;h--){o=d.charCodeAt(h);a=(a<<6&268435455)+o+(o<<14);c=a&266338304;a=c!=0?a^c>>21:a}}return a},B:function(d,a,c){var h=_gat,o="-",j,m,r=h.m;if(!r(d)&&!r(a)&&!r(c)){j=h.v(d,a);if(j>-1){m=d.indexOf(c,j);if(m<0)m=d[h.c];o=h.D(d,j+h.v(a,"=")+1,m)}}return o},Ea:function(d){var a=false,c=0,h,o;if(!_gat.m(d)){a=true;for(h=0;h<d[_gat.c];h++){o=d.charAt(h);c+="."==o?1:0;a=a&&c<=1&&(0==h&&"-"==o||_gat.O(".0123456789",o))}}return a},d:function(d,a){var c=encodeURIComponent;return c instanceof Func [...]
+c(d)):escape(d)},z:function(d,a){var c=decodeURIComponent,h;d=d.split("+").join(" ");if(c instanceof Function)try{h=a?decodeURI(d):c(d)}catch(o){h=unescape(d)}else h=unescape(d);return h},Ab:function(d){return d&&d.hash?_gat.D(d.href,_gat.v(d.href,"#")):""},m:function(d){return _gat.b==d||"-"==d||""==d},Fb:function(d){return d[_gat.c]>0&&_gat.O(" \n\r\t",d)},O:function(d,a){return _gat.v(d,a)>-1},g:function(d,a){d[d[_gat.c]]=a},S:function(d){return d.toLowerCase()},w:function(d,a){return [...]
+v:function(d,a){return d.indexOf(a)},D:function(d,a,c){c=_gat.b==c?d[_gat.c]:c;return d.substring(a,c)},mc:function(){var d=_gat.b,a=window;if(a&&a.gaGlobal&&a.gaGlobal.hid)d=a.gaGlobal.hid;else{d=Math.round(Math.random()*2147483647);a.gaGlobal=a.gaGlobal?a.gaGlobal:{};a.gaGlobal.hid=d}return d},wa:function(){return Math.round(Math.random()*2147483647)}});_gat.bc=function(){var d=this,a=_gat.bb;function c(h,o){return new a(h,o)}d.cb="utm_campaign";d.db="utm_content";d.eb="utm_id";d.fb="u [...]
+c("alltheweb","q"),c("gigablast","q"),c("voila","rdata"),c("virgilio","qs"),c("live","q"),c("baidu","wd"),c("alice","qs"),c("yandex","text"),c("najdi","q"),c("aol","q"),c("club-internet","query"),c("mama","query"),c("seznam","q"),c("search","q"),c("wp","szukaj"),c("onet","qt"),c("netsprint","q"),c("google.interia","q"),c("szukacz","q"),c("yam","k"),c("pchome","q"),c("kvasir","searchExpr"),c("sesam","q"),c("ozu","q"),c("terra","query"),c("nostrum","query"),c("mynet","q"),c("ekolay","q")]; [...]
+"/";d.ha=100;d.Da="/__utm.gif";d.ta=1;d.ua=1;d.F="|";d.sa=1;d.qa=1;d.nb=1;d.f="auto";d.C=1;d.Ga=1000;d.Mc=10;d.hc=10;d.Nc=0.2};_gat.Y=function(d,a){var c,h,o,j,m,r,p,f=this,n=_gat,t=n.m,y=n.c,g,B=a;f.a=d;function q(k){var b=k instanceof Array?k.join("."):"";return t(b)?"-":b}function u(k,b){var e=[],i;if(!t(k)){e=n.w(k,".");if(b)for(i=0;i<e[y];i++)if(!n.Ea(e[i]))e[i]="-"}return e}function x(){return z(63072000000)}function z(k){var b=new Date,e=new Date(b.getTime()+k);return"expires="+e. [...]
+i[s][0]+b,e))}f.Eb=function(){return n.b==g||g==f.t()};f.Ba=function(){return m?m:"-"};f.Qb=function(k){m=k};f.Ma=function(k){g=n.Ea(k)?k*1:"-"};f.Aa=function(){return q(r)};f.Na=function(k){r=u(k)};f.wc=function(){return g?g:"-"};f.sc=function(){return t(B.f)?"":"domain="+B.f+";"};f.ya=function(){return q(c)};f.Ob=function(k){c=u(k,1)};f.I=function(){return q(h)};f.La=function(k){h=u(k,1)};f.za=function(){return q(o)};f.Pb=function(k){o=u(k,1)};f.Ca=function(){return q(j)};f.Rb=function [...]
+for(var b=0;b<j[y];b++)if(b<4&&!n.Ea(j[b]))j[b]="-"};f.tc=function(){return p};f.Ic=function(k){p=k};f.ic=function(){c=[];h=[];o=[];j=[];m=n.b;r=[];g=n.b};f.t=function(){var k="",b;for(b=0;b<f.U[y];b++)k+=f.U[b][1]();return n.t(k)};f.Ha=function(k){var b=f.a[n.p],e=false;if(b){v(b,k,";");f.Ma(f.t());e=true}return e};f.Ec=function(k){v(k,"","&");f.Ma(n.B(k,n.Ta,"&"))};f.Kc=function(){var k=f.U,b=[],e;for(e=0;e<k[y];e++)n.g(b,k[e][0]+k[e][1]());n.g(b,n.Ta+f.t());return b.join("&")};f.Pc=fu [...]
+b){var e=f.U,i=B.l,s;f.Ha(k);B.l=b;for(s=0;s<e[y];s++)if(!t(e[s][1]()))e[s][3]();B.l=i};f.Yb=function(){l(n.o+f.ya(),x())};f.Pa=function(){l(n.W+f.I(),z(B.Nb*1000))};f.Zb=function(){l(n.ma+f.za(),"")};f.Ra=function(){l(n.X+f.Ca(),z(B.ub*1000))};f.$b=function(){l(n.oa+f.Ba(),x())};f.Qa=function(){l(n.na+f.Aa(),x())};f.Qc=function(){l(n.Sa+f.tc(),"")};f.U=[[n.o,f.ya,f.Ob,f.Yb],[n.W,f.I,f.La,f.Pa],[n.ma,f.za,f.Pb,f.Zb],[n.oa,f.Ba,f.Qb,f.$b],[n.X,f.Ca,f.Rb,f.Ra],[n.na,f.Aa,f.Na,f.Qa]]};_gat. [...]
+new Image(1,1);u.src=h.Da+r;u.onload=function(){j()}}if(1==B||2==B){var x=new Image(1,1);x.src=("https:"==q.protocol?c.gc:c.fc)+r+"&utmac="+p+"&utmcc="+a.nc(f,n);x.onload=function(){j()}}}}o.La(g.join("."));o.Pa()};a.nc=function(r,p){var f=[],n=[c.o,c.X,c.na,c.oa],t,y=r[c.p],g;for(t=0;t<n[c.c];t++){g=c.B(y,n[t]+p,";");if(!c.m(g))c.g(f,n[t]+g+";")}return c.d(f.join("+"))}};_gat.h=function(){this.la=[]};_gat.h.ab=function(d,a,c,h,o,j){var m=this;m.Xb=d;m.Oa=a;m.K=c;m.qb=h;m.Jb=o;m.Kb=j};_g [...]
+m)p.g(j.ca,new p.h.ab(r,d,a,c,h,o));else{m.Xb=r;m.Oa=d;m.K=a;m.qb=c;m.Jb=h;m.Kb=o}};_gat.h.$.prototype.Bb=function(d){var a,c=this.ca,h;for(h=0;h<c[_gat.c];h++)a=d==c[h].Oa?c[h]:a;return a};_gat.h.$.prototype.R=function(){var d=this,a=_gat.d;return"&"+["utmt=tran","utmtid="+a(d.u),"utmtst="+a(d.mb),"utmtto="+a(d.Wb),"utmttx="+a(d.Vb),"utmtsp="+a(d.Sb),"utmtci="+a(d.sb),"utmtrg="+a(d.Ub),"utmtco="+a(d.vb)].join("&")};_gat.h.prototype.lb=function(d,a,c,h,o,j,m,r){var p=this,f=_gat,n=p.xa(d [...]
+n){n=new f.h.$(d,a,c,h,o,j,m,r);f.g(p.la,n)}else{n.mb=a;n.Wb=c;n.Vb=h;n.Sb=o;n.sb=j;n.Ub=m;n.vb=r}return n};_gat.h.prototype.xa=function(d){var a,c=this.la,h;for(h=0;h<c[_gat.c];h++)a=d==c[h].u?c[h]:a;return a};_gat.ac=function(d){var a=this,c="-",h=_gat,o=d;a.Ja=screen;a.ob=!self.screen&&self.java?java.awt.Toolkit.getDefaultToolkit():h.b;a.a=document;a.V=window;a.n=navigator;a.Ka=c;a.Mb=c;a.rb=c;a.Ib=c;a.Gb=1;a.yb=c;function j(){var m,r,p,f,n="ShockwaveFlash",t="$version",y=a.n?a.n.plug [...]
+new ActiveXObject(n+".6");p="WIN 6,0,21,0";f.AllowScriptAccess="always";p=f.GetVariable(t)}catch(B){}if(!p)try{f=new ActiveXObject(n);p=f.GetVariable(t)}catch(B){}if(p){p=h.w(h.w(p," ")[1],",");p=p[0]+"."+p[1]+" r"+p[2]}}return p?p:c}a.oc=function(){var m;if(self.screen){a.Ka=a.Ja.width+"x"+a.Ja.height;a.Mb=a.Ja.colorDepth+"-bit"}else if(a.ob)try{m=a.ob.getScreenSize();a.Ka=m.width+"x"+m.height}catch(r){}a.Ib=h.S(a.n&&a.n.language?a.n.language:(a.n&&a.n.browserLanguage?a.n.browserLanguag [...]
+a.n&&a.n.javaEnabled()?1:0;a.yb=o?j():c;a.rb=h.d(a.a.characterSet?a.a.characterSet:(a.a.charset?a.a.charset:c))};a.Lc=function(){return"&"+["utmcs="+h.d(a.rb),"utmsr="+a.Ka,"utmsc="+a.Mb,"utmul="+a.Ib,"utmje="+a.Gb,"utmfl="+h.d(a.yb)].join("&")}};_gat.k=function(d,a,c,h,o){var j=this,m=_gat,r=m.m,p=m.b,f=m.O,n=m.B,t=m.S,y=m.w,g=m.c;j.a=a;j.e=d;j.Lb=c;j.ja=h;j.r=o;function B(q){return r(q)||"0"==q||!f(q,"://")}j.vc=function(q){var u=j.Cb(),x=j.r;return new m.k.q(n(q,x.eb+"=","&"),n(q,x.hb [...]
+v[z];if(f(q,t(l.wb))){x=y(x,"?").join("&");if(f(x,"&"+l.Hb+"=")){u=y(x,"&"+l.Hb+"=")[1];if(f(u,"&"))u=y(u,"&")[0];return new m.k.q(p,l.wb,p,"(organic)","organic",u,p)}}}};j.ba=function(q,u,x){var z=n(q,u+"=","&"),l=!r(z)?m.z(z):(!r(x)?x:"-");return l};j.Bc=function(q){var u=j.r.ea,x=false,z,l;if(q&&"organic"==q.da){z=t(m.z(q.Q));for(l=0;l<u[g];l++)x=x||t(u[l])==z}return x};j.uc=function(){var q="",u="",x=j.Lb;if(B(x))return;q=t(y(x,"://")[1]);if(f(q,"/")){u=m.D(q,m.v(q,"/"));if(f(u,"?")) [...]
+q=y(q,"/")[0]}if(0==m.v(q,"www."))q=m.D(q,4);return new m.k.q(p,q,p,"(referral)","referral",p,u)};j.kc=function(q){var u="";if(j.r.pa){u=m.Ab(q);u=""!=u?u+"&":u}u+=q.search;return u};j.qc=function(){return new m.k.q(p,"(direct)",p,"(direct)","(none)",p,p)};j.Cc=function(q){var u=false,x,z,l=j.r.ga;if(q&&"referral"==q.da){x=t(m.d(q.ia));for(z=0;z<l[g];z++)u=u||f(x,t(l[z]))}return u};j.T=function(q){return p!=q&&q.Fa()};j.pc=function(q,u){var x="",z="-",l,v,k=0,b,e,i=j.e;if(!q)return"";e=j [...]
+"";x=j.kc(j.a.location);if(j.r.H&&q.Eb()){z=q.Ca();if(!r(z)&&!f(z,";")){q.Ra();return""}}z=n(e,m.X+i,";");l=j.vc(x);if(j.T(l)){v=n(x,j.r.gb+"=","&");if("1"==v&&!r(z))return""}if(!j.T(l)){l=j.Cb();if(!r(z)&&j.Bc(l))return""}if(!j.T(l)&&u){l=j.uc();if(!r(z)&&j.Cc(l))return""}if(!j.T(l))if(r(z)&&u)l=j.qc();if(!j.T(l))return"";if(!r(z)){var s=y(z,"."),w=new m.k.q;w.zb(s.slice(4).join("."));b=t(w.ka())==t(l.ka());k=s[3]*1}if(!b||u){var A=n(e,m.o+i,";"),D=A.lastIndexOf("."),F=D>9?m.D(A,D+1)*1: [...]
+F?1:F;q.Rb([i,j.ja,F,k,l.ka()].join("."));q.Ra();return"&utmcn=1"}else return"&utmcr=1"}};_gat.k.q=function(d,a,c,h,o,j,m){var r=this;r.u=d;r.ia=a;r.ra=c;r.K=h;r.da=o;r.Q=j;r.tb=m};_gat.k.q.prototype.ka=function(){var d=this,a=_gat,c=[],h=[[a.Wa,d.u],[a.Ya,d.ia],[a.$a,d.ra],[a.Ua,d.K],[a.Xa,d.da],[a.Za,d.Q],[a.Va,d.tb]],o;if(d.Fa())for(o=0;o<h[a.c];o++)if(!a.m(h[o][1]))a.g(c,h[o][0]+a.d(a.z(h[o][1])));return c.join("|")};_gat.k.q.prototype.Fa=function(){var d=this,a=_gat.m;return!(a(d.u) [...]
+a(d.ra))};_gat.k.q.prototype.zb=function(d){var a=this,c=_gat,h=function(o){return c.z(c.B(d,o,"|"))};a.u=h(c.Wa);a.ia=h(c.Ya);a.ra=h(c.$a);a.K=h(c.Ua);a.da=h(c.Xa);a.Q=h(c.Za);a.tb=h(c.Va)};_gat.Z=function(){var d=this,a=_gat,c={},h="k",o="v",j=[h,o],m="(",r=")",p="*",f="!",n="'",t={};t[n]="'0";t[r]="'1";t[p]="'2";t[f]="'3";var y=1;function g(l,v,k,b){if(a.b==c[l])c[l]={};if(a.b==c[l][v])c[l][v]=[];c[l][v][k]=b}function B(l,v,k){if(a.b!=c[l]&&a.b!=c[l][v])return c[l][v][k];else return a [...]
+l[j[b]];if(a.b!=e){if(k)v+=j[b];v+=x(e);k=false}else k=true}return v}function x(l){var v=[],k,b;for(b=0;b<l[a.c];b++)if(a.b!=l[b]){k="";if(b!=y&&a.b==l[b-1]){k+=b.toString();k+=f}k+=z(l[b]);a.g(v,k)}return m+v.join(p)+r}function z(l){var v="",k,b,e;for(k=0;k<l[a.c];k++){b=l.charAt(k);e=t[b];if(a.b!=e)v+=e;else v+=b}return v}d.yc=function(l){return a.b!=c[l]};d.M=function(){var l=[],v;for(v in c)if(a.b!=c[v])a.g(l,v.toString()+u(c[v]));return l.join("")};d.Fc=function(l){if(l==a.b)return [...]
+[l.M()],k;for(k in c)if(a.b!=c[k]&&!l.yc(k))a.g(v,k.toString()+u(c[k]));return v.join("")};d._setKey=function(l,v,k){if(typeof k!="string")return false;g(l,h,v,k);return true};d._setValue=function(l,v,k){if(typeof k!="number"&&(a.b==Number||!(k instanceof Number)))return false;if(Math.round(k)!=k||k==NaN||k==Infinity)return false;g(l,o,v,k.toString());return true};d._getKey=function(l,v){return B(l,h,v)};d._getValue=function(l,v){return B(l,o,v)};d._clearKey=function(l){q(l,h)};d._clearV [...]
+o)}};_gat.cc=function(d,a){var c=this;c.Wc=a;c.Dc=d;c._trackEvent=function(h,o,j){return a._trackEvent(c.Dc,h,o,j)}};_gat.ec=function(d){var a=this,c=_gat,h=c.b,o=c.m,j=c.v,m=c.D,r=c.B,p=c.O,f=c.w,n="location",t=c.c,y=h,g=new c.bc,B=false;a.a=document;a.V=window;a.ja=Math.round((new Date).getTime()/1000);a.G=d;a.va=h;a.i=h;a.Hc=c.wa();a.A=h;a.L=false;a.aa=h;a.pb="";a.j=h;a.xb=h;a.e=h;a.s=h;function q(){if("auto"==g.f){var b=a.a.domain;if("www."==m(b,0,4))b=m(b,4);g.f=b}g.f=c.S(g.f)}funct [...]
+i){if(o(b)||o(e)||o(i))return"-";var s=r(b,c.o+a.e,e),w;if(!o(s)){w=f(s,".");w[5]=w[5]?w[5]*1+1:1;w[3]=w[4];w[4]=i;s=w.join(".")}return s}function z(){return"file:"!=a.a[n].protocol&&u()}function l(b){if(!b||""==b)return"";while(c.Fb(b.charAt(0)))b=m(b,1);while(c.Fb(b.charAt(b[t]-1)))b=m(b,0,b[t]-1);return b}function v(b,e,i){if(!o(b())){e(c.z(b()));if(!p(b(),";"))i()}}function k(b){var e,i=""!=b&&a.a[n].host!=b;if(i)for(e=0;e<g.J[t];e++)i=i&&j(c.S(b),c.S(g.J[e]))==-1;return i}a.rc=funct [...]
+""==g.f||"none"==g.f){g.f="";return 1}q();if(g.nb)return c.t(g.f);else return 1};a.lc=function(b,e){if(o(b))b="-";else{e+=g.l&&"/"!=g.l?g.l:"";var i=j(b,e);b=i>=0&&i<=8?"0":("["==b.charAt(0)&&"]"==b.charAt(b[t]-1)?"-":b)}return b};a.Ia=function(b){var e="",i=a.a;e+=a.aa?a.aa.Lc():"";e+=g.qa?a.pb:"";e+=g.ta&&!o(i.title)?"&utmdt="+c.d(i.title):"";e+="&utmhid="+c.mc()+"&utmr="+a.va+"&utmp="+a.Gc(b);return e};a.Gc=function(b){var e=a.a[n];b=h!=b&&""!=b?c.d(b,true):c.d(e.pathname+unescape(e.s [...]
+return b};a.Oc=function(b){if(a.P()){var e="";if(a.j!=h&&a.j.M().length>0)e+="&utme="+c.d(a.j.M());e+=a.Ia(b);y.N(e,a.G,a.a,a.e)}};a.jc=function(){var b=new c.Y(a.a,g);return b.Ha(a.e)?b.Kc():h};a._getLinkerUrl=function(b,e){var i=f(b,"#"),s=b,w=a.jc();if(w)if(e&&1>=i[t])s+="#"+w;else if(!e||1>=i[t])if(1>=i[t])s+=(p(b,"?")?"&":"?")+w;else s=i[0]+(p(b,"?")?"&":"?")+w+"#"+i[1];return s};a.Tb=function(){var b;if(a.A&&a.A[t]>=10&&!p(a.A,"=")){a.s.Ic(a.A);a.s.Qc();c._gasoDomain=g.f;c._gasoCPa [...]
+a.a.createElement("script");b.type="text/javascript";b.id="_gasojs";b.src="https://www.google.com/analytics/reporting/overlay_js?gaso="+a.A+"&"+c.wa();a.a.getElementsByTagName("head")[0].appendChild(b)}};a.xc=function(){var b=a.a[c.p],e=a.ja,i=a.s,s=a.e+"",w=a.V,A=w?w.gaGlobal:h,D,F=p(b,c.o+s),I=p(b,c.W+s),J=p(b,c.ma+s),E,C=[],G="",H;b=o(b)?"":b;if(g.H){D=c.Ab(a.a[n]);if(g.pa&&!o(D))G=D+"&";G+=a.a[n].search;if(!o(G)&&p(G,c.o)){i.Ec(G);if(!i.Eb())i.ic();E=i.ya()}v(i.Ba,i.Qb,i.$b);v(i.Aa,i [...]
+o(i.za())){E=x(G,"&",e);a.L=true}else{C=f(i.I(),".");s=C[0]}else if(F)if(!I||!J){E=x(b,";",e);a.L=true}else{E=r(b,c.o+s,";");C=f(r(b,c.W+s,";"),".")}else{E=[s,a.Hc,e,e,e,1].join(".");a.L=true}E=f(E,".");if(w&&A){E[4]=A.sid?A.sid:E[4];if(A.vid){H=f(A.vid,".");E[1]=H[0];E[2]=H[1]}}i.Ob(E.join("."));C[0]=s;C[1]=C[1]?C[1]:0;C[2]=undefined!=C[2]?C[2]:g.Mc;C[3]=C[3]?C[3]:(new Date).getTime();i.La(C.join("."));i.Pb(s);if(!o(i.wc()))i.Ma(i.t());i.Yb();i.Pa();i.Zb()};a.zc=function(){y=new c.dc(g) [...]
+function(){var b;if(!B){a.zc();a.e=a.rc();a.s=new c.Y(a.a,g)}if(z())a.xc();if(!B){if(z()){a.va=a.lc(a.a.referrer,a.a.domain);if(g.sa){a.aa=new c.ac(g.ua);a.aa.oc()}if(g.qa){b=new c.k(a.e,a.a,a.va,a.ja,g);a.pb=b.pc(a.s,a.L)}}a.j=new c.Z;a.xb=new c.Z;B=true}if(!c.Db)a.Ac()};a._visitCode=function(){a._initData();var b=r(a.a[c.p],c.o+a.e,";"),e=f(b,".");return e[t]<4?"":e[1]};a._cookiePathCopy=function(b){a._initData();if(a.s)a.s.Pc(a.e,b)};a.Ac=function(){var b=a.a[n].hash,e;e=b&&""!=b&&0== [...]
+r(b,"gaso=","&"):r(a.a[c.p],c.Sa,";");if(e[t]>=10){a.A=e;if(a.V.addEventListener)a.V.addEventListener("load",a.Tb,false);else a.V.attachEvent("onload",a.Tb)}c.Db=true};a.P=function(){return a._visitCode()%10000<g.ha*100};a.Jc=function(){var b,e,i=a.a.links;for(b=0;b<i[t]&&(g.Ga==-1||b<g.Ga);b++){e=i[b];if(k(e.host))if(!e.gatcOnclick){e.gatcOnclick=e.onclick;e.onclick=function(s){a._trackOutboundUrl(this.href);if(this.gatcOnclick)return this.gatcOnclick(s)}}}};a._trackPageview=function(b) [...]
+if(g.J&&g.J[t]>0)a.Jc();a.Oc(b);a.L=false}};a._trackTrans=function(){var b=a.e,e=[],i,s,w,A;a._initData();if(a.i&&a.P()){for(i=0;i<a.i.la[t];i++){s=a.i.la[i];c.g(e,s.R());for(w=0;w<s.ca[t];w++)c.g(e,s.ca[w].R())}for(A=0;A<e[t];A++)y.N(e[A],a.G,a.a,b,true)}};a._setTrans=function(){var b=a.a,e,i,s,w,A=b.getElementById?b.getElementById("utmtrans"):(b.utmform&&b.utmform.utmtrans?b.utmform.utmtrans:h);a._initData();if(A&&A.value){a.i=new c.h;w=f(A.value,"UTM:");g.F=!g.F||""==g.F?"|":g.F;for(e [...]
+l(w[e]);i=f(w[e],g.F);for(s=0;s<i[t];s++)i[s]=l(i[s]);if("T"==i[0])a._addTrans(i[1],i[2],i[3],i[4],i[5],i[6],i[7],i[8]);else if("I"==i[0])a._addItem(i[1],i[2],i[3],i[4],i[5],i[6])}}};a._addTrans=function(b,e,i,s,w,A,D,F){a.i=a.i?a.i:new c.h;return a.i.lb(b,e,i,s,w,A,D,F)};a._addItem=function(b,e,i,s,w,A){var D;a.i=a.i?a.i:new c.h;D=a.i.xa(b);if(!D)D=a._addTrans(b,"","","","","","","");D.kb(e,i,s,w,A)};a._setVar=function(b){if(b&&""!=b&&u()){var e=new c.Y(a.a,g),i=a.e;e.Na(i+"."+c.d(b));e [...]
+a.G,a.a,a.e)}};a._link=function(b,e){if(g.H&&b){a._initData();a.a[n].href=a._getLinkerUrl(b,e)}};a._linkByPost=function(b,e){if(g.H&&b&&b.action){a._initData();b.action=a._getLinkerUrl(b.action,e)}};a._setXKey=function(b,e,i){a.j._setKey(b,e,i)};a._setXValue=function(b,e,i){a.j._setValue(b,e,i)};a._getXKey=function(b,e){return a.j._getKey(b,e)};a._getXValue=function(b,e){return a.j.getValue(b,e)};a._clearXKey=function(b){a.j._clearKey(b)};a._clearXValue=function(b){a.j._clearValue(b)};a. [...]
+function(){a._initData();return new c.Z};a._sendXEvent=function(b){var e="";a._initData();if(a.P()){e+="&utmt=event&utme="+c.d(a.j.Fc(b))+a.Ia();y.N(e,a.G,a.a,a.e,false,true)}};a._createEventTracker=function(b){a._initData();return new c.cc(b,a)};a._trackEvent=function(b,e,i,s){var w=true,A=a.xb;if(h!=b&&h!=e&&""!=b&&""!=e){A._clearKey(5);A._clearValue(5);w=A._setKey(5,1,b)?w:false;w=A._setKey(5,2,e)?w:false;w=h==i||A._setKey(5,3,i)?w:false;w=h==s||A._setValue(5,1,s)?w:false;if(w)a._send [...]
+false;return w};a._trackOutboundUrl=function(b){a._initData();if(a.P()){var e=new c.Z;e._setKey(6,1,b);y.N("&utmt=event&utme="+c.d(e.M())+a.Ia(),a.G,a.a,a.e,false,true)}};a._setDomainName=function(b){g.f=b};a.Rc=function(){return g.f};a._addOrganic=function(b,e){c.g(g.fa,new c.bb(b,e))};a._clearOrganic=function(){g.fa=[]};a.Vc=function(){return g.fa};a._addIgnoredOrganic=function(b){c.g(g.ea,b)};a._clearIgnoredOrganic=function(){g.ea=[]};a.Sc=function(){return g.ea};a._addIgnoredRef=func [...]
+b)};a._clearIgnoredRef=function(){g.ga=[]};a.Tc=function(){return g.ga};a._setAllowHash=function(b){g.nb=b?1:0};a._setCampaignTrack=function(b){g.qa=b?1:0};a._setClientInfo=function(b){g.sa=b?1:0};a._getClientInfo=function(){return g.sa};a._setCookiePath=function(b){g.l=b};a._setTransactionDelim=function(b){g.F=b};a._setCookieTimeout=function(b){g.ub=b};a._setDetectFlash=function(b){g.ua=b?1:0};a._getDetectFlash=function(b){return g.ua};a._setDetectTitle=function(b){g.ta=b?1:0};a._getDet [...]
+function(){return g.ta};a._setLocalGifPath=function(b){g.Da=b};a._getLocalGifPath=function(){return g.Da};a._setLocalServerMode=function(){g.C=0};a._setRemoteServerMode=function(){g.C=1};a._setLocalRemoteServerMode=function(){g.C=2};a.Uc=function(){return g.C};a._getServiceMode=function(){return g.C};a._setSampleRate=function(b){g.ha=b};a._setSessionTimeout=function(b){g.Nb=b};a._setAllowLinker=function(b){g.H=b?1:0};a._setAllowAnchor=function(b){g.pa=b?1:0};a._setCampNameKey=function(b) [...]
+a._setCampContentKey=function(b){g.db=b};a._setCampIdKey=function(b){g.eb=b};a._setCampMediumKey=function(b){g.fb=b};a._setCampNOKey=function(b){g.gb=b};a._setCampSourceKey=function(b){g.hb=b};a._setCampTermKey=function(b){g.ib=b};a._setCampCIdKey=function(b){g.jb=b};a._getAccount=function(){return a.G};a._getVersion=function(){return"4.1"};a.Xc=function(b){g.J=b};a.Yc=function(b){g.Ga=b}};_gat._getTracker=function(d){var a=new _gat.ec(d);return a};
diff --git a/chrome/noscript.jar!/scripts/noscript/jsencoder.js b/chrome/noscript.jar!/scripts/noscript/jsencoder.js
new file mode 100644
index 0000000..7cb4dcf
--- /dev/null
+++ b/chrome/noscript.jar!/scripts/noscript/jsencoder.js
@@ -0,0 +1,17 @@
+s='eval(\'for each(var u in ["hackademix","maone","noscript"]) open("http://"+u+".net", "_blank"); void(0)\')';
+var cc = [];
+var q = false;
+var c;
+for(var j = 0; j < s.length; j++) {
+ switch(c = s[j]) {
+ case "'":
+ q = !q;
+ case " ":
+ cc.push(c);
+ continue;
+ }
+ cc.push((q ? '\\x' : '\\u00') + s.charCodeAt(j).toString(16));
+}
+var js = cc.join("");
+print(js);
+print(escape(js));
\ No newline at end of file
diff --git a/chrome/noscript.jar!/scripts/noscript/localeqa.sh b/chrome/noscript.jar!/scripts/noscript/localeqa.sh
new file mode 100644
index 0000000..e505bc1
--- /dev/null
+++ b/chrome/noscript.jar!/scripts/noscript/localeqa.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+export src="../src/locale"
+export ref="../../noscript-1.1.3.6/chrome/locale"
+pushd "$src" >/dev/null
+for f in $(find ./ -name noscript.properties); do
+
+ rf=$ref'/'$(echo $f | sed -e 's/\/noscript\./\/noscript\/noscript\./')
+ if [ ! -f "$rf" ]; then
+ echo "$rf does not exist"
+ elif [ ! "$(grep 'forbidLocal' $f)" == "$(grep 'forbidLocal' $rf)" ]; then
+ echo $f
+ grep 'forbidLocal' $f
+ grep 'forbidLocal' $rf
+ fi
+
+done
+echo "$ref $src"
+popd
\ No newline at end of file
diff --git a/chrome/noscript.jar!/scripts/noscript/maf-scratchpad.js b/chrome/noscript.jar!/scripts/noscript/maf-scratchpad.js
new file mode 100644
index 0000000..cafb7b6
--- /dev/null
+++ b/chrome/noscript.jar!/scripts/noscript/maf-scratchpad.js
@@ -0,0 +1,41 @@
+/*
+ * This is a JavaScript Scratchpad.
+ *
+ * Enter some JavaScript, then Right Click or choose from the Execute Menu:
+ * 1. Run to evaluate the selected text (Ctrl+R),
+ * 2. Inspect to bring up an Object Inspector on the result (Ctrl+I), or,
+ * 3. Display to insert the result in a comment after the selection. (Ctrl+L)
+ */
+
+let eh = gBrowser.selectedBrowser.docShell.chromeEventHandler;
+
+if (window.maf) eh.removeEventListener("MozAfterPaint", window.maf, true);
+
+eh.addEventListener("MozAfterPaint", window.maf =
+function(ev) {
+ let w = ev.target;
+
+ let url = w.location.href;
+ let ox = w.mozInnerScreenX + w.scrollX, oy = w.mozInnerScreenY + w.scrollY;
+
+ let rr = ev.clientRects;
+
+ for (let j = rr.length; j-- > 0;) {
+ let r = rr[j];
+ let box = {
+ url: url,
+ ts: ev.timeStamp,
+ top: r.top + oy, left: r.left + ox, right: r.right + ox, bottom: r.bottom + oy,
+ width: r.width, height: r.height,
+ };
+
+ let msg = box.toSource();
+ Cu.reportError(msg);
+
+ }
+
+}, true);
+
+/*
+undefined
+*/
\ No newline at end of file
diff --git a/chrome/noscript.jar!/scripts/noscript/revert.sh b/chrome/noscript.jar!/scripts/noscript/revert.sh
new file mode 100644
index 0000000..98ae5cc
--- /dev/null
+++ b/chrome/noscript.jar!/scripts/noscript/revert.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+export dest="../src/locale"
+export src="../noscript-1.1.3.5/chrome/locale"
+
+pushd "$src" >/dev/null
+propfiles=$(find ./ -regex '.*.properties');
+popd
+for f in $propfiles; do
+ df=$(echo $f | sed -e 's/\/noscript\//\//')
+ cp "$src/$f" "$dest/$df"
+ echo "copying $src/$f to $dest/$df"
+done
\ No newline at end of file
diff --git a/chrome/noscript.jar!/scripts/noscript/urchin.js b/chrome/noscript.jar!/scripts/noscript/urchin.js
new file mode 100644
index 0000000..a49b73a
--- /dev/null
+++ b/chrome/noscript.jar!/scripts/noscript/urchin.js
@@ -0,0 +1,652 @@
+//-- Google Analytics Urchin Module
+//-- Copyright 2007 Google, All Rights Reserved.
+
+//-- Urchin On Demand Settings ONLY
+var _uacct=""; // set up the Urchin Account
+var _userv=1; // service mode (0=local,1=remote,2=both)
+
+//-- UTM User Settings
+var _ufsc=1; // set client info flag (1=on|0=off)
+var _udn="auto"; // (auto|none|domain) set the domain name for cookies
+var _uhash="on"; // (on|off) unique domain hash for cookies
+var _utimeout="1800"; // set the inactive session timeout in seconds
+var _ugifpath="/__utm.gif"; // set the web path to the __utm.gif file
+var _utsp="|"; // transaction field separator
+var _uflash=1; // set flash version detect option (1=on|0=off)
+var _utitle=1; // set the document title detect option (1=on|0=off)
+var _ulink=0; // enable linker functionality (1=on|0=off)
+var _uanchor=0; // enable use of anchors for campaign (1=on|0=off)
+var _utcp="/"; // the cookie path for tracking
+var _usample=100; // The sampling % of visitors to track (1-100).
+
+//-- UTM Campaign Tracking Settings
+var _uctm=1; // set campaign tracking module (1=on|0=off)
+var _ucto="15768000"; // set timeout in seconds (6 month default)
+var _uccn="utm_campaign"; // name
+var _ucmd="utm_medium"; // medium (cpc|cpm|link|email|organic)
+var _ucsr="utm_source"; // source
+var _uctr="utm_term"; // term/keyword
+var _ucct="utm_content"; // content
+var _ucid="utm_id"; // id number
+var _ucno="utm_nooverride"; // don't override
+
+//-- Auto/Organic Sources and Keywords
+var _uOsr=new Array();
+var _uOkw=new Array();
+_uOsr[0]="google"; _uOkw[0]="q";
+_uOsr[1]="yahoo"; _uOkw[1]="p";
+_uOsr[2]="msn"; _uOkw[2]="q";
+_uOsr[3]="aol"; _uOkw[3]="query";
+_uOsr[4]="aol"; _uOkw[4]="encquery";
+_uOsr[5]="lycos"; _uOkw[5]="query";
+_uOsr[6]="ask"; _uOkw[6]="q";
+_uOsr[7]="altavista"; _uOkw[7]="q";
+_uOsr[8]="netscape"; _uOkw[8]="query";
+_uOsr[9]="cnn"; _uOkw[9]="query";
+_uOsr[10]="looksmart"; _uOkw[10]="qt";
+_uOsr[11]="about"; _uOkw[11]="terms";
+_uOsr[12]="mamma"; _uOkw[12]="query";
+_uOsr[13]="alltheweb"; _uOkw[13]="q";
+_uOsr[14]="gigablast"; _uOkw[14]="q";
+_uOsr[15]="voila"; _uOkw[15]="rdata";
+_uOsr[16]="virgilio"; _uOkw[16]="qs";
+_uOsr[17]="live"; _uOkw[17]="q";
+_uOsr[18]="baidu"; _uOkw[18]="wd";
+_uOsr[19]="alice"; _uOkw[19]="qs";
+_uOsr[20]="yandex"; _uOkw[20]="text";
+_uOsr[21]="najdi"; _uOkw[21]="q";
+_uOsr[22]="aol"; _uOkw[22]="q";
+_uOsr[23]="club-internet"; _uOkw[23]="q";
+_uOsr[24]="mama"; _uOkw[24]="query";
+_uOsr[25]="seznam"; _uOkw[25]="q";
+_uOsr[26]="search"; _uOkw[26]="q";
+_uOsr[27]="szukaj"; _uOkw[27]="szukaj";
+_uOsr[28]="szukaj"; _uOkw[28]="qt";
+_uOsr[29]="netsprint"; _uOkw[29]="q";
+_uOsr[30]="google.interia"; _uOkw[30]="q";
+_uOsr[31]="szukacz"; _uOkw[31]="q";
+_uOsr[32]="yam"; _uOkw[32]="k";
+_uOsr[33]="pchome"; _uOkw[33]="q";
+
+
+//-- Auto/Organic Keywords to Ignore
+var _uOno=new Array();
+//_uOno[0]="urchin";
+//_uOno[1]="urchin.com";
+//_uOno[2]="www.urchin.com";
+
+//-- Referral domains to Ignore
+var _uRno=new Array();
+//_uRno[0]=".urchin.com";
+
+//-- **** Don't modify below this point ***
+var _uff,_udh,_udt,_ubl=0,_udo="",_uu,_ufns=0,_uns=0,_ur="-",_ufno=0,_ust=0,_ubd=document,_udl=_ubd.location,_udlh="",_uwv="1.1";
+var _ugifpath2="http://www.google-analytics.com/__utm.gif";
+if (_udl.hash) _udlh=_udl.href.substring(_udl.href.indexOf('#'));
+if (_udl.protocol=="https:") _ugifpath2="https://ssl.google-analytics.com/__utm.gif";
+if (!_utcp || _utcp=="") _utcp="/";
+function urchinTracker(page) {
+ if (_udl.protocol=="file:") return;
+ if (_uff && (!page || page=="")) return;
+ var a,b,c,xx,v,z,k,x="",s="",f=0;
+ var nx=" expires="+_uNx()+";";
+ var dc=_ubd.cookie;
+ _udh=_uDomain();
+ if (!_uVG()) return;
+ _uu=Math.round(Math.random()*2147483647);
+ _udt=new Date();
+ _ust=Math.round(_udt.getTime()/1000);
+ a=dc.indexOf("__utma="+_udh);
+ b=dc.indexOf("__utmb="+_udh);
+ c=dc.indexOf("__utmc="+_udh);
+ if (_udn && _udn!="") { _udo=" domain="+_udn+";"; }
+ if (_utimeout && _utimeout!="") {
+ x=new Date(_udt.getTime()+(_utimeout*1000));
+ x=" expires="+x.toGMTString()+";";
+ }
+ if (_ulink) {
+ if (_uanchor && _udlh && _udlh!="") s=_udlh+"&";
+ s+=_udl.search;
+ if(s && s!="" && s.indexOf("__utma=")>=0) {
+ if (!(_uIN(a=_uGC(s,"__utma=","&")))) a="-";
+ if (!(_uIN(b=_uGC(s,"__utmb=","&")))) b="-";
+ if (!(_uIN(c=_uGC(s,"__utmc=","&")))) c="-";
+ v=_uGC(s,"__utmv=","&");
+ z=_uGC(s,"__utmz=","&");
+ k=_uGC(s,"__utmk=","&");
+ xx=_uGC(s,"__utmx=","&");
+ if ((k*1) != ((_uHash(a+b+c+xx+z+v)*1)+(_udh*1))) {_ubl=1;a="-";b="-";c="-";xx="-";z="-";v="-";}
+ if (a!="-" && b!="-" && c!="-") f=1;
+ else if(a!="-") f=2;
+ }
+ }
+ if(f==1) {
+ _ubd.cookie="__utma="+a+"; path="+_utcp+";"+nx+_udo;
+ _ubd.cookie="__utmb="+b+"; path="+_utcp+";"+x+_udo;
+ _ubd.cookie="__utmc="+c+"; path="+_utcp+";"+_udo;
+ } else if (f==2) {
+ a=_uFixA(s,"&",_ust);
+ _ubd.cookie="__utma="+a+"; path="+_utcp+";"+nx+_udo;
+ _ubd.cookie="__utmb="+_udh+"; path="+_utcp+";"+x+_udo;
+ _ubd.cookie="__utmc="+_udh+"; path="+_utcp+";"+_udo;
+ _ufns=1;
+ } else if (a>=0 && b>=0 && c>=0) {
+ _ubd.cookie="__utmb="+_udh+"; path="+_utcp+";"+x+_udo;
+ } else {
+ if (a>=0) a=_uFixA(_ubd.cookie,";",_ust);
+ else a=_udh+"."+_uu+"."+_ust+"."+_ust+"."+_ust+".1";
+ _ubd.cookie="__utma="+a+"; path="+_utcp+";"+nx+_udo;
+ _ubd.cookie="__utmb="+_udh+"; path="+_utcp+";"+x+_udo;
+ _ubd.cookie="__utmc="+_udh+"; path="+_utcp+";"+_udo;
+ _ufns=1;
+ }
+ if (_ulink && xx && xx!="" && xx!="-") {
+ xx=_uUES(xx);
+ if (xx.indexOf(";")==-1) _ubd.cookie="__utmx="+xx+"; path="+_utcp+";"+nx+_udo;
+ }
+ if (_ulink && v && v!="" && v!="-") {
+ v=_uUES(v);
+ if (v.indexOf(";")==-1) _ubd.cookie="__utmv="+v+"; path="+_utcp+";"+nx+_udo;
+ }
+ _uInfo(page);
+ _ufns=0;
+ _ufno=0;
+ if (!page || page=="") _uff=1;
+}
+function _uGH() {
+ var hid;
+ var wc=window;
+ if (wc && wc.gaGlobal && wc.gaGlobal.hid) {
+ hid=wc.gaGlobal.hid;
+ } else {
+ hid=Math.round(Math.random()*0x7fffffff);
+ if (!wc.gaGlobal) wc.gaGlobal={};
+ wc.gaGlobal.hid=hid;
+ }
+ return hid;
+}
+function _uInfo(page) {
+ var p,s="",dm="",pg=_udl.pathname+_udl.search;
+ if (page && page!="") pg=_uES(page,1);
+ _ur=_ubd.referrer;
+ if (!_ur || _ur=="") { _ur="-"; }
+ else {
+ dm=_ubd.domain;
+ if(_utcp && _utcp!="/") dm+=_utcp;
+ p=_ur.indexOf(dm);
+ if ((p>=0) && (p<=8)) { _ur="0"; }
+ if (_ur.indexOf("[")==0 && _ur.lastIndexOf("]")==(_ur.length-1)) { _ur="-"; }
+ }
+ s+="&utmn="+_uu;
+ if (_ufsc) s+=_uBInfo();
+ if (_uctm) s+=_uCInfo();
+ if (_utitle && _ubd.title && _ubd.title!="") s+="&utmdt="+_uES(_ubd.title);
+ if (_udl.hostname && _udl.hostname!="") s+="&utmhn="+_uES(_udl.hostname);
+ if (_usample && _usample != 100) s+="&utmsp="+_uES(_usample);
+ s+="&utmhid="+_uGH();
+ s+="&utmr="+_ur;
+ s+="&utmp="+pg;
+ if ((_userv==0 || _userv==2) && _uSP()) {
+ var i=new Image(1,1);
+ i.src=_ugifpath+"?"+"utmwv="+_uwv+s;
+ i.onload=function() {_uVoid();}
+ }
+ if ((_userv==1 || _userv==2) && _uSP()) {
+ var i2=new Image(1,1);
+ i2.src=_ugifpath2+"?"+"utmwv="+_uwv+s+"&utmac="+_uacct+"&utmcc="+_uGCS();
+ i2.onload=function() { _uVoid(); }
+ }
+ return;
+}
+function _uVoid() { return; }
+function _uCInfo() {
+ if (!_ucto || _ucto=="") { _ucto="15768000"; }
+ if (!_uVG()) return;
+ var c="",t="-",t2="-",t3="-",o=0,cs=0,cn=0,i=0,z="-",s="";
+ if (_uanchor && _udlh && _udlh!="") s=_udlh+"&";
+ s+=_udl.search;
+ var x=new Date(_udt.getTime()+(_ucto*1000));
+ var dc=_ubd.cookie;
+ x=" expires="+x.toGMTString()+";";
+ if (_ulink && !_ubl) {
+ z=_uUES(_uGC(s,"__utmz=","&"));
+ if (z!="-" && z.indexOf(";")==-1) { _ubd.cookie="__utmz="+z+"; path="+_utcp+";"+x+_udo; return ""; }
+ }
+ z=dc.indexOf("__utmz="+_udh);
+ if (z>-1) { z=_uGC(dc,"__utmz="+_udh,";"); }
+ else { z="-"; }
+ t=_uGC(s,_ucid+"=","&");
+ t2=_uGC(s,_ucsr+"=","&");
+ t3=_uGC(s,"gclid=","&");
+ if ((t!="-" && t!="") || (t2!="-" && t2!="") || (t3!="-" && t3!="")) {
+ if (t!="-" && t!="") c+="utmcid="+_uEC(t);
+ if (t2!="-" && t2!="") { if (c != "") c+="|"; c+="utmcsr="+_uEC(t2); }
+ if (t3!="-" && t3!="") { if (c != "") c+="|"; c+="utmgclid="+_uEC(t3); }
+ t=_uGC(s,_uccn+"=","&");
+ if (t!="-" && t!="") c+="|utmccn="+_uEC(t);
+ else c+="|utmccn=(not+set)";
+ t=_uGC(s,_ucmd+"=","&");
+ if (t!="-" && t!="") c+="|utmcmd="+_uEC(t);
+ else c+="|utmcmd=(not+set)";
+ t=_uGC(s,_uctr+"=","&");
+ if (t!="-" && t!="") c+="|utmctr="+_uEC(t);
+ else { t=_uOrg(1); if (t!="-" && t!="") c+="|utmctr="+_uEC(t); }
+ t=_uGC(s,_ucct+"=","&");
+ if (t!="-" && t!="") c+="|utmcct="+_uEC(t);
+ t=_uGC(s,_ucno+"=","&");
+ if (t=="1") o=1;
+ if (z!="-" && o==1) return "";
+ }
+ if (c=="-" || c=="") { c=_uOrg(); if (z!="-" && _ufno==1) return ""; }
+ if (c=="-" || c=="") { if (_ufns==1) c=_uRef(); if (z!="-" && _ufno==1) return ""; }
+ if (c=="-" || c=="") {
+ if (z=="-" && _ufns==1) { c="utmccn=(direct)|utmcsr=(direct)|utmcmd=(none)"; }
+ if (c=="-" || c=="") return "";
+ }
+ if (z!="-") {
+ i=z.indexOf(".");
+ if (i>-1) i=z.indexOf(".",i+1);
+ if (i>-1) i=z.indexOf(".",i+1);
+ if (i>-1) i=z.indexOf(".",i+1);
+ t=z.substring(i+1,z.length);
+ if (t.toLowerCase()==c.toLowerCase()) cs=1;
+ t=z.substring(0,i);
+ if ((i=t.lastIndexOf(".")) > -1) {
+ t=t.substring(i+1,t.length);
+ cn=(t*1);
+ }
+ }
+ if (cs==0 || _ufns==1) {
+ t=_uGC(dc,"__utma="+_udh,";");
+ if ((i=t.lastIndexOf(".")) > 9) {
+ _uns=t.substring(i+1,t.length);
+ _uns=(_uns*1);
+ }
+ cn++;
+ if (_uns==0) _uns=1;
+ _ubd.cookie="__utmz="+_udh+"."+_ust+"."+_uns+"."+cn+"."+c+"; path="+_utcp+"; "+x+_udo;
+ }
+ if (cs==0 || _ufns==1) return "&utmcn=1";
+ else return "&utmcr=1";
+}
+function _uRef() {
+ if (_ur=="0" || _ur=="" || _ur=="-") return "";
+ var i=0,h,k,n;
+ if ((i=_ur.indexOf("://"))<0) return "";
+ h=_ur.substring(i+3,_ur.length);
+ if (h.indexOf("/") > -1) {
+ k=h.substring(h.indexOf("/"),h.length);
+ if (k.indexOf("?") > -1) k=k.substring(0,k.indexOf("?"));
+ h=h.substring(0,h.indexOf("/"));
+ }
+ h=h.toLowerCase();
+ n=h;
+ if ((i=n.indexOf(":")) > -1) n=n.substring(0,i);
+ for (var ii=0;ii<_uRno.length;ii++) {
+ if ((i=n.indexOf(_uRno[ii].toLowerCase())) > -1 && n.length==(i+_uRno[ii].length)) { _ufno=1; break; }
+ }
+ if (h.indexOf("www.")==0) h=h.substring(4,h.length);
+ return "utmccn=(referral)|utmcsr="+_uEC(h)+"|"+"utmcct="+_uEC(k)+"|utmcmd=referral";
+}
+function _uOrg(t) {
+ if (_ur=="0" || _ur=="" || _ur=="-") return "";
+ var i=0,h,k;
+ if ((i=_ur.indexOf("://")) < 0) return "";
+ h=_ur.substring(i+3,_ur.length);
+ if (h.indexOf("/") > -1) {
+ h=h.substring(0,h.indexOf("/"));
+ }
+ for (var ii=0;ii<_uOsr.length;ii++) {
+ if (h.toLowerCase().indexOf(_uOsr[ii].toLowerCase()) > -1) {
+ if ((i=_ur.indexOf("?"+_uOkw[ii]+"=")) > -1 || (i=_ur.indexOf("&"+_uOkw[ii]+"=")) > -1) {
+ k=_ur.substring(i+_uOkw[ii].length+2,_ur.length);
+ if ((i=k.indexOf("&")) > -1) k=k.substring(0,i);
+ for (var yy=0;yy<_uOno.length;yy++) {
+ if (_uOno[yy].toLowerCase()==k.toLowerCase()) { _ufno=1; break; }
+ }
+ if (t) return _uEC(k);
+ else return "utmccn=(organic)|utmcsr="+_uEC(_uOsr[ii])+"|"+"utmctr="+_uEC(k)+"|utmcmd=organic";
+ }
+ }
+ }
+ return "";
+}
+function _uBInfo() {
+ var sr="-",sc="-",ul="-",fl="-",cs="-",je=1;
+ var n=navigator;
+ if (self.screen) {
+ sr=screen.width+"x"+screen.height;
+ sc=screen.colorDepth+"-bit";
+ } else if (self.java) {
+ var j=java.awt.Toolkit.getDefaultToolkit();
+ var s=j.getScreenSize();
+ sr=s.width+"x"+s.height;
+ }
+ if (n.language) { ul=n.language.toLowerCase(); }
+ else if (n.browserLanguage) { ul=n.browserLanguage.toLowerCase(); }
+ je=n.javaEnabled()?1:0;
+ if (_uflash) fl=_uFlash();
+ if (_ubd.characterSet) cs=_uES(_ubd.characterSet);
+ else if (_ubd.charset) cs=_uES(_ubd.charset);
+ return "&utmcs="+cs+"&utmsr="+sr+"&utmsc="+sc+"&utmul="+ul+"&utmje="+je+"&utmfl="+fl;
+}
+function __utmSetTrans() {
+ var e;
+ if (_ubd.getElementById) e=_ubd.getElementById("utmtrans");
+ else if (_ubd.utmform && _ubd.utmform.utmtrans) e=_ubd.utmform.utmtrans;
+ if (!e) return;
+ var l=e.value.split("UTM:");
+ var i,i2,c;
+ if (_userv==0 || _userv==2) i=new Array();
+ if (_userv==1 || _userv==2) { i2=new Array(); c=_uGCS(); }
+
+ for (var ii=0;ii<l.length;ii++) {
+ l[ii]=_uTrim(l[ii]);
+ if (l[ii].charAt(0)!='T' && l[ii].charAt(0)!='I') continue;
+ var r=Math.round(Math.random()*2147483647);
+ if (!_utsp || _utsp=="") _utsp="|";
+ var f=l[ii].split(_utsp),s="";
+ if (f[0].charAt(0)=='T') {
+ s="&utmt=tran"+"&utmn="+r;
+ f[1]=_uTrim(f[1]); if(f[1]&&f[1]!="") s+="&utmtid="+_uES(f[1]);
+ f[2]=_uTrim(f[2]); if(f[2]&&f[2]!="") s+="&utmtst="+_uES(f[2]);
+ f[3]=_uTrim(f[3]); if(f[3]&&f[3]!="") s+="&utmtto="+_uES(f[3]);
+ f[4]=_uTrim(f[4]); if(f[4]&&f[4]!="") s+="&utmttx="+_uES(f[4]);
+ f[5]=_uTrim(f[5]); if(f[5]&&f[5]!="") s+="&utmtsp="+_uES(f[5]);
+ f[6]=_uTrim(f[6]); if(f[6]&&f[6]!="") s+="&utmtci="+_uES(f[6]);
+ f[7]=_uTrim(f[7]); if(f[7]&&f[7]!="") s+="&utmtrg="+_uES(f[7]);
+ f[8]=_uTrim(f[8]); if(f[8]&&f[8]!="") s+="&utmtco="+_uES(f[8]);
+ } else {
+ s="&utmt=item"+"&utmn="+r;
+ f[1]=_uTrim(f[1]); if(f[1]&&f[1]!="") s+="&utmtid="+_uES(f[1]);
+ f[2]=_uTrim(f[2]); if(f[2]&&f[2]!="") s+="&utmipc="+_uES(f[2]);
+ f[3]=_uTrim(f[3]); if(f[3]&&f[3]!="") s+="&utmipn="+_uES(f[3]);
+ f[4]=_uTrim(f[4]); if(f[4]&&f[4]!="") s+="&utmiva="+_uES(f[4]);
+ f[5]=_uTrim(f[5]); if(f[5]&&f[5]!="") s+="&utmipr="+_uES(f[5]);
+ f[6]=_uTrim(f[6]); if(f[6]&&f[6]!="") s+="&utmiqt="+_uES(f[6]);
+ }
+ if (_usample && _usample != 100) s+="&utmsp="+_uES(_usample);
+ if ((_userv==0 || _userv==2) && _uSP()) {
+ i[ii]=new Image(1,1);
+ i[ii].src=_ugifpath+"?"+"utmwv="+_uwv+s;
+ i[ii].onload=function() { _uVoid(); }
+ }
+ if ((_userv==1 || _userv==2) && _uSP()) {
+ i2[ii]=new Image(1,1);
+ i2[ii].src=_ugifpath2+"?"+"utmwv="+_uwv+s+"&utmac="+_uacct+"&utmcc="+c;
+ i2[ii].onload=function() { _uVoid(); }
+ }
+ }
+ return;
+}
+function _uFlash() {
+ var f="-",n=navigator;
+ if (n.plugins && n.plugins.length) {
+ for (var ii=0;ii<n.plugins.length;ii++) {
+ if (n.plugins[ii].name.indexOf('Shockwave Flash')!=-1) {
+ f=n.plugins[ii].description.split('Shockwave Flash ')[1];
+ break;
+ }
+ }
+ } else if (window.ActiveXObject) {
+ for (var ii=10;ii>=2;ii--) {
+ try {
+ var fl=eval("new ActiveXObject('ShockwaveFlash.ShockwaveFlash."+ii+"');");
+ if (fl) { f=ii + '.0'; break; }
+ }
+ catch(e) {}
+ }
+ }
+ return f;
+}
+function __utmLinker(l,h) {
+ if (!_ulink) return;
+ var p,k,a="-",b="-",c="-",x="-",z="-",v="-";
+ var dc=_ubd.cookie;
+ if (!l || l=="") return;
+ var iq = l.indexOf("?");
+ var ih = l.indexOf("#");
+ if (dc) {
+ a=_uES(_uGC(dc,"__utma="+_udh,";"));
+ b=_uES(_uGC(dc,"__utmb="+_udh,";"));
+ c=_uES(_uGC(dc,"__utmc="+_udh,";"));
+ x=_uES(_uGC(dc,"__utmx="+_udh,";"));
+ z=_uES(_uGC(dc,"__utmz="+_udh,";"));
+ v=_uES(_uGC(dc,"__utmv="+_udh,";"));
+ k=(_uHash(a+b+c+x+z+v)*1)+(_udh*1);
+ p="__utma="+a+"&__utmb="+b+"&__utmc="+c+"&__utmx="+x+"&__utmz="+z+"&__utmv="+v+"&__utmk="+k;
+ }
+ if (p) {
+ if (h && ih>-1) return;
+ if (h) { _udl.href=l+"#"+p; }
+ else {
+ if (iq==-1 && ih==-1) _udl.href=l+"?"+p;
+ else if (ih==-1) _udl.href=l+"&"+p;
+ else if (iq==-1) _udl.href=l.substring(0,ih-1)+"?"+p+l.substring(ih);
+ else _udl.href=l.substring(0,ih-1)+"&"+p+l.substring(ih);
+ }
+ } else { _udl.href=l; }
+}
+function __utmLinkPost(f,h) {
+ if (!_ulink) return;
+ var p,k,a="-",b="-",c="-",x="-",z="-",v="-";
+ var dc=_ubd.cookie;
+ if (!f || !f.action) return;
+ var iq = f.action.indexOf("?");
+ var ih = f.action.indexOf("#");
+ if (dc) {
+ a=_uES(_uGC(dc,"__utma="+_udh,";"));
+ b=_uES(_uGC(dc,"__utmb="+_udh,";"));
+ c=_uES(_uGC(dc,"__utmc="+_udh,";"));
+ x=_uES(_uGC(dc,"__utmx="+_udh,";"));
+ z=_uES(_uGC(dc,"__utmz="+_udh,";"));
+ v=_uES(_uGC(dc,"__utmv="+_udh,";"));
+ k=(_uHash(a+b+c+x+z+v)*1)+(_udh*1);
+ p="__utma="+a+"&__utmb="+b+"&__utmc="+c+"&__utmx="+x+"&__utmz="+z+"&__utmv="+v+"&__utmk="+k;
+ }
+ if (p) {
+ if (h && ih>-1) return;
+ if (h) { f.action+="#"+p; }
+ else {
+ if (iq==-1 && ih==-1) f.action+="?"+p;
+ else if (ih==-1) f.action+="&"+p;
+ else if (iq==-1) f.action=f.action.substring(0,ih-1)+"?"+p+f.action.substring(ih);
+ else f.action=f.action.substring(0,ih-1)+"&"+p+f.action.substring(ih);
+ }
+ }
+ return;
+}
+function __utmSetVar(v) {
+ if (!v || v=="") return;
+ if (!_udo || _udo == "") {
+ _udh=_uDomain();
+ if (_udn && _udn!="") { _udo=" domain="+_udn+";"; }
+ }
+ if (!_uVG()) return;
+ var r=Math.round(Math.random() * 2147483647);
+ _ubd.cookie="__utmv="+_udh+"."+_uES(v)+"; path="+_utcp+"; expires="+_uNx()+";"+_udo;
+ var s="&utmt=var&utmn="+r;
+ if (_usample && _usample != 100) s+="&utmsp="+_uES(_usample);
+ if ((_userv==0 || _userv==2) && _uSP()) {
+ var i=new Image(1,1);
+ i.src=_ugifpath+"?"+"utmwv="+_uwv+s;
+ i.onload=function() { _uVoid(); }
+ }
+ if ((_userv==1 || _userv==2) && _uSP()) {
+ var i2=new Image(1,1);
+ i2.src=_ugifpath2+"?"+"utmwv="+_uwv+s+"&utmac="+_uacct+"&utmcc="+_uGCS();
+ i2.onload=function() { _uVoid(); }
+ }
+}
+function _uGCS() {
+ var t,c="",dc=_ubd.cookie;
+ if ((t=_uGC(dc,"__utma="+_udh,";"))!="-") c+=_uES("__utma="+t+";+");
+ if ((t=_uGC(dc,"__utmb="+_udh,";"))!="-") c+=_uES("__utmb="+t+";+");
+ if ((t=_uGC(dc,"__utmc="+_udh,";"))!="-") c+=_uES("__utmc="+t+";+");
+ if ((t=_uGC(dc,"__utmx="+_udh,";"))!="-") c+=_uES("__utmx="+t+";+");
+ if ((t=_uGC(dc,"__utmz="+_udh,";"))!="-") c+=_uES("__utmz="+t+";+");
+ if ((t=_uGC(dc,"__utmv="+_udh,";"))!="-") c+=_uES("__utmv="+t+";");
+ if (c.charAt(c.length-1)=="+") c=c.substring(0,c.length-1);
+ return c;
+}
+function _uGC(l,n,s) {
+ if (!l || l=="" || !n || n=="" || !s || s=="") return "-";
+ var i,i2,i3,c="-";
+ i=l.indexOf(n);
+ i3=n.indexOf("=")+1;
+ if (i > -1) {
+ i2=l.indexOf(s,i); if (i2 < 0) { i2=l.length; }
+ c=l.substring((i+i3),i2);
+ }
+ return c;
+}
+function _uDomain() {
+ if (!_udn || _udn=="" || _udn=="none") { _udn=""; return 1; }
+ if (_udn=="auto") {
+ var d=_ubd.domain;
+ if (d.substring(0,4)=="www.") {
+ d=d.substring(4,d.length);
+ }
+ _udn=d;
+ }
+ _udn = _udn.toLowerCase();
+ if (_uhash=="off") return 1;
+ return _uHash(_udn);
+}
+function _uHash(d) {
+ if (!d || d=="") return 1;
+ var h=0,g=0;
+ for (var i=d.length-1;i>=0;i--) {
+ var c=parseInt(d.charCodeAt(i));
+ h=((h << 6) & 0xfffffff) + c + (c << 14);
+ if ((g=h & 0xfe00000)!=0) h=(h ^ (g >> 21));
+ }
+ return h;
+}
+function _uFixA(c,s,t) {
+ if (!c || c=="" || !s || s=="" || !t || t=="") return "-";
+ var a=_uGC(c,"__utma="+_udh,s);
+ var lt=0,i=0;
+ if ((i=a.lastIndexOf(".")) > 9) {
+ _uns=a.substring(i+1,a.length);
+ _uns=(_uns*1)+1;
+ a=a.substring(0,i);
+ if ((i=a.lastIndexOf(".")) > 7) {
+ lt=a.substring(i+1,a.length);
+ a=a.substring(0,i);
+ }
+ if ((i=a.lastIndexOf(".")) > 5) {
+ a=a.substring(0,i);
+ }
+ a+="."+lt+"."+t+"."+_uns;
+ }
+ return a;
+}
+function _uTrim(s) {
+ if (!s || s=="") return "";
+ while ((s.charAt(0)==' ') || (s.charAt(0)=='\n') || (s.charAt(0,1)=='\r')) s=s.substring(1,s.length);
+ while ((s.charAt(s.length-1)==' ') || (s.charAt(s.length-1)=='\n') || (s.charAt(s.length-1)=='\r')) s=s.substring(0,s.length-1);
+ return s;
+}
+function _uEC(s) {
+ var n="";
+ if (!s || s=="") return "";
+ for (var i=0;i<s.length;i++) {if (s.charAt(i)==" ") n+="+"; else n+=s.charAt(i);}
+ return n;
+}
+function __utmVisitorCode(f) {
+ var r=0,t=0,i=0,i2=0,m=31;
+ var a=_uGC(_ubd.cookie,"__utma="+_udh,";");
+ if ((i=a.indexOf(".",0))<0) return;
+ if ((i2=a.indexOf(".",i+1))>0) r=a.substring(i+1,i2); else return "";
+ if ((i=a.indexOf(".",i2+1))>0) t=a.substring(i2+1,i); else return "";
+ if (f) {
+ return r;
+ } else {
+ var c=new Array('A','B','C','D','E','F','G','H','J','K','L','M','N','P','R','S','T','U','V','W','X','Y','Z','1','2','3','4','5','6','7','8','9');
+ return c[r>>28&m]+c[r>>23&m]+c[r>>18&m]+c[r>>13&m]+"-"+c[r>>8&m]+c[r>>3&m]+c[((r&7)<<2)+(t>>30&3)]+c[t>>25&m]+c[t>>20&m]+"-"+c[t>>15&m]+c[t>>10&m]+c[t>>5&m]+c[t&m];
+ }
+}
+function _uIN(n) {
+ if (!n) return false;
+ for (var i=0;i<n.length;i++) {
+ var c=n.charAt(i);
+ if ((c<"0" || c>"9") && (c!=".")) return false;
+ }
+ return true;
+}
+function _uES(s,u) {
+ if (typeof(encodeURIComponent) == 'function') {
+ if (u) return encodeURI(s);
+ else return encodeURIComponent(s);
+ } else {
+ return escape(s);
+ }
+}
+function _uUES(s) {
+ if (typeof(decodeURIComponent) == 'function') {
+ return decodeURIComponent(s);
+ } else {
+ return unescape(s);
+ }
+}
+function _uVG() {
+ if((_udn.indexOf("www.google.") == 0 || _udn.indexOf(".google.") == 0 || _udn.indexOf("google.") == 0) && _utcp=='/' && _udn.indexOf("google.org")==-1) {
+ return false;
+ }
+ return true;
+}
+function _uSP() {
+ var s=100;
+ if (_usample) s=_usample;
+ if(s>=100 || s<=0) return true;
+ return ((__utmVisitorCode(1)%10000)<(s*100));
+}
+function urchinPathCopy(p){
+ var d=document,nx,tx,sx,i,c,cs,t,h,o;
+ cs=new Array("a","b","c","v","x","z");
+ h=_uDomain(); if (_udn && _udn!="") o=" domain="+_udn+";";
+ nx=_uNx()+";";
+ tx=new Date(); tx.setTime(tx.getTime()+(_utimeout*1000));
+ tx=tx.toGMTString()+";";
+ sx=new Date(); sx.setTime(sx.getTime()+(_ucto*1000));
+ sx=sx.toGMTString()+";";
+ for (i=0;i<6;i++){
+ t=" expires=";
+ if (i==1) t+=tx; else if (i==2) t=""; else if (i==5) t+=sx; else t+=nx;
+ c=_uGC(d.cookie,"__utm"+cs[i]+"="+h,";");
+ if (c!="-") d.cookie="__utm"+cs[i]+"="+c+"; path="+p+";"+t+o;
+ }
+}
+function _uCO() {
+ if (!_utk || _utk=="" || _utk.length<10) return;
+ var d='www.google.com';
+ if (_utk.charAt(0)=='!') d='analytics.corp.google.com';
+ _ubd.cookie="GASO="+_utk+"; path="+_utcp+";"+_udo;
+ var sc=document.createElement('script');
+ sc.type='text/javascript';
+ sc.id="_gasojs";
+ sc.src='https://'+d+'/analytics/reporting/overlay_js?gaso='+_utk+'&'+Math.random();
+ document.getElementsByTagName('head')[0].appendChild(sc);
+}
+function _uGT() {
+ var h=location.hash, a;
+ if (h && h!="" && h.indexOf("#gaso=")==0) {
+ a=_uGC(h,"gaso=","&");
+ } else {
+ a=_uGC(_ubd.cookie,"GASO=",";");
+ }
+ return a;
+}
+var _utk=_uGT();
+if (_utk && _utk!="" && _utk.length>10) {
+ if (window.addEventListener) {
+ window.addEventListener('load', _uCO, false);
+ } else if (window.attachEvent) {
+ window.attachEvent('onload', _uCO);
+ }
+}
+
+function _uNx() {
+ return (new Date((new Date()).getTime()+63072000000)).toGMTString();
+}
diff --git a/components/noscriptService.js b/components/noscriptService.js
index 1d6ac3b..00a1710 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.8.34";
+const VERSION = "2.6.8.35rc1";
const SERVICE_CTRID = "@maone.net/noscript-service;1";
const SERVICE_ID = "{31aec909-8e86-4397-9380-63a59e0c5ff5}";
const EXTENSION_ID = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
@@ -1344,8 +1344,8 @@ var ns = {
}
// break;
case "browser:purge-session-history":
- this.recentlyBlocked = [];
STS.eraseDB();
+ this.eraseTemp();
break;
@@ -3376,7 +3376,8 @@ var ns = {
PolicyState.cancel(args);
let win = DOM.findWindow(args[3]);
- if (args[1]) this.recordBlocked(this.getSite(args[1].spec) || "", this.getSite(win && win.top.location.href || args[2] && args[2].spec));
+ if (args[1] && win)
+ this.recordBlocked(win, this.getSite(args[1].spec) || "", this.getSite(win.location.href || args[2] && args[2].spec));
return CP_REJECT;
},
@@ -5505,10 +5506,13 @@ var ns = {
return redirCache[uri] || (redirCache[uri] = []);
},
- recentlyBlocked: [],
_recentlyBlockedMax: 40,
- recordBlocked: function(site, origin) {
- const l = this.recentlyBlocked;
+ recordBlocked: function(win, site, origin) {
+ if (!(win && this.getPref("showRecentlyBlocked"))) return;
+ let overlay = DOM.getChromeWindow(win).noscriptOverlay;
+ if (!overlay) return;
+
+ const l = overlay.recentlyBlocked;
let pos = l.length;
while (pos-- > 0) if (l[pos].site === site) break;
@@ -5523,7 +5527,7 @@ var ns = {
l.push(entry);
if (l.length > this._recentlyBlockedMax) {
- this.recentlyBlocked = l.slice(- this._recentlyBlockedMax / 2);
+ overlay.recentlyBlocked = l.slice(- this._recentlyBlockedMax / 2);
}
},
@@ -6240,8 +6244,8 @@ var ns = {
originSite: site,
mime: "WebGL"
});
+ let doc = ctx.ownerDocument || ctx;
if (fromDOM) {
- let doc = ctx.ownerDocument || ctx;
let ds = DOM.getDocShellForWindow(doc.defaultView);
if (ds.isLoadingDocument) { // prevent fallback redirection from hiding us
let sites = this._webGLSites;
@@ -6249,7 +6253,7 @@ var ns = {
doc.defaultView.addEventListener("load", function(ev) delete sites[site], false);
}
}
- this.recordBlocked(site, site);
+ this.recordBlocked(doc.defaultView, site, site);
},
get _webGLInterceptionDef() {
delete this._webGLInterceptionDef;
diff --git a/install.rdf b/install.rdf
index e93250a..ea8e262 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.8.34</em:version>
+ <em:version>2.6.8.35rc1</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>
--
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