[or-cvs] r10744: Add options to spoof charset and language in http headers. A (in torbutton/trunk/src: . chrome/content chrome/locale/de-AT chrome/locale/de-CH chrome/locale/de-DE chrome/locale/el-GR chrome/locale/en-US chrome/locale/es-AR chrome/locale/fr-FR chrome/locale/hr-HR chrome/locale/it-IT chrome/locale/nl-NL chrome/locale/pl-PL chrome/locale/pt-BR chrome/locale/ru-RU chrome/locale/sl-SI chrome/locale/zh-CN chrome/locale/zh-TW defaults/preferences)
mikeperry at seul.org
mikeperry at seul.org
Fri Jul 6 05:10:57 UTC 2007
Author: mikeperry
Date: 2007-07-06 01:10:57 -0400 (Fri, 06 Jul 2007)
New Revision: 10744
Modified:
torbutton/trunk/src/chrome/content/preferences.js
torbutton/trunk/src/chrome/content/preferences.xul
torbutton/trunk/src/chrome/content/torbutton.js
torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
torbutton/trunk/src/defaults/preferences/preferences.js
torbutton/trunk/src/install.rdf
Log:
Add options to spoof charset and language in http headers.
Add option to remove referer (temporarily solution.. breaks
some sites and is off by default). Copied new DTD elements
(in english) to all language sets. Change plugin blocking
logic slightly to associate it more closely with tor state
(plugins are pretty disobedient beasts anyways, this is
mostly a feel-good measure).
Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/content/preferences.js 2007-07-06 05:10:57 UTC (rev 10744)
@@ -181,6 +181,8 @@
doc.getElementById('torbutton_noSearch').checked = o_torprefs.getBoolPref('no_search');
doc.getElementById('torbutton_noUpdates').checked = o_torprefs.getBoolPref('no_updates');
doc.getElementById('torbutton_setUagent').checked = o_torprefs.getBoolPref('set_uagent');
+ doc.getElementById('torbutton_noReferer').checked = o_torprefs.getBoolPref('disable_referer');
+ doc.getElementById('torbutton_spoofEnglish').checked = o_torprefs.getBoolPref('spoof_english');
torbutton_prefs_set_field_attributes(doc);
@@ -250,6 +252,8 @@
o_torprefs.setBoolPref('no_updates', doc.getElementById('torbutton_noUpdates').checked);
o_torprefs.setBoolPref('set_uagent', doc.getElementById('torbutton_setUagent').checked);
+ o_torprefs.setBoolPref('disable_referer', doc.getElementById('torbutton_noReferer').checked);
+ o_torprefs.setBoolPref('spoof_english', doc.getElementById('torbutton_spoofEnglish').checked);
// if tor settings were initially active, update the active settings to reflect any changes
if (tor_enabled) torbutton_activate_tor_settings();
Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/content/preferences.xul 2007-07-06 05:10:57 UTC (rev 10744)
@@ -119,7 +119,7 @@
<tab label="&torbutton.prefs.cache;"/>
<tab label="&torbutton.prefs.cookies;"/>
<tab label="&torbutton.prefs.shutdown;"/>
- <tab label="&torbutton.prefs.uagent;"/>
+ <tab label="&torbutton.prefs.headers;"/>
</tabs>
<tabpanels>
<tabpanel id="plugins">
@@ -194,10 +194,14 @@
oncommand="torbutton_prefs_set_field_attributes(document)"/>
</vbox>
</tabpanel>
- <tabpanel id="uagent">
+ <tabpanel id="headers">
<vbox>
<checkbox id="torbutton_setUagent" label="&torbutton.prefs.set_uagent;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
+ <checkbox id="torbutton_spoofEnglish" label="&torbutton.prefs.spoof_english;"
+ oncommand="torbutton_prefs_set_field_attributes(document)"/>
+ <checkbox id="torbutton_noReferer" label="&torbutton.prefs.disable_referer;"
+ oncommand="torbutton_prefs_set_field_attributes(document)"/>
</vbox>
</tabpanel>
</tabpanels>
Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/content/torbutton.js 2007-07-06 05:10:57 UTC (rev 10744)
@@ -1,8 +1,6 @@
// TODO: check for leaks: http://www.mozilla.org/scriptable/avoiding-leaks.html
// TODO: Double-check there are no strange exploits to defeat:
// http://kb.mozillazine.org/Links_to_local_pages_don%27t_work
-// FIXME: Browser accept, locale, currency? (intl.*)
-// - Need to see which of these actually change and are server-visible
// status
var m_tb_wasinited = false;
@@ -65,6 +63,11 @@
case "network.proxy.type":
torbutton_set_status();
break;
+ case "extensions.torbutton.disable_referer":
+ if(!m_tb_prefs.getBoolPref("extensions.torbutton.disable_referer")) {
+ m_tb_prefs.setBoolPref("network.http.sendSecureXSiteReferrer", true);
+ m_tb_prefs.setIntPref("network.http.sendRefererHeader", 2);
+ }
case "extensions.torbutton.no_tor_plugins":
case "extensions.torbutton.no_updates":
case "extensions.torbutton.no_search":
@@ -74,6 +77,7 @@
case "extensions.torbutton.block_thwrite":
case "extensions.torbutton.shutdown_method":
case "extensions.torbutton.disable_sessionstore":
+ case "extensions.torbutton.spoof_english":
torbutton_update_status(
m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"),
true);
@@ -153,8 +157,6 @@
return o_stringbundle;
}
-
-
function torbutton_init_toolbutton(event)
{
if (event.originalTarget && event.originalTarget.getAttribute('id') == 'torbutton-button')
@@ -469,6 +471,23 @@
torbutton_log(2, 'Done with user agent: '+changed);
+ // FIXME: This is not ideal, but the refspoof method is not compatible
+ // with FF2.0
+ if(torprefs.getBoolPref("disable_referer")) {
+ m_tb_prefs.setBoolPref("network.http.sendSecureXSiteReferrer", !mode);
+ m_tb_prefs.setIntPref("network.http.sendRefererHeader", mode ? 0 : 2);
+ }
+
+ if(torprefs.getBoolPref("spoof_english") && mode) {
+ m_tb_prefs.setCharPref("intl.accept_charsets",
+ torprefs.getCharPref("spoof_charset"));
+ m_tb_prefs.setCharPref("intl.accept_languages",
+ torprefs.getCharPref("spoof_language"));
+ } else {
+ m_tb_prefs.clearUserPref("intl.accept_charsets");
+ m_tb_prefs.clearUserPref("intl.accept_languages");
+ }
+
if(torprefs.getIntPref("shutdown_method") == 1) {
// clear cookies on shutdown only if tor is enabled.
m_tb_prefs.setBoolPref("privacy.item.cookies", true);
@@ -716,17 +735,25 @@
var browser = win.getBrowser();
if(isolate_dyn) torbutton_check_js_tag(browser, allowed, js_enabled);
-
- if(kill_plugins) browser.docShell.allowPlugins = allowed;
- else browser.docShell.allowPlugins = true;
+
+ // Only allow plugins if the tab load was from an allowed state
+ // and the current tor state is off.
+ if(kill_plugins)
+ browser.docShell.allowPlugins = allowed && browser.__tb_js_state;
+ else
+ browser.docShell.allowPlugins = true;
var browsers = browser.browsers;
for (var i = 0; i < browsers.length; ++i) {
var b = browser.browsers[i];
if (b) {
- if(kill_plugins) b.docShell.allowPlugins = allowed;
- else browser.docShell.allowPlugins = true;
+ // Only allow plugins if the tab load was from an allowed state
+ // and the current tor state is off.
+ if(kill_plugins)
+ b.docShell.allowPlugins = allowed && b.__tb_js_state;
+ else
+ browser.docShell.allowPlugins = true;
if(isolate_dyn) {
torbutton_check_js_tag(b, allowed, js_enabled);
@@ -811,7 +838,6 @@
if (subject.id.toUpperCase() == TORBUTTON_EXTENSION_UUID) {
torbutton_log(1, "Uninstall: "+data);
- // XXX: What about disabled??
if (data == "item-uninstalled" || data == "item-disabled") {
this._uninstall = true;
} else if (data == "item-cancel-action") {
@@ -873,7 +899,7 @@
return null;
}
-function torbutton_hookdoc(doc) {
+function torbutton_hookdoc(win, doc) {
torbutton_log(1, "Hooking document");
if(doc.doctype) {
torbutton_log(1, "Hooking document: "+doc.doctype.name);
@@ -882,6 +908,16 @@
torbutton_init();
}
+ // We can't just tag the document here because it is possible
+ // to hit reload at just the right point such that the document
+ // has been cleared but the window remained.
+ if(typeof(win.__tb_did_hook) != 'undefined')
+ return; // Ran already
+
+ win.__tb_did_hook = true;
+
+ // We also can't just tag the window either, because it gets
+ // cleared on back/fwd(!??)
if(typeof(doc.__tb_did_hook) != 'undefined')
return; // Ran already
@@ -890,11 +926,13 @@
torbutton_log(1, "JS to be set to: " +m_tb_prefs.getBoolPref("javascript.enabled"));
var browser = getBrowser();
var tor_tag = !m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled");
+ var kill_plugins = m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins");
var js_enabled = m_tb_prefs.getBoolPref("javascript.enabled");
// TODO: try nsIWindowWatcher.getChromeForWindow()
if (browser.contentDocument == doc) {
browser.__tb_js_state = tor_tag;
+ browser.docShell.allowPlugins = tor_tag || !kill_plugins;
browser.docShell.allowJavascript = js_enabled;
}
@@ -903,6 +941,7 @@
var b = browser.browsers[i];
if (b && b.contentDocument == doc) {
b.__tb_js_state = tor_tag;
+ b.docShell.allowPlugins = tor_tag || !kill_plugins;
b.docShell.allowJavascript = js_enabled;
}
}
@@ -966,7 +1005,7 @@
if(aProgress) {
torbutton_log(1, "location progress");
var doc = aProgress.DOMWindow.document;
- if(doc) torbutton_hookdoc(doc);
+ if(doc) torbutton_hookdoc(aProgress.DOMWindow, doc);
else torbutton_log(3, "No DOM at location event!");
} else {
torbutton_log(3, "No aProgress for location!");
Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "Π">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Κάντε κλικ για να εκκίνηση του Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -14,6 +14,19 @@
<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
<!ENTITY torbutton.prefs.proxy.port "Port:">
+<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
+<!ENTITY torbutton.pref_connection.more_info "More information">
+<!ENTITY torbutton.pref_connection_more_info.title "Help">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window.">
+<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.context_menu.toggle.key "T">
+<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.button.label "Torbutton">
+<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
<!ENTITY torbutton.prefs.sec_settings "Security Settings">
<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
@@ -26,7 +39,7 @@
<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Block dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
@@ -34,23 +47,12 @@
<!ENTITY torbutton.prefs.cookies "Cookies">
<!ENTITY torbutton.prefs.cache "Cache">
<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.uagent "User Agent">
<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
<!ENTITY torbutton.prefs.shutdown "Shutdown">
<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
-<!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "O">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Cliquer pour initialiser Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "O">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Kliknite da biste pokrenuli Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "I">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Fare clic per avviare Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "O">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "T">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "С">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Инициализировать Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razširitve Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "点击初始化 Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd 2007-07-06 05:10:57 UTC (rev 10744)
@@ -27,3 +27,32 @@
<!ENTITY torbutton.context_menu.about.key "A">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "點擊以初始 Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (optional)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
Modified: torbutton/trunk/src/defaults/preferences/preferences.js
===================================================================
--- torbutton/trunk/src/defaults/preferences/preferences.js 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/defaults/preferences/preferences.js 2007-07-06 05:10:57 UTC (rev 10744)
@@ -56,6 +56,10 @@
pref("extensions.torbutton.no_search",true);
pref("extensions.torbutton.set_uagent",true);
pref("extensions.torbutton.disable_sessionstore",true);
+pref("extensions.torbutton.spoof_english",true);
+pref("extensions.torbutton.spoof_charset",'iso-8859-1,*,utf-8');
+pref("extensions.torbutton.spoof_language",'en-us, en');
+pref("extensions.torbutton.disable_referer",false);
pref("extensions.torbutton.shutdown_method",1); // 0=none, 1=tor, 2=all
// Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.4) Gecko/20070515 Firefox/2.0.0.4
Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf 2007-07-06 03:49:57 UTC (rev 10743)
+++ torbutton/trunk/src/install.rdf 2007-07-06 05:10:57 UTC (rev 10744)
@@ -6,7 +6,7 @@
<em:name>Torbutton</em:name>
<em:creator>Scott Squires & Mike Perry</em:creator>
<em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id>
- <em:version>1.1.3-alpha</em:version>
+ <em:version>1.1.4-alpha-dev</em:version>
<em:homepageURL>http://freehaven.net/~squires/torbutton/</em:homepageURL>
<em:updateURL>http://freehaven.net/~squires/torbutton/update.rdf</em:updateURL>
<em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
More information about the tor-commits
mailing list