[or-cvs] r22058: {torbrowser} update prefs.js with all noscript option, re-add en-US to co (in torbrowser/trunk/build-scripts: . config)

[Erinn Clark]

Author: erinn
Date: 2010-03-26 07:14:56 +0000 (Fri, 26 Mar 2010)
New Revision: 22058

Modified:
   torbrowser/trunk/build-scripts/Makefile.linux
   torbrowser/trunk/build-scripts/config/linux-prefs.js
Log:
update prefs.js with all noscript option, re-add en-US to compressed bundles target.


Modified: torbrowser/trunk/build-scripts/Makefile.linux
===================================================================
--- torbrowser/trunk/build-scripts/Makefile.linux	2010-03-26 04:57:02 UTC (rev 22057)
+++ torbrowser/trunk/build-scripts/Makefile.linux	2010-03-26 07:14:56 UTC (rev 22058)
@@ -258,6 +258,7 @@
 
 all-compressed-bundles: compressed-bundle_ar \
 	compressed-bundle_de \
+	compressed-bundle_en-US \
 	compressed-bundle_es-ES \
 	compressed-bundle_fa \
 	compressed-bundle_fr \

Modified: torbrowser/trunk/build-scripts/config/linux-prefs.js
===================================================================
--- torbrowser/trunk/build-scripts/config/linux-prefs.js	2010-03-26 04:57:02 UTC (rev 22057)
+++ torbrowser/trunk/build-scripts/config/linux-prefs.js	2010-03-26 07:14:56 UTC (rev 22058)
@@ -46,16 +46,16 @@
 user_pref("browser.sessionstore.privacy_level", 2);
 user_pref("browser.shell.checkDefaultBrowser", false);
 user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE&small=1");
-user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.8pre");
+user_pref("browser.startup.homepage_override.mstone", "rv:1.9.1.8");
 user_pref("browser.urlbar.autocomplete.enabled", false);
 user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org flashgot.net google.com googlesyndication.com gstatic.com hotmail.com informaction.com js.wlxrs.com live.com maone.net msn.com noscript.net passport.com passport.net passportimages.com yahoo.com yimg.com about: about:blank about:blocked about:certerror about:config about:credits about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: http://flashgot.net http://google.com http://googlesyndication.com http://gstatic.com http://hotmail.com http://informaction.com http://live.com http://maone.net http://msn.com http://noscript.net http://passport.com http://passport.net http://passportimages.com http://yahoo.com http://yimg.com https://flashgot.net https://google.com https://googlesyndication.com https://gstatic.com https://hotmail.com https://informaction.com https://live.com https://maone.net https://msn.com https://noscript.net https://passport.com https://passport.net https://passpor
 timages.com https://yahoo.com https://yimg.com resource:");
+user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:blank about:blocked about:certerror about:config about:credits about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:");
 user_pref("dom.event.contextmenu.enabled", false);
 user_pref("dom.storage.enabled", false);
 user_pref("extensions.checkCompatibility", false);
 user_pref("extensions.checkUpdateSecurity", false);
-user_pref("extensions.enabledItems", "BUNDLELOCALE,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8pre");
-user_pref("extensions.lastAppVersion", "3.5.8pre");
+user_pref("extensions.enabledItems", "BUNDLELOCALE,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8");
+user_pref("extensions.lastAppVersion", "3.5.8");
 user_pref("extensions.torbutton.fresh_install", false);
 user_pref("extensions.torbutton.http_port", 8118);
 user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
@@ -111,10 +111,32 @@
 user_pref("network.proxy.ssl_port", 8118);
 user_pref("network.proxy.type", 1);
 user_pref("network.security.ports.banned", "8118,8123,9050,9051");
+user_pref("noscript.ABE.enabled", false);
+user_pref("noscript.ABE.notify", false);
+user_pref("noscript.autoReload", false);
+user_pref("noscript.contentBlocker", true);
+user_pref("noscript.default", "about:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com");
+user_pref("noscript.firstRunRedirection", false);
 user_pref("noscript.gtemp", "");
+user_pref("noscript.httpsForced", "*twitter.com *facebook.com blog.torproject.org www.torproject.org docs.google.com addons.mozilla.org www.stumbleupon.com");
+user_pref("noscript.httpsForcedExceptions", "www.google.com images.google.com safebrowsing*.google.com maps.google.com code.google.com sorry.google.com news.google.com gitweb.torproject.org metrics.torproject.org exitlist.torproject.org deb.torproject.org");
+user_pref("noscript.opacizeObject", 3);
+user_pref("noscript.options.tabSelectedIndexes", "5,0,0");
 user_pref("noscript.policynames", "");
-user_pref("noscript.subscription.lastCheck", -1739963884);
+user_pref("noscript.secureCookies", true);
+user_pref("noscript.secureCookiesForced", "*torproject.org *github.com *facebook.com *twitter.com");
+user_pref("noscript.showAllowPage", false);
+user_pref("noscript.showBaseDomain", false);
+user_pref("noscript.showDistrust", false);
+user_pref("noscript.showRecentlyBlocked", false);
+user_pref("noscript.showRevokeTemp", false);
+user_pref("noscript.showTemp", false);
+user_pref("noscript.showTempAllowPage", false);
+user_pref("noscript.showTempToPerm", false);
+user_pref("noscript.showUntrusted", false);
+user_pref("noscript.subscription.lastCheck", -1723345640);
 user_pref("noscript.temp", "");
+user_pref("noscript.untrusted", "");
 user_pref("noscript.version", "1.9.9.57");
 user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
 user_pref("plugin.expose_full_path", true);