[Pkg-mozext-commits] [noscript] 01/05: Imported Upstream version 2.6.8.41~rc1
David Prévot
taffit at moszumanska.debian.org
Wed Sep 10 17:55:03 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 fd25a1407896018492c3051ffe563137862a491e
Author: David Prévot <taffit at debian.org>
Date: Wed Sep 10 12:38:07 2014 -0400
Imported Upstream version 2.6.8.41~rc1
---
.../content/noscript/RequestWatchdog.js | 2 +
chrome/noscript.jar!/content/noscript/about.xul | 6 +-
.../content/noscript/noscriptOptions.xul.orig | 456 ---------------------
.../content/noscript/noscriptOptions.xul.rej | 25 --
.../content/noscript/noscriptOverlay.js | 13 +-
.../content/noscript/patch.exe.stackdump | 21 -
.../locale/ar/noscript/noscript.properties | 2 +
.../locale/be-BY/noscript/noscript.properties | 2 +
.../locale/bg-BG/noscript/noscript.dtd | 2 +-
.../locale/bg-BG/noscript/noscript.properties | 2 +
.../locale/bn-IN/noscript/noscript.properties | 2 +
.../locale/ca-AD/noscript/noscript.dtd | 2 +-
.../locale/ca-AD/noscript/noscript.properties | 2 +
.../locale/cs-CZ/noscript/noscript.dtd | 2 +-
.../locale/cs-CZ/noscript/noscript.properties | 2 +
.../locale/cy-GB/noscript/noscript.dtd | 2 +-
.../locale/cy-GB/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/da/noscript/noscript.dtd | 2 +-
.../locale/da/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/de/noscript/noscript.dtd | 2 +-
.../locale/de/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/el/noscript/noscript.dtd | 2 +-
.../locale/el/noscript/noscript.properties | 2 +
.../locale/en-GB/noscript/noscript.dtd | 2 +-
.../locale/en-GB/noscript/noscript.properties | 2 +
.../locale/en-US/noscript/noscript.dtd | 2 +-
.../locale/en-US/noscript/noscript.properties | 4 +-
.../noscript.jar!/locale/eo/noscript/noscript.dtd | 2 +-
.../locale/eo/noscript/noscript.properties | 2 +
.../locale/es-AR/noscript/noscript.dtd | 2 +-
.../locale/es-AR/noscript/noscript.properties | 2 +
.../locale/es-CL/noscript/noscript.dtd | 2 +-
.../locale/es-CL/noscript/noscript.properties | 2 +
.../locale/es-ES/noscript/noscript.dtd | 2 +-
.../locale/es-ES/noscript/noscript.properties | 2 +
.../locale/et-EE/noscript/noscript.dtd | 2 +-
.../locale/et-EE/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/eu/noscript/noscript.dtd | 2 +-
.../locale/eu/noscript/noscript.properties | 2 +
.../locale/fa-IR/noscript/noscript.dtd | 2 +-
.../locale/fa-IR/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/fi/noscript/noscript.dtd | 2 +-
.../locale/fi/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/fr/noscript/noscript.dtd | 2 +-
.../locale/fr/noscript/noscript.properties | 2 +
.../locale/gl-ES/noscript/noscript.dtd | 2 +-
.../locale/gl-ES/noscript/noscript.properties | 2 +
.../locale/he-IL/noscript/noscript.dtd | 2 +-
.../locale/he-IL/noscript/noscript.properties | 2 +
.../locale/hr-HR/noscript/noscript.dtd | 2 +-
.../locale/hr-HR/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/hsb/noscript/noscript.dtd | 2 +-
.../locale/hsb/noscript/noscript.properties | 2 +
.../locale/hu-HU/noscript/noscript.dtd | 2 +-
.../locale/hu-HU/noscript/noscript.properties | 2 +
.../locale/id-ID/noscript/noscript.dtd | 2 +-
.../locale/id-ID/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/it/noscript/noscript.dtd | 2 +-
.../locale/it/noscript/noscript.properties | 2 +
.../locale/ja-JP/noscript/noscript.dtd | 2 +-
.../locale/ja-JP/noscript/noscript.properties | 2 +
.../locale/kk-KZ/noscript/noscript.dtd | 2 +-
.../locale/kk-KZ/noscript/noscript.properties | 2 +
.../locale/km-KH/noscript/noscript.dtd | 2 +-
.../locale/km-KH/noscript/noscript.properties | 2 +
.../locale/ko-KR/noscript/noscript.dtd | 2 +-
.../locale/ko-KR/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/lt/noscript/noscript.dtd | 2 +-
.../locale/lt/noscript/noscript.properties | 2 +
.../locale/mk-MK/noscript/noscript.dtd | 2 +-
.../locale/mk-MK/noscript/noscript.properties | 2 +
.../locale/ms-MY/noscript/noscript.dtd | 2 +-
.../locale/ms-MY/noscript/noscript.properties | 2 +
.../locale/nb-NO/noscript/noscript.dtd | 2 +-
.../locale/nb-NO/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/nl/noscript/noscript.dtd | 2 +-
.../locale/nl/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/pl/noscript/noscript.dtd | 2 +-
.../locale/pl/noscript/noscript.properties | 2 +
.../locale/pt-BR/noscript/noscript.dtd | 2 +-
.../locale/pt-BR/noscript/noscript.properties | 2 +
.../locale/pt-PT/noscript/noscript.dtd | 2 +-
.../locale/pt-PT/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/ro/noscript/noscript.dtd | 2 +-
.../locale/ro/noscript/noscript.properties | 2 +
.../locale/ru-RU/noscript/noscript.properties | 2 +
.../locale/sk-SK/noscript/noscript.dtd | 2 +-
.../locale/sk-SK/noscript/noscript.properties | 2 +
.../locale/sl-SI/noscript/noscript.dtd | 2 +-
.../locale/sl-SI/noscript/noscript.properties | 2 +
.../locale/sr-RS/noscript/noscript.dtd | 2 +-
.../locale/sr-RS/noscript/noscript.properties | 2 +
.../locale/sr/noscript/noscript.properties | 2 +
.../locale/sv-SE/noscript/noscript.dtd | 2 +-
.../locale/sv-SE/noscript/noscript.properties | 2 +
.../locale/te-IN/noscript/noscript.dtd | 2 +-
.../locale/te-IN/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/th/noscript/noscript.dtd | 2 +-
.../locale/th/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/tr/noscript/noscript.dtd | 2 +-
.../locale/tr/noscript/noscript.properties | 2 +
.../locale/uk/noscript/noscript.properties | 2 +
.../noscript.jar!/locale/vi/noscript/noscript.dtd | 2 +-
.../locale/vi/noscript/noscript.properties | 2 +
.../locale/zh-CN/noscript/noscript.dtd | 2 +-
.../locale/zh-CN/noscript/noscript.properties | 2 +
.../locale/zh-TW/noscript/noscript.dtd | 2 +-
.../locale/zh-TW/noscript/noscript.properties | 2 +
components/noscriptService.js | 2 +-
install.rdf | 2 +-
110 files changed, 171 insertions(+), 562 deletions(-)
diff --git a/chrome/noscript.jar!/content/noscript/RequestWatchdog.js b/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
index 2c456ab..a56b2cb 100644
--- a/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
+++ b/chrome/noscript.jar!/content/noscript/RequestWatchdog.js
@@ -780,6 +780,8 @@ RequestWatchdog.prototype = {
stripPost = false;
// Paypal buttons encrypted parameter causes a DOS, strip it out
skipArr = ['encrypted'];
+ } else if (let (rx = /\.adnxs\.com$/) rx.test(originSite) && rx.test(targetSite)) {
+ skipArr = ['udj'];
} else if (/^https?:\/\/www\.mendeley\.com\/import\/bookmarklet\/$/.test(originalSpec)) {
skipArr = ['html'];
} else if (/^https?:\/\/[\w\-\.]+\/talkpost_do(?:\.bml)?$/.test(originalSpec) &&
diff --git a/chrome/noscript.jar!/content/noscript/about.xul b/chrome/noscript.jar!/content/noscript/about.xul
index 5c94e6e..86f98a2 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.40"]);
+ str = getString("version", ["2.6.8.41rc1"]);
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.40" id="extensionVersion" crop="right"/>
+<label value="Version 2.6.8.41rc1" 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.40')">Changelog</label>
+<label id="changelog" class="text-link" align="center" tooltiptext="See Changelog" onclick="about_open('http://noscript.net/changelog#2.6.8.41rc1')">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/noscriptOptions.xul.orig b/chrome/noscript.jar!/content/noscript/noscriptOptions.xul.orig
deleted file mode 100644
index 95292a7..0000000
--- a/chrome/noscript.jar!/content/noscript/noscriptOptions.xul.orig
+++ /dev/null
@@ -1,456 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://noscript/skin/browser.css" type="text/css"?>
-<?xml-stylesheet href="chrome://noscript/skin/options.css" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://noscript/locale/noscript.dtd">
-<dialog id="noscriptOptions"
- onload="nsopt.init()"
- ondialogaccept="return nsopt.save()"
-
- title="&noscriptOptionsLong;"
- buttons="extra2,accept,cancel"
-
- buttonlabelextra2="&noscriptReset;"
- buttonaccesskeyextra2="&noscriptReset.accesskey;"
- ondialogextra2="nsopt.reset()"
-
- ondialoghelp="noscriptUtil.openHelp('options')"
-
- spacerflex="1"
- persist="screenX screenY"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <script type="application/x-javascript;version=1.8" src="noscript.js" />
- <script type="application/x-javascript;version=1.8" src="iaUI.js" />
- <script type="application/x-javascript;version=1.8" src="noscriptOptions.js" />
-
- <vbox style="width: &noscriptOptionsWidth;">
- <tabbox id="nsopt-tabsMain">
- <tabs>
-
- <tab label="&noscriptGeneral;" id="nsopt-tabGeneral"/>
- <tab label="&noscriptWhitelist;" id="nsopt-tabWhitelist"/>
- <tab label="&noscriptEmbeddings;" id="nsopt-tabEmbeddings"/>
- <tab label="&noscriptAppearance;" id="nsopt-tabAppearance"/>
- <tab label="&noscriptNotifications;" id="nsopt-tabNotifications"/>
- <tab label="&noscriptAdvanced;" id="nsopt-tabAdvanced"/>
-
- </tabs>
- <tabpanels>
-
- <tabpanel><!-- General -->
-
- <vbox flex="1">
-
- <groupbox class="ia-indent">
- <caption><checkbox id="cbx-autoAllow" label="&noscriptAutoAllowTopLevel;"/></caption>
- <radiogroup id="sel-autoAllow">
- <radio label="&noscriptFullAddr;" value="1" selected="true"/>
- <radio label="&noscriptFullDom;" value="2"/>
- <radio label="&noscriptBaseDom;" value="3"/>
- </radiogroup>
- </groupbox>
- <checkbox id="opt-hoverUI" label="&noscript.hoverUI;" oncommand="nsopt.toggleHoverUI()" />
- <groupbox id="toolbarToggleGroup" class="ia-indent">
- <caption orient="vertical">
- <checkbox id="cbx-toolbarToggle" label="&noscriptToolbarToggle;"/>
- <label control="sel-toolbarToggle" id="toolbarToggle-shortcut" class="ia-indent" hidden="true"/>
- </caption>
-
- <radiogroup id="sel-toolbarToggle">
- <radio label="&noscriptFullAddr;" value="1"/>
- <radio label="&noscriptFullDom;" value="2"/>
- <radio label="&noscriptBaseDom;" value="3" selected="true"/>
- </radiogroup>
- </groupbox>
-
-
- <checkbox id="opt-autoReload" label="&noscriptAutoReload;" />
- <checkbox id="opt-allowBookmarks" label="&noscriptAllowViaBookmarks;" />
- <checkbox id="opt-placesPrefs" label="&noscriptBookmarkSync;" />
-
- <spacer flex="1" />
- <button id="importConfButton" label="&noscriptImport;" hidden="true" oncommand="nsopt.importConf()" />
- <button id="exportConfButton" label="&noscriptExport;" hidden="true" oncommand="nsopt.exportConf()" />
- <button id="donateButton" label="&noscriptDonate;" accesskey="&noscriptDonate.accesskey;" hidden="true" oncommand="nsopt.donate();" />
- </vbox>
- </tabpanel><!-- END General -->
-
- <tabpanel><!-- Whitelist -->
- <vbox flex="1">
- <description style="white-space: normal; width: 33em" id="permissionsText">&noscriptPermissionsText;</description>
- <separator class="thin"/>
- <label control="urlText" value="&noscriptWebAddress;"/>
- <hbox align="center">
- <textbox id="urlText" flex="1" oninput="nsopt.urlChanged()"/>
- <button disabled="false" id="addButton" label="&noscriptAllow;"
- accesskey="&noscriptAllow.accesskey;"
- oncommand="nsopt.allow()"/>
- </hbox>
- <listbox id="urlList" seltype="multiple"
- onselect="nsopt.urlListChanged()"
- onkeyup="if (event.keyCode == event.DOM_VK_DELETE) nsopt.remove();"
- onkeydown="if (event.keyCode === event.DOM_VK_A && event.ctrlKey) { this.selectAll(); return false; }"
- onclick="nsopt.openInfo(event);"
- flex="1"
- >
- <listitem id="fake_url_item" label=" " />
- </listbox>
- <separator class="thin"/>
- <hbox>
- <button id="removeButton" disabled="true" label="&noscriptRemoveSelected;" oncommand="nsopt.remove()"/>
- <button id="revokeButton" disabled="true" label="&noscriptRevokeTemp;" accesskey="&noscriptRevokeTemp.accesskey;" oncommand="nsopt.revokeTemp()"/>
- <spacer flex="1" />
- <button id="importButton" label="&noscriptImport;" accesskey="&noscriptImport.accesskey;"
- oncommand="nsopt.importExport('import')"/>
- <button id="exportButton" label="&noscriptExport;" accesskey="&noscriptExport.accesskey;"
- oncommand="nsopt.importExport('export')"/>
- </hbox>
- <checkbox id="jsglobal" label="&noscriptGloballyEnabled;" />
- </vbox>
- </tabpanel><!-- END Whitelist -->
-
- <tabpanel><!-- Embeddings -->
- <vbox flex="1">
- <label class="header" value="&noscriptAdditionalRestrictions;" />
- <hbox><description style="white-space: normal">&noscriptReloadWarn;</description></hbox>
- <separator class="thin" />
- <hbox class="flexible-cbx">
- <vbox>
- <checkbox id="opt-forbidJava" label="&noscriptForbidJava;" />
- <checkbox id="opt-forbidFlash" label="&noscriptForbidFlash;" />
- <checkbox id="opt-forbidSilverlight" label="&noscriptForbidSilverlight;" />
- <checkbox id="opt-forbidPlugins" label="&noscriptForbidPlugins;" />
- </vbox>
- <vbox flex="1">
- <checkbox id="opt-forbidMedia" label="&noscriptForbidMedia;" />
- <checkbox id="opt-forbidIFrames" label="&noscriptForbidIFrames;" />
- <checkbox id="opt-forbidFrames" label="&noscriptForbidFrames;" />
- <checkbox id="opt-forbidFonts" label="&noscriptForbidFonts;" />
- </vbox>
- </hbox>
- <separator class="thin" />
- <checkbox id="opt-contentBlocker" label="&noscriptContentBlocker;" class="header" />
- <checkbox id="opt-alwaysBlockUntrustedContent" label="&noscriptAlwaysBlockUntrustedContent;" />
-
- <separator class="thin" />
- <checkbox id="opt-forbidWebGL" label="&noscriptForbidWebGL;" />
- <separator class="thin" />
- <checkbox id="opt-showPlaceholder" label="&noscriptShowPlaceholder;" />
- <checkbox id="invopt-showUntrustedPlaceholder" label="&noscriptNoUntrustedPlaceholder;" />
- <checkbox id="opt-confirmUnblock" label="&noscriptConfirmUnblock;" />
- <checkbox id="opt-collapseObject" label="&noscriptCollapseBlockedObjects;" />
-
- <hbox>
-
- <spacer flex="1" />
- </hbox>
- </vbox>
- </tabpanel>
-
- <tabpanel><!-- Appearance -->
- <vbox flex="1">
-
- <label class="header" value="&noscriptShow;"/>
-
- <checkbox id="opt-statusIcon" label="&noscriptStatusIcon;" />
- <checkbox id="opt-statusLabel" label="&noscriptStatusLabel;" />
- <checkbox id="opt-ctxMenu" label="&noscriptCtxMenu;" />
-
- <separator />
- <hbox>
- <vbox flex="1">
- <checkbox id="opt-showPermanent" label="Allow [...]" />
- <checkbox id="opt-showTemp" label="&noscriptTempCmd;" />
- <checkbox id="opt-showDistrust" label="Mark [...] as untrusted" />
- </vbox>
- <vbox flex="1">
- <checkbox id="opt-showBaseDomain" label="&noscriptBaseDom;" />
- <checkbox id="opt-showDomain" label="&noscriptFullDom;" />
- <checkbox id="opt-showAddress" label="&noscriptFullAddr;" />
- </vbox>
- </hbox>
- <separator />
- <hbox>
- <vbox flex="1">
- <checkbox id="opt-showGlobal" label="Allow Globally" />
- <checkbox id="opt-showAbout" label="&noscriptAbout;" />
- <checkbox id="opt-showUntrusted" label="&noscriptUntrusted;" />
- <checkbox id="opt-showBlockedObjects" label="&noscriptBlockedObjects;" />
- <checkbox id="opt-showRecentlyBlocked" label="&noscriptRecentBlocked;" />
- </vbox>
- <vbox flex="1">
- <checkbox id="opt-showAllowPage" label="&noscriptAllowPage;" />
- <checkbox id="opt-showTempAllowPage" label="&noscriptTempAllowPage;" />
- <checkbox id="opt-showTempToPerm" label="&noscriptTempToPerm;" />
- <checkbox id="opt-showRevokeTemp" label="&noscriptRevokeTemp;" />
- </vbox>
- </hbox>
-
- </vbox>
- </tabpanel><!-- END Appearance -->
-
- <tabpanel><!-- Notifications -->
- <vbox flex="1">
- <vbox id="fx-notifications">
- <vbox id="notifyOpts">
- <checkbox id="opt-notify" label="&noscriptNotify;" />
- <vbox class="ia-indent">
- <checkbox id="opt-notify.bottom" label="&noscriptNotify.bottom;" />
- <hbox align="baseline">
- <checkbox id="opt-notify.hide" label="Hide after" />
- <textbox id="notifyDelay" type="number" min="1" max="60"
- oninput="nsopt.notifyHideDelay.onInput(this)"
- onchange="nsopt.notifyHideDelay.onChange(this)"
- maxlength="2" size="2" />
- <label control="notifyDelay" id="notifyDelayLabel" value="seconds" />
- <spacer flex="1"/>
- </hbox>
- </vbox>
- </vbox>
- <separator class="thin" />
- <hbox align="center">
- <checkbox id="opt-xss.notify" label="&noscriptXss;" /><!-- TODO: accesskey -->
- <label class="text-link" style="font-weight: bold" value="?"
- onclick="noscriptUtil.openFaq('xss')"
- tooltiptext="&noscriptXssFaq;" />
- </hbox>
-
-
- <checkbox id="opt-forbidMetaRefresh.notify" label="&noscriptNotifyMeta;" accesskey="&noscriptNotifyMeta.accesskey;"/>
-
- <checkbox id="opt-ABE.notify" label="&ABE;"/><!-- TODO: accesskey -->
- </vbox>
-
- <checkbox id="opt-clearClick.prompt" label="&noscriptClearClickTitle;"/>
-
- <groupbox class="ia-indent">
- <caption><checkbox id="opt-sound" label="&noscriptSound;" /></caption>
-
- <hbox>
- <textbox id="sampleURL" readonly="true" flex="1" />
- <button id="sampleChooseButton" label="&noscriptSound.choose;"
- accesskey="&noscriptSound.choose.accesskey;"
- oncommand="nsopt.soundChooser.choose()" />
- </hbox>
- <hbox align="right">
- <spacer flex="1" />
- <button label="&noscriptSound.play;" accesskey="&noscriptSound.play.accesskey;"
- oncommand="nsopt.soundChooser.play()" />
- <button label="&noscriptSound.reset;" accesskey="&noscriptSound.reset.accesskey;"
- oncommand="nsopt.soundChooser.setSample(null)" />
- </hbox>
-
- </groupbox>
-
- <checkbox id="opt-firstRunRedirection" label="&noscriptShowReleaseNotes;"/>
- </vbox>
- </tabpanel><!-- END Notifications -->
-
- <tabpanel><!-- Advanced -->
- <vbox flex="1">
- <hbox><description style="white-space: normal">&noscriptReloadWarn;</description></hbox>
- <tabbox id="nsopt-tabsAdvanced" flex="1">
- <tabs>
- <tab class="noscript-no" label=" &noscriptUntrusted; " id="nsopt-tabUntrusted" tooltiptext="&noscriptAdditionalRestrictions;"/>
- <tab class="noscript-yes" label=" &noscriptTrusted; " id="nsopt-tabTrusted" tooltiptext="&noscriptAdditionalPermissions;"/>
- <tab class="noscript-xss" label=" &noscriptXss; " id="nsopt-tabXss"/>
- <tab class="noscript-https" label=" &noscriptHttps; " id="nsopt-tabHttps"/>
- <tab class="noscript-abe" label="&ABE;" id="nsopt-tabABE"/>
- <tab class="noscript-clearclick" label="ClearClick" id="nsopt-tabClearClick"/>
- </tabs>
- <tabpanels flex="1">
- <tabpanel>
- <vbox flex="1">
- <label class="header" value="&noscriptAdditionalRestrictions;" />
-
- <checkbox id="opt-forbidBookmarklets" label="&noscriptForbidBookmarklets;" />
- <checkbox id="opt-noping" label="&noscriptForbidPing;" />
- <separator class="thin"/>
- <checkbox id="opt-nselNever" label="&noscriptNselNever;" />
- <checkbox id="opt-forbidMetaRefresh" label="&noscriptForbidMetaRefresh;" />
- <checkbox id="opt-forbidXSLT" label="&noscriptForbidXSLT;" />
- <separator class="thin"/>
- <checkbox id="opt-fixLinks" label="&noscriptFixLinks;" />
-
- <separator class="thin"/>
- <checkbox id="opt-restrictSubdocScripting" label="&noscriptRestrictSubdocScripting;" />
-
- <separator />
- <label class="text-link header"
- onclick="document.getElementById('nsopt-tabsMain').selectedTab = document.getElementById('nsopt-tabEmbeddings')"
- value="&noscriptEmbeddings;" />
- </vbox>
- </tabpanel><!-- END additional restrictions -->
-
- <tabpanel><!-- Additional Permissions -->
- <vbox flex="1">
- <label class="header" value="&noscriptAdditionalPermissions;" />
-
- <checkbox id="opt-nselForce" label="&noscriptNselForce;" />
- <checkbox id="mozopt-browser.send_pings" label="&noscriptAllowPing;" />
-
- <separator class="thin" />
- <checkbox id="opt-allowClipboard" label="&noscriptAllowClipboard;" />
- <checkbox id="opt-allowLocalLinks" label="&noscriptAllowLocalLinks;" />
-
- <separator class="thin" />
- <checkbox id="opt-cascadePermissions" label="&noscriptCascadePermissions;" />
- </vbox>
- </tabpanel><!-- END Additional Permissions -->
-
-
- <tabpanel><!-- XSS -->
- <vbox flex="1">
- <label class="text-link header"
- onclick="noscriptUtil.openFaq('xss')" value="&noscriptXssFaq;"
- accesskey="&noscriptXssFaq.accesskey;"
- />
- <checkbox id="opt-filterXGet" label="&noscriptOptFilterXGet;" />
- <checkbox id="opt-filterXPost" label="&noscriptOptFilterXPost;" />
- <separator class="thin" />
- <label control="xssEx-regexp" class="header" value="&noscriptXssExceptions;" />
- <description control="xssEx-regexp" style="white-space: normal">&noscriptXssExceptions.description;</description>
- <textbox id="xssEx-regexp" multiline="true" flex="1" />
- <hbox align="center">
- <label control="xssEx-sample" value="&noscriptMatchSample;" />
- <textbox id="xssEx-sample" flex="1" value="http://www.google.com/search?q=test" />
- </hbox>
- </vbox>
- </tabpanel>
-
- <tabpanel><!-- HTTPS -->
- <vbox flex="1">
- <label class="text-link header"
- accesskey="&noscriptHttpsFaq.accesskey;"
- onclick="noscriptUtil.openFaq('https')"
- value="&noscriptHttpsFaq;"/>
-
- <tabbox id="nsopt-tabsHttps" flex="1">
- <tabs>
- <tab label=" &noscriptHttps.behavior; " id="nsopt-tabHttpsBehavior" />
- <tab label=" &noscriptHttps.cookies; " id="nsopt-tabHttpsCookies"/>
- <tab label=" &noscriptPermissions; " id="nsopt-tabHttpsPermissions"/>
-
- </tabs>
-
- <tabpanels flex="1">
- <tabpanel>
- <vbox flex="1">
-
- <description control="opt-httpsForced" style="white-space: normal">&noscriptHttpsForced;</description>
- <textbox id="opt-httpsForced" multiline="true" flex="1" />
- <description control="opt-httpsForcedExceptions" style="white-space: normal">&noscriptHttpsForcedExceptions;</description>
- <textbox id="opt-httpsForcedExceptions" multiline="true" flex="1" />
- </vbox>
- </tabpanel>
- <tabpanel>
- <vbox flex="1">
- <groupbox flex="1">
- <caption><checkbox id="opt-secureCookies" label="&noscriptSecureCookies;" oncommand="nsopt.utils.syncGroup(this)" /></caption>
- <description control="opt-secureCookiesForced" style="white-space: normal">&noscriptSecureCookiesForced;</description>
- <textbox id="opt-secureCookiesForced" multiline="true" flex="1" />
-
- <description control="opt-secureCookiesExceptions" style="white-space: normal">&noscriptSecureCookiesExceptions;</description>
- <textbox id="opt-secureCookiesExceptions" multiline="true" flex="1" />
- </groupbox>
- </vbox>
- </tabpanel>
- <tabpanel>
- <vbox flex="1">
- <description control="sel-allowHttpsOnly" style="white-space: normal">&noscriptHttps.description;</description>
- <menulist id="sel-allowHttpsOnly">
- <menupopup id="mp-allowHttpsOnly">
- <menuitem label="&noscriptHttps.never;" value="0" selected="true" />
- <menuitem label="&noscriptHttps.proxy;" value="1"/>
- <menuitem label="&noscriptHttps.always;" value="3"/>
- </menupopup>
- </menulist>
- <spacer flex="1" />
- <checkbox id="opt-globalHttpsWhitelist" label="&noscriptGlobalHttpsWhitelist;" />
- <spacer flex="1" />
- </vbox>
- </tabpanel>
- </tabpanels>
- </tabbox>
- </vbox>
- </tabpanel>
- <tabpanel><!-- ABE -->
- <vbox flex="1">
- <hbox>
- <vbox>
- <checkbox id="opt-ABE.enabled" label="&ABE.enabled.label;" />
- <spacer flex="1" />
- <checkbox id="opt-ABE.siteEnabled" label="&ABE.siteEnabled.label;" />
- </vbox>
- <vbox pack="end">
- <spacer flex="1" />
- <label class="text-link header"
- accesskey="?"
- onclick="noscriptUtil.openHelp('ABE')"
- value="?"/>
- <spacer flex="1" />
- <checkbox id="opt-ABE.wanIpAsLocal" label="" />
- </vbox>
- </hbox>
-
- <vbox >
- <label control="abeRulesets-list" value="&ABE.rulesets.label;" />
- <hbox flex="1">
- <listbox id="abeRulesets-list"
- onselect="abeOpts.selected(this)"
- ondblclick="abeOpts.edit(this)"
- flex="1"
- width="50"
- persist="width"
- style="margin-right: 0"
- >
- <listitem label="SYSTEM" />
- <listitem label="USER" />
- </listbox>
- <splitter style="background: transparent; margin: 0; border-width: 0" />
- <!-- <textbox id="abeRuleset-text" flex="5" multiline="true" wrap="off"
- onchange="abeOpts.changed()"
- oninput="abeOpts.input(this)"
- style="margin-left: 0"
- />
- </hbox>
- <splitter style="background: transparent; margin: 0px; border-width: 0px" />
- <textbox id="abeRuleset-errors" class="noscript-error" style="width: 100%"
- readonly="true" multiline="true" rows="2" hidden="true" value="" />
- </vbox>
- <hbox align="center">
- <button id="abeRefresh-button" label="&ABE.refresh.label;" accesskey="&ABE.refresh.accesskey;" oncommand="abeOpts.refresh()" />
- <spacer flex="2"/>
- <button id="abeEnable-button" label="&ABE.enable.label;" accesskey="&ABE.enable.accesskey;" oncommand="abeOpts.toggle(true)" />
- <button id="abeDisable-button" label="&ABE.disable.label;" accesskey="&ABE.disable.accesskey;" oncommand="abeOpts.toggle(false)" />
- <spacer flex="3"/>
- <button id="abeReset-button" label="&noscriptReset;" oncommand="abeOpts.reset()" />
- </hbox>
- </vbox>
- </tabpanel><!-- End ABE -->
-
- <tabpanel><!-- ClearClick -->
- <vbox flex="1">
-
- <label class="header" control="cc1" value="&noscriptClearClickOpt;" />
- <vbox id="clearClickOpts">
- <checkbox id="cc1" value="1" label="&noscriptUntrustedPagesAdj;"/>
- <checkbox id="cc2" value="2" label="&noscriptTrustedPagesAdj;"/>
- </vbox>
- </vbox>
-
- </tabpanel><!-- End ClearClick -->
-
- </tabpanels>
-
-
- </tabbox>
- </vbox>
- </tabpanel>
-
- </tabpanels>
- </tabbox>
- </vbox>
-</dialog>
diff --git a/chrome/noscript.jar!/content/noscript/noscriptOptions.xul.rej b/chrome/noscript.jar!/content/noscript/noscriptOptions.xul.rej
deleted file mode 100644
index 47e69b4..0000000
--- a/chrome/noscript.jar!/content/noscript/noscriptOptions.xul.rej
+++ /dev/null
@@ -1,25 +0,0 @@
-*** /dev/null
---- /dev/null
-***************
-*** 398
-- <vbox >
---- 398 -----
-+ <vbox >
-***************
-*** 413
-- <textbox id="abeRuleset-text" flex="5" multiline="true" wrap="off"
---- 413 -----
-+ <!-- <textbox id="abeRuleset-text" flex="5" multiline="true" wrap="off"
-***************
-*** 417
-- />
---- 417,418 -----
-+ /> -->
-+ <deck id="abeRuleset-text-container" flex="5" style="margin-left: 0" />
-***************
-*** 419,420
-- <splitter style="background: transparent; margin: 0px; border-width: 0px" />
-- <textbox id="abeRuleset-errors" class="noscript-error" style="width: 100%"
---- 420,421 -----
-+ <splitter style="background: transparent; margin: 0px; border-width: 0px" class="abe-error-element" />
-+ <textbox id="abeRuleset-errors" class="noscript-error abe-error-element" style="width: 100%"
diff --git a/chrome/noscript.jar!/content/noscript/noscriptOverlay.js b/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
index 533bfcd..57e31fc 100644
--- a/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
+++ b/chrome/noscript.jar!/content/noscript/noscriptOverlay.js
@@ -377,20 +377,21 @@ return noscriptUtil.service ? {
}
const buttons = [tbb, $("noscript-statusLabel")];
- let statusIcon = $("noscript-statusIcon");
-
if (install && "CustomizableUI" in window) {
CustomizableUI.addListener({
- onWidgetAdded: function(aWidgetId) {
- for each(let b in buttons) {
- if(b && b.id == aWidgetId) {
- noscriptOverlay.initPopups();
+ onWidgetAfterDOMChange: function(aWidget) {
+ for each(let b in buttonIds) {
+ if(b == aWidget.id) {
+ window.setTimeout(function() { noscriptOverlay.initPopups(); }, 0);
return;
}
}
}
});
}
+
+ let statusIcon = $("noscript-statusIcon");
+
if ($("addon-bar")) {
// Fx 4 or above
if (install) {
diff --git a/chrome/noscript.jar!/content/noscript/patch.exe.stackdump b/chrome/noscript.jar!/content/noscript/patch.exe.stackdump
deleted file mode 100644
index 746ff5b..0000000
--- a/chrome/noscript.jar!/content/noscript/patch.exe.stackdump
+++ /dev/null
@@ -1,21 +0,0 @@
-Exception: STATUS_ACCESS_VIOLATION at eip=0040202F
-eax=00000000 ebx=0028A8F0 ecx=80000038 edx=00422044 esi=0028A90C edi=612605E0
-ebp=0028A918 esp=0028A8E0 program=C:\CygWin\bin\patch.exe, pid 2212, thread main
-cs=0023 ds=002B es=002B fs=0053 gs=002B ss=002B
-Stack trace:
-Frame Function Args
-0028A918 0040202F (0028D404, 61187DB0, 0041C425, 0028A964)
-0028A938 0040682F (00000000, 61187DB0, 0028A964, 6102C234)
-0028A958 0040DC6B (0041C420, 0041C816, 004225A0, 610781BA)
-0028A9A8 00402169 (0041D0C0, 00000000, 00000001, 0041D0C0)
-0028AC28 004035E3 (0000002E, 00000061, 0028ACF8, 61008039)
-0028ACF8 61008039 (00000000, 0028CD84, 610071D0, 00000000)
-0028CD58 61005E84 (0028CD84, 00000000, 00000000, 00000000)
-0028FF28 61005FF6 (610071D0, 00000000, 00000000, 006829F0)
-0028FF48 61006F54 (004031A0, 00000000, 00000000, 00000000)
-0028FF68 0041AC72 (004031A0, 0028FF90, 00682948, 0028FF94)
-0028FF8C 00401015 (FFFD9000, 0028FFDC, 779CA22B, FFFD9000)
-0028FF98 7769919F (FFFD9000, D75A69E0, 00000000, 00000000)
-0028FFDC 779CA22B (FFFFFFFF, 779BF23B, 00000000, 00000000)
-0028FFEC 779CA201 (00401000, FFFD9000, 00000000, 78746341)
-End of stack trace
diff --git a/chrome/noscript.jar!/locale/ar/noscript/noscript.properties b/chrome/noscript.jar!/locale/ar/noscript/noscript.properties
index 6fbcf31..babfb76 100644
--- a/chrome/noscript.jar!/locale/ar/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/ar/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/be-BY/noscript/noscript.properties b/chrome/noscript.jar!/locale/be-BY/noscript/noscript.properties
index 9e95f1c..87a5c89 100644
--- a/chrome/noscript.jar!/locale/be-BY/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/be-BY/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.dtd b/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.dtd
index 0509fb0..b86fca6 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.40">
+<!ENTITY noscriptAbout "За NoScript 2.6.8.41rc1">
<!ENTITY noscriptPermissionsText "Можете да зададете в кои уеб-сайтове е позволено да се използват скриптовете. Напишете адреса или домейна (например "http://www.site.com" или "site.com") на сайта, който искате да разрешите и натиснете Разреши.">
<!ENTITY noscriptWebAddress "Адрес на уеб-сайта:">
<!ENTITY noscriptAllow "Разреши">
diff --git a/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.properties b/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.properties
index 3711808..b0bc04f 100644
--- a/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/bg-BG/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/bn-IN/noscript/noscript.properties b/chrome/noscript.jar!/locale/bn-IN/noscript/noscript.properties
index 4f00cb1..3525fb6 100644
--- a/chrome/noscript.jar!/locale/bn-IN/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/bn-IN/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.dtd
index c88453d..c3ac14c 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.40">
+<!ENTITY noscriptAbout "Quant a NoScript 2.6.8.41rc1">
<!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/ca-AD/noscript/noscript.properties b/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.properties
index ee6a419..d5666eb 100644
--- a/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/ca-AD/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.dtd b/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.dtd
index 1d863da..9de2202 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.40">
+<!ENTITY noscriptAbout "O rozšíření NoScript 2.6.8.41rc1">
<!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/cs-CZ/noscript/noscript.properties b/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.properties
index ea7fbb9..e4eaf28 100644
--- a/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/cs-CZ/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.dtd b/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.dtd
index 29151b8..c80a415 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.40">
+<!ENTITY noscriptAbout "Yngylch NoScript 2.6.8.41rc1">
<!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/cy-GB/noscript/noscript.properties b/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.properties
index 3373204..bc04bc8 100644
--- a/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/cy-GB/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/da/noscript/noscript.dtd b/chrome/noscript.jar!/locale/da/noscript/noscript.dtd
index 48cf426..1ae4e7c 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.40">
+<!ENTITY noscriptAbout "Om NoScript 2.6.8.41rc1">
<!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/da/noscript/noscript.properties b/chrome/noscript.jar!/locale/da/noscript/noscript.properties
index 59075d5..288e0fd 100644
--- a/chrome/noscript.jar!/locale/da/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/da/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/de/noscript/noscript.dtd b/chrome/noscript.jar!/locale/de/noscript/noscript.dtd
index c8d0ee8..aba61a6 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.40…">
+<!ENTITY noscriptAbout "Über NoScript 2.6.8.41rc1…">
<!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/de/noscript/noscript.properties b/chrome/noscript.jar!/locale/de/noscript/noscript.properties
index cde5965..94a9680 100644
--- a/chrome/noscript.jar!/locale/de/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/de/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/el/noscript/noscript.dtd b/chrome/noscript.jar!/locale/el/noscript/noscript.dtd
index abc1f3b..7aabc43 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.40">
+<!ENTITY noscriptAbout "Περί NoScript 2.6.8.41rc1">
<!ENTITY noscriptPermissionsText "Μπορείτε να καθορίσετε για ποιους ιστότοπους θα επιτρέπεται η εκτέλεση σεναρίων εντολών. Πληκτρολογήστε τη διεύθυνση τομέα (πχ. "http://www.site.com" or "site.com") του ιστότοπου που θέλετε και μετά κάντε κλικ στο «Να επιτρέπεται»">
<!ENTITY noscriptWebAddress "Διεύθυνση ιστότοπου">
<!ENTITY noscriptAllow "Να επιτρέπεται">
diff --git a/chrome/noscript.jar!/locale/el/noscript/noscript.properties b/chrome/noscript.jar!/locale/el/noscript/noscript.properties
index e31e339..cf4b923 100644
--- a/chrome/noscript.jar!/locale/el/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/el/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/en-GB/noscript/noscript.dtd b/chrome/noscript.jar!/locale/en-GB/noscript/noscript.dtd
index 660a421..47afaf3 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.40…">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.41rc1…">
<!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-GB/noscript/noscript.properties b/chrome/noscript.jar!/locale/en-GB/noscript/noscript.properties
index c5b6edc..11831ed 100644
--- a/chrome/noscript.jar!/locale/en-GB/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/en-GB/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/en-US/noscript/noscript.dtd b/chrome/noscript.jar!/locale/en-US/noscript/noscript.dtd
index 73e95ab..9af1b59 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.40…">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.41rc1…">
<!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.properties b/chrome/noscript.jar!/locale/en-US/noscript/noscript.properties
index 44ff7e7..a1ebd88 100644
--- a/chrome/noscript.jar!/locale/en-US/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/en-US/noscript/noscript.properties
@@ -50,4 +50,6 @@ disable.accessKey=D
removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
-removal.yes=Yes, remove ALL protections
\ No newline at end of file
+removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
\ No newline at end of file
diff --git a/chrome/noscript.jar!/locale/eo/noscript/noscript.dtd b/chrome/noscript.jar!/locale/eo/noscript/noscript.dtd
index 8e5fe17..64cef62 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.40…">
+<!ENTITY noscriptAbout "Pri NoScript 2.6.8.41rc1…">
<!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/eo/noscript/noscript.properties b/chrome/noscript.jar!/locale/eo/noscript/noscript.properties
index 7b2e8df..35ddb07 100644
--- a/chrome/noscript.jar!/locale/eo/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/eo/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Averto pri malpromociado de sekureco
removal.message=Malebligante aŭ malinstalante NoScript, vi rezignas pri la TUTA protekto, kiun NoScript disponigas.\n\nSe vi nur estas tedita de la manipulado de skriptaj permesoj retejo post retejo, estas pli sekura ebleco.\n\nNoScript povas ĉesigi bloki skriptojn, escepte de tiuj, kiujn vi markas kiel nefidindajn, dum ĝi ankoraŭ protektas vin per la plej progresintaj sekurecaj kontraŭrimedoj kontraŭ XSS, Clickjacking, CSRF kaj aliaj retminacoj.\n\nĈu vi vere volas forigi la TUTAN prote [...]
removal.no=Ne, ĉesu nur bloki skriptojn
removal.yes=Jes, forigu la TUTAN protekton
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/es-AR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/es-AR/noscript/noscript.dtd
index d6d4ec9..50a2c37 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.40">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.8.41rc1">
<!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-AR/noscript/noscript.properties b/chrome/noscript.jar!/locale/es-AR/noscript/noscript.properties
index 89fe451..7211f00 100644
--- a/chrome/noscript.jar!/locale/es-AR/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/es-AR/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/es-CL/noscript/noscript.dtd b/chrome/noscript.jar!/locale/es-CL/noscript/noscript.dtd
index 8240775..5e33a95 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.40…">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.41rc1…">
<!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-CL/noscript/noscript.properties b/chrome/noscript.jar!/locale/es-CL/noscript/noscript.properties
index c5b6edc..11831ed 100644
--- a/chrome/noscript.jar!/locale/es-CL/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/es-CL/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/es-ES/noscript/noscript.dtd b/chrome/noscript.jar!/locale/es-ES/noscript/noscript.dtd
index 970b47b..6a10ef9 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.40">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.8.41rc1">
<!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/es-ES/noscript/noscript.properties b/chrome/noscript.jar!/locale/es-ES/noscript/noscript.properties
index 3dccfe6..20a09d0 100644
--- a/chrome/noscript.jar!/locale/es-ES/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/es-ES/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/et-EE/noscript/noscript.dtd b/chrome/noscript.jar!/locale/et-EE/noscript/noscript.dtd
index 1060d3b..2b65840 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.40…">
+<!ENTITY noscriptAbout "Täpsemalt lisast NoScript 2.6.8.41rc1…">
<!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/et-EE/noscript/noscript.properties b/chrome/noscript.jar!/locale/et-EE/noscript/noscript.properties
index cce4927..2c00415 100644
--- a/chrome/noscript.jar!/locale/et-EE/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/et-EE/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/eu/noscript/noscript.dtd b/chrome/noscript.jar!/locale/eu/noscript/noscript.dtd
index c25b5cc..72d6c60 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.40-eri buruz:">
+<!ENTITY noscriptAbout "NoScript 2.6.8.41rc1-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/eu/noscript/noscript.properties b/chrome/noscript.jar!/locale/eu/noscript/noscript.properties
index 96269cd..d7f04a3 100644
--- a/chrome/noscript.jar!/locale/eu/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/eu/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.dtd
index a0730c9..7106f9e 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.40">
+<!ENTITY noscriptAbout "درباره NoScript 2.6.8.41rc1">
<!ENTITY noscriptPermissionsText "شما می توانید سایت هایی را که اجازه اجرای اسکریپت دارند را مشخص کنید.آدرس سایت یا نام دامنه را وارد کنید.(به عنوان مثال "http://www.site.com" یا "site.com")">
<!ENTITY noscriptWebAddress "آدرس وب سایت :">
<!ENTITY noscriptAllow "اجازه دادن">
diff --git a/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.properties b/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.properties
index 13bec56..9ffb212 100644
--- a/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/fa-IR/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/fi/noscript/noscript.dtd b/chrome/noscript.jar!/locale/fi/noscript/noscript.dtd
index af8d9d5..11a81b2 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.40istä…">
+<!ENTITY noscriptAbout "Tietoja NoScript 2.6.8.41rc1istä…">
<!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/fi/noscript/noscript.properties b/chrome/noscript.jar!/locale/fi/noscript/noscript.properties
index ba0bff5..09c2445 100644
--- a/chrome/noscript.jar!/locale/fi/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/fi/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/fr/noscript/noscript.dtd b/chrome/noscript.jar!/locale/fr/noscript/noscript.dtd
index 1ccbfdd..38a5188 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.40…">
+<!ENTITY noscriptAbout "À propos de NoScript 2.6.8.41rc1…">
<!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/fr/noscript/noscript.properties b/chrome/noscript.jar!/locale/fr/noscript/noscript.properties
index e65a50b..53a0f4e 100644
--- a/chrome/noscript.jar!/locale/fr/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/fr/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Avertissement de Baisse de la Sécurité
removal.message=En désactivant ou désinstallant NoScript, vous abandonnez TOUTES les protections fournies par NoScript.\n\nSi vous êtes simplement fatigué de gérer les permissions de script site par site, il y a un choix plus sûr.\n\nNoScript peut arrêter de bloquer les scripts, exceptés ceux que vous marquez comme non fiables, tout en continuant de vous protéger avec les contremesures de sécurités les plus avancées contre XSS, le Clickjacking, CSRF et d'autres menaces web.\n\nVoulez-vou [...]
removal.no=Non, arrêter simplement de bloquer les scripts
removal.yes=Oui, enlever TOUTES les protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.dtd b/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.dtd
index 49415be..d66d893 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.40">
+<!ENTITY noscriptAbout "Acerca de NoScript 2.6.8.41rc1">
<!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/gl-ES/noscript/noscript.properties b/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.properties
index 8816a96..f4e6168 100644
--- a/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/gl-ES/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/he-IL/noscript/noscript.dtd b/chrome/noscript.jar!/locale/he-IL/noscript/noscript.dtd
index 5df940d..b346c17 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.40">
+<!ENTITY noscriptAbout "אודות NoScript 2.6.8.41rc1">
<!ENTITY noscriptPermissionsText "ציין אילו אתרים יכולים לקבל היתר להפעלת קבצי Script. הקלד את כתובת האתר או את שם התחום (כגון: "http://www.site.com" או "site.com") ולאחר מכן לחץ על התר.">
<!ENTITY noscriptWebAddress "כתובת/תחום:">
<!ENTITY noscriptAllow "התר">
diff --git a/chrome/noscript.jar!/locale/he-IL/noscript/noscript.properties b/chrome/noscript.jar!/locale/he-IL/noscript/noscript.properties
index f5c2ec8..af57090 100644
--- a/chrome/noscript.jar!/locale/he-IL/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/he-IL/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.dtd
index 5cc1657..d48cfb2 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.40">
+<!ENTITY noscriptAbout "O NoScript 2.6.8.41rc1">
<!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/hr-HR/noscript/noscript.properties b/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.properties
index 346b4e8..7d7f9be 100644
--- a/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/hr-HR/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/hsb/noscript/noscript.dtd b/chrome/noscript.jar!/locale/hsb/noscript/noscript.dtd
index 87c1d7f..fae16f0 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.40…">
+<!ENTITY noscriptAbout "Wo NoScript 2.6.8.41rc1…">
<!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/hsb/noscript/noscript.properties b/chrome/noscript.jar!/locale/hsb/noscript/noscript.properties
index 22d471a..b0c697e 100644
--- a/chrome/noscript.jar!/locale/hsb/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/hsb/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Warnowanje znižowanja wěstoty
removal.message=Hdyž NoScript znjemóžnjeće abo wotinstalujeće, wzdaće WŠEHO škita, kotryž NoScript k dispoziciji steji.\n\nJeli maće jenož syte, ze skriptowymi dowolnosćemi sydło po sydle wobchadźeće, je wěsćiša móžnosć.\n\nNoScript móže blokowanje skriptow skónčić, nimo tych, kotrež woznamjenjeće jako dowěry njehódne, mjeztym zo hišće z najbóle rozšěrjenymi wěstotnymi přećiwnymi naprawami přećiwo XSS, Clickjacking, CSRF a drugim webwohroženjam.\n\nChceće woprawdźe WŠÓN škit přez NoScri [...]
removal.no=Ně, jenož blokowanje skriptow skónčić
removal.yes=Haj, WŠÓN škit wotstronić
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.dtd b/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.dtd
index 2e3d7d7..da5400f 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.40 névjegye">
+<!ENTITY noscriptAbout "A NoScript 2.6.8.41rc1 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/hu-HU/noscript/noscript.properties b/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.properties
index 1844b9e..f8d2b17 100644
--- a/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/hu-HU/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/id-ID/noscript/noscript.dtd b/chrome/noscript.jar!/locale/id-ID/noscript/noscript.dtd
index caf771a..fced46a 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.40">
+<!ENTITY noscriptAbout "Tentang NoScript 2.6.8.41rc1">
<!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/id-ID/noscript/noscript.properties b/chrome/noscript.jar!/locale/id-ID/noscript/noscript.properties
index bbb0675..376c494 100644
--- a/chrome/noscript.jar!/locale/id-ID/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/id-ID/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/it/noscript/noscript.dtd b/chrome/noscript.jar!/locale/it/noscript/noscript.dtd
index e5b7dc2..489fca5 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.40…">
+<!ENTITY noscriptAbout "Informazioni su NoScript 2.6.8.41rc1…">
<!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/it/noscript/noscript.properties b/chrome/noscript.jar!/locale/it/noscript/noscript.properties
index 9cd0d61..c910333 100644
--- a/chrome/noscript.jar!/locale/it/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/it/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.dtd
index 289705e..58dd8e8 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.40について...">
+<!ENTITY noscriptAbout "NoScript 2.6.8.41rc1について...">
<!ENTITY noscriptPermissionsText "JavaScriptを許可するサイトを指定する事ができます。許可したいサイトのアドレスかドメインを入力して、ボタンを押してください。(例: "http://www.site.com" または "site.com")">
<!ENTITY noscriptWebAddress "ウェブサイトのアドレス:">
<!ENTITY noscriptAllow "許可する">
diff --git a/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.properties b/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.properties
index d7b7238..f00f03e 100644
--- a/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/ja-JP/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.dtd b/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.dtd
index 0b6d53e..547066d 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.40 туралы...">
+<!ENTITY noscriptAbout "NoScript 2.6.8.41rc1 туралы...">
<!ENTITY noscriptPermissionsText "Қай сайттарға JavaScript орындауға рұқсат екенін көрсете аласыз. Рұқсат етілетін сайттың домен адресін енгізіңіз (мысалы, "http://www.site.com" немесе "site.com"), содан кейін Рұқсат ету басыңыз.">
<!ENTITY noscriptWebAddress "Веб-сайт адресі:">
<!ENTITY noscriptAllow "Рұқсат ету">
diff --git a/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.properties b/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.properties
index f9ae966..ce4cc33 100644
--- a/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/kk-KZ/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/km-KH/noscript/noscript.dtd b/chrome/noscript.jar!/locale/km-KH/noscript/noscript.dtd
index dc3a25f..30e8ff9 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.40">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.41rc1">
<!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/km-KH/noscript/noscript.properties b/chrome/noscript.jar!/locale/km-KH/noscript/noscript.properties
index c5b6edc..11831ed 100644
--- a/chrome/noscript.jar!/locale/km-KH/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/km-KH/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.dtd
index 1578047..75fc74f 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.40 정보...">
+<!ENTITY noscriptAbout "NoScript 2.6.8.41rc1 정보...">
<!ENTITY noscriptPermissionsText "스크립트 실행을 허용할 웹 사이트를 지정할 수 있습니다. 스크립트를 허용할 사이트의 주소나 도메인 (예를 들면, "http://www.site.com" 또는 "site.com")을 입력한 후 [허용] 버튼을 클릭합니다.">
<!ENTITY noscriptWebAddress "웹 사이트 주소">
<!ENTITY noscriptAllow "허용">
diff --git a/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.properties b/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.properties
index 60e3e17..3d44e5a 100644
--- a/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/ko-KR/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/lt/noscript/noscript.dtd b/chrome/noscript.jar!/locale/lt/noscript/noscript.dtd
index 79e7b66..a9420b4 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.40">
+<!ENTITY noscriptAbout "Apie NoScript 2.6.8.41rc1">
<!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/lt/noscript/noscript.properties b/chrome/noscript.jar!/locale/lt/noscript/noscript.properties
index 80cbce5..c967f0b 100644
--- a/chrome/noscript.jar!/locale/lt/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/lt/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.dtd b/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.dtd
index 1d2905f..d06cba7 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.40">
+<!ENTITY noscriptAbout "За NoScript 2.6.8.41rc1">
<!ENTITY noscriptPermissionsText "Можете да ги назначите страните, на кои што скриптите ќе бидат дозволени. Напишете ја дозволената адреса (на пример http://www.site.com или site.com) и кликнете „Дозволи“">
<!ENTITY noscriptWebAddress "Адреса на дозволената веб страна:">
<!ENTITY noscriptAllow "Дозволи">
diff --git a/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.properties b/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.properties
index d325fa3..48221ac 100644
--- a/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/mk-MK/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.dtd
index 488a95e..4d4fb15 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.40">
+<!ENTITY noscriptAbout "Tentang NoScript 2.6.8.41rc1">
<!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/ms-MY/noscript/noscript.properties b/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.properties
index b01fefc..e29b9a7 100644
--- a/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/ms-MY/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.dtd b/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.dtd
index e8e4362..ec6dc67 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.40">
+<!ENTITY noscriptAbout "Om NoScript 2.6.8.41rc1">
<!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/nb-NO/noscript/noscript.properties b/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.properties
index e8a84ba..c773120 100644
--- a/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/nb-NO/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/nl/noscript/noscript.dtd b/chrome/noscript.jar!/locale/nl/noscript/noscript.dtd
index a02fc3c..9003fec 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.40">
+<!ENTITY noscriptAbout "Over NoScript 2.6.8.41rc1">
<!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/nl/noscript/noscript.properties b/chrome/noscript.jar!/locale/nl/noscript/noscript.properties
index 3814a4c..d956472 100644
--- a/chrome/noscript.jar!/locale/nl/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/nl/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/pl/noscript/noscript.dtd b/chrome/noscript.jar!/locale/pl/noscript/noscript.dtd
index 0efe694..243622c 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.40 – informacje">
+<!ENTITY noscriptAbout "NoScript 2.6.8.41rc1 – 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/pl/noscript/noscript.properties b/chrome/noscript.jar!/locale/pl/noscript/noscript.properties
index 1682db6..4af43d3 100644
--- a/chrome/noscript.jar!/locale/pl/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/pl/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.dtd b/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.dtd
index 4e4b23d..2db984f 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.40…">
+<!ENTITY noscriptAbout "Sobre o NoScript 2.6.8.41rc1…">
<!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-BR/noscript/noscript.properties b/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.properties
index aebc0dc..0b557f5 100644
--- a/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/pt-BR/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.dtd b/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.dtd
index 9451a60..2c6968f 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.40">
+<!ENTITY noscriptAbout "Sobre o NoScript 2.6.8.41rc1">
<!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/pt-PT/noscript/noscript.properties b/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.properties
index c2fbed9..c9860c5 100644
--- a/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/pt-PT/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/ro/noscript/noscript.dtd b/chrome/noscript.jar!/locale/ro/noscript/noscript.dtd
index 8af7edf..1b833d6 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.40">
+<!ENTITY noscriptAbout "Despre NoScript 2.6.8.41rc1">
<!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/ro/noscript/noscript.properties b/chrome/noscript.jar!/locale/ro/noscript/noscript.properties
index 23b9509..79cb79e 100644
--- a/chrome/noscript.jar!/locale/ro/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/ro/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/ru-RU/noscript/noscript.properties b/chrome/noscript.jar!/locale/ru-RU/noscript/noscript.properties
index 48271cb..4cc0da3 100644
--- a/chrome/noscript.jar!/locale/ru-RU/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/ru-RU/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.dtd b/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.dtd
index b32eb67..0ee7450 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.40">
+<!ENTITY noscriptAbout "O rozšírení NoScript 2.6.8.41rc1">
<!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/sk-SK/noscript/noscript.properties b/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.properties
index b2ee4ae..077c235 100644
--- a/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/sk-SK/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.dtd b/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.dtd
index ef8ba6c..b9e3318 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.40 programu...">
+<!ENTITY noscriptAbout "O NoScript 2.6.8.41rc1 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/sl-SI/noscript/noscript.properties b/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.properties
index 43247a0..af44922 100644
--- a/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/sl-SI/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.dtd b/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.dtd
index 313276f..d58b808 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.40-у">
+<!ENTITY noscriptAbout "О NoScript 2.6.8.41rc1-у">
<!ENTITY noscriptPermissionsText "Можете да наведете којим веб странама је дозвољено да извршавају скриптове. Унесите адресу или домен (нпр. "http://www.site.com" или "site.com") стране којој желите да дате дозволу и онда кликните Дозволи.">
<!ENTITY noscriptWebAddress "Адреса веб стране:">
<!ENTITY noscriptAllow "Дозволи">
diff --git a/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.properties b/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.properties
index e4960e4..41cc8da 100644
--- a/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/sr-RS/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/sr/noscript/noscript.properties b/chrome/noscript.jar!/locale/sr/noscript/noscript.properties
index bccd386..32dd363 100644
--- a/chrome/noscript.jar!/locale/sr/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/sr/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.dtd b/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.dtd
index a6c458d..10f9274 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.40">
+<!ENTITY noscriptAbout "Om NoScript 2.6.8.41rc1">
<!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/sv-SE/noscript/noscript.properties b/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.properties
index 6d6f92e..324c404 100644
--- a/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/sv-SE/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/te-IN/noscript/noscript.dtd b/chrome/noscript.jar!/locale/te-IN/noscript/noscript.dtd
index 2021c4d..1af080e 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.40…">
+<!ENTITY noscriptAbout "About NoScript 2.6.8.41rc1…">
<!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/te-IN/noscript/noscript.properties b/chrome/noscript.jar!/locale/te-IN/noscript/noscript.properties
index c5b6edc..11831ed 100644
--- a/chrome/noscript.jar!/locale/te-IN/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/te-IN/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/th/noscript/noscript.dtd b/chrome/noscript.jar!/locale/th/noscript/noscript.dtd
index ce6bd95..2994a36 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.40">
+<!ENTITY noscriptAbout "เกี่ยวกับ NoScript 2.6.8.41rc1">
<!ENTITY noscriptPermissionsText "คุณสามารถกำหนดเว็บไซต์ที่จะอนุญาตดำเนินการสคริปต์ พิมพ์ที่อยู่หรือโดเมน (เช่น "http://www.site.com" หรือ "site.com") ของไซต์ที่คุณต้องการอนุญาตและคลิกอนุญาต">
<!ENTITY noscriptWebAddress "ที่อยู่เว็บไซต์:">
<!ENTITY noscriptAllow "อนุญาต">
diff --git a/chrome/noscript.jar!/locale/th/noscript/noscript.properties b/chrome/noscript.jar!/locale/th/noscript/noscript.properties
index e1dd618..64b3549 100644
--- a/chrome/noscript.jar!/locale/th/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/th/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/tr/noscript/noscript.dtd b/chrome/noscript.jar!/locale/tr/noscript/noscript.dtd
index 4967d8f..807b27d 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.40 Hakkında">
+<!ENTITY noscriptAbout "NoScript 2.6.8.41rc1 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/tr/noscript/noscript.properties b/chrome/noscript.jar!/locale/tr/noscript/noscript.properties
index ed7d8e6..e73169d 100644
--- a/chrome/noscript.jar!/locale/tr/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/tr/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/uk/noscript/noscript.properties b/chrome/noscript.jar!/locale/uk/noscript/noscript.properties
index 35b555e..fed455c 100644
--- a/chrome/noscript.jar!/locale/uk/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/uk/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/vi/noscript/noscript.dtd b/chrome/noscript.jar!/locale/vi/noscript/noscript.dtd
index 62301e0..fa603f6 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.40">
+<!ENTITY noscriptAbout "Thông tin về NoScript 2.6.8.41rc1">
<!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/vi/noscript/noscript.properties b/chrome/noscript.jar!/locale/vi/noscript/noscript.properties
index ba021b6..55753a3 100644
--- a/chrome/noscript.jar!/locale/vi/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/vi/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.dtd b/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.dtd
index 4d0178d..9584159 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.40">
+<!ENTITY noscriptAbout "关于 NoScript 2.6.8.41rc1">
<!ENTITY noscriptPermissionsText "您可以指定允许执行脚本的网站。请输入您想要允许的网站地址或域名(例如: “http://www.site.com”或者“site.com”)然后单击“允许”。">
<!ENTITY noscriptWebAddress "网站地址:">
<!ENTITY noscriptAllow "允许">
diff --git a/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.properties b/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.properties
index 696febd..f81ef13 100644
--- a/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/zh-CN/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.dtd b/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.dtd
index 68b9818..334b359 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.40">
+<!ENTITY noscriptAbout "關於 NoScript 2.6.8.41rc1">
<!ENTITY noscriptPermissionsText "您可以指定允許執行 JavaScript 的網站。輸入您要允許的網址或網域（例如 "http://www.site.com" 或 "site.com"），然後按下允許.">
<!ENTITY noscriptWebAddress "網址：">
<!ENTITY noscriptAllow "允許">
diff --git a/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.properties b/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.properties
index 16740af..6aefd62 100644
--- a/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.properties
+++ b/chrome/noscript.jar!/locale/zh-TW/noscript/noscript.properties
@@ -51,3 +51,5 @@ removal.title=Security Downgrade Warning
removal.message=By disabling or uninstalling NoScript, you give up ALL the protections provided by NoScript.\n\nIf you're just tired of handling script permissions site by site, there's a safer choice.\n\nNoScript can stop blocking scripts, except those you mark as untrusted, while still protecting you with the most advanced security countermeasures against XSS, Clickjacking, CSRF and other web threats.\n\nDo you really want to remove ALL the NoScript protections?\n
removal.no=No, just stop blocking scripts
removal.yes=Yes, remove ALL protections
+incompatibleOptions.title=Incompatible Options Warning
+incompatibleOptions="1$%S"\nis incompatible with "%2$S".\bDo you want to enable the former and disable the latter?
diff --git a/components/noscriptService.js b/components/noscriptService.js
index 3f71db9..9e9c1d6 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.40";
+const VERSION = "2.6.8.41rc1";
const SERVICE_CTRID = "@maone.net/noscript-service;1";
const SERVICE_ID = "{31aec909-8e86-4397-9380-63a59e0c5ff5}";
const EXTENSION_ID = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
diff --git a/install.rdf b/install.rdf
index 51594bf..0d7b2ee 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.40</em:version>
+ <em:version>2.6.8.41rc1</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