Commit 1b41636c authored by Kathleen Brade's avatar Kathleen Brade
Browse files

Bug 15852: Remove/synchronize Torbutton SOCKS pref logic

Remove the remains of the Torbutton settings panel (which was hidden
by the fix for bug 14630).

Remove the status bar panel (the status bar was removed in Firefox 4).

Remove the outdated "Disable Torbutton to change these settings"
message from the Firefox proxy settings dialog.

Change the behavior of the "Restore Defaults" button in the Privacy
and Security Settings window to no longer reset the browser's proxy
preferences. Our general philosophy is that if Torbutton does not
provide a GUI for changing a preference, Torbutton should not modify
the preference. The exceptions are that Torbutton still supports the
TOR_SOCKS_PORT and TOR_TRANSPROXY environment variables.

Remove a lot of toggle logic, including extensions.torbutton.tor_enabled
and related preferences.

Remove the dual cookie jar support since Tor can no longer be turned off.

Rename torbutton_close_on_toggle() to torbutton_close_tabs_on_new_identity().

Remove torbutton_check_socks_remote_dns() since SOCKS remote DNS is
supported by all modern versions of Firefox.

Remove torbutton_has_good_socks() since it was testing for Firefox 5
or newer.

Remove unused Firefox version check variables, unused functions, and
commented out code.
parent 61b395a4
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd">
<dialog id="torbutton-pref-connection-more-info"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
title="&torbutton.pref_connection_more_info.title;"
maxwidth="500"
buttons="accept"
persist="screenX screenY"
onload="sizeToContent();">
<stringbundleset id="extensionsSet">
<stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/>
</stringbundleset>
<vbox flex="1">
<description>
&torbutton.pref_connection_more_info.text;
</description>
</vbox>
</dialog>
<?xml version="1.0"?>
<!-- TODO: This entire file could be removed, but see bug 19929. -->
<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd">
<overlay id="torbutton-prefs-notice"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" />
<script language="JavaScript">
// onload handler
try{window.addEventListener("load", torbutton_browser_proxy_prefs_init, false);}catch(e){}
</script>
<stringbundleset id="extensionsSet">
<stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/>
</stringbundleset>
<radiogroup id="networkProxyType">
<label id="torbutton-pref-connection-notice" position="1">
&torbutton.pref_connection.notice;
</label>
<label id="torbutton-pref-connection-more-info" position="2"
class="url"
style="color: blue; text-decoration: underline;"
onclick="window.openDialog('chrome://torbutton/content/pref-connection-info.xul','torbutton-pref-connection-more-info','centerscreen,chrome,modal=yes,dialog=yes');">
&torbutton.pref_connection.more_info;
</label>
</radiogroup>
</overlay>
This diff is collapsed.
......@@ -17,129 +17,6 @@
<script type="application/x-javascript" src="torbutton_util.js"/>
<script type="application/x-javascript" src="preferences.js"/>
<tabbox>
<tabs>
<tab hidden="true" label="&torbutton.prefs.privacy_security_settings;"/>
<tab hidden="true" label="&torbutton.prefs.tor_settings;"/>
</tabs>
<tabpanels>
<tabpanel hidden="true">
<vbox>
<radiogroup id="torbutton_settingsMethod">
<radio value="recommended" id="torbutton_useRecommendedSettings"
label="&torbutton.prefs.recommended_settings;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<checkbox class="indent" id="torbutton_usePrivoxy"
label="&torbutton.prefs.use_polipo;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<radio value="custom" id="torbutton_useCustomSettings"
label="&torbutton.prefs.custom_settings;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<grid class="indent" flex="1">
<columns>
<column/>
<column flex="1"/>
</columns>
<rows>
<row align="center">
<hbox align="center" pack="end">
<label value="&torbutton.prefs.proxy.host.http;" control="torbutton_httpProxy"/>
</hbox>
<hbox align="center">
<textbox id="torbutton_httpProxy" preftype="string" flex="1"/>
<label value="&torbutton.prefs.proxy.port;" control="torbutton_httpPort"/>
<textbox id="torbutton_httpPort" size="5"/>
</hbox>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&torbutton.prefs.proxy.host.https;" control="torbutton_httpsProxy"/>
</hbox>
<hbox align="center">
<textbox id="torbutton_httpsProxy" preftype="string" flex="1"/>
<label value="&torbutton.prefs.proxy.port;" control="torbutton_httpsPort"/>
<textbox id="torbutton_httpsPort" size="5"/>
</hbox>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&torbutton.prefs.proxy.host.ftp;" control="torbutton_ftpProxy"/>
</hbox>
<hbox align="center">
<textbox id="torbutton_ftpProxy" preftype="string" flex="1"/>
<label value="&torbutton.prefs.proxy.port;" control="torbutton_ftpPort"/>
<textbox id="torbutton_ftpPort" size="5"/>
</hbox>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&torbutton.prefs.proxy.host.gopher;" control="torbutton_gopherProxy"/>
</hbox>
<hbox align="center">
<textbox id="torbutton_gopherProxy" preftype="string" flex="1"/>
<label value="&torbutton.prefs.proxy.port;" control="torbutton_gopherPort"/>
<textbox id="torbutton_gopherPort" size="5"/>
</hbox>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&torbutton.prefs.proxy.host.socks;" control="torbutton_socksHost"/>
</hbox>
<hbox align="center">
<textbox id="torbutton_socksHost" flex="1"/>
<label value="&torbutton.prefs.proxy.port;" control="torbutton_socksPort"/>
<textbox id="torbutton_socksPort" size="5"/>
</hbox>
</row>
<row align="center">
<hbox align="center" pack="end">
<spacer flex="1"/>
</hbox>
<radiogroup align="center" orient="horizontal" id="torbutton_socksGroup">
<radio id="torbutton_socksv4"
label="&torbutton.prefs.socks_vfour;"/>
<radio id="torbutton_socksv5"
label="&torbutton.prefs.socks_vfive;"/>
</radiogroup>
</row>
<row align="center">
<hbox align="center" pack="end">
<label value="&torbutton.prefs.no_proxies_on;" control="torbutton_noProxiesOn"/>
</hbox>
<hbox align="center">
<textbox id="torbutton_noProxiesOn"/>
<spacer/>
</hbox>
</row>
<row align="right">
<hbox align="center" pack="end">
<spacer flex="1"/>
</hbox>
<hbox align="center" pack="end">
<label class="indent" value="&torbutton.prefs.no_proxy_warning;"/>
</hbox>
</row>
</rows>
</grid>
<!-- This is where we overload for maximum functionality and assume
transparent proxy settings -->
<radio id="torbutton_transparentTor"
label="&torbutton.prefs.transparentTor;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
</radiogroup>
<hbox>
<spacer flex="1"/>
<button id="torbutton_testSettings"
label="&torbutton.prefs.test_settings;"
oncommand="torbutton_prefs_test_settings()"/>
</hbox>
</vbox>
</tabpanel>
<tabpanel hidden="false">
<vbox>
<groupbox>
<caption label="&torbutton.prefs.priv_caption;"/>
......@@ -306,10 +183,6 @@
</hbox>
</groupbox>
</vbox>
</tabpanel>
</tabpanels>
</tabbox>
<tooltip id="high_preview">
<html:b>&torbutton.prefs.sec_gen_desc;</html:b>
......
This diff is collapsed.
......@@ -38,14 +38,6 @@
context="torbutton-context-menu"/>
</toolbarpalette>
<statusbar id="status-bar">
<statusbarpanel id="torbutton-panel"
insertbefore="statusbar-updates"
menu="torbutton-context-menu"
context="torbutton-context-menu" />
<!-- <statusbarpanel context="clipmenu" class="statusbarpanel-iconic" id="plugins-status" tooltip="plugin-tooltip" onclick="torbutton_toggle_plugins();"/> -->
</statusbar>
<!-- Global keyboard shortcuts for new identity and new circuit. -->
<keyset>
<key id="torbutton-new-identity-key" modifiers="accel shift" key="U" oncommand="torbutton_new_identity()"/>
......
......@@ -23,8 +23,7 @@
class="toolbarbutton-1"
label="Torbutton"
tooltiptext="&torbutton.button.tooltip;"
context="torbutton-context-menu"
oncommand="torbutton_toggle(false);" />
context="torbutton-context-menu" />
</toolbarpalette>
<toolbarpalette id="MsgComposeToolbarPalette">
......@@ -33,16 +32,7 @@
class="toolbarbutton-1"
label="Torbutton"
tooltiptext="&torbutton.button.tooltip;"
context="torbutton-context-menu"
oncommand="torbutton_toggle(false);" />
context="torbutton-context-menu" />
</toolbarpalette>
<statusbar id="status-bar">
<statusbarpanel id="torbutton-panel"
insertbefore="statusbar-updates"
context="torbutton-context-menu"
onclick="if (event.button == 0) torbutton_toggle(false)"/>
<menupopup id="torbutton-context-menu"/>
</statusbar>
</overlay>
......@@ -6,28 +6,8 @@
var m_tb_torlog = Components.classes["@torproject.org/torbutton-logger;1"]
.getService(Components.interfaces.nsISupports).wrappedJSObject;
// This is sort of hacky and random..
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo);
var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
.getService(Components.interfaces.nsIVersionComparator);
var m_tb_ff5 = false;
var m_tb_ff4 = false;
var m_tb_string_bundle = torbutton_get_stringbundle();
if(versionChecker.compare(appInfo.version, "4.0a1") >= 0) {
m_tb_ff4 = true;
} else {
m_tb_ff4 = false;
}
if(versionChecker.compare(appInfo.version, "5.0a1") >= 0) {
m_tb_ff5 = true;
} else {
m_tb_ff5 = false;
}
// Bug 1506 P0: Use the log service directly
function torbutton_eclog(nLevel, sMsg) {
m_tb_torlog.eclog(nLevel, sMsg);
......@@ -96,145 +76,6 @@ function torbutton_reset_browser_prefs() {
}
}
// check if the socks_remote_dns preference exists
function torbutton_check_socks_remote_dns()
{
var o_prefbranch = false;
o_prefbranch = torbutton_get_prefbranch("network.proxy.");
// check if this version of Firefox has the socks_remote_dns option
try {
o_prefbranch.getBoolPref('socks_remote_dns');
torbutton_log(2, "socks_remote_dns is available");
return true;
} catch (rErr) {
// no such preference
torbutton_log(4, "socks_remote_dns is unavailable");
return false;
}
}
function torbutton_has_good_socks() {
if(m_tb_ff5) {
return true;
}
// TBB will set this pref if it has the SOCKS timeout patch applied
var environ = Components.classes["@mozilla.org/process/environment;1"]
.getService(Components.interfaces.nsIEnvironment);
if (environ.exists("TOR_SOCKS_PORT"))
return true;
return false;
}
function torbutton_check_status() {
var liveprefs = false;
var torprefs = false;
var remote_dns = true;
torbutton_log(1, "Check status");
liveprefs = torbutton_get_prefbranch('network.proxy.');
torprefs = torbutton_get_prefbranch('extensions.torbutton.');
if (!torprefs) {
torbutton_log(5, "Failed to get torprefs!");
return false;
}
if (!liveprefs) {
torbutton_log(5, "Failed to get lifeprefs!");
return false;
}
if (torprefs.getBoolPref("use_nontor_proxy")) {
return true;
}
if (torbutton_check_socks_remote_dns())
remote_dns = liveprefs.getBoolPref("socks_remote_dns");
else
remote_dns = true;
var proxy_type = 1;
if (torprefs.getCharPref('settings_method') == 'transparent') {
remote_dns = true; // Hack. Transparent has remote_dns disabled
proxy_type = 0;
}
return (
(liveprefs.getIntPref("type") == proxy_type) &&
torbutton_log(1, "Type is true") &&
(liveprefs.getCharPref("http") == torprefs.getCharPref('http_proxy')) &&
torbutton_log(1, "Http proxy") &&
(liveprefs.getIntPref("http_port") == torprefs.getIntPref('http_port')) &&
torbutton_log(1, "Http port") &&
(liveprefs.getCharPref("ssl") == torprefs.getCharPref('https_proxy')) &&
torbutton_log(1, "ssl proxy") &&
(liveprefs.getIntPref("ssl_port") == torprefs.getIntPref('https_port')) &&
torbutton_log(1, "ssl port") &&
(liveprefs.getCharPref("ftp") == torprefs.getCharPref('ftp_proxy')) &&
torbutton_log(1, "ftp proxy") &&
(liveprefs.getIntPref("ftp_port") == torprefs.getIntPref('ftp_port')) &&
torbutton_log(1, "ftp port") &&
(liveprefs.getCharPref("socks") == torprefs.getCharPref('socks_host')) &&
torbutton_log(1, "socks proxy") &&
(liveprefs.getIntPref("socks_port") == torprefs.getIntPref('socks_port')) &&
torbutton_log(1, "socks port") &&
(liveprefs.getIntPref("socks_version") == torprefs.getIntPref('socks_version')) &&
torbutton_log(1, "socks version") &&
(liveprefs.getBoolPref("share_proxy_settings") == false) &&
torbutton_log(1, "share proxy settins") &&
(remote_dns == true)
&& torbutton_log(1, "remote_dns"));
}
function torbutton_activate_tor_settings()
{
var liveprefs = false;
var torprefs = false;
liveprefs = torbutton_get_prefbranch('network.proxy.');
torprefs = torbutton_get_prefbranch('extensions.torbutton.');
if (!liveprefs || !torprefs) {
torbutton_log(4, 'Prefbranch error');
return;
}
torbutton_log(2, 'Activate tor settings');
torprefs.setBoolPref("tor_enabled", true);
liveprefs.setCharPref('http', torprefs.getCharPref('http_proxy'));
liveprefs.setIntPref('http_port', torprefs.getIntPref('http_port'));
liveprefs.setCharPref('ssl', torprefs.getCharPref('https_proxy'));
liveprefs.setIntPref('ssl_port', torprefs.getIntPref('https_port'));
liveprefs.setCharPref('ftp', torprefs.getCharPref('ftp_proxy'));
liveprefs.setIntPref('ftp_port', torprefs.getIntPref('ftp_port'));
torbutton_log(1, 'Half-way there');
if (!m_tb_ff4) {
liveprefs.setCharPref('gopher', torprefs.getCharPref('gopher_proxy'));
liveprefs.setIntPref('gopher_port', torprefs.getIntPref('gopher_port'));
}
liveprefs.setCharPref('socks', torprefs.getCharPref('socks_host'));
liveprefs.setIntPref('socks_port', torprefs.getIntPref('socks_port'));
liveprefs.setIntPref('socks_version', torprefs.getIntPref('socks_version'));
liveprefs.setCharPref('no_proxies_on', torprefs.getCharPref('no_proxies_on'));
liveprefs.setBoolPref('share_proxy_settings', false);
if (torprefs.getCharPref('settings_method') == 'transparent') {
liveprefs.setIntPref('type', 0);
if (torbutton_check_socks_remote_dns()) {
liveprefs.setBoolPref('socks_remote_dns', false);
}
} else {
liveprefs.setIntPref('type', 1);
if (torbutton_check_socks_remote_dns()) {
liveprefs.setBoolPref('socks_remote_dns', true);
}
}
torbutton_log(2, 'Done activating tor settings');
}
// load localization strings
function torbutton_get_stringbundle()
{
......
......@@ -59,7 +59,6 @@ function initDialog() {
selector = Components.classes["@torproject.org/cookie-jar-selector;1"]
.getService(Components.interfaces.nsISupports)
.wrappedJSObject;
var tor_enabled = prefs.getBoolPref("extensions.torbutton.tor_enabled");
//init cookie manager
cookiemanager = Components.classes["@mozilla.org/cookiemanager;1"].getService();
cookiemanager = cookiemanager.QueryInterface(Components.interfaces.nsICookieManager);
......
<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
<!ENTITY torbutton.prefs.proxy.port "Port:">
<!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.new_identity "New Identity">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Preferences...">
......@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
<!ENTITY torbutton.prefs.test_settings "Test Settings">
<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
<!ENTITY torbutton.cookiedialog.lockCol "Protected">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
......@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
......
......@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.test.success = Tor proxy test successful!
torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
......@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
......
<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
<!ENTITY torbutton.prefs.proxy.port "Port:">
<!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.new_identity "New Identity">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Preferences...">
......@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
<!ENTITY torbutton.prefs.test_settings "Test Settings">
<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
<!ENTITY torbutton.cookiedialog.lockCol "Protected">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
......@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
......
......@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.test.success = Tor proxy test successful!
torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
......@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
......
<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
<!ENTITY torbutton.prefs.proxy.port "Port:">
<!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.new_identity "New Identity">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Preferences...">
......@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
<!ENTITY torbutton.prefs.test_settings "Test Settings">
<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
<!ENTITY torbutton.cookiedialog.lockCol "Protected">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
......@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
......
......@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.test.success = Tor proxy test successful!
torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?