[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [torbutton/master] Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
commit 1b41636c9351b46bbcb2094a65c65a4407b60a37
Author: Kathy Brade <brade@xxxxxxxxxxxxxxxxx>
Date: Thu Aug 25 15:40:30 2016 -0400
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.
---
src/chrome/content/pref-connection-info.xul | 24 -
src/chrome/content/pref-connection.xul | 24 +-
src/chrome/content/preferences.js | 354 +-----------
src/chrome/content/preferences.xul | 127 -----
src/chrome/content/torbutton.js | 799 ++-------------------------
src/chrome/content/torbutton.xul | 8 -
src/chrome/content/torbutton_tb.xul | 14 +-
src/chrome/content/torbutton_util.js | 159 ------
src/chrome/content/torcookie.js | 1 -
src/chrome/locale/af/torbutton.dtd | 20 -
src/chrome/locale/af/torbutton.properties | 8 -
src/chrome/locale/ak/torbutton.dtd | 20 -
src/chrome/locale/ak/torbutton.properties | 8 -
src/chrome/locale/am/torbutton.dtd | 20 -
src/chrome/locale/am/torbutton.properties | 8 -
src/chrome/locale/ar/torbutton.dtd | 20 -
src/chrome/locale/ar/torbutton.properties | 8 -
src/chrome/locale/arn/torbutton.dtd | 20 -
src/chrome/locale/arn/torbutton.properties | 8 -
src/chrome/locale/ast/torbutton.dtd | 20 -
src/chrome/locale/ast/torbutton.properties | 8 -
src/chrome/locale/az/torbutton.dtd | 20 -
src/chrome/locale/az/torbutton.properties | 8 -
src/chrome/locale/be/torbutton.dtd | 20 -
src/chrome/locale/be/torbutton.properties | 8 -
src/chrome/locale/bg/torbutton.dtd | 20 -
src/chrome/locale/bg/torbutton.properties | 8 -
src/chrome/locale/bms/torbutton.dtd | 20 -
src/chrome/locale/bms/torbutton.properties | 5 -
src/chrome/locale/bn-IN/torbutton.dtd | 20 -
src/chrome/locale/bn-IN/torbutton.properties | 8 -
src/chrome/locale/bn/torbutton.dtd | 20 -
src/chrome/locale/bn/torbutton.properties | 8 -
src/chrome/locale/bo/torbutton.dtd | 20 -
src/chrome/locale/bo/torbutton.properties | 8 -
src/chrome/locale/br/torbutton.dtd | 20 -
src/chrome/locale/br/torbutton.properties | 8 -
src/chrome/locale/bs/torbutton.dtd | 20 -
src/chrome/locale/bs/torbutton.properties | 8 -
src/chrome/locale/ca/torbutton.dtd | 20 -
src/chrome/locale/ca/torbutton.properties | 8 -
src/chrome/locale/cs/torbutton.dtd | 20 -
src/chrome/locale/cs/torbutton.properties | 8 -
src/chrome/locale/csb/torbutton.dtd | 20 -
src/chrome/locale/csb/torbutton.properties | 8 -
src/chrome/locale/cy/torbutton.dtd | 20 -
src/chrome/locale/cy/torbutton.properties | 8 -
src/chrome/locale/da/torbutton.dtd | 20 -
src/chrome/locale/da/torbutton.properties | 8 -
src/chrome/locale/de/torbutton.dtd | 20 -
src/chrome/locale/de/torbutton.properties | 8 -
src/chrome/locale/dz/torbutton.dtd | 20 -
src/chrome/locale/dz/torbutton.properties | 8 -
src/chrome/locale/el/torbutton.dtd | 20 -
src/chrome/locale/el/torbutton.properties | 8 -
src/chrome/locale/en/torbutton.dtd | 20 -
src/chrome/locale/en/torbutton.properties | 8 -
src/chrome/locale/eo/torbutton.dtd | 20 -
src/chrome/locale/eo/torbutton.properties | 8 -
src/chrome/locale/es/torbutton.dtd | 20 -
src/chrome/locale/es/torbutton.properties | 8 -
src/chrome/locale/et/torbutton.dtd | 20 -
src/chrome/locale/et/torbutton.properties | 8 -
src/chrome/locale/eu/torbutton.dtd | 20 -
src/chrome/locale/eu/torbutton.properties | 8 -
src/chrome/locale/fa/torbutton.dtd | 20 -
src/chrome/locale/fa/torbutton.properties | 8 -
src/chrome/locale/fi/torbutton.dtd | 20 -
src/chrome/locale/fi/torbutton.properties | 8 -
src/chrome/locale/fil/torbutton.dtd | 20 -
src/chrome/locale/fil/torbutton.properties | 8 -
src/chrome/locale/fo/torbutton.dtd | 20 -
src/chrome/locale/fo/torbutton.properties | 8 -
src/chrome/locale/fr/torbutton.dtd | 20 -
src/chrome/locale/fr/torbutton.properties | 8 -
src/chrome/locale/fur/torbutton.dtd | 20 -
src/chrome/locale/fur/torbutton.properties | 8 -
src/chrome/locale/fy/torbutton.dtd | 20 -
src/chrome/locale/fy/torbutton.properties | 8 -
src/chrome/locale/ga/torbutton.dtd | 20 -
src/chrome/locale/ga/torbutton.properties | 8 -
src/chrome/locale/gl/torbutton.dtd | 20 -
src/chrome/locale/gl/torbutton.properties | 8 -
src/chrome/locale/gu/torbutton.dtd | 20 -
src/chrome/locale/gu/torbutton.properties | 8 -
src/chrome/locale/gun/torbutton.dtd | 20 -
src/chrome/locale/gun/torbutton.properties | 8 -
src/chrome/locale/ha/torbutton.dtd | 20 -
src/chrome/locale/ha/torbutton.properties | 8 -
src/chrome/locale/he/torbutton.dtd | 20 -
src/chrome/locale/he/torbutton.properties | 8 -
src/chrome/locale/hi/torbutton.dtd | 20 -
src/chrome/locale/hi/torbutton.properties | 8 -
src/chrome/locale/hr/torbutton.dtd | 20 -
src/chrome/locale/hr/torbutton.properties | 8 -
src/chrome/locale/ht/torbutton.dtd | 20 -
src/chrome/locale/ht/torbutton.properties | 8 -
src/chrome/locale/hu/torbutton.dtd | 20 -
src/chrome/locale/hu/torbutton.properties | 8 -
src/chrome/locale/hy/torbutton.dtd | 20 -
src/chrome/locale/hy/torbutton.properties | 8 -
src/chrome/locale/id/torbutton.dtd | 20 -
src/chrome/locale/id/torbutton.properties | 8 -
src/chrome/locale/is/torbutton.dtd | 20 -
src/chrome/locale/is/torbutton.properties | 8 -
src/chrome/locale/it/torbutton.dtd | 20 -
src/chrome/locale/it/torbutton.properties | 8 -
src/chrome/locale/ja/torbutton.dtd | 20 -
src/chrome/locale/ja/torbutton.properties | 8 -
src/chrome/locale/jv/torbutton.dtd | 20 -
src/chrome/locale/jv/torbutton.properties | 8 -
src/chrome/locale/ka/torbutton.dtd | 20 -
src/chrome/locale/ka/torbutton.properties | 8 -
src/chrome/locale/km/torbutton.dtd | 20 -
src/chrome/locale/km/torbutton.properties | 8 -
src/chrome/locale/kn/torbutton.dtd | 20 -
src/chrome/locale/kn/torbutton.properties | 8 -
src/chrome/locale/ko/torbutton.dtd | 20 -
src/chrome/locale/ko/torbutton.properties | 8 -
src/chrome/locale/ku/torbutton.dtd | 20 -
src/chrome/locale/ku/torbutton.properties | 8 -
src/chrome/locale/kw/torbutton.dtd | 20 -
src/chrome/locale/kw/torbutton.properties | 8 -
src/chrome/locale/ky/torbutton.dtd | 20 -
src/chrome/locale/ky/torbutton.properties | 8 -
src/chrome/locale/lb/torbutton.dtd | 20 -
src/chrome/locale/lb/torbutton.properties | 8 -
src/chrome/locale/lg/torbutton.dtd | 20 -
src/chrome/locale/lg/torbutton.properties | 5 -
src/chrome/locale/ln/torbutton.dtd | 20 -
src/chrome/locale/ln/torbutton.properties | 8 -
src/chrome/locale/lo/torbutton.dtd | 20 -
src/chrome/locale/lo/torbutton.properties | 8 -
src/chrome/locale/lt/torbutton.dtd | 20 -
src/chrome/locale/lt/torbutton.properties | 8 -
src/chrome/locale/lv/torbutton.dtd | 20 -
src/chrome/locale/lv/torbutton.properties | 8 -
src/chrome/locale/mg/torbutton.dtd | 20 -
src/chrome/locale/mg/torbutton.properties | 8 -
src/chrome/locale/mi/torbutton.dtd | 20 -
src/chrome/locale/mi/torbutton.properties | 8 -
src/chrome/locale/mk/torbutton.dtd | 20 -
src/chrome/locale/mk/torbutton.properties | 8 -
src/chrome/locale/ml/torbutton.dtd | 20 -
src/chrome/locale/ml/torbutton.properties | 8 -
src/chrome/locale/mn/torbutton.dtd | 20 -
src/chrome/locale/mn/torbutton.properties | 8 -
src/chrome/locale/mr/torbutton.dtd | 20 -
src/chrome/locale/mr/torbutton.properties | 8 -
src/chrome/locale/ms/torbutton.dtd | 20 -
src/chrome/locale/ms/torbutton.properties | 8 -
src/chrome/locale/mt/torbutton.dtd | 20 -
src/chrome/locale/mt/torbutton.properties | 8 -
src/chrome/locale/my/torbutton.dtd | 20 -
src/chrome/locale/my/torbutton.properties | 8 -
src/chrome/locale/nah/torbutton.dtd | 20 -
src/chrome/locale/nah/torbutton.properties | 8 -
src/chrome/locale/nap/torbutton.dtd | 20 -
src/chrome/locale/nap/torbutton.properties | 8 -
src/chrome/locale/nb/torbutton.dtd | 20 -
src/chrome/locale/nb/torbutton.properties | 8 -
src/chrome/locale/ne/torbutton.dtd | 20 -
src/chrome/locale/ne/torbutton.properties | 8 -
src/chrome/locale/nl/torbutton.dtd | 20 -
src/chrome/locale/nl/torbutton.properties | 8 -
src/chrome/locale/nn/torbutton.dtd | 20 -
src/chrome/locale/nn/torbutton.properties | 8 -
src/chrome/locale/nso/torbutton.dtd | 20 -
src/chrome/locale/nso/torbutton.properties | 8 -
src/chrome/locale/oc/torbutton.dtd | 20 -
src/chrome/locale/oc/torbutton.properties | 8 -
src/chrome/locale/or/torbutton.dtd | 20 -
src/chrome/locale/or/torbutton.properties | 8 -
src/chrome/locale/pa/torbutton.dtd | 20 -
src/chrome/locale/pa/torbutton.properties | 8 -
src/chrome/locale/pap/torbutton.dtd | 20 -
src/chrome/locale/pap/torbutton.properties | 8 -
src/chrome/locale/pl/torbutton.dtd | 20 -
src/chrome/locale/pl/torbutton.properties | 8 -
src/chrome/locale/pms/torbutton.dtd | 20 -
src/chrome/locale/pms/torbutton.properties | 8 -
src/chrome/locale/ps/torbutton.dtd | 20 -
src/chrome/locale/ps/torbutton.properties | 8 -
src/chrome/locale/pt-BR/torbutton.dtd | 20 -
src/chrome/locale/pt-BR/torbutton.properties | 8 -
src/chrome/locale/pt/torbutton.dtd | 20 -
src/chrome/locale/pt/torbutton.properties | 8 -
src/chrome/locale/ro/torbutton.dtd | 20 -
src/chrome/locale/ro/torbutton.properties | 8 -
src/chrome/locale/ru/torbutton.dtd | 20 -
src/chrome/locale/ru/torbutton.properties | 8 -
src/chrome/locale/sco/torbutton.dtd | 20 -
src/chrome/locale/sco/torbutton.properties | 8 -
src/chrome/locale/sk/torbutton.dtd | 20 -
src/chrome/locale/sk/torbutton.properties | 8 -
src/chrome/locale/sl/torbutton.dtd | 20 -
src/chrome/locale/sl/torbutton.properties | 8 -
src/chrome/locale/so/torbutton.dtd | 20 -
src/chrome/locale/so/torbutton.properties | 8 -
src/chrome/locale/son/torbutton.dtd | 20 -
src/chrome/locale/son/torbutton.properties | 8 -
src/chrome/locale/sq/torbutton.dtd | 20 -
src/chrome/locale/sq/torbutton.properties | 8 -
src/chrome/locale/sr/torbutton.dtd | 20 -
src/chrome/locale/sr/torbutton.properties | 8 -
src/chrome/locale/st/torbutton.dtd | 20 -
src/chrome/locale/st/torbutton.properties | 8 -
src/chrome/locale/su/torbutton.dtd | 20 -
src/chrome/locale/su/torbutton.properties | 8 -
src/chrome/locale/sv/torbutton.dtd | 20 -
src/chrome/locale/sv/torbutton.properties | 8 -
src/chrome/locale/sw/torbutton.dtd | 20 -
src/chrome/locale/sw/torbutton.properties | 8 -
src/chrome/locale/ta/torbutton.dtd | 20 -
src/chrome/locale/ta/torbutton.properties | 8 -
src/chrome/locale/te/torbutton.dtd | 20 -
src/chrome/locale/te/torbutton.properties | 8 -
src/chrome/locale/tg/torbutton.dtd | 20 -
src/chrome/locale/tg/torbutton.properties | 8 -
src/chrome/locale/th/torbutton.dtd | 20 -
src/chrome/locale/th/torbutton.properties | 8 -
src/chrome/locale/ti/torbutton.dtd | 20 -
src/chrome/locale/ti/torbutton.properties | 8 -
src/chrome/locale/tk/torbutton.dtd | 20 -
src/chrome/locale/tk/torbutton.properties | 8 -
src/chrome/locale/tr/torbutton.dtd | 20 -
src/chrome/locale/tr/torbutton.properties | 8 -
src/chrome/locale/uk/torbutton.dtd | 20 -
src/chrome/locale/uk/torbutton.properties | 8 -
src/chrome/locale/ur/torbutton.dtd | 20 -
src/chrome/locale/ur/torbutton.properties | 8 -
src/chrome/locale/ve/torbutton.dtd | 20 -
src/chrome/locale/ve/torbutton.properties | 8 -
src/chrome/locale/vi/torbutton.dtd | 20 -
src/chrome/locale/vi/torbutton.properties | 8 -
src/chrome/locale/wa/torbutton.dtd | 20 -
src/chrome/locale/wa/torbutton.properties | 8 -
src/chrome/locale/wo/torbutton.dtd | 20 -
src/chrome/locale/wo/torbutton.properties | 8 -
src/chrome/locale/zh-CN/torbutton.dtd | 20 -
src/chrome/locale/zh-CN/torbutton.properties | 8 -
src/chrome/locale/zh-HK/torbutton.dtd | 20 -
src/chrome/locale/zh-HK/torbutton.properties | 8 -
src/chrome/locale/zh-TW/torbutton.dtd | 20 -
src/chrome/locale/zh-TW/torbutton.properties | 8 -
src/chrome/locale/zu/torbutton.dtd | 20 -
src/chrome/locale/zu/torbutton.properties | 8 -
src/chrome/skin/p.png | Bin 916 -> 0 bytes
src/chrome/skin/poff.png | Bin 970 -> 0 bytes
src/chrome/skin/punknown.png | Bin 1000 -> 0 bytes
src/chrome/skin/torbutton.css | 31 --
src/components/cookie-jar-selector.js | 24 +-
src/components/external-app-blocker.js | 9 +-
src/components/startup-observer.js | 100 +---
src/defaults/preferences/preferences.js | 58 +-
255 files changed, 64 insertions(+), 4994 deletions(-)
diff --git a/src/chrome/content/pref-connection-info.xul b/src/chrome/content/pref-connection-info.xul
deleted file mode 100644
index 0968ec5..0000000
--- a/src/chrome/content/pref-connection-info.xul
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>
diff --git a/src/chrome/content/pref-connection.xul b/src/chrome/content/pref-connection.xul
index b00a5aa..4d5fb61 100644
--- a/src/chrome/content/pref-connection.xul
+++ b/src/chrome/content/pref-connection.xul
@@ -1,30 +1,10 @@
<?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>
diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index 1ac89da..fb5aafd 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -1,186 +1,18 @@
// Bug 1506 P1: Most of this code needs to go away. See also Bug 3100.
// PREFERences dialog functions
-// torbutton_prefs_set_field_attributes() -- initialize dialog fields
// torbutton_prefs_init() -- on dialog load
// torbutton_prefs_save() -- on dialog save
-var tor_enabled = false;
const Cc = Components.classes, Ci = Components.interfaces;
-function torbutton_prefs_set_field_attributes(doc)
-{
- torbutton_log(2, "called prefs_set_field_attributes()");
- var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
- var o_customprefs = torbutton_get_prefbranch('extensions.torbutton.custom.');
-
- // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns
- if (doc.getElementById('torbutton_transparentTor').selected) {
- doc.getElementById('torbutton_settingsMethod').value = 'transparent';
- } else if (!torbutton_check_socks_remote_dns()) {
- doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true);
- } else {
- doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", doc.getElementById('torbutton_settingsMethod').value != 'recommended');
- }
-
- if (doc.getElementById('torbutton_settingsMethod').value == 'recommended') {
- var proxy_port;
- var proxy_host;
- if (torbutton_has_good_socks()) {
- doc.getElementById('torbutton_usePrivoxy').checked = false;
- doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true);
- proxy_host = '';
- proxy_port = 0;
- } else {
- if (doc.getElementById('torbutton_usePrivoxy').checked) {
- proxy_host = '127.0.0.1';
- proxy_port = 8118;
- } else {
- proxy_host = '';
- proxy_port = 0;
- }
- }
-
- torbutton_log(2, "using recommended settings");
- if (!torbutton_check_socks_remote_dns()) {
- doc.getElementById('torbutton_httpProxy').value = proxy_host;
- doc.getElementById('torbutton_httpPort').value = proxy_port;
- doc.getElementById('torbutton_httpsProxy').value = proxy_host;
- doc.getElementById('torbutton_httpsPort').value = proxy_port;
- doc.getElementById('torbutton_ftpProxy').value = proxy_host;
- doc.getElementById('torbutton_ftpPort').value = proxy_port;
- doc.getElementById('torbutton_gopherProxy').value = proxy_host;
- doc.getElementById('torbutton_gopherPort').value = proxy_port;
- } else {
- doc.getElementById('torbutton_httpProxy').value = proxy_host;
- doc.getElementById('torbutton_httpPort').value = proxy_port;
- doc.getElementById('torbutton_httpsProxy').value = proxy_host;
- doc.getElementById('torbutton_httpsPort').value = proxy_port;
-
- doc.getElementById('torbutton_ftpProxy').value = '';
- doc.getElementById('torbutton_ftpPort').value = 0;
- doc.getElementById('torbutton_gopherProxy').value = '';
- doc.getElementById('torbutton_gopherPort').value = 0;
- }
-
- var environ = Components.classes["@mozilla.org/process/environment;1"]
- .getService(Components.interfaces.nsIEnvironment);
-
- if (environ.exists("TOR_SOCKS_PORT")) {
- doc.getElementById('torbutton_socksPort').value = parseInt(environ.get("TOR_SOCKS_PORT"));
- } else {
- doc.getElementById('torbutton_socksPort').value = 9150;
- }
-
- if (environ.exists("TOR_SOCKS_HOST")) {
- doc.getElementById('torbutton_socksHost').value = environ.get("TOR_SOCKS_HOST");
- } else {
- doc.getElementById('torbutton_socksHost').value = '127.0.0.1';
- }
-
- doc.getElementById('torbutton_httpProxy').disabled = true;
- doc.getElementById('torbutton_httpPort').disabled = true;
- doc.getElementById('torbutton_httpsProxy').disabled = true;
- doc.getElementById('torbutton_httpsPort').disabled = true;
- doc.getElementById('torbutton_ftpProxy').disabled = true;
- doc.getElementById('torbutton_ftpPort').disabled = true;
- doc.getElementById('torbutton_gopherProxy').disabled = true;
- doc.getElementById('torbutton_gopherPort').disabled = true;
- doc.getElementById('torbutton_socksHost').disabled = true;
- doc.getElementById('torbutton_socksPort').disabled = true;
- doc.getElementById('torbutton_socksGroup').disabled = true;
- doc.getElementById('torbutton_noProxiesOn').disabled = true;
- } else if (doc.getElementById('torbutton_settingsMethod').value == 'transparent') {
- // Mr. Larry was so lazy when he wrote the rest of this code
- torbutton_log(2, "not using recommended settings");
- torbutton_log(2, "using transparent settings");
- doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true);
- doc.getElementById('torbutton_httpProxy').disabled = true;
- doc.getElementById('torbutton_httpPort').disabled = true;
- doc.getElementById('torbutton_httpsProxy').disabled = true;
- doc.getElementById('torbutton_httpsPort').disabled = true;
- doc.getElementById('torbutton_ftpProxy').disabled = true;
- doc.getElementById('torbutton_ftpPort').disabled = true;
- doc.getElementById('torbutton_gopherProxy').disabled = true;
- doc.getElementById('torbutton_gopherPort').disabled = true;
- doc.getElementById('torbutton_socksHost').disabled = true;
- doc.getElementById('torbutton_socksPort').disabled = true;
- doc.getElementById('torbutton_socksGroup').disabled = true;
- doc.getElementById('torbutton_noProxiesOn').disabled = true;
- } else {
- torbutton_log(2, "using transparent settings");
- doc.getElementById('torbutton_httpProxy').disabled = false;
- doc.getElementById('torbutton_httpPort').disabled = false;
- doc.getElementById('torbutton_httpsProxy').disabled = false;
- doc.getElementById('torbutton_httpsPort').disabled = false;
- doc.getElementById('torbutton_ftpProxy').disabled = false;
- doc.getElementById('torbutton_ftpPort').disabled = false;
- doc.getElementById('torbutton_gopherProxy').disabled = false;
- doc.getElementById('torbutton_gopherPort').disabled = false;
- doc.getElementById('torbutton_socksHost').disabled = false;
- doc.getElementById('torbutton_socksPort').disabled = false;
- doc.getElementById('torbutton_socksGroup').disabled = false;
- doc.getElementById('torbutton_noProxiesOn').disabled = false;
- /* Do not reset these on every document update..
- doc.getElementById('torbutton_httpProxy').value = o_customprefs.getCharPref('http_proxy');
- doc.getElementById('torbutton_httpPort').value = o_customprefs.getIntPref('http_port');
- doc.getElementById('torbutton_httpsProxy').value = o_customprefs.getCharPref('https_proxy');
- doc.getElementById('torbutton_httpsPort').value = o_customprefs.getIntPref('https_port');
- doc.getElementById('torbutton_ftpProxy').value = o_customprefs.getCharPref('ftp_proxy');
- doc.getElementById('torbutton_ftpPort').value = o_customprefs.getIntPref('ftp_port');
- doc.getElementById('torbutton_gopherProxy').value = o_customprefs.getCharPref('gopher_proxy');
- doc.getElementById('torbutton_gopherPort').value = o_customprefs.getIntPref('gopher_port');
- doc.getElementById('torbutton_socksHost').value = o_customprefs.getCharPref('socks_host');
- doc.getElementById('torbutton_socksPort').value = o_customprefs.getIntPref('socks_port');
- */
- }
-}
function torbutton_prefs_init(doc) {
- var checkbox_displayStatusPanel = doc.getElementById('torbutton_displayStatusPanel');
-// return;
-
torbutton_log(2, "called prefs_init()");
sizeToContent();
- // remember if tor settings were enabled when the window was opened
- tor_enabled = torbutton_check_status();
-
var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
- // doc.getElementById('torbutton_panelStyle').value = o_torprefs.getCharPref('panel_style');
- var settings_method = doc.getElementById('torbutton_settingsMethod');
- var settings_method_pref = o_torprefs.getCharPref('settings_method');
- if (settings_method_pref == 'recommended')
- settings_method.selectedItem = doc.getElementById('torbutton_useRecommendedSettings');
- else if (settings_method_pref == 'custom')
- settings_method.selectedItem = doc.getElementById('torbutton_useCustomSettings');
- // doc.getElementById('torbutton_settingsMethod').value = o_torprefs.getCharPref('settings_method');
- doc.getElementById('torbutton_usePrivoxy').checked = o_torprefs.getBoolPref('use_privoxy');
- doc.getElementById('torbutton_httpProxy').value = o_torprefs.getCharPref('http_proxy');
- doc.getElementById('torbutton_httpPort').value = o_torprefs.getIntPref('http_port');
- doc.getElementById('torbutton_httpsProxy').value = o_torprefs.getCharPref('https_proxy');
- doc.getElementById('torbutton_httpsPort').value = o_torprefs.getIntPref('https_port');
- doc.getElementById('torbutton_ftpProxy').value = o_torprefs.getCharPref('ftp_proxy');
- doc.getElementById('torbutton_ftpPort').value = o_torprefs.getIntPref('ftp_port');
- doc.getElementById('torbutton_gopherProxy').value = o_torprefs.getCharPref('gopher_proxy');
- doc.getElementById('torbutton_gopherPort').value = o_torprefs.getIntPref('gopher_port');
- doc.getElementById('torbutton_socksHost').value = o_torprefs.getCharPref('socks_host');
- doc.getElementById('torbutton_socksPort').value = o_torprefs.getIntPref('socks_port');
- if(o_torprefs.getIntPref('socks_version') == 4) {
- doc.getElementById('torbutton_socksGroup').selectedItem =
- doc.getElementById('torbutton_socksv4');
- } else {
- doc.getElementById('torbutton_socksGroup').selectedItem =
- doc.getElementById('torbutton_socksv5');
- }
- doc.getElementById('torbutton_noProxiesOn').value = o_torprefs.getCharPref('no_proxies_on');
-
- // Transparent Torification magic
- if (o_torprefs.getBoolPref('saved.transparentTor')) {
- doc.getElementById('torbutton_settingsMethod').selectedItem = doc.getElementById('torbutton_transparentTor');
- }
-
// Privacy and security settings
doc.getElementById('torbutton_blockDisk').checked = o_torprefs.getBoolPref('block_disk');
doc.getElementById('torbutton_resistFingerprinting').checked = o_torprefs.getBoolPref('resist_fingerprinting');
@@ -204,8 +36,6 @@ function torbutton_prefs_init(doc) {
sec_slider.valueChanged = function(which, newValue, userChanged) {
torbutton_set_slider_text(doc, false);
}
-
- torbutton_prefs_set_field_attributes(doc);
}
function torbutton_prefs_save(doc) {
@@ -215,83 +45,6 @@ function torbutton_prefs_save(doc) {
doc.documentElement.getButton("accept").disabled = true;
torbutton_log(2, "called prefs_save()");
var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
- var o_customprefs = torbutton_get_prefbranch('extensions.torbutton.custom.');
-
- var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var enumerator = wm.getEnumerator("navigator:browser");
- while(enumerator.hasMoreElements()) {
- var win = enumerator.getNext();
- if(win != window && win.m_tb_is_main_window) {
- torbutton_log(3, "Found main window for popup hack.");
- win.torbutton_unique_pref_observer.did_toggle_warning = false;
- }
- }
-
- o_torprefs.setCharPref('settings_method', doc.getElementById('torbutton_settingsMethod').value);
- o_torprefs.setBoolPref('use_privoxy', doc.getElementById('torbutton_usePrivoxy').checked);
- o_torprefs.setCharPref('http_proxy', doc.getElementById('torbutton_httpProxy').value);
- o_torprefs.setIntPref('http_port', doc.getElementById('torbutton_httpPort').value);
- o_torprefs.setCharPref('https_proxy', doc.getElementById('torbutton_httpsProxy').value);
- o_torprefs.setIntPref('https_port', doc.getElementById('torbutton_httpsPort').value);
- o_torprefs.setCharPref('ftp_proxy', doc.getElementById('torbutton_ftpProxy').value);
- o_torprefs.setIntPref('ftp_port', doc.getElementById('torbutton_ftpPort').value);
- o_torprefs.setCharPref('gopher_proxy', doc.getElementById('torbutton_gopherProxy').value);
- o_torprefs.setIntPref('gopher_port', doc.getElementById('torbutton_gopherPort').value);
- o_torprefs.setCharPref('socks_host', doc.getElementById('torbutton_socksHost').value);
- o_torprefs.setIntPref('socks_port', doc.getElementById('torbutton_socksPort').value);
-
- if(doc.getElementById('torbutton_socksGroup').selectedItem ==
- doc.getElementById('torbutton_socksv4')) {
- o_torprefs.setIntPref('socks_version', 4);
- } else if(doc.getElementById('torbutton_socksGroup').selectedItem ==
- doc.getElementById('torbutton_socksv5')) {
- o_torprefs.setIntPref('socks_version', 5);
- }
-
- o_torprefs.setCharPref('no_proxies_on', doc.getElementById('torbutton_noProxiesOn').value);
-
- o_torprefs.setBoolPref('saved.transparentTor', doc.getElementById('torbutton_transparentTor').selected);
- if (o_torprefs.getBoolPref('saved.transparentTor')) {
- var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var chrome = wm.getMostRecentWindow("navigator:browser");
- var ret = chrome.torbutton_test_settings();
- if (ret != 4) {
- var warning = chrome.torbutton_get_property_string("torbutton.popup.test.failure");
- window.alert(warning);
- } else {
- o_torprefs.setBoolPref('tor_enabled', true);
- // In theory this is where we unlock some things that are now "safe"
- // Unleash Flash on Tor users
- // Ignore any proxy settings that the user has set
- // etc etc etc - pde will be very happy
- }
- }
-
-
- if (doc.getElementById('torbutton_settingsMethod').value == 'custom') {
- // XXX: Is this even needed anymore? We don't read the
- // custom prefs at all it seems..
- o_customprefs.setCharPref('http_proxy', doc.getElementById('torbutton_httpProxy').value);
- o_customprefs.setIntPref('http_port', doc.getElementById('torbutton_httpPort').value);
- o_customprefs.setCharPref('https_proxy', doc.getElementById('torbutton_httpsProxy').value);
- o_customprefs.setIntPref('https_port', doc.getElementById('torbutton_httpsPort').value);
- o_customprefs.setCharPref('ftp_proxy', doc.getElementById('torbutton_ftpProxy').value);
- o_customprefs.setIntPref('ftp_port', doc.getElementById('torbutton_ftpPort').value);
- o_customprefs.setCharPref('gopher_proxy', doc.getElementById('torbutton_gopherProxy').value);
- o_customprefs.setIntPref('gopher_port', doc.getElementById('torbutton_gopherPort').value);
- o_customprefs.setCharPref('socks_host', doc.getElementById('torbutton_socksHost').value);
- o_customprefs.setIntPref('socks_port', doc.getElementById('torbutton_socksPort').value);
-
- if(doc.getElementById('torbutton_socksGroup').selectedItem ==
- doc.getElementById('torbutton_socksv4')) {
- o_customprefs.setIntPref('socks_version', 4);
- } else if(doc.getElementById('torbutton_socksGroup').selectedItem ==
- doc.getElementById('torbutton_socksv5')) {
- o_customprefs.setIntPref('socks_version', 5);
- }
- }
// Privacy and Security Settings
o_torprefs.setBoolPref('block_disk', doc.getElementById('torbutton_blockDisk').checked);
@@ -317,92 +70,28 @@ function torbutton_prefs_save(doc) {
o_torprefs.setIntPref('security_slider',
doc.getElementById('torbutton_sec_slider').value);
- // if tor settings were initially active, update the active settings to reflect any changes
- if (tor_enabled) torbutton_activate_tor_settings();
// If we have non-custom Security Slider settings update them now.
if (!o_torprefs.getBoolPref('security_custom')) {
+ let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+ .getService(Components.interfaces.nsIWindowMediator);
+ let win = wm.getMostRecentWindow("navigator:browser");
win.torbutton_update_security_slider();
}
}
-function torbutton_prefs_test_settings() {
-
- // Reset Tor state to disabled.
- var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var chrome = wm.getMostRecentWindow("navigator:browser");
-
- if(chrome.m_tb_ff3) {
- // FIXME: This is kind of ghetto.. can we make a progress
- // bar or a window that updates itself?
- var warning = chrome.torbutton_get_property_string("torbutton.popup.test.ff3_notice");
- window.alert(warning);
- }
- var ret = chrome.torbutton_test_settings();
- // Strange errors are not worth translating. Our english users will
- // tell us they happen and we will (presumably) make them not happen.
- if(ret < 0) {
- ret = -ret;
- window.alert("Tor proxy test: HTTP error for check.torproject.org: "+ret);
- return;
- }
-
- switch(ret) {
- case 0:
- window.alert("Tor proxy test: Internal error");
- break;
- case 1:
- window.alert("Tor proxy test: Result not mimetype text/xml");
- break;
- case 3: // Can't seem to happen
- window.alert("Tor proxy test: Can't find result target!");
- break;
- case 2:
- window.alert("Tor proxy test: No TorCheckResult id found (response not valid XHTML)");
- break;
- case 4:
- var warning = chrome.torbutton_get_property_string("torbutton.popup.test.success");
- window.alert(warning);
- break;
- case 5:
- var warning = chrome.torbutton_get_property_string("torbutton.popup.test.failure");
- window.alert(warning);
- break;
- case 6:
- window.alert("Tor proxy test: TorDNSEL failure. Results unknown.");
- break;
- case 7:
- window.alert("Tor proxy test: check.torproject.org returned bad result");
- break;
- case 8:
- var warning = chrome.torbutton_get_property_string("torbutton.popup.test.no_http_proxy");
- window.alert(warning);
- break;
- }
-}
-
function torbutton_prefs_reset_defaults() {
var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
- var o_proxyprefs = torbutton_get_prefbranch('network.proxy.');
var tmpcnt = new Object();
var children;
var i;
- var was_enabled = false;
var loglevel = o_torprefs.getIntPref("loglevel");
var logmthd = o_torprefs.getIntPref("logmethod");
torbutton_log(3, "Starting Pref reset");
- // 0. Disable tor
- // 1. Clear proxy settings
- // 2. Restore saved prefs
- // 3. Clear torbutton settings
- // 4. Enable tor if was previously enabled
-
- // Reset Tor state to disabled.
- var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var chrome = wm.getMostRecentWindow("navigator:browser");
+ // 1. Clear torbutton settings
+ // 2. Clear browser proxy settings
+ // 3. Reset Security Slider settings
// XXX Warning: The only reason this works is because of Firefox's
// threading model. As soon as a pref is changed, all observers
@@ -410,13 +99,7 @@ function torbutton_prefs_reset_defaults() {
// security state is driven by proxy pref observers, this
// causes everything to be reset in a linear order. If firefox
// ever makes pref observers asynchonous, this will all break.
- if(o_torprefs.getBoolPref("tor_enabled")) {
- chrome.torbutton_disable_tor();
- was_enabled = true;
- }
- torbutton_log(3, "Tor disabled for pref reset");
-
children = o_torprefs.getChildList("" , tmpcnt);
for(i = 0; i < children.length; i++) {
if(o_torprefs.prefHasUserValue(children[i]))
@@ -427,12 +110,6 @@ function torbutton_prefs_reset_defaults() {
o_torprefs.setIntPref("loglevel", loglevel);
o_torprefs.setIntPref("logmethod", logmthd);
- children = o_proxyprefs.getChildList("" , tmpcnt);
- for(i = 0; i < children.length; i++) {
- if(o_proxyprefs.prefHasUserValue(children[i]))
- o_proxyprefs.clearUserPref(children[i]);
- }
-
torbutton_log(3, "Resetting browser prefs");
// Reset browser prefs that torbutton touches just in case
@@ -442,24 +119,13 @@ function torbutton_prefs_reset_defaults() {
// It's the non-technical ones we should make it easy for
torbutton_reset_browser_prefs();
- chrome.torbutton_init_prefs();
- torbutton_log(3, "Prefs reset");
-
- if(was_enabled) {
- // Hack for torbrowser/others where tor proxies are the same
- // as non-tor.
- if(chrome.torbutton_check_status()) {
- torbutton_log(4, "Tor still enabled after reset. Attempting to restore sanity");
- chrome.torbutton_set_status();
- } else {
- chrome.torbutton_enable_tor(true);
- }
- }
-
// Resetting the Security Slider preferences
+ var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+ .getService(Components.interfaces.nsIWindowMediator);
+ var win = wm.getMostRecentWindow("navigator:browser");
o_torprefs.setBoolPref('security_custom', false);
o_torprefs.setIntPref('security_slider', 4);
- chrome.torbutton_update_security_slider();
+ win.torbutton_update_security_slider();
torbutton_log(4, "Preferences reset to defaults");
torbutton_prefs_init(window.document);
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index 60a214b..507efd0 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -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>
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 81f5a23..d7c42bd 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -29,12 +29,6 @@ var m_tb_confirming_plugins = false;
var m_tb_window_height = window.outerHeight;
var m_tb_window_width = window.outerWidth;
-var m_tb_ff3 = false;
-var m_tb_ff35 = false;
-var m_tb_ff36 = false;
-var m_tb_ff4 = false;
-var m_tb_ff15 = false;
-var m_tb_ff10_8 = false;
var m_tb_tbb = false;
var m_tb_control_port = null;
@@ -72,24 +66,6 @@ var torbutton_window_pref_observer =
{
if (topic != "nsPref:changed") return;
switch (data) {
- // These two need to be per-window:
- case "extensions.torbutton.display_panel":
- torbutton_set_panel_view();
- break;
- case "extensions.torbutton.panel_style":
- torbutton_set_panel_style();
- break;
-
- // FIXME: Maybe make a intermediate state with a yellow
- // icon?
- case "extensions.torbutton.settings_applied":
- var mode = m_tb_prefs.getBoolPref("extensions.torbutton.settings_applied");
- torbutton_update_toolbutton(mode);
- torbutton_update_statusbar(mode);
-
- // Update all open about:tor pages.
- torbutton_update_all_abouttor_pages(undefined, undefined);
- break;
case k_tb_browser_update_needed_pref:
torbutton_notify_if_update_needed();
break;
@@ -99,8 +75,7 @@ var torbutton_window_pref_observer =
// Bug 1506 P2: This object keeps Firefox prefs in sync with Torbutton prefs.
// It probably could stand some simplification (See #3100). It also belongs
-// in a component, not the XUL overlay. There also are a lot of toggle-triggering
-// prefs here..
+// in a component, not the XUL overlay.
var torbutton_unique_pref_observer =
{
register: function()
@@ -108,10 +83,8 @@ var torbutton_unique_pref_observer =
this.forced_ua = false;
var pref_service = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranchInternal);
- this.did_toggle_warning = false;
this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal);
this._branch.addObserver("extensions.torbutton", this, false);
- this._branch.addObserver("network.proxy", this, false);
this._branch.addObserver("network.cookie", this, false);
this._branch.addObserver("network.jar", this, false);
this._branch.addObserver("browser.privatebrowsing.autostart", this, false);
@@ -132,7 +105,6 @@ var torbutton_unique_pref_observer =
{
if (!this._branch) return;
this._branch.removeObserver("extensions.torbutton", this);
- this._branch.removeObserver("network.proxy", this);
this._branch.removeObserver("network.cookie", this);
this._branch.removeObserver("network.jar", this);
this._branch.removeObserver("browser.privatebrowsing.autostart", this);
@@ -181,24 +153,6 @@ var torbutton_unique_pref_observer =
if (topic != "nsPref:changed") return;
switch (data) {
- case "network.proxy.http":
- case "network.proxy.http_port":
- case "network.proxy.ssl":
- case "network.proxy.ssl_port":
- case "network.proxy.ftp":
- case "network.proxy.ftp_port":
- case "network.proxy.gopher":
- case "network.proxy.gopher_port":
- case "network.proxy.socks":
- case "network.proxy.socks_port":
- case "network.proxy.socks_version":
- case "network.proxy.share_proxy_settings":
- case "network.proxy.socks_remote_dns":
- case "network.proxy.type":
- torbutton_log(1, "Got update message, setting status");
- torbutton_set_status();
- break;
-
case "browser.privatebrowsing.autostart":
var mode = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart");
var ourmode = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk");
@@ -293,8 +247,7 @@ var torbutton_tor_check_observer = {
{
if (topic == k_tb_tor_check_failed_topic) {
// Update toolbar icon and tooltip.
- var mode = m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled");
- torbutton_update_toolbutton(mode);
+ torbutton_update_toolbutton();
// Update all open about:tor pages. If the user does not have an
// about:tor page open in the front most window, open one.
@@ -310,123 +263,11 @@ var torbutton_tor_check_observer = {
}
};
-// Bug 1506 P1
-function torbutton_set_panel_view() {
- var o_statuspanel = false;
- var o_prefbranch = false;
-
- o_statuspanel = torbutton_get_statuspanel();
- o_prefbranch = torbutton_get_prefbranch('extensions.torbutton.');
- if (!o_statuspanel || !o_prefbranch) return;
-
- // Firefox 4 has no toolbar panel
- var display_panel = o_prefbranch.getBoolPref('display_panel')
- && !m_tb_ff4;
- torbutton_log(2, 'setting panel visibility');
- o_statuspanel.setAttribute('collapsed', !display_panel);
-}
-
-// Bug 1506 P1
-function torbutton_set_panel_style() {
- var o_statuspanel = false;
- var o_prefbranch = false;
-
- o_statuspanel = torbutton_get_statuspanel();
- o_prefbranch = torbutton_get_prefbranch('extensions.torbutton.');
- if (!o_statuspanel || !o_prefbranch) return;
-
- var panel_style = o_prefbranch.getCharPref('panel_style');
- torbutton_log(2, 'setting panel style: ' + panel_style);
- o_statuspanel.setAttribute('class','statusbarpanel-' + panel_style);
-}
-
-// Bug 1506 P0: Die toggle, die!
-function torbutton_toggle(force) {
- torbutton_log(5, "Somehow we received a toggle request. Refusing to honor it. (force="+force+")");
-}
-
-// Bug 1506 P0: Die toggle, die!
-function torbutton_set_status() {
- var state = false;
- if (torbutton_check_status()) {
- state = true;
- try {
- torbutton_update_status(true);
- } catch(e) {
- torbutton_log(5,'Error applying tor settings: '+e);
- var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var chrome = wm.getMostRecentWindow("navigator:browser");
- var warning1 = torbutton_get_property_string("torbutton.popup.pref_error");
-
- if (e.result == 0x80520015 || e.result == 0x80520013) { // NS_ERROR_FILE_ACCESS_DENIED/NS_ERROR_FILE_READ_ONLY
- var warning2 = torbutton_get_property_string("torbutton.popup.permission_denied");
- chrome.alert(warning1+"\n\n"+warning2);
- } else if (e.result == 0x80520010) { // NS_ERROR_FILE_NO_DEVICE_SPACE
- var o_stringbundle = torbutton_get_stringbundle();
- var warning2 = torbutton_get_property_string("torbutton.popup.device_full");
- chrome.alert(warning1+"\n\n"+warning2);
- } else {
- // This should never happen..
- chrome.alert(warning1+"\n\n"+e);
- }
- // Setting these prefs should avoid ininite recursion
- // because torbutton_update_status should return immediately
- // on the next call.
- m_tb_prefs.setBoolPref("extensions.torbutton.tor_enabled", false);
- m_tb_prefs.setBoolPref("extensions.torbutton.proxies_applied", false);
- m_tb_prefs.setBoolPref("extensions.torbutton.settings_applied", false);
- torbutton_disable_tor();
- }
- } else {
- state = false;
- try {
- torbutton_update_status(false);
- } catch(e) {
- torbutton_log(5,'Error applying nontor settings: '+e);
-
- var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var chrome = wm.getMostRecentWindow("navigator:browser");
- var warning1 = torbutton_get_property_string("torbutton.popup.pref_error");
-
- if (e.result == 0x80520015 || e.result == 0x80520013) { // NS_ERROR_FILE_ACCESS_DENIED/NS_ERROR_FILE_READ_ONLY
- var warning2 = torbutton_get_property_string("torbutton.popup.permission_denied");
- chrome.alert(warning1+"\n\n"+warning2);
- } else if (e.result == 0x80520010) { // NS_ERROR_FILE_NO_DEVICE_SPACE
- var warning2 = torbutton_get_property_string("torbutton.popup.device_full");
- chrome.alert(warning1+"\n\n"+warning2);
- } else {
- // This should never happen..
- chrome.alert(warning1+"\n\n"+e);
- }
- // Setting these prefs should avoid infinite recursion
- // because torbutton_update_status should return immediately
- // on the next call.
- m_tb_prefs.setBoolPref("extensions.torbutton.tor_enabled", true);
- m_tb_prefs.setBoolPref("extensions.torbutton.proxies_applied", true);
- m_tb_prefs.setBoolPref("extensions.torbutton.settings_applied", true);
- torbutton_enable_tor(true);
- }
- }
-}
-
-// Bug 1506 P0: Die toggle die
function torbutton_init_toolbutton()
{
try {
torbutton_log(3, "Initializing the Torbutton button.");
- // Prevent the FF4 status bar from making our menu invisible...
- /* Not needed
- var o_toolbutton = torbutton_get_toolbutton();
- if (o_toolbutton) {
- var context = document.getElementById('torbutton-context-menu');
- context.style.visibility = "visible";
- context.hidden = false;
- torbutton_log(3, "Set new context menu.");
- }
- */
- torbutton_update_toolbutton(torbutton_check_status());
+ torbutton_update_toolbutton();
} catch(e) {
torbutton_log(4, "Error Initializing Torbutton button: "+e);
}
@@ -446,49 +287,7 @@ function torbutton_init() {
m_tb_prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
- // Determine if we are firefox 3 or not.
- 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);
-
- if(versionChecker.compare(appInfo.version, "15.0a1") >= 0) {
- m_tb_ff15 = true;
- } else {
- m_tb_ff15 = false;
- }
-
- if(versionChecker.compare(appInfo.version, "10.0.8") >= 0
- && versionChecker.compare(appInfo.version, "11.0a1") < 0) {
- m_tb_ff10_8 = true;
- } else {
- m_tb_ff10_8 = false;
- }
-
- if(versionChecker.compare(appInfo.version, "4.0a1") >= 0) {
- m_tb_ff4 = true;
- } else {
- m_tb_ff4 = false;
- }
-
- if(versionChecker.compare(appInfo.version, "3.0a1") >= 0) {
- m_tb_ff3 = true;
- } else {
- m_tb_ff3 = false;
- }
-
- if(versionChecker.compare(appInfo.version, "3.5a1") >= 0) {
- m_tb_ff35 = true;
- } else {
- m_tb_ff35 = false;
- }
-
- if(versionChecker.compare(appInfo.version, "3.6a1") >= 0) {
- m_tb_ff36 = true;
- } else {
- m_tb_ff36 = false;
- }
-
+ // Determine if we are running inside Tor Browser.
var cur_version;
try {
cur_version = m_tb_prefs.getCharPref("torbrowser.version");
@@ -564,8 +363,6 @@ function torbutton_init() {
torbutton_on_abouttor_load(aEvent.target);
}, false, true);
- // initialize preferences before we start our prefs observer
- torbutton_init_prefs();
// Set some important security prefs according to the chosen security level
// if there are no custom settings to respect.
if (!m_tb_prefs.getBoolPref("extensions.torbutton.security_custom")) {
@@ -589,9 +386,6 @@ function torbutton_init() {
}
}
- // set panel style from preferences
- torbutton_set_panel_style();
-
// listen for our toolbar button being added so we can initialize it
torbutton_init_toolbutton();
@@ -632,12 +426,7 @@ function torbutton_init() {
}
}
- torbutton_set_panel_view();
- torbutton_log(1, 'setting torbutton status from proxy prefs');
- torbutton_set_status();
- var mode = m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled");
- torbutton_update_toolbutton(mode);
- torbutton_update_statusbar(mode);
+ torbutton_update_toolbutton();
torbutton_notify_if_update_needed();
torbutton_update_sync_ui();
@@ -764,76 +553,6 @@ function torbutton_inform_about_tbb() {
m_tb_prefs.setBoolPref("extensions.torbutton.prompt_torbrowser", !checkbox.value);
}
-// Bug 1506 P0: Our prefs should be handled by Tor Browser. Even if they're
-// not, they should be vastly simplified from this. See also #3100.
-//
-// this function duplicates a lot of code in preferences.js for deciding our
-// recommended settings. figure out a way to eliminate the redundancy.
-// TODO: Move it to torbutton_util.js?
-function torbutton_init_prefs() {
- var torprefs = false;
- var proxy_port;
- var proxy_host;
- torbutton_log(2, "called init_prefs()");
- torprefs = torbutton_get_prefbranch('extensions.torbutton.');
-
- if (torprefs.getCharPref('settings_method') == 'recommended') {
- torbutton_log(2, "using recommended settings");
- if (torbutton_has_good_socks()) {
- proxy_host = '';
- proxy_port = 0;
- } else {
- // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns
- if (!torbutton_check_socks_remote_dns())
- torprefs.setBoolPref('use_privoxy', true);
-
- if (torprefs.getBoolPref('use_privoxy')) {
- proxy_host = '127.0.0.1';
- proxy_port = 8118;
- } else {
- proxy_host = '';
- proxy_port = 0;
- }
- }
-
- if (torbutton_check_socks_remote_dns()) {
- torprefs.setCharPref('http_proxy', proxy_host);
- torprefs.setCharPref('https_proxy', proxy_host);
- torprefs.setCharPref('ftp_proxy', '');
- torprefs.setIntPref('http_port', proxy_port);
- torprefs.setIntPref('https_port', proxy_port);
- torprefs.setIntPref('ftp_port', 0);
- if (!m_tb_ff4) {
- torprefs.setCharPref('gopher_proxy', '');
- torprefs.setIntPref('gopher_port', 0);
- }
- } else {
- torprefs.setCharPref('http_proxy', proxy_host);
- torprefs.setCharPref('https_proxy', proxy_host);
- torprefs.setCharPref('ftp_proxy', proxy_host);
- if (!m_tb_ff4) {
- torprefs.setCharPref('gopher_proxy', proxy_host);
- torprefs.setIntPref('gopher_port', proxy_port);
- }
- torprefs.setIntPref('http_port', proxy_port);
- torprefs.setIntPref('https_port', proxy_port);
- torprefs.setIntPref('ftp_port', proxy_port);
- }
- }
-
- torbutton_log(1, 'http_port='+torprefs.getIntPref('http_port'));
-}
-
-// Bug 1506 P2: It might be nice to let people move the button around, I guess?
-function torbutton_get_button_from_toolbox() {
- var toolbox = document.getElementById("navigator-toolbox");
- for (var child = toolbox.palette.firstChild; child; child = child.nextSibling)
- if (child.id == "torbutton-button")
- return child;
- torbutton_log(3, "Could not find toolbox button, trying in window DOM");
- return torbutton_get_toolbutton();
-}
-
// Bug 1506 P2: It might be nice to let people move the button around, I guess?
function torbutton_get_toolbutton() {
var o_toolbutton = false;
@@ -852,19 +571,6 @@ function torbutton_get_toolbutton() {
return o_toolbutton;
}
-function torbutton_get_statuspanel() {
- var o_statuspanel = false;
-
- torbutton_log(1, 'init_statuspanel(): looking for statusbar element');
- if (document.getElementById("torbutton-panel")) {
- o_statuspanel = document.getElementById("torbutton-panel");
- } else {
- torbutton_log(5, 'ERROR (init): failed to find torbutton-panel');
- }
-
- return o_statuspanel;
-}
-
function torbutton_update_is_needed() {
var updateNeeded = false;
try {
@@ -1121,95 +827,6 @@ function torbutton_is_abouttor_doc(aDoc) {
return (aDoc && /^about:tor$/i.test(aDoc.documentURI.toLowerCase()));
}
-// Bug 1506 P0: Toggle. Kill kill kill.
-function torbutton_save_nontor_settings()
-{
- var liveprefs = false;
- var savprefs = false;
-
- liveprefs = torbutton_get_prefbranch('network.proxy.');
- savprefs = torbutton_get_prefbranch('extensions.torbutton.saved.');
- if (!liveprefs || !savprefs) {
- torbutton_log(4, 'Prefbranch error');
- return;
- }
-
- torbutton_log(2, 'saving nontor settings');
- savprefs.setIntPref('type', liveprefs.getIntPref('type'));
- savprefs.setCharPref('http_proxy', liveprefs.getCharPref('http'));
- savprefs.setIntPref('http_port', liveprefs.getIntPref('http_port'));
- savprefs.setCharPref('https_proxy', liveprefs.getCharPref('ssl'));
- savprefs.setIntPref('https_port', liveprefs.getIntPref('ssl_port'));
- savprefs.setCharPref('ftp_proxy', liveprefs.getCharPref('ftp'));
- torbutton_log(1, 'half-way');
- savprefs.setIntPref('ftp_port', liveprefs.getIntPref('ftp_port'));
- savprefs.setCharPref('socks_host', liveprefs.getCharPref('socks'));
- savprefs.setIntPref('socks_port', liveprefs.getIntPref('socks_port'));
- savprefs.setIntPref('socks_version', liveprefs.getIntPref('socks_version'));
- savprefs.setCharPref('no_proxies_on', liveprefs.getCharPref('no_proxies_on'));
- if (!m_tb_ff4) {
- savprefs.setCharPref('gopher_proxy', liveprefs.getCharPref('gopher'));
- savprefs.setIntPref('gopher_port', liveprefs.getIntPref('gopher_port'));
- }
- try { // ff-0.9 doesn't have share_proxy_settings
- savprefs.setBoolPref('share_proxy_settings', liveprefs.getBoolPref('share_proxy_settings'));
- } catch(e) {}
-
- torbutton_log(1, 'almost there');
- if (torbutton_check_socks_remote_dns())
- savprefs.setBoolPref('socks_remote_dns', liveprefs.getBoolPref('socks_remote_dns'));
- torbutton_log(2, 'Non-tor settings saved');
-}
-
-// Bug 1506 P0: Toggle. Kill kill kill.
-function torbutton_restore_nontor_settings()
-{
- var liveprefs = false;
- var savprefs = false;
-
- liveprefs = torbutton_get_prefbranch('network.proxy.');
- savprefs = torbutton_get_prefbranch('extensions.torbutton.saved.');
- if (!liveprefs || !savprefs) {
- torbutton_log(4, 'Prefbranch error');
- return;
- }
-
- torbutton_log(2, 'restoring nontor settings');
-
- m_tb_prefs.setBoolPref("extensions.torbutton.tor_enabled", false);
- liveprefs.setIntPref('type', savprefs.getIntPref('type'));
- liveprefs.setCharPref('http', savprefs.getCharPref('http_proxy'));
- liveprefs.setIntPref('http_port', savprefs.getIntPref('http_port'));
- liveprefs.setCharPref('ssl', savprefs.getCharPref('https_proxy'));
- liveprefs.setIntPref('ssl_port', savprefs.getIntPref('https_port'));
- liveprefs.setCharPref('ftp', savprefs.getCharPref('ftp_proxy'));
- torbutton_log(1, 'half-way there');
- liveprefs.setIntPref('ftp_port', savprefs.getIntPref('ftp_port'));
- if (!m_tb_ff4) {
- liveprefs.setCharPref('gopher', savprefs.getCharPref('gopher_proxy'));
- liveprefs.setIntPref('gopher_port', savprefs.getIntPref('gopher_port'));
- }
- liveprefs.setCharPref('socks', savprefs.getCharPref('socks_host'));
- liveprefs.setIntPref('socks_port', savprefs.getIntPref('socks_port'));
- liveprefs.setIntPref('socks_version', savprefs.getIntPref('socks_version'));
- liveprefs.setCharPref('no_proxies_on',savprefs.getCharPref('no_proxies_on'));
- try { // ff-0.9 doesn't have share_proxy_settings
- liveprefs.setBoolPref('share_proxy_settings', savprefs.getBoolPref('share_proxy_settings'));
- } catch(e) {}
-
- torbutton_log(1, 'almost there');
- if (torbutton_check_socks_remote_dns())
- liveprefs.setBoolPref('socks_remote_dns', savprefs.getBoolPref('socks_remote_dns'));
-
- // This is needed for torbrowser and other cases where the
- // proxy prefs are actually the same..
- if(torbutton_check_status()) {
- m_tb_prefs.setBoolPref("extensions.torbutton.tor_enabled", true);
- }
-
- torbutton_log(2, 'settings restored');
-}
-
// Bug 1506 P4: Checking for Tor Browser updates is pretty important,
// probably even as a fallback if we ever do get a working updater.
function torbutton_do_async_versioncheck() {
@@ -1233,7 +850,7 @@ function torbutton_do_async_versioncheck() {
m_tb_prefs.setCharPref(k_tb_last_update_check_pref, now);
torbutton_log(3, "Checking version with socks port: "
- +m_tb_prefs.getIntPref("extensions.torbutton.socks_port"));
+ +m_tb_prefs.getIntPref("network.proxy.socks_port"));
try {
var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance(Components.interfaces.nsIXMLHttpRequest);
@@ -1287,224 +904,30 @@ function torbutton_do_async_versioncheck() {
}
-// Bug 1506 P0: Deprecated by the async version.
-function torbutton_check_version() {
- torbutton_log(3, "Checking version");
- try {
- var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"]
- .createInstance(Components.interfaces.nsIXMLHttpRequest);
- //var req = new XMLHttpRequest(); Blocked by content policy
- var url = m_tb_prefs.getCharPref("extensions.torbutton.versioncheck_url");
- req.open('GET', url, false);
- req.overrideMimeType("text/json");
- req.send(null);
- } catch(e) {
- if(e.result == 0x80004005) { // NS_ERROR_FAILURE
- torbutton_log(5, "Version check failed! Is tor running?");
- return -1;
- }
- torbutton_log(5, "Version check failed! Tor internal error: "+e);
- return -1;
- }
- if(req.status == 200) {
- if(!req.responseText) {
- torbutton_log(5, "Version check failed! No JSON present!");
- return -1;
- }
- try {
- var version_list = JSON.parse(req.responseText);
- // torbrowser.version may not exist..
- var my_version = m_tb_prefs.getCharPref("torbrowser.version");
- for (var v in version_list) {
- if (version_list[v] == my_version) {
- return 1;
- }
- }
- return 0;
- } catch(e) {
- torbutton_log(5, "Version check failed! JSON parsing error: "+e);
- return -1;
- }
- } else if (req.status == 404) {
- // We're going to assume 404 means the service is not implemented yet.
- torbutton_log(3, "Version check failed. Versions file is 404.");
- return -1;
- }
- torbutton_log(5, "Version check failed! Web server error: "+req.status);
- return -1;
-}
-
-// Bug 1506 P2: Probably a good idea to have some way to test everything,
-// but will need to be decoupled from the toggle logic :/
-function torbutton_test_settings() {
- var wasEnabled = true;
- if(!torbutton_check_status()) {
- wasEnabled = false;
- torbutton_enable_tor(true);
- }
-
- torbutton_log(3, "Testing Tor settings");
-
- m_tb_prefs.setBoolPref("extensions.torbutton.test_failed", true);
- try {
- var checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"]
- .getService(Ci.nsISupports).wrappedJSObject;
- var req = checkSvc.createCheckRequest(false);
- req.send(null);
- } catch(e) {
- // FIXME: This happens if this function is called from a browser
- // window with tor disabled because the content policy will block us.
- // Right now the check works because we get called from the
- // preference window. Sort of makes automatic testing a bit trickier..
- if(!wasEnabled) torbutton_disable_tor();
- if(e.result == 0x80004005) { // NS_ERROR_FAILURE
- torbutton_log(5,
- "Test failed! HTTP proxy down or request blocked!");
- return 8;
- }
- torbutton_log(5, "Test failed! Tor internal error: "+e);
- return 0;
- }
-
- var ret = checkSvc.parseCheckResponse(req);
- if (ret == 4)
- m_tb_prefs.setBoolPref("extensions.torbutton.test_failed", false);
- if(!wasEnabled) torbutton_disable_tor();
- torbutton_log(3, "Done testing Tor settings. Result: "+ret);
- return ret;
-}
-
-// Bug 1506 P0: Toggle must die.
-function torbutton_disable_tor()
-{
- torbutton_log(3, 'called disable_tor()');
- torbutton_restore_nontor_settings();
-}
-
-// Bug 1506 P0: Toggle must die.
-function torbutton_enable_tor(force)
-{
- torbutton_log(3, 'called enable_tor()');
-
- if(!force && m_tb_prefs.getBoolPref("extensions.torbutton.test_failed")) {
- var warning = torbutton_get_property_string("torbutton.popup.test.confirm_toggle");
- var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var chrome = wm.getMostRecentWindow("navigator:browser");
- if(!chrome.confirm(warning)) {
- return;
- }
- }
-
- torbutton_save_nontor_settings();
- torbutton_activate_tor_settings();
-}
-
-// Bug 1506 P0: Toggle must die.
-function torbutton_update_toolbutton(mode)
+function torbutton_update_toolbutton()
{
- var o_toolbutton = torbutton_get_toolbutton();
+ let o_toolbutton = torbutton_get_toolbutton();
if (!o_toolbutton) return;
- var tooltip = "";
- if (mode && torbutton_tor_check_ok()) {
- tooltip = torbutton_get_property_string("torbutton.panel.label.enabled");
- o_toolbutton.setAttribute('tbstatus', 'on');
- o_toolbutton.setAttribute('tooltiptext', tooltip);
- } else {
- tooltip = torbutton_get_property_string("torbutton.panel.label.disabled");
- o_toolbutton.setAttribute('tbstatus', 'off');
- o_toolbutton.setAttribute('tooltiptext', tooltip);
- }
-}
+ let isOK = torbutton_tor_check_ok();
+ let tbstatus = isOK ? "on" : "off";
+ o_toolbutton.setAttribute("tbstatus", tbstatus);
-// Bug 1506 P0: Toggle must die.
-function torbutton_update_statusbar(mode)
-{
- var o_statuspanel = torbutton_get_statuspanel();
- if (!window.statusbar.visible) return;
- var label = "";
- var tooltip = "";
-
- if (mode && torbutton_tor_check_ok()) {
- label = torbutton_get_property_string("torbutton.panel.label.enabled");
- tooltip = torbutton_get_property_string("torbutton.panel.tooltip.enabled");
- o_statuspanel.style.color = "#390";
- o_statuspanel.setAttribute('label', label);
- o_statuspanel.setAttribute('tooltiptext', tooltip);
- o_statuspanel.setAttribute('tbstatus', 'on');
- } else {
- label = torbutton_get_property_string("torbutton.panel.label.disabled");
- tooltip = torbutton_get_property_string("torbutton.panel.tooltip.disabled");
- o_statuspanel.style.color = "#F00";
- o_statuspanel.setAttribute('label', label);
- o_statuspanel.setAttribute('tooltiptext', tooltip);
- o_statuspanel.setAttribute('tbstatus', 'off');
- }
+ let tooltipKey = isOK ? "torbutton.panel.label.enabled"
+ : "torbutton.panel.label.disabled";
+ o_toolbutton.setAttribute("tooltiptext",
+ torbutton_get_property_string(tooltipKey));
}
// Bug 1506 P4: Timezone spoofing is pretty important
-function torbutton_set_timezone(mode, startup) {
+function torbutton_set_timezone() {
/* Windows doesn't call tzset() automatically.. Linux and MacOS
* both do though.. FF3.5 now calls _tzset() for us on windows.
*/
- // FIXME: Test:
- // 1. odd timezones like IST and IST+13:30
- // 2. negative offsets
- // 3. Windows-style spaced names
+ torbutton_log(3, "Setting timezone to UTC");
var environ = Components.classes["@mozilla.org/process/environment;1"]
.getService(Components.interfaces.nsIEnvironment);
-
- torbutton_log(3, "Setting timezone at "+startup+" for mode "+mode);
-
- // For TZ info, see:
- // http://www-01.ibm.com/support/docview.wss?rs=0&uid=swg21150296
- // and
- // http://msdn.microsoft.com/en-us/library/90s5c885.aspx
- if(startup) {
- // Save Date() string to pref
- var d = new Date();
- var offset = d.getTimezoneOffset();
- var offStr = "";
- if(d.getTimezoneOffset() < 0) {
- offset = -offset;
- offStr = "-";
- } else {
- offStr = "+";
- }
-
- if(Math.floor(offset/60) < 10) {
- offStr += "0";
- }
- offStr += Math.floor(offset/60)+":";
- if((offset%60) < 10) {
- offStr += "0";
- }
- offStr += (offset%60);
-
- // Regex match for 3 letter code
- var re = new RegExp('\\((\\S+)\\)', "gm");
- var match = re.exec(d.toString());
- // Parse parens. If parseable, use. Otherwise set TZ=""
- var set = ""
- if(match) {
- set = match[1]+offStr;
- } else {
- torbutton_log(3, "Skipping timezone storage");
- }
- m_tb_prefs.setCharPref("extensions.torbutton.tz_string", set);
- }
-
- if(mode) {
- torbutton_log(2, "Setting timezone to UTC");
- environ.set("TZ", "UTC");
- } else {
- // 1. If startup TZ string, reset.
- torbutton_log(2, "Unsetting timezone.");
- // FIXME: Tears.. This will not update during daylight switch for linux+mac users
- // Windows users will be fine though, because tz_string should be empty for them
- environ.set("TZ", m_tb_prefs.getCharPref("extensions.torbutton.tz_string"));
- }
+ environ.set("TZ", "UTC");
}
// Bug 1506 P3: Support code for language+uagent spoofing
@@ -1709,14 +1132,12 @@ function torbutton_do_new_identity() {
m_tb_prefs.setBoolPref("browser.zoom.siteSpecific",
!m_tb_prefs.getBoolPref("browser.zoom.siteSpecific"));
- if(m_tb_ff35) {
- try {
- if(m_tb_prefs.prefHasUserValue("geo.wifi.access_token")) {
- m_tb_prefs.clearUserPref("geo.wifi.access_token");
- }
- } catch(e) {
- torbutton_log(3, "Exception on wifi token clear: "+e);
+ try {
+ if(m_tb_prefs.prefHasUserValue("geo.wifi.access_token")) {
+ m_tb_prefs.clearUserPref("geo.wifi.access_token");
}
+ } catch(e) {
+ torbutton_log(3, "Exception on wifi token clear: "+e);
}
try {
@@ -1729,7 +1150,7 @@ function torbutton_do_new_identity() {
torbutton_log(3, "New Identity: Closing tabs and clearing searchbox");
- torbutton_close_on_toggle(true, true);
+ torbutton_close_tabs_on_new_identity();
// Bug #10800: Trying to clear search/find can cause exceptions
// in unknown cases. Just log for now.
@@ -2067,10 +1488,11 @@ function torbutton_do_tor_check()
// If we have a tor control port and transparent torification is off,
// perform a check via the control port.
const kEnvSkipControlPortTest = "TOR_SKIP_CONTROLPORTTEST";
+ const kEnvUseTransparentProxy = "TOR_TRANSPROXY";
var env = Cc["@mozilla.org/process/environment;1"]
.getService(Ci.nsIEnvironment);
if (m_tb_control_port &&
- !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") &&
+ !env.exists(kEnvUseTransparentProxy) &&
!env.exists(kEnvSkipControlPortTest) &&
m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) {
if (torbutton_local_tor_check())
@@ -2078,8 +1500,7 @@ function torbutton_do_tor_check()
else {
// The check failed. Update toolbar icon and tooltip.
checkSvc.statusOfTorCheck = checkSvc.kCheckFailed;
- var mode = m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled");
- torbutton_update_toolbutton(mode);
+ torbutton_update_toolbutton();
}
}
else {
@@ -2558,54 +1979,11 @@ function torbutton_security_slider_custom_check(mode) {
}
}
-// Bug 1506 P0: This code is a toggle-relic.
-//
-// It basically just enforces the three Torbutton prefs
-// so that the Torbutton state and button UI is consistent
-function torbutton_update_status(mode) {
- var o_toolbutton = false;
- var o_statuspanel = false;
- var o_stringbundle = false;
- var sPrefix;
- var label;
- var tooltip;
-
- var torprefs = torbutton_get_prefbranch('extensions.torbutton.');
- var changed = (torprefs.getBoolPref('proxies_applied') != mode);
-
- torbutton_log(2, 'called update_status: '+mode+","+changed);
-
- if (!changed) return;
-
- torprefs.setBoolPref('proxies_applied', mode);
- if(torprefs.getBoolPref("tor_enabled") != mode) {
- torbutton_log(3, 'Got external update for: '+mode);
- torprefs.setBoolPref("tor_enabled", mode);
- }
-
- m_tb_prefs.setBoolPref("extensions.torbutton.settings_applied", mode);
-
- // Force prefs to be synced to disk
- var prefService = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefService);
- prefService.savePrefFile(null);
-
- torbutton_log(3, "Settings applied for mode: "+mode);
-}
-
-// Bug 1506 P4: Despite the name, it is used on new identity
-function torbutton_close_on_toggle(mode, newnym) {
- var close_tor = m_tb_prefs.getBoolPref("extensions.torbutton.close_tor");
- var close_nontor = m_tb_prefs.getBoolPref("extensions.torbutton.close_nontor");
+function torbutton_close_tabs_on_new_identity() {
var close_newnym = m_tb_prefs.getBoolPref("extensions.torbutton.close_newnym");
-
- if (newnym) {
- if (!close_newnym) {
- torbutton_log(3, "Not closing tabs");
- }
- } else if((mode && !close_nontor) || (!mode && !close_tor)) {
- torbutton_log(3, "Not closing tabs");
- return;
+ if (!close_newnym) {
+ torbutton_log(3, "Not closing tabs");
+ return;
}
// TODO: muck around with browser.tabs.warnOnClose.. maybe..
@@ -2713,36 +2091,6 @@ function torbutton_gecko_compare(aVersion) {
return versionComparator.compare(aVersion, geckoVersion);
}
-// Bug 1506 P0: Code to attempt to grey out browser proxy prefs. Doesn't
-// actually seem to work?
-function torbutton_browser_proxy_prefs_init()
-{
- var _elementIDs = ["networkProxyType",
- "networkProxyFTP", "networkProxyFTP_Port",
- "networkProxyGopher", "networkProxyGopher_Port",
- "networkProxyHTTP", "networkProxyHTTP_Port",
- "networkProxySOCKS", "networkProxySOCKS_Port",
- "networkProxySOCKSVersion",
- "networkProxySOCKSVersion4", "networkProxySOCKSVersion5",
- "networkProxySSL", "networkProxySSL_Port",
- "networkProxyNone", "networkProxyAutoconfigURL", "shareAllProxies"];
-
- torbutton_log(2, 'called torbutton_browser_proxy_prefs_init()');
- if (!torbutton_check_status())
- {
- document.getElementById('torbutton-pref-connection-notice').hidden = true;
- document.getElementById('torbutton-pref-connection-more-info').hidden = true;
- }
- else
- {
- document.getElementById('networkProxyType').disabled = true;
- for (var i = 0; i < _elementIDs.length; i++)
- document.getElementById(_elementIDs[i]).setAttribute( "disabled", "true" );
- }
-
- // window.sizeToContent();
-}
-
// -------------- HISTORY & COOKIES ---------------------
// Bug 1506 P4: Used by New Identity if cookie protections are
@@ -2755,38 +2103,6 @@ function torbutton_clear_cookies() {
cm.removeAll();
}
-// Bug 1506 P0: Toggle-only. Kill it.
-function torbutton_jar_cookies(mode) {
- var selector =
- Components.classes["@torproject.org/cookie-jar-selector;1"]
- .getService(Components.interfaces.nsISupports)
- .wrappedJSObject;
-
- /*
- if(m_tb_ff3) {
- var o_stringbundle = torbutton_get_stringbundle();
- var warning = torbutton_get_property_string("torbutton.popup.ff3.cookie_warning");
- window.alert(warning);
- return;
- }*/
- var protectcookies = m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections');
- if(mode) {
- if (protectcookies)
- selector.clearUnprotectedCookies("nontor");
- selector.saveCookies("nontor");
- selector.clearCookies();
- if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars'))
- selector.loadCookies("tor", false);
- } else {
- if (protectcookies)
- selector.clearUnprotectedCookies("tor");
- if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars'))
- selector.saveCookies("tor");
- selector.clearCookies();
- selector.loadCookies("nontor", false);
- }
-}
-
// -------------- JS/PLUGIN HANDLING CODE ---------------------
// Bug 1506 P3: Defense in depth. Disables JS and events for New Identity.
function torbutton_disable_browser_js(browser) {
@@ -2877,44 +2193,6 @@ function torbutton_disable_all_js() {
}
}
-// Bug 1506 P2: We may want to replace this with a XUl solution.
-// See #6096.
-function torbutton_reload_homepage() {
- var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage",
- Components.interfaces.nsIPrefLocalizedString).data;
-
- torbutton_log(3, "Reloading homepage: "+homepage);
- try {
- gBrowser.loadURI(homepage, null, null);
- } catch(e) {
- torbutton_log(4, "Failure reloading homepage "+homepage+": "+e);
- }
-}
-
-// Bug 1506 P0: Toggle, kill it.
-function torbutton_restore_cookies(tor_enabled)
-{
- var selector =
- Components.classes["@torproject.org/cookie-jar-selector;1"]
- .getService(Components.interfaces.nsISupports)
- .wrappedJSObject;
- torbutton_log(4, "Restoring cookie status");
- selector.clearCookies();
-
- if(tor_enabled) {
- if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')) {
- torbutton_log(4, "Loading tor jar after crash");
- selector.loadCookies("tor", false);
- }
- } else {
- if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')
- || m_tb_prefs.getBoolPref('extensions.torbutton.cookie_jars')) {
- torbutton_log(4, "Loading non-tor jar after crash");
- selector.loadCookies("nontor", false);
- }
- }
-}
-
// Bug 1506 P1: This function just cleans up prefs that got set badly in previous releases
function torbutton_fixup_old_prefs()
{
@@ -2976,7 +2254,7 @@ function torbutton_do_startup()
torbutton_do_main_window_startup();
// Bug 1506: Still want to do this
- torbutton_set_timezone(true, true);
+ torbutton_set_timezone();
// For charsets
torbutton_update_fingerprinting_prefs();
@@ -3005,22 +2283,14 @@ function torbutton_do_startup()
}
}
-// Bug 1506 P0: Has some tagging code (can be removed)
+// Bug 1506 P0: Perform version check when a new tab is opened.
function torbutton_new_tab(event)
{
// listening for new tabs
torbutton_log(3, "New tab");
- var tor_tag = !m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled");
- var no_plugins = m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins");
- // Changed in FF4...
- //var browser = event.currentTarget;
- var browser = gBrowser.getBrowserForTab(event.target);
-
/* Perform the version check on new tab, module timer */
- if (!tor_tag) { // tor is enabled...
- torbutton_do_async_versioncheck();
- }
+ torbutton_do_async_versioncheck();
}
// Bug 1506 P3: Used to decide if we should resize the window.
@@ -3077,7 +2347,6 @@ function torbutton_new_window(event)
.getService(Ci.nsIWebProgress);
if (m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows")
- && m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled")
&& torbutton_is_windowed(window)) {
progress.addProgressListener(torbutton_resizelistener,
Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT);
diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul
index df86370..2f6e72e 100644
--- a/src/chrome/content/torbutton.xul
+++ b/src/chrome/content/torbutton.xul
@@ -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()"/>
diff --git a/src/chrome/content/torbutton_tb.xul b/src/chrome/content/torbutton_tb.xul
index c240248..450ffb3 100644
--- a/src/chrome/content/torbutton_tb.xul
+++ b/src/chrome/content/torbutton_tb.xul
@@ -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>
diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js
index e7b0197..1558ced 100644
--- a/src/chrome/content/torbutton_util.js
+++ b/src/chrome/content/torbutton_util.js
@@ -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()
{
diff --git a/src/chrome/content/torcookie.js b/src/chrome/content/torcookie.js
index 9420994..0a3dace 100644
--- a/src/chrome/content/torcookie.js
+++ b/src/chrome/content/torcookie.js
@@ -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);
diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/af/torbutton.properties b/src/chrome/locale/af/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/af/torbutton.properties
+++ b/src/chrome/locale/af/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ak/torbutton.dtd
+++ b/src/chrome/locale/ak/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ak/torbutton.properties b/src/chrome/locale/ak/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ak/torbutton.properties
+++ b/src/chrome/locale/ak/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/am/torbutton.dtd
+++ b/src/chrome/locale/am/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/am/torbutton.properties b/src/chrome/locale/am/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/am/torbutton.properties
+++ b/src/chrome/locale/am/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index 43601b2..0da10fd 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "إعدادات اÙ?برÙ?Ù?سÙ?">
-<!ENTITY torbutton.prefs.recommended_settings "استخدÙ? إعدادات اÙ?برÙ?Ù?سÙ? اÙ?Ù?ØبÙ?ذة Ù?Ù?Ø°Ù? اÙ?Ù?سخة Ù?Ù? Ù?اÙ?رÙ?Ù?س">
-<!ENTITY torbutton.prefs.use_polipo "استخدÙ? Polipo">
-<!ENTITY torbutton.prefs.custom_settings "استخدÙ? إعدادات برÙ?Ù?سÙ? Ù?خصصة">
-<!ENTITY torbutton.prefs.proxy.host.http "برÙ?Ù?سÙ? HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "برÙ?Ù?سÙ? SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "برÙ?Ù?سÙ? FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "برÙ?Ù?سÙ? Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "برÙ?Ù?سÙ? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "اÙ?بÙ?ابة:">
-<!ENTITY torbutton.pref_connection.notice "عطÙ?Ù? زر تÙ?ر Ù?تغÙ?Ù?ر Ù?Ø°Ù? اÙ?إعدادات.">
-<!ENTITY torbutton.pref_connection.more_info "Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات">
-<!ENTITY torbutton.pref_connection_more_info.title "اÙ?تعÙ?Ù?Ù?ات">
-<!ENTITY torbutton.pref_connection_more_info.text "زر تÙ?ر Ù?Ù?عÙ?Ù? ØاÙ?Ù?Ù?ا. إذا Ù?Ù?ت ترÙ?د تغÙ?Ù?ر إعدادات اÙ?برÙ?Ù?سÙ? غÙ?ر اÙ?Ù?تعÙ?Ù?Ø© بتÙ?رØ? Ù?ضÙ?اÙ? عطÙ? زر تÙ?ر Ø£Ù?Ù?اÙ? Ø«Ù? عد Ø¥Ù?Ù? Ù?Ù?ا. Ø¥Ù? Ù?Ù?ت ترÙ?د تعدÙ?Ù? إعدادات زر تÙ?ر Ù?استخدÙ? Ù?اÙ?ذة تÙ?ضÙ?Ù?ات زر تÙ?ر.">
<!ENTITY torbutton.context_menu.new_identity "Ù?Ù?Ù?Ø© جدÙ?دة">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "دائرة تÙ?ر جدÙ?دة Ù?Ù?ذا اÙ?Ù?Ù?Ù?ع">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "اÙ?Ù?ر Ù?بدء زر تÙ?ر">
<!ENTITY torbutton.prefs.privacy_security_settings "إعدادات اÙ?Ø£Ù?اÙ? Ù?اÙ?خصÙ?صÙ?Ù?Ø©">
<!ENTITY torbutton.prefs.restore_defaults "استعادة اÙ?اÙ?تراضÙ?ات">
-<!ENTITY torbutton.prefs.test_settings "Ù?Øص اÙ?إعدادات">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ù?ا Ù?سÙ?Ø· Ù?:">
-<!ENTITY torbutton.prefs.no_proxy_warning "تØØ°Ù?ر: تجÙ?ب استخداÙ? Ø£Ù? Ù?Ù? أسÙ?اء اÙ?Ù?ضÙ?Ù? اÙ?Ù?Ø°Ù?Ù?رة أعÙ?اÙ?">
<!ENTITY torbutton.cookiedialog.title "إدارة إعدادت اÙ?ØÙ?اÙ?Ø© Ù?Ù?Ù?Ù?ات تعرÙ?Ù? اÙ?ارتباط">
<!ENTITY torbutton.cookiedialog.lockCol "Ù?ØÙ?Ù?Ø©">
<!ENTITY torbutton.cookiedialog.domainCol "استضاÙ?Ø©">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "إزاÙ?Ø© اÙ?Ù?Ù? Ù?Ù?Ù? استÙ?ر Ù?Ù? اÙ?ØÙ?اÙ?Ø©">
<!ENTITY torbutton.cookiedialog.saveAllCookies "اØÙ? Ù?Ù?Ù?ات تعرÙ?Ù? اÙ?ارتباط اÙ?جدÙ?دة">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ù?ا تØÙ? Ù?Ù?Ù?ات تعرÙ?Ù? اÙ?ارتباط اÙ?جدÙ?دة">
-<!ENTITY torbutton.prefs.transparentTor "Ø´Ù?اÙ?Ù?Ø© تÙ?رÙ?Ù?Ù?Ù?Ø´Ù? (تØتاج Ù?Ù?جÙ? تÙ?ر Ø£Ù? تراÙ?سبÙ?Ù?سÙ? Ù?خصص)">
<!ENTITY torbutton.prefs.priv_caption "إعدادات اÙ?خصÙ?صÙ?Ø©">
<!ENTITY torbutton.prefs.block_disk "Ù?ا تسجÙ? سجÙ? اÙ?تصÙ?Ø Ø£Ù? بÙ?اÙ?ات اÙ?Ù?Ù?اÙ?ع اÙ?Ø£Ù?Ù?ترÙ?Ù?Ù?Ø© (تÙ?عÙ?Ù? اÙ?تصÙ?Ø Ø§Ù?خصÙ?صÙ?)">
<!ENTITY torbutton.prefs.restrict_thirdparty "تÙ?Ù?Ù?د اÙ?Ù?Cookies اÙ?خاصة باÙ?طرÙ? اÙ?ثاÙ?Ø« Ù? بÙ?اÙ?ات اÙ?تتبع اÙ?أخرÙ?.">
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 5fa8bb1..fd7e4b4 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = اÙ?Ù?ر Ù?تعطÙ?Ù? تÙ?ر
torbutton.panel.label.disabled = تÙ?ر Ù?عطÙ?Ù?
torbutton.panel.label.enabled = تÙ?ر Ù?Ù?عÙ?Ù?
extensions.torbutton@xxxxxxxxxxxxxx.description = زر تÙ?ر Ù?Ù?Ù?ر زر Ù?تعدÙ?Ù? إعدادات تÙ?ر Ù?اÙ?ضاÙ? Ù?Ù?Ø³Ø Ø¨Ù?اÙ?ات اÙ?تصÙ?Ø Ø§Ù?خاصة بÙ? بسرعة Ù?بسÙ?Ù?Ù?Ø©.
-torbutton.popup.test.success = تÙ?Ù? اختبار برÙ?Ù?سÙ? تÙ?ر بÙ?جاØ!
-torbutton.popup.test.failure = Ù?Ø´Ù?ت عÙ?Ù?Ù?Ø© اختبار برÙ?Ù?سÙ? تÙ?ر! تأÙ?د Ù?Ù? إعدادات اÙ?برÙ?Ù?سÙ? اÙ?خاص بÙ? Ù?إعدادات Polipo .
-torbutton.popup.test.confirm_toggle = Ù?Ø´Ù? آخر اختبار Ù?برÙ?Ù?سÙ? تÙ?ر Ù?Ù? استخداÙ? تÙ?ر.\n\nÙ?Ù? Ø£Ù?ت Ù?تأÙ?د Ù?Ù? Ø£Ù?Ù? ترÙ?د تÙ?عÙ?Ù?Ù? عÙ?Ù? Ø£Ù? ØاÙ?Ø?\n\nÙ?Ù?اØظة: Ø¥Ù? Ù?Ù?ت Ù?د عاÙ?جت اÙ?Ù?Ø´Ù?Ù?Ø©Ø? Ù?Ù?Ù?Ù?Ù? إعادة إجراء اÙ?Ù?Øص Ù?Ù? Ù?اÙ?ذة إعدادات اÙ?برÙ?Ù?سÙ? Ù?زر تÙ?ر ØتÙ? Ù?ختÙ?Ù? Ù?ذا اÙ?تÙ?بÙ?Ù?.
-torbutton.popup.test.ff3_notice = اضغط "Ù?Ù?اÙ?Ù?" Ù?اختبار إعدادات برÙ?Ù?سÙ? تÙ?ر. Ù?ذا اÙ?اختبار سÙ?تÙ? Ù?Ù? اÙ?Ø®Ù?Ù?Ù?Ø©. Ù?رجÙ? اÙ?اÙ?تظار.
torbutton.popup.external.title = Ù?Ù? ترÙ?د تÙ?زÙ?Ù? Ù?Ù?Ù?اÙ? Ù?Ù? Ù?Ù?ع اÙ?Ù?صÙ?Ø© اÙ?خارجÙ?Ø©Ø?
torbutton.popup.external.app = Ù?ا Ù?Ù?Ù?Ù? Ù?Ù?تصÙ?Ù?Ø ØªÙ?ر عرض Ù?Ø°Ù? اÙ?Ù?Ù?Ù?, Ù?جب عÙ?Ù?Ù? Ø£Ù? تÙ?تØÙ? باستعÙ?اÙ? تطبÙ?Ù? أخر.\n\n
torbutton.popup.external.note = بعض اÙ?Ø£Ù?Ù?اع Ù?Ù? اÙ?Ù?Ù?Ù?ات Ù?د تعÙ?Ù? عÙ?Ù? إعطاء بعض اÙ?تطبÙ?Ù?ات اÙ?Ø¥Ù?Ù?اÙ?Ù?Ù?Ø© Ù?Ù?اتصاÙ? باÙ?Ø¥Ù?ترÙ?ت دÙ?Ù? استعÙ?اÙ? تÙ?ر.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Ù?سÙ?اÙ?تÙ?, Ù?جب عÙ?Ù?Ù? Ù?ØªØ Ø§Ù?Ù?
torbutton.popup.launch = تØÙ?Ù?Ù? اÙ?Ù?Ù?Ù?
torbutton.popup.cancel = Ø¥Ù?غاء
torbutton.popup.dontask = Ø£Ù?زÙ? اÙ?Ù?Ù?Ù?ات بشÙ?Ù?Ù? Ø£Ù?تÙ?Ù?اتÙ?Ù?Ù?Ù? Ù?Ù? اÙ?Ø£Ù? Ù?صاعداÙ?
-torbutton.popup.test.no_http_proxy = Ù?Øص برÙ?Ù?سÙ? تÙ?ر: Ù?ا Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù? برÙ?Ù?سÙ? HTTP اÙ?Ù?ØÙ?Ù?. Ù?Ù? Ù?عÙ?Ù? Polipo بشÙ?Ù? صØÙ?ØØ?
torbutton.popup.prompted_language = ØتÙ? Ù?Ù?Ù?ØÙ? زر تÙ?ر Ù?زÙ?داÙ? Ù?Ù? اÙ?خصÙ?صÙ?Ø©Ø? Ù?ستطÙ?ع زر تÙ?ر Ø·Ù?ب اÙ?Ù?سخ اÙ?Ø¥Ù?جÙ?Ù?زÙ?Ø© Ù?Ù? صÙ?Øات اÙ?اÙ?ترÙ?ت. Ù?Ù?د Ù?Ù?تج عÙ? Ø°Ù?Ù? عرض اÙ?صÙ?Øات اÙ?تÙ? تÙ?ضÙ? Ù?راءتÙ?ا بÙ?غتÙ? اÙ?Ø£Ù? باÙ?Ù?غة اÙ?Ø¥Ù?جÙ?Ù?زÙ?Ø©.\n\nÙ?Ù? ترÙ?د Ø·Ù?ب صÙ?Øات اÙ?Ù?ب باÙ?Ù?غة اÙ?Ø¥Ù?جÙ?Ù?زÙ?Ø© Ù?خصÙ?صÙ?Ø© اÙ?ضÙ?Ø?
torbutton.popup.no_newnym = Ù?ا Ù?Ù?Ù?Ù? Ù?زر تÙ?ر Ø£Ù? Ù?عطÙ?Ù? Ù?Ù?Ù?Ø© جدÙ?دة بشÙ?Ù? Ø¢Ù?Ù?Ø? Ù?Ù?ذا Ù?اÙ? زر تÙ?ر Ù?ا Ù?ستطÙ?ع اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù? Ù?Ù?Ù?Ø° اÙ?تØÙ?Ù? اÙ?خاص بتÙ?ر.\n\nÙ?Ù? تستخدÙ? ØزÙ?Ø© Ù?تصÙ?Ø ØªÙ?ر ØاÙ?Ù?اÙ?Ø?
-torbutton.popup.pref_error = Ù?ا Ù?Ù?Ù?Ù? Ù?زر تÙ?ر تØدÙ?Ø« اÙ?تÙ?ضÙ?Ù?ات Ù?Ù? Ù?جÙ?د Ù?تصÙ?Ø ØªÙ?ر.
-torbutton.popup.permission_denied = Ù?رجÙ? Ø£Ù? تÙ?Ù?Ù? بتغÙ?Ù?ر اÙ?صÙ?اØÙ?ات Ù?Ù?جÙ?د Ù?تصÙ?Ø ØªÙ?ر Ø£Ù? Ù?Ù? بÙ?Ù?Ù?Ù? Ø¥Ù?Ù? Ù?Ù?اÙ? آخر.
-torbutton.popup.device_full = Ù?بدÙ? Ø£Ù? اÙ?Ù?رص اÙ?صÙ?ب Ù?Ù?تÙ?ئ. Ù?رجÙ? تÙ?رÙ?غ Ù?ساØØ© Ø£Ù?ثر Ø£Ù? Ù?Ù? بÙ?Ù?Ù? Ù?تصÙ?Ø ØªÙ?ر Ø¥Ù?Ù? Ù?Øدة تخزÙ?Ù? أخرÙ?.
torbutton.title.prompt_torbrowser = Ù?عÙ?Ù?Ù?ات Ù?اÙ?Ø© عÙ? تÙ?ر
torbutton.popup.prompt_torbrowser = Ù?Ù?د تغÙ?رت طرÙ?Ù?Ø© عÙ?Ù? زر تÙ?ر اÙ?اÙ?: Ù?ا Ù?Ù?Ù?Ù?Ù? Ø¥Ù?Ù?اÙ?Ù? اÙ?اÙ? \n\nÙ?Ù?Ù?ا بÙ?ذا اÙ?تغÙ?Ù?ر Ù?اÙ?Ù? Ø§ØµØ¨Ø Ù?Ù? غÙ?ر اÙ?Ø¢Ù?Ù? استخداÙ? زر تÙ?ر Ù?Ù? اÙ?Ù?تصÙ?Ø Ø§Ù?Ø°Ù? Ù?ستخدÙ? Ù?Ù? اÙ?تصÙ?Ø Ø®Ø§Ø±Ø¬ تÙ?ر. Ù?اÙ? Ù?Ù?اÙ? اÙ?عدÙ?د Ù?Ù? اÙ?عÙ?Ù? Ù? اÙ?تÙ? Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ù? اÙ?Ù?Ù?Ù?Ù? Ù?عاÙ?جتÙ?ا باÙ? طرÙ?Ù?Ø© اخرÙ?.\n\nإذا اردت اÙ?استÙ?رار Ù?Ù? استخداÙ? Ù?اÙ?رÙ?Ù?Ù?س تÙ?Ù?Ù?دÙ?اÙ?Ø? Ù?تÙ?جب عÙ?Ù?Ù? إزاÙ?Ø© زر تÙ?ر Ù? تØÙ?Ù?Ù? ØزÙ?Ø© Ù?تصÙ?Ø ØªÙ?ر. Ù?Ù?ا اÙ? خصائص اÙ?خصÙ?صÙ?Ø© Ù?Ù?تصÙ?Ø ØªÙ?ر تتÙ?Ù?Ù? عÙ?Ù? تÙ?Ù? اÙ?تÙ? Ù?Ù? Ù?تصÙ?Ø Ù?اÙ?رÙ?Ù?Ù?س اÙ?تÙ?Ù?Ù?دÙ?Ø? ØتÙ? Ù?Ù? تÙ? استخداÙ? Ù?تصÙ?Ø Ù?اÙ?رÙ?Ù?Ù?س Ù?ع زر تÙ?ر.\n\nÙ?إزاÙ?Ø© زر تÙ?رØ? اذÙ?ب Ø¥Ù?Ù? أدÙ?ات->إضاÙ?ات->Ù?ØÙ?Ù?ات Ø? Ø«Ù? إضغط عÙ?Ù? زر إزاÙ?Ø© اÙ?Ø°Ù? بجاÙ?ب Ø
²Ø± تÙ?ر.
torbutton.popup.short_torbrowser = Ù?عÙ?Ù?Ù?ات Ù?اÙ?Ø© عÙ? زر تÙ?ر \n\nتÙ? تÙ?Ù?Ù?Ù? زر تÙ?ر Ù?Ù?عÙ?Ù? باستÙ?رار اÙ?اÙ?\n\nاضغط عÙ?Ù? زر تÙ?ر Ù?Ù?Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات
diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/arn/torbutton.dtd
+++ b/src/chrome/locale/arn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/arn/torbutton.properties b/src/chrome/locale/arn/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/arn/torbutton.properties
+++ b/src/chrome/locale/arn/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ast/torbutton.dtd
+++ b/src/chrome/locale/ast/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ast/torbutton.properties b/src/chrome/locale/ast/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ast/torbutton.properties
+++ b/src/chrome/locale/ast/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd
index be32e17..68a3f88 100644
--- a/src/chrome/locale/az/torbutton.dtd
+++ b/src/chrome/locale/az/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proksi qurÄ?uları">
-<!ENTITY torbutton.prefs.recommended_settings " Firefox -un versiyası üçün uyÄ?un proksi qurÄ?ularından istifadÉ? et">
-<!ENTITY torbutton.prefs.use_polipo "Polipo-nu istifadÉ? et">
-<!ENTITY torbutton.prefs.custom_settings "Proksinin fÉ?rdi qurÄ?usundan istifadÉ? et">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Bu qurÄ?uları dÉ?yiÅ?mÉ?k üçün TordüymÉ?sini söndür.">
-<!ENTITY torbutton.pref_connection.more_info "Daha çox mÉ?lumat">
-<!ENTITY torbutton.pref_connection_more_info.title "KömÉ?k">
-<!ENTITY torbutton.pref_connection_more_info.text "TordüymÉ?si hal hazırda yanılıdır. Æ?gÉ?r Tordan baÅ?qa qurÄ?uları dÉ?yiÅ?mÉ?k istÉ?yirsÉ?nsÉ? zÉ?hmÉ?t olmasa TordüymÉ?sini söndürün vÉ? bura qayıdın. Æ?gÉ?r Tor qurÄ?ularını dÉ?yiÅ?mÉ?k istÉ?yirsÉ?nsÉ? zÉ?hmÉ?t olmasa TordüymÉ?si seçimlÉ?ri pÉ?ncÉ?rÉ?sindÉ?n istifadÉ? edin.">
<!ENTITY torbutton.context_menu.new_identity "New Identity">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "SeçimlÉ?r...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "TordüymÉ?sini baÅ?latmaq üçün kliklÉ?yin">
<!ENTITY torbutton.prefs.restore_defaults "Varsayılanları yenidÉ?n yüklÉ?">
-<!ENTITY torbutton.prefs.test_settings "Test qurÄ?uları">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Bunun üçün ProksilÉ?r yoxdu">
-<!ENTITY torbutton.prefs.no_proxy_warning "XÉ?bÉ?rdarlıq : Yuxarıda istÉ?nilÉ?n hostnames-dÉ?n istifadÉ? etmÉ?kdÉ?n boyun qaçırın">
<!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)">
diff --git a/src/chrome/locale/az/torbutton.properties b/src/chrome/locale/az/torbutton.properties
index 06ffc8a..7cb3271 100644
--- a/src/chrome/locale/az/torbutton.properties
+++ b/src/chrome/locale/az/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Toru söndürmÉ?k üçün kliklÉ?
torbutton.panel.label.disabled = Tor sönülüdür
torbutton.panel.label.enabled = Tor yanılıdır
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proksi testi müvÉ?ffÉ?qiyyÉ?tlidir!
-torbutton.popup.test.failure = Tor proksi testi sÉ?hvdir! Proksinizi vÉ? Polipo qurÄ?unuzu yoxlayın.
-torbutton.popup.test.confirm_toggle = Tor proksi testi Tordan istifadÉ?yÉ? müvÉ?ffÉ?q olmadı.\n\nSiz hÉ?r halda imkan vermÉ?k istÉ?yirsiniz?\n\nQeyd: Æ?gÉ?r siz problemi meÉ?yyÉ?nlÉ?Å?dirmiÅ?sinizsÉ?, bu xÉ?bÉ?rdarlıÄ?ı lÉ?Ä?v etmÉ?k üçün TordüymÉ?si Proksi Ã?stünlüklÉ?ri pÉ?ncÉ?rÉ?sindÉ? testi tÉ?krar iÅ?É? sala bilÉ?rsiniz.
-torbutton.popup.test.ff3_notice = Tor proksi qurÄ?ularını test etmÉ?k üçün Ok kliklÉ?. Bu test arxaplanda baÅ? verÉ?cÉ?k. Ehtiyatlı olun.
torbutton.popup.external.title = Xarici mÉ?zmun yüklÉ?nsin?
torbutton.popup.external.app = Ä°darÉ? etmÉ?k üçün xarici tÉ?tbiqÉ? ehtiyac duyulur:\n\n
torbutton.popup.external.note = \n\nQEYD: Xarici tÉ?tbiqlÉ?r Tor üçün uyÄ?un olmaya bilÉ?r vÉ? bu sizi ifÅ?a edÉ? bilÉ?r!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = BuraxılıÅ? É?rizÉ?si
torbutton.popup.cancel = LÉ?Ä?v et
torbutton.popup.dontask = Bundan sonra É?rizÉ?lÉ?ri iÅ?É? salın
-torbutton.popup.test.no_http_proxy = Tor proksi testi: Yerli HTTP Proksisi É?lçÉ?tmazdır. Polipo uyÄ?un Å?É?kildÉ? davam edir?
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.
diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/be/torbutton.dtd
+++ b/src/chrome/locale/be/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/be/torbutton.properties b/src/chrome/locale/be/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/be/torbutton.properties
+++ b/src/chrome/locale/be/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 6bee2cd..1c6f284 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_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 "Ð?оÑ?Ñ?:">
-<!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 "Ð?омоÑ?">
-<!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 "Ð?ова Ñ?амолиÑ?ноÑ?Ñ?">
<!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 "Ð?Ñ?зÑ?Ñ?анови Ñ?Ñ?андаÑ?Ñ?ниÑ?е">
-<!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)">
diff --git a/src/chrome/locale/bg/torbutton.properties b/src/chrome/locale/bg/torbutton.properties
index 3c69881..6fab40e 100644
--- a/src/chrome/locale/bg/torbutton.properties
+++ b/src/chrome/locale/bg/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = Ð?Ñ?каз
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.
diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index 4a79cda..110938d 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -1,28 +1,9 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy á??á?ºá?á??á?¹á??á??á?á??á?ºá??á?¹á??á?ºá?¬á?¸">
-<!ENTITY torbutton.prefs.recommended_settings "á?¡á?¾á??á?¶á?»á??á?³ á?±á??á?¬á??á?¹á??á?¶á?±á??á?¬ proxy á??á?ºá?á??á?¹á??á?á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?á?¯ á??á?á??á?á?? Firefox version á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.use_polipo "Polipo á??á?á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.custom_settings "proxy á??á?ºá?á??á?¹á??á?á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?á?¯ á??á?á??á?¹á?¾á??á?á?³á??á?¹á?»á??á?³á?»á??á??á?¹á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP á??á?±á??á?¬á?·á??á?® :">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL á??á?±á??á?¬á?·á??á?® :">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP á??á?±á??á?¬á?·á??á?® :">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher á??á?±á??á?¬á?·á??á?®">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host :">
-<!ENTITY torbutton.prefs.proxy.port "Port :">
-<!ENTITY torbutton.pref_connection.notice "á??á??á?¹á?¸á??á?ºá?á??á?¹á??á??á?á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹á?¡á??á?¼á??á?¹ Torbutton á??á?¯á? á??á?á??á?¹á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.pref_connection.more_info "á??á?á?¯á??á?¯á?á?»á??á??á?¹á?·á??á?¶á?¯á?±á??á?¬ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?á?¯á??">
-<!ENTITY torbutton.pref_connection_more_info.title "á??á?°á??á?®á??á??á??á??á?°á??á??á?¹">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton á??á?¯á? á??á??á?¹á??á?½á?á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?á??á?¹á??á?«á??á??á?¹á?? Tor Proxy á??á??á?¯á??á?¹á?±á??á?¬ á??á?ºá?á??á?¹á??á?á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?á??á?¹á??á??á?¹á?¡á??á?¼á??á?¹ Torbutton á??á?¯á? á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?á?¯á??á?¹á?±á?¡á?¬á??á?¹ á??á?á??á?¹á?? á??á??á?¯á?±á??á??á?¬á??á?á?¯á?? á?»á??á??á?¹á??á?¬á??á?«á?? Tor á??á?ºá?á??á?¹á??á??á?á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?á?¯á??á?«á?? Torbutton á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸á??á??á??á?¹á?»á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?á?¯ á??á?á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??">
<!ENTITY torbutton.context_menu.preferences "á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸ á??á??á??á?¹á?»á??á??á??á??á?ºá?¬á?¸">
<!ENTITY torbutton.context_menu.preferences.key "P">
<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Torbutton á??á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«">
<!ENTITY torbutton.prefs.restore_defaults "á??á?°á??á?¡á?±á?»á??á?¡á?±á??á??á?á?¯á?? á?»á??á??á?¹á??á??á?¹ á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.test_settings "á??á?ºá?á??á?¹á??á?á??á??á??á??á?ºá?¬á?¸á??á?á?¯ á??á??á?¹á?¸á??á??á?¹á??á??á?¹">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "á??á??á?¹á?¸á??á?á?¯á??á?¡á??á?¼á??á?¹ proxy á??á??á?½á?á??á?«:">
-<!ENTITY torbutton.prefs.no_proxy_warning "á??á??á?á?±á??á?¸á??á?ºá??á?¹: á?¡á??á??á?¹á?±á??á?¬á?¹á?»á??á??á?« hostname á??á?ºá?¬á?¸á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á??á?¹">
<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
<!ENTITY torbutton.cookiedialog.lockCol "Protected">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -34,4 +15,3 @@
<!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)">
diff --git a/src/chrome/locale/bms/torbutton.properties b/src/chrome/locale/bms/torbutton.properties
index ff02845..14517d0 100644
--- a/src/chrome/locale/bms/torbutton.properties
+++ b/src/chrome/locale/bms/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·
torbutton.panel.label.disabled = Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¯á?á??á?¹á??á?«
torbutton.panel.label.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?á??á?¹á??á?«á??á??á?¹á??
extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Tor proxy á??á?¯á? Firefox á??á?¼á??á?¹ á?¡á??á?¼á??á?¹á??á??á?° á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á?»á??á?³á??á??á?¹/ á??á?»á??á?³á??á??á?¹ Torbutton á??á?½ á??á??á?¯á??á?¹á??á??á?¹á??á?¯á??á?¯á? á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á?¬á?¸á??á?«á??á??á?¹
-torbutton.popup.test.success = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á??á??á?¹ !
-torbutton.popup.test.failure = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?« ! á??á??á?¹á?? proxy á??á?½á??á?¹á?· Privoxy á??á?ºá?á??á?¹á??á?á??á??á??á??á?ºá?¬á?¸á??á?á?¯ á??á??á?¹á?±á??á?¸á??á?«á??
-torbutton.popup.test.confirm_toggle = á?±á??á?¬á??á?¹á??á?¶á?¯á?¸á??á??á?¹á?¸á??á??á?¹á??á?¬á?¸á?±á??á?¬ Proxy Test á??á?½ Tor á??á?á?¯á??á??á??á??á?¹á??á?á?¯á??á?¹á??á?«á?? \n\nTor á??á?á?¯ enable á??á?¯á??á?¹á??á??á?¹á?±á??á??á?ºá?¬á??á?«á??á??á?¬á?¸á??\n\ná??á??á?á?»á??á?³á??á??á?¹-á?»á??á??á?¹á??á??á?¹á??á?½á?³á??á?ºá?¬á?¸á??á?á?¯á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸á??á?«á??á?? Torbutton Proxy Preferences window á??á?½ á?¤á??á??á?á?±á??á?¸á??á?ºá??á?¹á??á?á?¯ á??á?á??á?¹á??á??á?¹á??á?á?¯á?¹á??á?¹á??á?«á??á??á?¹á??
-torbutton.popup.test.ff3_notice = Tor proxy á??á?ºá?á??á?¹á??á?á??á??á??á??á?ºá?¬á?¸á??á?¯á? á??á??á?¹á?¸á??á??á?¹á??á??á?¹ OK á??á?¯á? á??á??á??á?¹á??á?½á?á??á?¹á??á?«á?? á??á??á?¹á?¸á??á??á?¹á??á??á??á??á?¹ á?±á??á?¬á??á?¹á??á?¼á??á?¹á??á?¼á??á?¹ á?»á??á?³á??á?¯á??á?¹á??á?«á??á??á?¹á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹á?¸á??á?¶á?±á??á?¬á??á?¹á?·á??á?¯á?á??á?¹á?¸á?±á??á?¸á??á?«á??á??á?¹á??
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,4 +10,3 @@ 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?
diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/bn-IN/torbutton.dtd
+++ b/src/chrome/locale/bn-IN/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/bn-IN/torbutton.properties b/src/chrome/locale/bn-IN/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/bn-IN/torbutton.properties
+++ b/src/chrome/locale/bn-IN/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/bn/torbutton.dtd
+++ b/src/chrome/locale/bn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/bn/torbutton.properties b/src/chrome/locale/bn/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/bn/torbutton.properties
+++ b/src/chrome/locale/bn/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/bo/torbutton.properties b/src/chrome/locale/bo/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/bo/torbutton.properties
+++ b/src/chrome/locale/bo/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/br/torbutton.dtd
+++ b/src/chrome/locale/br/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/br/torbutton.properties b/src/chrome/locale/br/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/br/torbutton.properties
+++ b/src/chrome/locale/br/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd
index b7d0233..ee65693 100644
--- a/src/chrome/locale/bs/torbutton.dtd
+++ b/src/chrome/locale/bs/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proksi postavke">
-<!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄ?ene opcije proksija za moju verziju Firefoxa">
-<!ENTITY torbutton.prefs.use_polipo "Koristi Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Koristi standardne proksi postavke">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP proksi:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "OnemoguÄ?i Torbutton za promjenu ovih postavki.">
-<!ENTITY torbutton.pref_connection.more_info "Više Informacija">
-<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ?">
-<!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 "Prioriteti...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbutton-a">
<!ENTITY torbutton.prefs.restore_defaults "Vrati poÄ?etno">
-<!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)">
diff --git a/src/chrome/locale/bs/torbutton.properties b/src/chrome/locale/bs/torbutton.properties
index bcd8db7..21d05ed 100644
--- a/src/chrome/locale/bs/torbutton.properties
+++ b/src/chrome/locale/bs/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = Otkaži
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.
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 0b11775..37c705f 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Configuració del proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Utilitza la configuració recomanada de proxy per a la meva versió de Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Utilitza Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Utilitza una configuració del proxy personalitzada">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Amfitrió SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "No permetis que Torbutton canvii aquesta configuració.">
-<!ENTITY torbutton.pref_connection.more_info "Més informació">
-<!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton està activat. Si voleu canviar la configuració del vostre proxy quan no funciona Tor, desactiveu Torbutton i torneu aquÃ. Si voleu canviar la configuració de Tor, utilitzeu la finestra de preferències de Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Nova identitat">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Preferències...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Reestableix predeterminats">
-<!ENTITY torbutton.prefs.test_settings "Test de configuració">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No hi ha Proxys per a:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Alerta: eviteu utilitzar cap dels noms de l'equip d'aquà sobre.">
<!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)">
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index 742fac5..232359a 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Feu clic per a desactivar Tor
torbutton.panel.label.disabled = Tor està desactivat
torbutton.panel.label.enabled = Tor està activat
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Prova del proxy Tor realitzada amb èxit.
-torbutton.popup.test.failure = La prova del proxy Tor ha fallat. Reviseu les preferències de Polipo i del vostre proxy.
-torbutton.popup.test.confirm_toggle = La prova més recent del proxy Tor no s'ha pogut connectar a Tor.\n\nSegur que voleu activar-lo igualment?\n\nNota: si ja s'ha solucionat el problema, podeu repetir la prova a la finestra de Preferències de Proxy Torbutton per a eleminar aquest avÃs.
-torbutton.popup.test.ff3_notice = Feu clic a "D'acord" per a provar les preferències del proxy Tor. Aquesta prova es realitzarà en segon terme. Tingueu paciència.
torbutton.popup.external.title = Voleu carregar els continguts externs?
torbutton.popup.external.app = Es necessita una aplicació externa per a manejar:\n\n
torbutton.popup.external.note = \n\nAvÃs: les aplicacions externes no estan adaptades a Tor per defecte i podrien revelar la vostra identitat.\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nSi aquest arxiu no és de fiar, haurieu o b
torbutton.popup.launch = Inicia l'aplicació
torbutton.popup.cancel = Cancel·la
torbutton.popup.dontask = Inicia les aplicacions automà ticament
-torbutton.popup.test.no_http_proxy = Prova de proxy Tor: no es pot assolir el Proxy HTTP local. Comproveu si Polipo funciona correctament.
torbutton.popup.prompted_language = Per donar-vos més privacitat, Torbutton pot demanar la versió en anglès de les pà gines web. Això pot provocar que pà gines web que preferiu veure a la vostra llengua nativa siguin mostrades en anglès.\n\nDesitjeu demanar les pà gines web en anglès per una major privacitat?
torbutton.popup.no_newnym = Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposa d'accés al Tor Control Port.\n\nEsteu usant Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton no pot actualitzar les preferències al directori de perfil del Tor Browser.
-torbutton.popup.permission_denied = Siusplau, o bé re-inicieu els permisos del directori Tor Browser o copieu-lo a una nova ubicació.
-torbutton.popup.device_full = Sembla que el disc és ple. Siusplau allibereu espai o moveu Tor Browser a un nou dispositiu.
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.
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 0d4498f..eb7dc36 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Nastavenà Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "PoužÃt doporuÄ?ená nastavenà proxy pro mou verzi Firefoxu">
-<!ENTITY torbutton.prefs.use_polipo "Použità Polipo">
-<!ENTITY torbutton.prefs.custom_settings "PoužÃt vlastnà nastavenà proxy">
-<!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 "Zakázat aplikaci Torbutton toto nastavenà mÄ?nit.">
-<!ENTITY torbutton.pref_connection.more_info "VÃce informacÃ">
-<!ENTITY torbutton.pref_connection_more_info.title "NápovÄ?da">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je momentálnÄ? zapnutý. Pokud chcete zmÄ?nit vaÅ¡e non-Tor proxy nastavenÃ, vypnÄ?te prosÃm Torbutton a vraÅ¥te se. Pokud chcete zmÄ?nit vaÅ¡e Tor nastavenÃ, použijte prosÃm okno nastavenà Torbutton">
<!ENTITY torbutton.context_menu.new_identity "Nova identita">
<!ENTITY torbutton.context_menu.new_identity_key "S">
<!ENTITY torbutton.context_menu.preferences "NastavenÃ...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "KliknÄ?te pro inicializaci Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Původnà nastavenÃ">
-<!ENTITY torbutton.prefs.test_settings "Test nastavenÃ">
-<!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)">
diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties
index 819dea7..c53d446 100644
--- a/src/chrome/locale/cs/torbutton.properties
+++ b/src/chrome/locale/cs/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klikni pro zakázánà Tor
torbutton.panel.label.disabled = Tor Zapnut
torbutton.panel.label.enabled = Tor Vypnut
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Test Tor proxy byl úspÄ?Å¡ný!
-torbutton.popup.test.failure = Test Tor proxy SELHAL! Zkontrolujte své nastavenà proxy a Polipo.
-torbutton.popup.test.confirm_toggle = PoslednÃmu proxy testu se nepodaÅ?ilo použÃt Tor.\n\nChcete ho pÅ?esto zapnout?\n\nPoznámka: Pokud jste problém opravili, můžete znovu rozbÄ?hnout test v oknÄ? Nastavenà Torbutton Proxy; pokud bude úspÄ?Å¡ný, tato zpráva se již nebude zobrazovat.
-torbutton.popup.test.ff3_notice = KliknÄ?te OK k otestovánà Tor proxy nastavenÃ. Tento test probÄ?hne na pozadÃ. ProsÃme o strpenÃ.
torbutton.popup.external.title = NaÄ?Ãst vnÄ?jÅ¡Ã obsah?
torbutton.popup.external.app = Je potÅ?eba vnÄ?jÅ¡Ã aplikace k jednánà s: \n
torbutton.popup.external.note = \nPOZNÃ?MKA: VnÄ?jÅ¡Ã aplikace NEJSOU Torem zabezpeÄ?ené a mohou odkrýt VaÅ¡e informace!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nPokud tomuto souboru nevÄ?Å?Ãte, můžete
torbutton.popup.launch = Spustit aplikaci
torbutton.popup.cancel = Zrušit
torbutton.popup.dontask = OdteÄ? vždy spouÅ¡tÄ?t aplikace
-torbutton.popup.test.no_http_proxy = Tor proxy test: MÃstnà HTTP proxy je nedosažitelná. Funguje Polipo správnÄ??
torbutton.popup.prompted_language = K poskytnutà vÄ?tÅ¡Ãho soukromÃ, Torbutton může požadovat anglickou verzi internetových stránek. Stránky které chcete Ä?Ãst ve svém jazyce se mohou zobrazit namÃsto toho v angliÄ?tinÄ?.\n\nChtÄ?li byste požadovat anglicky psané stránky pro vÄ?tÅ¡Ã soukromÃ?
torbutton.popup.no_newnym = Torbutton nemůže bezpeÄ?nÄ? poskytnout novou identitu. Nemá pÅ?Ãstup k pÅ?Ãstupovému portu Tor.\n\nMáte spuÅ¡tÄ?n 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.
diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/csb/torbutton.dtd
+++ b/src/chrome/locale/csb/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/csb/torbutton.properties b/src/chrome/locale/csb/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/csb/torbutton.properties
+++ b/src/chrome/locale/csb/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd
index 4d6d577..c46b25d 100644
--- a/src/chrome/locale/cy/torbutton.dtd
+++ b/src/chrome/locale/cy/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Gosodiadau Procsi">
-<!ENTITY torbutton.prefs.recommended_settings "Defnyddiwch y gosodiadau procsi a argymhellir ar gyfer fy fersiwn o Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Defnyddiwch Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Defnyddiwch gosodiadau procsi addasiedig">
-<!ENTITY torbutton.prefs.proxy.host.http "Procsi HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Procsi SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Procsi FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Procsi Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Gwesteiwr SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Porth">
-<!ENTITY torbutton.pref_connection.notice "Analluoga Torbutton i newid y gosodiadau yma.">
-<!ENTITY torbutton.pref_connection.more_info "Mwy o gwybodaeth">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?опомога">
-<!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 "Dewisiadau">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Cliciwch i ymgychwyn 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)">
diff --git a/src/chrome/locale/cy/torbutton.properties b/src/chrome/locale/cy/torbutton.properties
index 6d43ba5..436f924 100644
--- a/src/chrome/locale/cy/torbutton.properties
+++ b/src/chrome/locale/cy/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Cliciwch i analluogu Tor
torbutton.panel.label.disabled = Tor Anabl
torbutton.panel.label.enabled = Tor Galluog
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Prawf procsi Tor llwyddiannus!
-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 = Canslo
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.
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 7a8d28a..a697bd7 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy-indstillinger">
-<!ENTITY torbutton.prefs.recommended_settings "Brug de anbefalede proxyindstillinger til min version af Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Brug Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Brug brugerdefinerede proxyindstillinger">
-<!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 "Deaktiver Torbutton for at ændre disse indstillinger.">
-<!ENTITY torbutton.pref_connection.more_info "Mere Information">
-<!ENTITY torbutton.pref_connection_more_info.title "Hjælp">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er i øjeblikket aktiveret. Hvis du vil ændre dine ikke-Tor proxyindstillinger, skal du deaktivere Torbutton og vende tilbage hertil. Hvis du vil ændre dine Tor indstillinger, kan du benytte Torbuttons Indstillingsvindue.">
<!ENTITY torbutton.context_menu.new_identity "Ny identitet">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Indstillinger...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder">
-<!ENTITY torbutton.prefs.test_settings "Test Indstillinger">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ingen Proxies for:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: Undgå at bruge enhver værtsnavne ovenfor">
<!ENTITY torbutton.cookiedialog.title "Håndtér Cookie-beskyttelser">
<!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
<!ENTITY torbutton.cookiedialog.domainCol "Vært">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle pånær beskyttede">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies">
-<!ENTITY torbutton.prefs.transparentTor "Gennemsigtig Torifikation (Kræver tilpasset transproxy eller Tor-router)">
<!ENTITY torbutton.prefs.block_disk "Undlad at registrere historik for browsing eller data for websteder (aktiverer tilstanden Privat browsing)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Begræns tredjeparts-cookies og andre registreringsdata">
<!ENTITY torbutton.prefs.block_plugins "Slå browser-udvidelser fra (såsom Flash)">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 166d346..49846ab 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor
torbutton.panel.label.disabled = Tor Deaktiveret
torbutton.panel.label.enabled = Tor Aktiveret
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton tilbyder en knap, der konfigurerer Tor-indstillinger, samt hurtigt og nemt fjerner private data browsing-data.
-torbutton.popup.test.success = Tor proxy test lykkedes!
-torbutton.popup.test.failure = Tor proxy test MISLYKKEDES! Kontroller dine proxy og Privoxy indstillinger.
-torbutton.popup.test.confirm_toggle = Den seneste Tor-proxy-test mislykkedes i brug af Tor.\n\nEr du sikker på at du vil aktivere alligevel?\n\nBemærk: Hvis du har rettet dette problem, så kan du igen køre testen i\nindstillinger for Torbutton Proxy-vinduet for at fjerne denne advarsel.
-torbutton.popup.test.ff3_notice = Klik på OK for at teste Tor proxyindstillinger. Denne test vil køre i baggrunden. Vær venligst tålmodig.
torbutton.popup.external.title = Indlæs eksternt indhold?
torbutton.popup.external.app = Et ekstern program kræves for at håndtere:\n\n
torbutton.popup.external.note = \n\nBEMÃ?RK: Eksterne programmer er IKKE Tor-sikre som standard og kan demaskere dig!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nHvis der ikke stoles på denne fil, så bø
torbutton.popup.launch = Start program
torbutton.popup.cancel = Annullér
torbutton.popup.dontask = Start altid programmer fremover
-torbutton.popup.test.no_http_proxy = Tor-proxy-test: Lokal HTTP-proxy kan ikke nås. Kører Polipo korrekt?
torbutton.popup.prompted_language = For at yde større privatliv, så kan Torbutton forespørge den engelsk sprogversion af websiderne. Dette kan betyde at websider som du foretrækker at læse på dit modersmål vises på engelsk i stedet for.\n\nVil du gerne forespørge engelske websider for øget privatliv?
torbutton.popup.no_newnym = Torbutton kan ikke med sikkerhed give dig en ny identitet. Den har ikke adgang til kontrolporten for Tor.\n\nKører du Tor Browser-bundet?
-torbutton.popup.pref_error = Torbutton kan ikke opdatere præferencer i profil-kataloget for Tor Browser.
-torbutton.popup.permission_denied = Nulstil venligst rettighederne for Tor Browser-kataloget eller kopiér det til en ny placering.
-torbutton.popup.device_full = Disken ser ud til at være fuld. Frigør venligst plads eller flyt Tor Browser til en ny enhed.
torbutton.title.prompt_torbrowser = Vigtig Torbutton-information
torbutton.popup.prompt_torbrowser = Torbutton fungerer anderledes end før: du kan ikke længere slå den fra.\n\nDu foretog denne ændring, da det ikke er sikkert at anvende Torbutton i en browser, der også anvendes til non-Tor-browsing. Der var for mange fejl deri, som vi ikke kunne rette på andre måder.\n\nHvis du ønsker at anvende Firefox på normal vis, så bør du afinstallere Torbutton og hente Tor Browser Bundle. Indstillingerne for privatliv i Tor Browser overgår også de normale i Firefox, selv når Firefox anvende med Torbutton.\n\nFor at fjerne Torbutton, så gå til Funktioner->Tilføjelser->Udvidelser og klik dernæst Fjern-knappen ved siden af Torbutton.
torbutton.popup.short_torbrowser = Vigtig Torbutton-information!\n\nTorbutton er nu altid slået til.\n\nKlik på Torbutton for mere information.
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 5e4b0e3..c711ed2 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxyserver-Einstellungen">
-<!ENTITY torbutton.prefs.recommended_settings "Benutze die empfohlenen Proxyserver-Einstellungen für meine Firefox-Version">
-<!ENTITY torbutton.prefs.use_polipo "Polipo verwenden">
-<!ENTITY torbutton.prefs.custom_settings "Individuelle Vermittlungsservereinstellungen verwenden">
-<!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 "Torbutton deaktivieren, um diese Einstellungen zu ändern.">
-<!ENTITY torbutton.pref_connection.more_info "Mehr Informationen">
-<!ENTITY torbutton.pref_connection_more_info.title "Hilfe">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutten ist momentan aktiv. Wenn Sie die Vermittlungsservereinstellungen für den Betrieb ohne Tor ändern möchten, bitte zuerst Torbutton deaktivieren. Zum �ndern der Tor-Einstellungen bitte das Fenster »Torbutton-Einstellungen« verwenden.">
<!ENTITY torbutton.context_menu.new_identity "Neue Identität">
<!ENTITY torbutton.context_menu.new_identity_key "N">
<!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal für diese Seite">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
<!ENTITY torbutton.prefs.privacy_security_settings "Privatsphäre- und Sicherheits-Einstellungen">
<!ENTITY torbutton.prefs.restore_defaults "Vorgabeeinstellungen wiederherstellen">
-<!ENTITY torbutton.prefs.test_settings "Einstellungen testen">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Keine Vermittlungsserver (Proxies) für: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Achtung: Vermeiden Sie es, oben irgendwelche Rechnernamen zu verwenden">
<!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten">
<!ENTITY torbutton.cookiedialog.lockCol "Geschützt">
<!ENTITY torbutton.cookiedialog.domainCol "Rechner">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Alle, au�er die geschützten Cookies entfernen">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Neue Cookies schützen">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schützen">
-<!ENTITY torbutton.prefs.transparentTor "Transparente-Torification (Erfordert eigenen Transproxy oder Tor-Router)">
<!ENTITY torbutton.prefs.priv_caption "Privatsphären-Einstellungen">
<!ENTITY torbutton.prefs.block_disk "Browser-Verlauf und Internetdaten nicht speichern (aktiviert den privaten Browser-Modus)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere �berwachungsdaten einschränken">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 57222a7..c6cdcfe 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
torbutton.panel.label.disabled = Tor ist deaktiviert
torbutton.panel.label.enabled = Tor ist aktiviert
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton gibt ihnen die Möglichkeit, Einstellungen von Tor schnell und einfach zu verändern und einfach die Internetdaten zu löschen.
-torbutton.popup.test.success = Test des Tor-Vermittlungsservers erfolgreich!
-torbutton.popup.test.failure = Test des Tor-Vermittlungsservers FEHLGESCHLAGEN! Bitte überprüfen Sie Ihre Vermittlungsserver-(Proxy) und Polipo-Einstellungen.
-torbutton.popup.test.confirm_toggle = Der letzte Tor-Vermittlungsservertest konnte Tor nicht benutzen.\n\nSind Sie sicher, dass Sie diesen trotzdem aktivieren möchten?\n\nAnmerkung: Falls Sie das Problem gelöst haben, können Sie den Test im Einstellungsfenster vom Torbutton-Vermittlungsserver wiederholen, um diese Warnung zu löschen.
-torbutton.popup.test.ff3_notice = Bitte OK klicken, um die Vermittlungsservereinstellungen zu testen. Dieser Test arbeitet im Hintergrund. Bitte warten Sie einen Augenblick.
torbutton.popup.external.title = Einen externen Dateitypen herunterladen
torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Sie müssen es mit einer anderen Anwendung öffnen.\n\n
torbutton.popup.external.note = Einige Dateitypen können Anwendungen dazu führen, dass sie sich mit dem Internet ohne Tor verbinden.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Um sicher zu sein, sollten Sie heruntergelade
torbutton.popup.launch = Datei herunterladen
torbutton.popup.cancel = Abbrechen
torbutton.popup.dontask = Von jetzt an Dateien immer automatisch herunterladen
-torbutton.popup.test.no_http_proxy = Tor-Vermittlungsservertest: Lokaler HTTP-Vermittlungsserver ist unerreichbar. Läuft Polipo korrekt?
torbutton.popup.prompted_language = Um Ihre Privatsphäre zu erhöhen, kann Torbutton die jeweilige englische Version einer Webseite anfordern. Dies kann zur Folge haben, dass Webseiten, die sie lieber in Ihrer Muttersprache lesen würden, nun in Englisch dargestellt werden. \n\nSollen nun - zur Erhöhung Ihrer Privatsphäre - Webseiten in Englisch geladen werden?
torbutton.popup.no_newnym = Torbutton kann Ihnen keine neue Identität geben, da es keinen Zugriff auf den Tor-Steueranschluss hat.\n\nBenutzen Sie das Tor-Browser-Paket?
-torbutton.popup.pref_error = Torbutton kann die Einstellungen von Tor-Browser im Profilordner nicht aktualisieren.
-torbutton.popup.permission_denied = Bitte entweder die Berechtigungen des Tor-Browser-Ordners zurücksetzen, oder es an einen neuen Ort kopieren.
-torbutton.popup.device_full = Es scheint als würde das Medium voll sein. Bitte machen Sie etwas Platz frei, oder bewegen sie den Tor-Browser auf ein neues Gerät.
torbutton.title.prompt_torbrowser = Wichtige Torbutton-Information
torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nicht mehr abgeschaltet werden.\n\nWir haben diese �nderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch für den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hätten beheben können.\n\nWenn Sie Firefox weiterhin normal benutzen möchten, sollten Sie Torbutton deinstallieren, und das Tor-Browser-Paket herunterladen. Die Privatsphäreeinstellungen des Tor-Browsers sind au�erdem denen des normalen Firefox überlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehen Sie einfach auf Extras->Add-ons->Erweiterungen und klicken Sie auf Entfernen neben dem Torbutton.
torbutton.popup.short_torbrowser = Wichtige Torbutton-Information!\n\nTorbutton ist jetzt immer aktiviert.\n\nBitte auf den Torbutton klicken, um mehr Informationen zu erhalten.
diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/dz/torbutton.dtd
+++ b/src/chrome/locale/dz/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/dz/torbutton.properties b/src/chrome/locale/dz/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/dz/torbutton.properties
+++ b/src/chrome/locale/dz/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 4472c2f..2a896a1 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "ΡÏ?θμίÏ?ειÏ? διαμεÏ?ολαβηÏ?ή">
-<!ENTITY torbutton.prefs.recommended_settings "ΧÏ?ήÏ?η Ï?Ï?ν Ï?Ï?οÏ?εινÏ?μενÏ?ν Ï?Ï?θμίÏ?εÏ?ν για Ï?ην Ï?Ï?ÎÏ?οÏ?Ï?α ÎκδοÏ?η Ï?οÏ? Firefox">
-<!ENTITY torbutton.prefs.use_polipo "ΧÏ?ήÏ?η Polipo">
-<!ENTITY torbutton.prefs.custom_settings "ΧÏ?ήÏ?η Ï?Ï?οÏ?αÏ?μοÏ?μÎνÏ?ν Ï?Ï?θμίÏ?εÏ?ν διαμεÏ?ολαβηÏ?ή">
-<!ENTITY torbutton.prefs.proxy.host.http "Î?ιαμεÏ?ολαβηÏ?ήÏ? HTTP :">
-<!ENTITY torbutton.prefs.proxy.host.https "Î?ιαμεÏ?ολαβηÏ?ήÏ? SSL :">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Î?ιαμεÏ?ολαβηÏ?ήÏ? FTP :">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Î?ιαμεÏ?ολαβηÏ?ήÏ? Gopher :">
-<!ENTITY torbutton.prefs.proxy.host.socks "Î?ενÏ?Ï?ικÏ?Ï? Ï?Ï?ολογιÏ?Ï?ήÏ? SOCKS :">
-<!ENTITY torbutton.prefs.proxy.port "Î?Ï?Ï?α :">
-<!ENTITY torbutton.pref_connection.notice "Î?Ï?ενεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο Torbutton για να αλλάξεÏ?ε αÏ?Ï?ÎÏ? Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ?.">
-<!ENTITY torbutton.pref_connection.more_info "ΠεÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ?">
-<!ENTITY torbutton.pref_connection_more_info.title "Î?οήθεια">
-<!ENTITY torbutton.pref_connection_more_info.text "Το Torbutton είναι ενεÏ?γοÏ?οιημÎνο.Î?ν θÎλεÏ?ε να αλλάξεÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? διαμεÏ?ολαβηÏ?ή, εκÏ?Ï?Ï? Ï?οÏ? Tor, αÏ?ενεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο Torbutton και εÏ?ιÏ?Ï?Ï?ÎÏ?Ï?ε εδÏ?. Î?ν θÎλεÏ?ε να αλλάξεÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? για Ï?ον διαμεÏ?ολαβηÏ?ή Tor, Ï?Ï?ηÏ?ιμοÏ?οιήÏ?Ï?ε Ï?ο Ï?αÏ?άθÏ?Ï?ο εÏ?ιλογÏ?ν Ï?οÏ? Torbutton">
<!ENTITY torbutton.context_menu.new_identity "Î?Îα ΤαÏ?Ï?Ï?Ï?ηÏ?α">
<!ENTITY torbutton.context_menu.new_identity_key "Τ">
<!ENTITY torbutton.context_menu.preferences "Î?Ï?ιλογÎÏ?...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Î?άνÏ?ε κλικ για να εκκίνηÏ?η Ï?οÏ? Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Î?Ï?οκαÏ?άÏ?Ï?αÏ?η αÏ?Ï?ικÏ?ν Ï?Ï?θμίÏ?εÏ?ν">
-<!ENTITY torbutton.prefs.test_settings "Î?λεγÏ?οÏ? Ï?Ï?θμίÏ?εÏ?ν">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Î?εν Ï?Ï?άÏ?Ï?οÏ?ν Ï?ληÏ?εξοÏ?Ï?ιοι διακομιÏ?Ï?ÎÏ? proxy για:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Î?ιδοÏ?οίηÏ?η: Î?Ï?οÏ?Ï?γεÏ?ε Ï?ην Ï?Ï?ήÏ?η hostnames Ï?ιο Ï?άνÏ?">
<!ENTITY torbutton.cookiedialog.title "Î?ιαÏ?είÏ?ιÏ?η Î Ï?οÏ?Ï?αÏ?ίαÏ? Cookie">
<!ENTITY torbutton.cookiedialog.lockCol "Î Ï?οÏ?Ï?αÏ?εÏ?μÎνα">
<!ENTITY torbutton.cookiedialog.domainCol "Î?ικοδεÏ?Ï?Ï?Ï?ηÏ?">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Î?Ï?αίÏ?εÏ?η Î?λÏ?ν Î?κÏ?Ï?Ï? αÏ?Ï? Ï?Ï?ν Î Ï?οÏ?Ï?αÏ?εÏ?μÎνÏ?ν">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Î Ï?οÏ?Ï?αÏ?ία Î?ÎÏ?ν Cookie">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Î?α Î?η γίνεÏ?αι Î Ï?οÏ?Ï?αÏ?ία Î?ÎÏ?ν Cookie">
-<!ENTITY torbutton.prefs.transparentTor "Î?ιαÏ?ανήÏ? Torification (Î?Ï?αιÏ?εί Ï?Ï?οÏ?αÏ?μοÏ?μÎνο proxy ή Tor δÏ?ομολογηÏ?ή)">
<!ENTITY torbutton.prefs.block_disk "Î?αμμια καÏ?αγÏ?αÏ?η Ï?οÏ? ιÏ?Ï?οÏ?ικÏ?Ï? Ï?εÏ?ιήγηÏ?ηÏ? ή δεδομÎνÏ?ν ιÏ?Ï?οÏ?ελίδαÏ? (ενεÏ?γοÏ?οιηÏ?η Ï?ηÏ? καÏ?άÏ?Ï?αÏ?ηÏ? ιδιÏ?Ï?ικήÏ? Ï?εÏ?ιήγηÏ?ηÏ?) ">
<!ENTITY torbutton.prefs.restrict_thirdparty "ΠεÏ?ιοÏ?ιÏ?μοÏ? Ï?Ï?ν cookies Ï?Ï?ιÏ?Ï?ν και αλλÏ?ν δεδομενÏ?ν Ï?αÏ?ακολοÏ?θηÏ?ηÏ?">
<!ENTITY torbutton.prefs.block_plugins "Î?Ï?ενεÏ?γοÏ?οίηÏ?η Ï?Ï?οÏ?θÎÏ?Ï?ν Ï?εÏ?ιηγηÏ?ή (Ï?α Ï?ο Flash)">
diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties
index b8aab49..3c68094 100644
--- a/src/chrome/locale/el/torbutton.properties
+++ b/src/chrome/locale/el/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Î?άνÏ?ε κλικ για να αÏ?ενεÏ?γ
torbutton.panel.label.disabled = Το Tor είναι αÏ?ενεÏ?γοÏ?οιημÎνο
torbutton.panel.label.enabled = Το Tor είναι ενεÏ?γοÏ?οιημÎνο
extensions.torbutton@xxxxxxxxxxxxxx.description = Το Torbutton Ï?Ï?οÏ?Ï?ÎÏ?ει Îνα κοÏ?μÏ?ί για Ï?η Ï?Ï?θμιÏ?η Ï?Ï?ν Ï?αÏ?αμÎÏ?Ï?Ï?ν Ï?οÏ? Tor και για Ï?η γÏ?ήγοÏ?η και εÏ?κολη εκκαθάÏ?ιÏ?η Ï?Ï?ν Ï?Ï?οÏ?Ï?Ï?ικÏ?ν Ï?Ï?οιÏ?είÏ?ν Ï?εÏ?ιήγηÏ?ηÏ?.
-torbutton.popup.test.success = Î?Ï?ιÏ?Ï?Ï?ήÏ? ÎλεγÏ?οÏ? Ï?οÏ? Tor Ï?ληÏ?εξοÏ?Ï?ιοÏ?/proxy.
-torbutton.popup.test.failure = Î? ÎλεγÏ?οÏ? Ï?οÏ? proxy Î?Î Î?ΤΥΧÎ?! Î?λÎγξÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?αÏ? για Ï?ον proxy και Ï?ο Polipo.
-torbutton.popup.test.confirm_toggle = Î? Ï?ιο Ï?Ï?Ï?Ï?Ï?αÏ?η δοκιμή Tor αÏ?ÎÏ?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?ει Ï?ο Tor.\n\nÎ?ίÏ?Ï?ε βÎβαιοι Ï?Ï?ι θÎλεÏ?ε να Ï?ο ενεÏ?γοÏ?οιήÏ?εÏ?ε;\n\nΣημείÏ?Ï?η: Î?ν διοÏ?θÏ?Ï?αÏ?ε Ï?ο Ï?Ï?Ï?βλημα μÏ?οÏ?είÏ?ε να εκÏ?ελÎÏ?εÏ?ε και Ï?άλι Ï?ην δοκιμή μÎÏ?α αÏ?Ï? Ï?ιÏ? Î Ï?οÏ?ιμήÏ?ειÏ? Proxy Ï?οÏ? Torbutton για να εξοÏ?δεÏ?εÏ?Ï?Ï?εÏ?ε αÏ?Ï?ή Ï?ην Ï?Ï?οειδοÏ?οίηÏ?η.
-torbutton.popup.test.ff3_notice = ΠαÏ?ήÏ?Ï?ε Î?Î? για να δοκιμάÏ?εÏ?ε Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? Tor proxy. Î? δοκιμή θα γίνει Ï?Ï?ο Ï?αÏ?αÏ?κήνιο. Î¥Ï?ομονή, Ï?αÏ?ακαλÏ?!
torbutton.popup.external.title = Î?α Ï?οÏ?Ï?Ï?θεί εξÏ?Ï?εÏ?ικÏ? Ï?εÏ?ιεÏ?Ï?μενο;
torbutton.popup.external.app = Î?ια εξÏ?Ï?εÏ?ική εÏ?αÏ?μογή είναι αÏ?αÏ?αίÏ?ηÏ?η για Ï?ον Ï?Ï?Ï?Ï?Ï? Ï?ειÏ?ιÏ?μÏ?:\n\n
torbutton.popup.external.note = \n\nΣÎ?Î?Î?Î?ΩΣÎ?: Î?ι εξÏ?Ï?εÏ?ικÎÏ? εÏ?αÏ?μογÎÏ? Î?Î?Î? είναι εξοÏ?ιÏ?μοÏ? αÏ?Ï?αλήÏ? για Ï?ο Tor και μÏ?οÏ?οÏ?ν να Ï?αÏ? αÏ?οκαλÏ?Ï?οÏ?ν!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nÎ?ν Ï?ο αÏ?Ï?είο αÏ?Ï?Ï? δεν εί
torbutton.popup.launch = Î?κÏ?ÎλεÏ?η εÏ?αÏ?μογήÏ?
torbutton.popup.cancel = Î?κÏ?Ï?ον
torbutton.popup.dontask = Î?Ï?Ï? Ï?Ï?Ï?α και Ï?Ï?ο εξήÏ? να εκÏ?ελοÏ?νÏ?αι Ï?άνÏ?οÏ?ε εÏ?αÏ?μογÎÏ?
-torbutton.popup.test.no_http_proxy = Î?οκιμή Tor proxy: Î? Ï?οÏ?ικÏ?Ï? HTTP Proxy είναι αÏ?Ï?Ï?Ï?ιÏ?οÏ?. Î?κÏ?ελείÏ?αι Ï?Ï?Ï?Ï?ά Ï?ο Polipo;
torbutton.popup.prompted_language = Î?ια Ï?ην ενίÏ?Ï?Ï?Ï?η Ï?οÏ? αÏ?οÏ?Ï?ήÏ?οÏ? Ï?αÏ? Ï?ο Torbutton μÏ?οÏ?εί να ζηÏ?ήÏ?ει Ï?ην ÎκδοÏ?η Ï?ηÏ? αγγλικήÏ? γλÏ?Ï?Ï?αÏ? για Ï?ιÏ? ιÏ?Ï?οÏ?ελίδεÏ?. Î?Ï?Ï?Ï? μÏ?οÏ?εί να ÎÏ?ει Ï?αν αÏ?οÏ?ÎλεÏ?μα, οι ιÏ?Ï?οÏ?ελίδεÏ? Ï?οÏ? εÏ?ιλÎξαÏ?ε να εμÏ?ανίζονÏ?αι Ï?Ï?ην εθνική Ï?αÏ? γλÏ?Ï?α, να Ï?Ï?οβάλονÏ?αι ανÏ?' αÏ?Ï?ήÏ? Ï?Ï?ην Î?γγλική.\n\nÎ?ÎλεÏ?ε να αιÏ?οÏ?νÏ?αι Ï?ελίδεÏ? γÏ?αμμÎνεÏ? Ï?Ï?α Î?γγλικά, για Ï?ην βελÏ?ίÏ?Ï?η Ï?οÏ? αÏ?οÏ?Ï?ήÏ?οÏ?;
torbutton.popup.no_newnym = Το Torbutton δεν μÏ?οÏ?εί να Ï?αÏ? δÏ?Ï?ει μια αÏ?Ï?αλή νÎα Ï?αÏ?Ï?Ï?Ï?ηÏ?α, διÏ?Ï?ι δεν ÎÏ?ει Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?ο Tor Control Port:\n\nΧÏ?ηÏ?ιμοÏ?οιείÏ?ε Ï?ο ΠακÎÏ?ο ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor;
-torbutton.popup.pref_error = Το Torbutton δεν μÏ?οÏ?εί να ενημεÏ?Ï?Ï?ει Ï?ιÏ? Ï?Ï?οÏ?ιμήÏ?ειÏ? Ï?Ï?ον καÏ?άλογο Ï?οÏ? Ï?Ï?οÏ?ίλ Ï?αÏ?Ï?οÏ? ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor.
-torbutton.popup.permission_denied = ΠαÏ?ακαλοÏ?με είÏ?ε να εÏ?αναÏ?ÎÏ?εÏ?ε Ï?ιÏ? άδειεÏ? Ï?οÏ? καÏ?αλÏ?γοÏ? ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor είÏ?ε να Ï?ον ανÏ?ιγÏ?άÏ?εÏ?ε Ï?ε μια νÎα Ï?οÏ?οθεÏ?ία.
-torbutton.popup.device_full = Î? δίÏ?κοÏ? Ï?αίνεÏ?αι Ï?Ï?ι είναι γεμάÏ?οÏ?. ΠαÏ?ακαλοÏ?με ελεÏ?θεÏ?Ï?Ï?Ï?ε Ï?Ï?Ï?ο Ï?Ï?ον δίÏ?κο ή μεÏ?ακινήÏ?Ï?ε Ï?ον ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor Ï?ε κάÏ?οιον άλλο δίÏ?κο.
torbutton.title.prompt_torbrowser = ΣημανÏ?ικÎÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ? για Ï?ο Torbutton
torbutton.popup.prompt_torbrowser = Το Torbutton λειÏ?οÏ?Ï?γεί διαÏ?οÏ?εÏ?ικά, Ï?Ï?Ï?α: δεν μÏ?οÏ?είÏ?ε Ï?λÎον να Ï?ο αÏ?ενεÏ?γοÏ?οιήÏ?εÏ?ε\n\nÎ Ï?οβήκαμε Ï?ε αÏ?Ï?ή Ï?ην αλλαγή διÏ?Ï?ι, δεν είναι αÏ?Ï?αλÎÏ? να Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι Ï?ο Torbutton μÎÏ?α αÏ?Ï? Îνα Ï?εÏ?ιηγηÏ?ή ιÏ?Ï?οÏ? ο οÏ?οίοÏ? Ï?Ï?ηÏ?ιμεÏ?ει και για εÏ?γαÏ?ίεÏ? Ï?Ï?Ï?ίÏ? Ï?ην Ï?Ï?ήÏ?η Tor. Î?μÏ?ανίζονÏ?αν διάÏ?οÏ?α Ï?Ï?άλμαÏ?α-bugs Ï?α οÏ?οία δεν μÏ?οÏ?οÏ?Ï?αμε να διοÏ?θÏ?Ï?οÏ?με.\n\nÎ?ν θÎλεÏ?ε να εξακολοÏ?θήÏ?εÏ?ε να Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε Ï?ον Firefox κανονικά, θα Ï?Ï?ÎÏ?ει να εγκαÏ?αÏ?Ï?ήÏ?εÏ?ε Ï?ο Torbutton και να κάνεÏ?ε λήÏ?η Ï?οÏ? ΠακÎÏ?οÏ? ΦÏ?λλομεÏ?Ï?ηÏ?ή Tor. Î?ι ιδιÏ?Ï?ηÏ?εÏ? ιδιÏ?Ï?ικÏ?Ï?ηÏ?αÏ? Ï?οÏ? ΠεÏ?ιηγηÏ?ή Tor είναι ανÏ?
Ï?εÏ?εÏ? αÏ?Ï? εκείνεÏ? Ï?οÏ? αÏ?λοÏ? Firefox, ακÏ?μη και Ï?Ï?ην Ï?εÏ?ίÏ?Ï?Ï?Ï?η Ï?οÏ? ο Firefox Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι μαζί με Ï?ο Torbutton.\n\nÎ?ια να αÏ?ομακÏ?Ï?νεÏ?ε Ï?ο Torbutton, Ï?ηγαίνεÏ?ε Î?Ï?γαλεία->Î Ï?Ï?Ï?θεÏ?α->Extensions και Ï?αÏ?ήÏ?Ï?ε Ï?ο Ï?λήκÏ?Ï?ο Î?Ï?ομάκÏ?Ï?νÏ?η Ï?οÏ? βÏ?ίÏ?κεÏ?αι δίÏ?λα αÏ?Ï? Ï?ο Torbutton.
torbutton.popup.short_torbrowser = ΣημανÏ?ική ΠληÏ?οÏ?οÏ?ία για Ï?ο Torbutton\n\nΤο Torbutton είναι Ï?Ï?Ï?α Ï?Ï?νεÏ?Ï?Ï? ενεÏ?γοÏ?οιημÎνο.\n\nÎ?ια Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ?, κάνεÏ?ε κλικ Ï?Ï?ο Torbutton.
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 12364fc..0720208 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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.new_circuit "New Tor Circuit for this Site">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings">
<!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">
@@ -43,7 +24,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.priv_caption "Privacy Settings">
<!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">
diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties
index 935cce1..2391e69 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@xxxxxxxxxxxxxx.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 = Download an external file type?
torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n
torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f
torbutton.popup.launch = Download file
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Automatically download files 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.
diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd
index f4bd994..4bbc98f 100644
--- a/src/chrome/locale/eo/torbutton.dtd
+++ b/src/chrome/locale/eo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Retperantâ??agordoj">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Uzi Polipoâ??n">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTPâ??peranto:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSLâ??peranto:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTPâ??peranto:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopherâ??peranto:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Pordo:">
-<!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 "Helpo">
-<!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 "Nova idento">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Agordojâ?¦">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "RestaÅri defaÅltojn">
-<!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)">
diff --git a/src/chrome/locale/eo/torbutton.properties b/src/chrome/locale/eo/torbutton.properties
index 643fce1..951abd1 100644
--- a/src/chrome/locale/eo/torbutton.properties
+++ b/src/chrome/locale/eo/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = Rezigni
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.
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 31e2aca..40c1270 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Configuración del proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Usar la configuración para proxy recomendada para mi versión de Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Usar Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Usar configuración de proxy personalizada">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Servidor SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Puerto:">
-<!ENTITY torbutton.pref_connection.notice "Desactive Torbutton para cambiar estas preferencias.">
-<!ENTITY torbutton.pref_connection.more_info "Más información">
-<!ENTITY torbutton.pref_connection_more_info.title "Ayuda">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo. Si desea cambiar la configuración para proxy de su navegación sin Tor, desactive Torbutton y regrese aquÃ. Si desea cambiar su configuración para Tor, use la ventana de preferencias de Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Nueva identidad (nueva instancia y conexiones de Tor)">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este sitio">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Preferencias de Privacidad y Seguridad">
<!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados ">
-<!ENTITY torbutton.prefs.test_settings "Probar configuración">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Sin proxies para: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Advertencia: Evite usar los nombres de servidor (host) citados arriba">
<!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie">
<!ENTITY torbutton.cookiedialog.lockCol "Protegidas">
<!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies">
-<!ENTITY torbutton.prefs.transparentTor "Torificación transparente (requiere un transproxy personalizado o un router Tor)">
<!ENTITY torbutton.prefs.priv_caption "Parámetros de privacidad">
<!ENTITY torbutton.prefs.block_disk "No registrar historial de navegación o datos del sitio web (habilita Modo de Navegación Privada)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 50c78d5..0689cb8 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor
torbutton.panel.label.disabled = Tor deshabilitado
torbutton.panel.label.enabled = Tor habilitado
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton proporciona un botón para configurar las preferencias de Tor y limpiar rápida y fácilmente los datos de navegación privada.
-torbutton.popup.test.success = ¡La prueba con "proxy" Tor finalizó con éxito!
-torbutton.popup.test.failure = ¡La prueba con "proxy" Tor FALL�! Revise su configuración para proxy y Polipo.
-torbutton.popup.test.confirm_toggle = La prueba más reciente con "proxy" Tor falló al usar Tor.\n\n¿Está seguro de que quiere habilitarlo de todos modos?\n\nNota: Si ha solucionado el problema, puede volver a ejecutar la prueba en la ventana de Preferencias para proxy de Torbutton para eliminar esta advertencia.
-torbutton.popup.test.ff3_notice = Haga clic en Aceptar para probar las preferencias para "proxy" Tor. Esta prueba se hará en segundo plano. Por favor, tenga paciencia.
torbutton.popup.external.title = ¿Descargar un tipo de fichero externo?
torbutton.popup.external.app = El Navegador Tor no puede mostrar este fichero. Tendrá que abrirlo con otra aplicación.\n\n
torbutton.popup.external.note = Algunos tipos de ficheros pueden hacer que ciertas aplicaciones se conecten a Internet sin usar Tor.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Para estar seguro, deberÃa abrir únicamente
torbutton.popup.launch = Descargar fichero
torbutton.popup.cancel = Cancelar
torbutton.popup.dontask = Descargar ficheros automáticamente a partir de ahora
-torbutton.popup.test.no_http_proxy = Prueba con "proxy" Tor: El proxy HTTP local es inalcanzable. ¿Está Polipo funcionando correctamente?
torbutton.popup.prompted_language = Para darle mayor privacidad, Torbutton puede solicitar la versión en inglés de las páginas web. Esto podrÃa causar que páginas que prefiera leer en su idioma nativo se muestren en inglés en su lugar. \n \n¿Le gustarÃa solicitar páginas web en inglés para mejor privacidad?
torbutton.popup.no_newnym = Torbutton no puede darle una nueva identidad (instancia de Tor) de forma segura. No tiene acceso al puerto de control de Tor (ControlPort)\n\n¿Está ejecutando el Paquete de Navegador Tor?
-torbutton.popup.pref_error = Torbutton no puede actualizar las preferencias en la carpeta de perfiles del Navegador Tor.
-torbutton.popup.permission_denied = Permiso denegado: reinicie los permisos de la carpeta del Navegador Tor o bien cópielo a una nueva ubicación.
-torbutton.popup.device_full = El disco parece estar lleno. Libere espacio o mueva el Navegador Tor a un nuevo dispositivo.
torbutton.title.prompt_torbrowser = Información importante sobre Torbutton
torbutton.popup.prompt_torbrowser = Torbutton ahora funciona de manera diferente: ya no lo podrá apagar más. \n \nHicimos este cambio porque no es seguro utilizar Torbutton en un navegador que también se utilice para navegar sin Tor. Hubo tantos fallos con esto que no pudimos arreglarlo de otro modo. \n \nSi quiere seguir usando Firefox normalmente, deberÃa desinstalar Torbutton y descargar el Paquete de Navegador Tor. Las propiedades de privacidad del Navegador Tor son superiores a las de un Firefox normal, incluso cuando se usa Firefox con Torbutton. \n \nPara eliminar Torbutton. vaya a Herramientas->Complementos->Extensiones y haga clic en el botón Eliminar próximo a Torbutton.
torbutton.popup.short_torbrowser = ¡Información importante sobre Torbutton! \n \nTorbutton ahora está siempre encendido. \n \nHaga clic en (el botón de) Torbutton para más información.
diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/et/torbutton.dtd
+++ b/src/chrome/locale/et/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/et/torbutton.properties b/src/chrome/locale/et/torbutton.properties
index 4c1518a..6e71612 100644
--- a/src/chrome/locale/et/torbutton.properties
+++ b/src/chrome/locale/et/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Vajuta, et deaktiveerida Tor
torbutton.panel.label.disabled = Tor on mitteaktiivne
torbutton.panel.label.enabled = Tor on aktiivne
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor vaheserveri kontroll õnnestus!
-torbutton.popup.test.failure = Tor vaheserveri kontroll ebaõnnestus! Kontrolli oma vaheserveri ja Polipo seadeid.
-torbutton.popup.test.confirm_toggle = Viimasel Tori vaheserveri kontrollimisel ei õnnestunud Tori kasutada.\n\nKas sa oled kindel, et tahad Tori ikkagi aktiveerida?\n\nTeade: kui sa oled probleemi parandanud, siis sa saad kontrolli uuesti käima panna Torbuttoni vaheserveri eelistuste aknas, et sellest hoiatusest lahti saada.
-torbutton.popup.test.ff3_notice = Vajuta OK, et kontrollida Tori vaheserveri seadeid. See kontroll jookseb taustal. Palun ole kannatlik.
torbutton.popup.external.title = Lae välist sisu?
torbutton.popup.external.app = Välist rakendust on vaja, et käsitseda:\n\n
torbutton.popup.external.note = \n\nTeadaanne: välised rakendused ei ole vaikimisi Toriga koos kasutades turvalised ning võivad sind paljastada.\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Käivita rakendus
torbutton.popup.cancel = Katkesta
torbutton.popup.dontask = Alati käivita rakendusi edaspidi
-torbutton.popup.test.no_http_proxy = Tor vaheserveri kontroll: kohalik HTTP vaheserver kättesaamatu. Kas Polipo jookseb korralikult?
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.
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index a8b1aa2..6ee2509 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy Ezarpenak">
-<!ENTITY torbutton.prefs.recommended_settings "Erabili nire Firefox bertsiorako proxy ezarpen gomendatuak">
-<!ENTITY torbutton.prefs.use_polipo "Erabili Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Erabili proxy ezarpen pertsonalizatuak">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxya:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxya:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxya:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxya:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ostalaria:">
-<!ENTITY torbutton.prefs.proxy.port "Portua:">
-<!ENTITY torbutton.pref_connection.notice "Torbutton ezgaitu ezarpen hauek aldatzeko">
-<!ENTITY torbutton.pref_connection.more_info "Informazio gehiago">
-<!ENTITY torbutton.pref_connection_more_info.title "Laguntza">
-<!ENTITY torbutton.pref_connection_more_info.text "Une honetan Torbutton gaituta dago. Zure ez-Tor proxy ezarpenak aldatu nahi badituzu, mesedez ezgaitu Torbutton eta hona bueltatu. Zure Tor ezarpenak aldatu nahi badituzu, mesedez erabili Torbutton ezarpen leihoa.">
<!ENTITY torbutton.context_menu.new_identity "Nortasun berria">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko">
<!ENTITY torbutton.prefs.privacy_security_settings "Pribatutasun eta segurtasun ezarpenak">
<!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri">
-<!ENTITY torbutton.prefs.test_settings "Ezarpenak frogatu">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Proxyrik ez hauentzako:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Kontuz: Ez erabili ostalari-izenik gainean">
<!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu">
<!ENTITY torbutton.cookiedialog.lockCol "Babestuta">
<!ENTITY torbutton.cookiedialog.domainCol "Ostalaria">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Denak kendu babestutakoak izan ezik">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Cookie berriak babestu">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ez babestu cookie berririk">
-<!ENTITY torbutton.prefs.transparentTor "Torifikazio Gardena (transproxy pertsonalizatua edo Tor routerra behar du)">
<!ENTITY torbutton.prefs.priv_caption "Pribatutasun ezarpenak">
<!ENTITY torbutton.prefs.block_disk "Ez grabatu nabigatze historia edo webgune datuak (Nabigatze pribatu modua gaitzen du)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu">
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index 8c886e1..fcc3b15 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko
torbutton.panel.label.disabled = Tor Ezgaitua
torbutton.panel.label.enabled = Tor Gaitua
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbuttonek Tor ezarpenak konfiguratzeko eta nabigatze pribatuko datuak azkar eta erraz garbitzeko botoi bat hornitzen du
-torbutton.popup.test.success = Tor proxy froga arrakastatsua!
-torbutton.popup.test.failure = Tor proxy frogak HUTS EGIN DU! Egiaztatu zure proxy eta Polipo ezarpenak.
-torbutton.popup.test.confirm_toggle = Azken Tor proxy frogak huts egin du Tor erabiltzerakoan.\n\nZiur al zaude hala ere gaitu nahi duzulaz?\n\nOharra: Arazoa konpondu baduzu, froga berriz exekuta dezakezu Torbutton Proxy Ezarpenak leihoan abisu hau ezabatzeko.
-torbutton.popup.test.ff3_notice = Sakatu Ados Tor proxy ezarpenak frogatzeko. Froga hau atzeko planoan gertatuko da. Mesedez pazientzia izan.
torbutton.popup.external.title = Kanpoko fitxategi mota bat desargatu?
torbutton.popup.external.app = Tor Nabigatzailea ezin du fitxategi hau bistaratu. Irekitzeko beste aplikazio bat behar izango duzu.\n\n
torbutton.popup.external.note = Fitxategi mota batzuk Tor erabili gabe aplikaziok Internetera konektatzea sor ditzake.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Arriskutik kanpo egoteko, zuk deskargatutako
torbutton.popup.launch = Fitxategia deskargatu
torbutton.popup.cancel = Utzi
torbutton.popup.dontask = Hemendik aurrera fitxategiak automatikoki deskargatu
-torbutton.popup.test.no_http_proxy = Tor proxy froga: Ezin da HTTP Proxy lokalera iritsi. Polipo zuzen exekutatzen ari da?
torbutton.popup.prompted_language = Pribatutasun gehiago emateko, Torbuttonek webguneen Ingelerazko bertsioa eska dezake. Honek zure ama hizkuntzan irakurtzea nahiago izan ditzakezun orriak Ingeleraz agertzea ekar dezake.\n\nNahiko al zenuke webguneen Ingelerazko hizkuntza eskatu pribatutasun hobeagoa izateko?
torbutton.popup.no_newnym = Torbuttonek ezin dizu modu seguruan nortasun berri bat eman. Ez du Tor Kontrol Portura nola sartzerik.\n\nTor Browser Bundle exekutatzen ari al zara?
-torbutton.popup.pref_error = Torbuttonek ezin ditu Tor Browser profilaren direktorioan hobespenak eguneratu.
-torbutton.popup.permission_denied = Mesedez berrezarri Tor Browser direktorioaren baimenak edo kopia ezazu beste kokaleku batera.
-torbutton.popup.device_full = Diska beteta dago, antza. Mesedez egizu lekua edo mugitu Tor Nabigatzailea gailu berri batera.
torbutton.title.prompt_torbrowser = Torbutton informazio garratzitsua
torbutton.popup.prompt_torbrowser = Torbuttonek ezberdin egiten du lan orain: ezin da gehiago itzali.\n\nTor kanpoko nabigatzea ere egiteko erabiltzen den nabigatzaile batean Torbutton erabiltzea segurura ez delako aldaketa hau egin dugu. Beste era batean konpondu ezin genituen akats asko zeuden.\n\nFirefox modu arruntean erabiltzen jarraitu nahi baduzu, Torbutton kendu beharko zenuke eta Tor Browser Bundlea deskargatu. Tor Browserren pribatutasun ezaugarriak Firefox arruntarenak baino hobeak dia, baita Firefox Torbuttonekin erabiltzen bada ere.\n\nTorbutton kentzeko, joan hona Tresnak->Gehigarriak->Hedapenak eta Torbuttonen ondoan dagoen Kendu botoian sakatu.
torbutton.popup.short_torbrowser = Torbutton informazio garrantzitsua!\n\nTorbutton orain beti gaituta dago.\n\nSakatu Torbuttonen informazio gehiago lortzeko.
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index f8a5ae7..a60c04d 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "تÙ?ظÙ?Ù?ات پراکسÛ?">
-<!ENTITY torbutton.prefs.recommended_settings "بکاربردÙ? تÙ?ظÙ?Ù?ات پراکسÛ? تÙ?صÙ?Ù? شدÙ? براÛ? Ù?سخÙ? Ù?اÙ?رÙ?اکس Ù?Ù?">
-<!ENTITY torbutton.prefs.use_polipo "استÙ?ادÙ? از Ù¾Ù?Ù?Ù?Ù¾Ù? (Polipo)">
-<!ENTITY torbutton.prefs.custom_settings "بکاربردÙ? تÙ?ظÙ?Ù?ات سÙ?ارشÛ? براÛ? پراکسÛ?">
-<!ENTITY torbutton.prefs.proxy.host.http "پراکسÛ? HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "پراکسÛ? SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "پراکسÛ? FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "پراکسÛ? Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Ù?Ù?زباÙ? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "درگاÙ? (Port):">
-<!ENTITY torbutton.pref_connection.notice "غÙ?رÙ?عاÙ? کردÙ? دکÙ?Ù? تÙ?ر جÙ?ت تغÙ?Ù?ر دراÙ?Ù? تÙ?ظÙ?Ù?ات.">
-<!ENTITY torbutton.pref_connection.more_info "اطÙ?اعات بÙ?شتر">
-<!ENTITY torbutton.pref_connection_more_info.title "راÙ?Ù?Ù?ا">
-<!ENTITY torbutton.pref_connection_more_info.text "دکÙ?Ù? تÙ?رÙ?Ù? اکÙ?Ù?Ù? Ù?عاÙ? شدÙ? است.اگر Ù?Û?â??Ø®Ù?اÙ?Ù?د تÙ?ظÙ?Ù?ات پراکسÛ? غÙ?رÙ?رتبط با تÙ?ر را تغÙ?Ù?ر دÙ?Ù?دØ? Ù?Ø·Ù?ا دکÙ?Ù? تÙ?ر را غÙ?رÙ?عاÙ? Ú©Ù?Ù?د Ù? دÙ?بارÙ? بÙ? اÙ?Ù?جا بازگردÙ?د. اگر Ù?Ù?Ø®Ù?اÙ?Ù?د تÙ?ظÙ?Ù?ات تÙ?ر را تغÙ?Ù?ر دÙ?Ù?دØ? از Ù¾Ù?جرÙ? تÙ?ظÙ?Ù?ات دکÙ?Ù? تÙ?ر استÙ?ادÙ? Ú©Ù?Ù?د.">
<!ENTITY torbutton.context_menu.new_identity "Ù?Ù?Û?ت جدÛ?د">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "شبکÙ? جدÛ?د Tor براÛ? اÛ?Ù? ساÛ?ت">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "جÙ?ت شرÙ?ع دÙ?Ù?Ù? تÙ?رکÙ?Ù?Ú© Ú©Ù?Ù?د">
<!ENTITY torbutton.prefs.privacy_security_settings "ØÙ?ظ ØرÛ?Ù? خصÙ?صÛ? Ù? تÙ?ظÛ?Ù?ات اÙ?Ù?Û?تÛ?">
<!ENTITY torbutton.prefs.restore_defaults "بازگرداÙ?دÙ? تÙ?ظÛ?Ù?ات بÙ? ØاÙ?ت Ù¾Û?Ø´â??Ù?رض">
-<!ENTITY torbutton.prefs.test_settings "تÙ?ظÛ?Ù?ات آزÙ?Ù?دÙ? ">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCK v5">
-<!ENTITY torbutton.prefs.no_proxies_on "عدÙ? استÙ?ادÙ? از پراکسÛ? براÛ?:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Ù?شدار: از بÙ? کار بردÙ? Ù?ر Ú¯Ù?Ù?Ù? Ù?اÙ? Ù?Ù?زباÙ? (hostname) در باÙ?ا بپرÙ?Ù?زÙ?د">
<!ENTITY torbutton.cookiedialog.title "Ù?دÙ?رÙ?ت ØÙ?اظت Ú©Ù?Ù?Ú?Ú©â??Ù?ا">
<!ENTITY torbutton.cookiedialog.lockCol "ØÙ?اظت شدÙ?">
<!ENTITY torbutton.cookiedialog.domainCol "Ù?Ù?زباÙ?">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "ØØ°Ù? تÙ?اÙ? Ú©Ù?Ù?Ú?Ú©â??Ù?اÛ? ØÙ?اظت Ù?شدÙ?">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ØÙ?اظت از Ú©Ù?Ù?Ú?Ú©â??Ù?اÛ? جدÙ?د">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "عدÙ? ØÙ?اظت از Ú©Ù?Ù?Ú?Ú©â??Ù?اÛ? جدÙ?د">
-<!ENTITY torbutton.prefs.transparentTor "سازگارسازÛ? با تÙ?ر بÙ? صÙ?رت Ø´Ù?اÙ? (Ù?Ù?از بÙ? رÙ?Ù?اب تÙ?ر Ù?ا Tor router Ù? Ù?ا transproxy سÙ?ارشÛ? دارد)">
<!ENTITY torbutton.prefs.priv_caption "تÙ?ظÛ?Ù?ات ØرÛ?Ù? خصÙ?صÛ?">
<!ENTITY torbutton.prefs.block_disk "ثبتâ??Ù?Ù?ردÙ? تارÙ?Ø®Ú?Ù? Ù?ا دادÙ?â??Ù?اÙ? Ù?بâ??گاÙ? (گشت Ù? گذار â??خصÙ?صÙ? Ù?عاÙ? Ù?Ù?â??Ù?Ù?د)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Ù?ØدÙ?دâ??Ù?ردÙ? Ù?Ù?Ù?Ù?â??Ù?اÙ? طرÙ? سÙ?Ù? Ù? دادÙ?â??Ù?اÙ? Ù¾Ù?گردÙ? دÙ?گر">
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index f094569..9f77531 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = براÛ? غÙ?رÙ?عاÙ? کردÙ? تÙ?ر Ú©Ù?Ù?
torbutton.panel.label.disabled = تÙ?رغÙ?رÙ?عاÙ? شد
torbutton.panel.label.enabled = تÙ?ر Ù?عاÙ? شد
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton دکÙ?Ù? اÛ? را براÛ? Ø´Ù?ا Ù?راÙ?Ù? Ù?Û?Ù?Ù?اÛ?د تا تÙ?ظÛ?Ù?ات "تر" را Ù¾Û?کربÙ?دÛ? کردÙ? Ù? بتÙ?اÙ?Û?د بÙ? راØتÛ? Ù? سرعتØ? دادÙ? Ù?اÛ? خصÙ?صÛ? Ù?رÙ?رگرتاÙ? را پاک Ú©Ù?Û?د.
-torbutton.popup.test.success = تÙ?ربا Ù?Ù?Ù?Ù?Ù?ت آزÙ?اÙ?Ø´ را سپرÛ? کرد!
-torbutton.popup.test.failure = آزÙ?اÙ?Ø´ تÙ?ر Ù?Ù?Ù?Ù?Ù?ت Ø¢Ù?Ù?ز Ù?بÙ?د! تÙ?ظÙ?Ù?ات پراکسÛ? Ù? Ù¾Ù?Ù?Ù?Ù¾Ù? را بررسÛ? Ú©Ù?Ù?د.
-torbutton.popup.test.confirm_toggle = آخÙ?رÙ? تغÙ?Ù?رات اÙ?جاÙ? شدÙ? در تÙ?ر پراکسÛ? Ù?Ù?Ù?Ù?Ù?ت Ø¢Ù?Ù?ز Ù?بÙ?د.\n\nØ¢Ù?ا Ù?Ø·Ù?ئÙ? Ù?ستÙ?د Ú©Ù? Ù?Ù?Ø®Ù?اÙ?Ù?د در Ù?ر صÙ?رت Ø¢Ù?Ù?ا را Ù?عاÙ? Ú©Ù?Ù?دØ?\n\nÙ?کتÙ?: اگرÙ?Ø´Ú©Ù?ات Ù?Ù?جÙ?د را ØÙ? کردÙ?دØ? Ù?Ù?تÙ?اÙ?Ù?د دÙ?بارÙ? آزÙ?Ù?Ù? بررسÛ? را در Ù¾Ù?جرÙ? تÙ?ظÙ?Ù?ات پراکسÛ? دکÙ?Ù? تÙ?راÙ?جاÙ? دÙ?Ù?د تا دÙ?گر اÙ?Ù? اخطار را درÙ?اÙ?ت Ù?Ú©Ù?Ù?د.
-torbutton.popup.test.ff3_notice = بر رÙ?Û? OK Ú©Ù?Ù?Ú© Ú©Ù?Ù?د تا تÙ?ظÙ?Ù?ات پراکسÛ? تÙ?ر آزÙ?اÙ?Ø´ Ø´Ù?د. اÙ?Ù? آزÙ?اÙ?Ø´ در پس ضÙ?Ù?Ù?Ù? اتÙ?اÙ? Ù?Ù? اÙ?تد. Ù?Ø·Ù?ا صبÙ?ر باشÙ?د.
torbutton.popup.external.title = Ù?Û?Ø®Ù?اÙ?Û?د Û?Ú© Ù?اÛ?Ù? Ù?Ù?ع بÛ?رÙ?Ù?Û? داÙ?Ù?Ù?د Ø´Ù?دØ?
torbutton.popup.external.app = Ù?رÙ?رگر Ù?Ù?Û?تÙ?اÙ?د اÛ?Ù? Ù?اÛ?Ù? را Ù?Ù?اÛ?Ø´ دÙ?دØ? Ù?ازÙ? است تا با برÙ?اÙ?Ù? دÛ?گرÛ? Ø¢Ù? را باز Ú©Ù?Û?د.\n
torbutton.popup.external.note = برخÛ? از اÙ?Ù?اع Ù?اÛ?Ù?Ù?اØ? باعث Ù?Û?Ø´Ù?Ù?د Ú©Ù? برÙ?اÙ?Ù? Ù?ا بدÙ?Ù? استÙ?ادÙ? از "تر" بÙ? اÛ?Ù?ترÙ?ت Ù?تصÙ? Ø´Ù?Ù?د.\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = براÛ? اÛ?Ù?Ù? Ù?اÙ?دÙ?Ø? باÛ?د Ù?Ù?
torbutton.popup.launch = داÙ?Ù?Ù?د Ù?اÛ?Ù?
torbutton.popup.cancel = Ù?غÙ?
torbutton.popup.dontask = از اÛ?Ù? پسØ? Ù?اÛ?Ù?Ù?ا بÙ? Ø·Ù?ر Ø®Ù?دکار داÙ?Ù?Ù?د Ø´Ù?د.
-torbutton.popup.test.no_http_proxy = آزÙ?Ù?Ù? پراکسÛ? تÙ?ر: پراکسÛ? HTTP Ù?ØÙ?Û? Ù?ابÙ? دسترسÛ? Ù?Û?ست. Ø¢Û?ا Ù¾Ù?Ù?Û?Ù¾Ù? بÙ? درستÛ? اجرا شدÙ? استØ?
torbutton.popup.prompted_language = براÛ? ØÙ?اظت بÙ?شتر از ØرÙ?Ù? خصÙ?صÛ? Ø´Ù?اØ? دکÙ?Ù? تÙ?ر Ù?Û?â??تÙ?اÙ?د Ù?سخÙ? اÙ?Ú¯Ù?Ù?سÛ? صÙ?Øات Ù?ب را درخÙ?است Ú©Ù?د. اÙ?Ù? Ù?Ù?ضÙ?ع Ù?Ù?Ú©Ù? است باعث Ø´Ù?د صÙ?ØÙ?â??Ù?اÛ?Û? را Ú©Ù? ترجÛ?Ø Ù?Û?دÙ?Û?د بÙ? زباÙ? Ù?ادرÛ? Ø®Ù?د بخÙ?اÙ?Ù?دØ? در عÙ?ض بÙ? اÙ?Ú¯Ù?Ù?سÛ? Ù?Ù?اÙ?Ø´ دادÙ? Ø´Ù?Ù?د.\n\nØ¢Ù?ا با اÙ?Ù? Ù?جÙ?د Ù?Û?â??Ø®Ù?اÙ?Ù?د براÛ? ØÙ?اظت بÙ?شتر از ØرÙ?Ù? خصÙ?صÛ? درخÙ?است Ù?سخÙ? اÙ?Ú¯Ù?Ù?سÛ? صÙ?Øات را بدÙ?Ù?دØ?
torbutton.popup.no_newnym = Torbutton Ù?Ù?Û? تÙ?اÙ?د بÙ? Ø´Ù?ا Û?Ú© Ø´Ù?اسÙ? جدÛ?د اÙ?Ù? بدÙ?د. دسترسÛ? بÙ? Ù¾Ù?رت Ú©Ù?ترÙ? Ù?Û?داÙ?Û?ا اÙ?کاÙ? پذÛ?ر Ù?Û?ست.\n\n Ø¢Û?ا Ø´Ù?ا در ØاÙ? اجرا بستÙ? Ù?رÙ? اÙ?زارÛ? Ù?رÙ?رگر تÙ?ر Ù?ستÛ?دØ?
-torbutton.popup.pref_error = Torbutton Ù?Ù?Û? تÙ?اÙ?Û?د تÙ?ظÛ?Ù?ات را در داÛ?رکتÙ?رÛ? Ù?شخصات Ù?رÙ?رگر Tor را بÙ? رÙ?ز رساÙ?Û? Ú©Ù?د
-torbutton.popup.permission_denied = Ù?Ø·Ù?ا Û?Ú©Û? از دÙ? تÙ?ظÛ?Ù? Ù?جدد Ù?جÙ?ز داÛ?رکتÙ?رÛ? Ù?رÙ?رگر Tor Ù? Û?ا Ú©Ù¾Û? Ø¢Ù? را بÙ? Û?Ú© Ù?کاÙ? جدÛ?د.
-torbutton.popup.device_full = دÛ?سک بÙ? Ù?ظر Ù?Û? رسد پر شدÙ? است. Ù?Ø·Ù?ا Ù?Ù?دارÛ? Ù?ضا خاÙ?Û? Ú©Ù?Û?د Û?ا تÙ?ر را بÙ? Ù?کاÙ? جدÛ?دÛ? اÙ?تÙ?اÙ? دÙ?Û?د.
torbutton.title.prompt_torbrowser = اطÙ?اعات Ù?Ù?Ù? Torbutton
torbutton.popup.prompt_torbrowser = اکÙ?Ù?Ù? Torbutton بطÙ?ر Ù?تÙ?اÙ?تÛ? کار Ù?Û?â??Ú©Ù?د - دÛ?گر Ù?Ù?Û?â??تÙ?اÙ?Û?د Ø¢Ù?â?? را خاÙ?Ù?Ø´ Ú©Ù?Û?د.\n\nاÛ?Ù? تغÛ?رات بÙ? اÛ?Ù? دÙ?Û?Ù? اعÙ?اÙ? شدÙ? است Ú©Ù? استÙ?ادÙ? از Torbutton در Ù?رÙ?رگرÛ? Ú©Ù? براÛ? Ù?رÙ?رگرÛ? بدÙ?Ù? تر Ù?Û?ز استÙ?ادÙ? Ù?Û?Ø´Ù?دØ? اÛ?Ù?Ù? Ù?Û?ست. Ù?Ù?صÙ?اÛ? Ù?رÙ? اÙ?زارÛ? Ø¢Ù?Ù?در زÛ?اد بÙ?د Ú©Ù? بÙ? رÙ?Ø´ دÛ?گرÛ? Ù?Ù?Û?تÙ?اÙ?ستÛ?Ù? Ø¢Ù? را ØÙ? Ú©Ù?Û?Ù?.\n\nاگر Ù?Û?Ø®Ù?اÙ?Û?د بÙ? Ø·Ù?ر عادÛ? بÙ? استÙ?ادÙ? از Ù?اÛ?رÙ?اکس اداÙ?Ù? دÙ?Û?دØ? باÛ?د Ù?رÙ? اÙ?زار Torbutton را ØØ°Ù? کردÙ? Ù? Tor Browser Bundle (بستÙ? Ù?رÙ?رگر تر) را داÙ?Ù?Ù?د Ú©Ù?Û?د. Ù?Û?Ú?Ú¯Û?Ù?اÛ? خصÙ?صÛ? بÙ?دÙ? ترØ? بÙ? Ø¢Ù?Ù?اÛ?Û? Ú©Ù? در Ù?اÛ?رÙ?اکس استØ? برترÛ? داردØ? ØتÛ? Ù?Ù?گاÙ?Û? Ú©Ù? Ù?اÛ?رÙ?اکس با Torbutton استÙ?ادÙ? Ø´Ù?د.\n\nبراÛ? ØØ°Ù?
TorbuttonØ? برÙ?Û?د بÙ? ابزارÙ?ا ( Û?ا tools اگر از Ù?سخÙ? اÙ?Ú¯Ù?Û?سÛ? Ù?اÛ?رÙ?اکس استÙ?ادÙ? Ù?Û?Ú©Ù?Û?د)Ø? اÙ?زÙ?Ù?Ù? Ù?ا (Addons)Ø? برÙ?اÙ?Ù? Ù?اÛ? گسترش Û?اÙ?تÙ? (Extensions ) Ù? سپس دکÙ?Ù? Remove Ú©Ù? در Ú©Ù?ار Torbutton است را بزÙ?Û?د.
torbutton.popup.short_torbrowser = اطÙ?اعÙ?ت Ù?Ù?Ù? Torbutton!\n\nTorbutton Ù?Ù?Û?Ø´Ù? Ù?عاÙ? باشد!\n\nبراÛ? اطÙ?اعات بÛ?شتر رÙ?Û? Torbutton Ú©Ù?Û?Ú© Ù?Ù?اÛ?Û?د.
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index f3686e2..bb3356a 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Välityspalvelin Asetukset">
-<!ENTITY torbutton.prefs.recommended_settings "Käytä suositeltuja välityspalvelin asetuksia minun Firefox versiolleni.">
-<!ENTITY torbutton.prefs.use_polipo "Käytä Polipoa">
-<!ENTITY torbutton.prefs.custom_settings "Aseta välityspalvelinasetukset käsin">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP-välityspalvelin:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL-välityspalvelin:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-välityspalvelin:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-välityspalvelin:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-palvelin:">
-<!ENTITY torbutton.prefs.proxy.port "Portti:">
-<!ENTITY torbutton.pref_connection.notice "Poista Torbutton käytöstä muuttaaksesi asetuksia.">
-<!ENTITY torbutton.pref_connection.more_info "Lisää tietoja">
-<!ENTITY torbutton.pref_connection_more_info.title "Apua">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton on tällähetkellä käytössä. Jos haluat muuttaa välityspalvelinasetuksia joita käytät silloin kun Torbutton ei ole käytössä, ota ensin Torbutton pois päältä (Tor Disabled) ja palaa sitten tänne. Jos haluat muuttaa Tor asetuksia, käytä Torbutton asetukset ikkunaa.">
<!ENTITY torbutton.context_menu.new_identity "Uusi identiteetti">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Asetukset...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "E">
<!ENTITY torbutton.button.tooltip "Klikkaa Torbutton aktiiviseksi">
<!ENTITY torbutton.prefs.restore_defaults "Palauta Oletukset">
-<!ENTITY torbutton.prefs.test_settings "Testaa Asetukset">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ei välityspalvelimia osoitteille:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Varoitus: Vältä yllä olevia osoitteita">
<!ENTITY torbutton.cookiedialog.title "Hallitse evästeiden suojauksia">
<!ENTITY torbutton.cookiedialog.lockCol "Suojaus">
<!ENTITY torbutton.cookiedialog.domainCol "Palvelin">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Poista kaikki paitsi suojatut">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evästeet">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "�lä suojaa uusia evästeitä">
-<!ENTITY torbutton.prefs.transparentTor "Käytä Toria läpinäkyvästi (edellyttää mukautetun transproxyn tai Tor-reitittimen käyttöä)">
<!ENTITY torbutton.prefs.block_disk "�lä säilytä selaushistoriaa tai verkkosivuston tietoa (käynnistää yksityisen selauksen)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Estä kolmannen osapuolen evästeet ja muut seurantatiedot">
<!ENTITY torbutton.prefs.block_plugins "Poista liitännäiset (Flash yms.) käytöstä">
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index 4c11024..279f6d0 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Poista Tor käytöstä napsauttamalla.
torbutton.panel.label.disabled = Tor pois käytöstä.
torbutton.panel.label.enabled = Tor käytössä.
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbuttonin lisää painikkeen, jolla voi muokata Torin asetuksia sekä poistaa nopeasti ja helposti selaustiedot.
-torbutton.popup.test.success = Tor-välityspalvelimen testaus onnistui!
-torbutton.popup.test.failure = Tor-välityspalvelimen testaus EP�ONNISTUI! Tarkista välityspalvelimen ja Polipon asetukset.
-torbutton.popup.test.confirm_toggle = Viimeisin suoritettu Tor välityspalvelintesti epäonnistui.\n\nHaluatko siitä huolimatta kääntää Torin päälle?\n\nHuom: Jos olet korjannut ongelman, voit ajaa testin uudestaan käyttämällä Torbutton Proxy Preferences ikkunaa, niin et enää saa tätä varoitusta uudestaan.
-torbutton.popup.test.ff3_notice = Klikkaa OK testataksesi Tor välityspalvelinasetukset. Testi tapahtuu taustalla, odota rauhassa, ilmoitus annetaan kuin testi on valmis.
torbutton.popup.external.title = Ladataanko ulkopuolinen sisältö?
torbutton.popup.external.app = Tarvitaan ulkoinen sovellus:\n\n
torbutton.popup.external.note = \nHUOM: Ulkoiset sovellukset eivät lähtökohtaisesti ole Tor turvallisia ja saattavat paljastaa identiteettisi!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nJos et luota tähän tiedostoon, on parasta
torbutton.popup.launch = Käynnistä sovellus
torbutton.popup.cancel = Peruuta
torbutton.popup.dontask = Jatkossa käynnistä aina sovellukset
-torbutton.popup.test.no_http_proxy = Tor välityspalvelintesti: Paikallista HTTP välityspalvelinta ei löydy. Onko polipo käynnissä?
torbutton.popup.prompted_language = Yksityisyytesi lisäämiseksi Torbutton voi pyytää webbisivuista englanninkielisen version. Tämä saattaa aiheuttaa sen, että webbisivut, jotka luet mieluiten äidinkielelläsi, näytetään englanniksi.\n\nHaluatko pyytää webbisivut englanniksi yksityisyyden lisäämiseksi?
torbutton.popup.no_newnym = Torbutton ei voi taata sinulle turvallisesti uutta identiteettiä. Sillä ei ole pääsyä Tor-hallintaporttiin.\n\nOnko Tor Browser Bundle käytössä?
-torbutton.popup.pref_error = Torbutton ei voi päivittää asetuksia Tor Browserin profiilihakemistossa.
-torbutton.popup.permission_denied = Aseta Tor Browserin hakemiston käyttöoikeudet uusiksi tai kopioi se uuteen sijaintiin.
-torbutton.popup.device_full = Levy näyttäisi olevan täysi. Vapauta tilaa tai siirrä Tor Browser uudelle laitteelle.
torbutton.title.prompt_torbrowser = Tärkeää tietoa Torbuttonista
torbutton.popup.prompt_torbrowser = Torbutton toimii nykyään toisin kuin ennen: et voi enää poistaa sitä käytöstä.\n\nMuutimme toimintatapaa, sillä Torbuttonin käyttö ei ole turvallista sellaisessa selaimessa, jota on käytetty ilman Toria. Oli liikaa ohjelmavirheitä, joita emme pystyneet korjaamaan millään muulla tavalla.\n\nJos haluat käyttää Firefoxia tavanomaisesti, poista Torbutton ja asenna Tor Browser Bundle. Tor Browserin yksityisyysominaisuudet ovat ylivoimaisia verrattuna tavanomaiseen Firefoxiin, vaikka siinä käytettäisiinkin Torbuttonia.\n\nTorbutton poistetaan valitsemalla Työkalut -> Lisäosat -> Laajennukset ja napsauttamalla Torbuttonin vieressä olevaa Poista-painiketta.
torbutton.popup.short_torbrowser = Tärkeää tietoa Torbuttonista!\n\nTorbutton on nykyään aina käytössä.\n\nLisätietoa saat napsauttamalla Torbuttonia.
diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/fil/torbutton.dtd
+++ b/src/chrome/locale/fil/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/fil/torbutton.properties b/src/chrome/locale/fil/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/fil/torbutton.properties
+++ b/src/chrome/locale/fil/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/fo/torbutton.dtd
+++ b/src/chrome/locale/fo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/fo/torbutton.properties b/src/chrome/locale/fo/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/fo/torbutton.properties
+++ b/src/chrome/locale/fo/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index b08a854..53bfb12 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Paramètres du proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramètres du proxy recommandés pour ma version de Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Utiliser Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Utiliser des paramètres de proxy personnalisés">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP :">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL :">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP :">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher :">
-<!ENTITY torbutton.prefs.proxy.host.socks "Hôte SOCKS :">
-<!ENTITY torbutton.prefs.proxy.port "Port :">
-<!ENTITY torbutton.pref_connection.notice "Désactiver Torbutton pour modifier ces paramètres.">
-<!ENTITY torbutton.pref_connection.more_info "Plus d'informations">
-<!ENTITY torbutton.pref_connection_more_info.title "Aide">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton est actuellement activé. Si vous souhaitez modifier vos paramètres proxy non-Tor, veuillez désactiver Torbutton et revenir à cette fenêtre. Si vous souhaitez modifier vos paramètres Tor, veuillez utiliser la fenêtre des préférences Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Nouvelle identité">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Paramètres de confidentialité et de sécurité">
<!ENTITY torbutton.prefs.restore_defaults "Valeurs par défaut">
-<!ENTITY torbutton.prefs.test_settings "Tester les paramètres">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Pas de Proxy pour: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Attention: �vitez d'utiliser les noms d'hôtes ci-dessus">
<!ENTITY torbutton.cookiedialog.title "Gérer les protections de cookies">
<!ENTITY torbutton.cookiedialog.lockCol "Protégé">
<!ENTITY torbutton.cookiedialog.domainCol "Hôte">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Supprimer tous les cookies non protégés">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protéger les nouveaux cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protéger les nouveaux cookies">
-<!ENTITY torbutton.prefs.transparentTor "Torification transparente (requiert un transproxy spécialisé ou un routeur Tor)">
<!ENTITY torbutton.prefs.priv_caption "Paramètres de vie privée">
<!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les données des sites webs (active le Mode de Navigation Privée)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 5e5a808..1568a3c 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor
torbutton.panel.label.disabled = Tor Inactif
torbutton.panel.label.enabled = Tor Actif
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton fournit un bouton pour configurer les paramètres de Tor et nettoie rapidement et facilement les données de navigation privée.
-torbutton.popup.test.success = Test du proxy Tor réussi !
-torbutton.popup.test.failure = �CHEC du test du proxy Tor ! Vérifiez les configurations du proxy et de Polipo.
-torbutton.popup.test.confirm_toggle = Le dernier test de proxy Tor a échoué.\n\nEtes-vous sûr de vouloir tout de même continuer?\n\nNote: Si vous avez reglé le problème, vous pouvez relancer le test dans la fenêtre des Préférences du Proxy Torbutton afin de supprimer cet avertissement.
-torbutton.popup.test.ff3_notice = Cliquez sur OK pour tester vos paramètres de proxy Tor. Ce test s'effectuera en tâche de fond. Merci de votre patience.
torbutton.popup.external.title = Télécharger un type de fichier externe
torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de l'ouvrir avec une autre application.
torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions à l'Internet sans passer par Tor pour certaines applications
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Pour être en sécurité, vous ne devriez ouv
torbutton.popup.launch = Télécharger le fichier
torbutton.popup.cancel = Annuler
torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant
-torbutton.popup.test.no_http_proxy = Test du proxy Tor : le proxy HTTP local est injoignable. Est-ce que Polipo fonctionne correctement ?
torbutton.popup.prompted_language = Pour renforcer votre anonymat, Torbutton peut demander une version anglaise de la page Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais afin d'améliorer votre anonymat ?
torbutton.popup.no_newnym = Torbutton ne peut pas délivrer une nouvelle identité de manière sécuritaire. Il n'a pas accès au port de contrôle de Tor.\n\nUtilisez-vous le paquet du Navigateur Tor ?
-torbutton.popup.pref_error = Torbutton ne peut pas mettre à jour les préférences dans le répertoire du profil du Navigateur Tor.
-torbutton.popup.permission_denied = Merci de réinitialiser les permissions du répertoire du Navigateur Tor ou de le copier dans un nouvel emplacement.
-torbutton.popup.device_full = Le disque semble être plein. Merci de libérer de la place ou déplacer le Navigateur Tor vers un nouveau périphérique.
torbutton.title.prompt_torbrowser = Information importante concernant Torbutton
torbutton.popup.prompt_torbrowser = Torbutton Fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n'est pas sécuritaire d'utiliser Torbutton dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller Torbutton et télécharger le paquet du naviguateur Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même s'il est utilisé avec Torbutton.\n\nPour enlever Torbutton, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de Torbutton.
torbutton.popup.short_torbrowser = Information importante concernant Torbutton!\n\nTorbutton est dorénavant toujours activé.\n\nCliquer sur Torbutton pour plus d'informations.
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/fur/torbutton.properties b/src/chrome/locale/fur/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/fur/torbutton.properties
+++ b/src/chrome/locale/fur/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/fy/torbutton.dtd
+++ b/src/chrome/locale/fy/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/fy/torbutton.properties b/src/chrome/locale/fy/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/fy/torbutton.properties
+++ b/src/chrome/locale/fy/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ga/torbutton.properties
+++ b/src/chrome/locale/ga/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index 6b251a9..8f22cc2 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Axustes do proxy">
-<!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 "Porto:">
-<!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 "Axuda">
-<!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 "Nova identidade">
<!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 "Restabelecer valores predeterminados">
-<!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)">
diff --git a/src/chrome/locale/gl/torbutton.properties b/src/chrome/locale/gl/torbutton.properties
index c3abbac..a6023da 100644
--- a/src/chrome/locale/gl/torbutton.properties
+++ b/src/chrome/locale/gl/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = Cancelar
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.
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index 92958cb..8b95427 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "પ�ર���સ� ��ઠવણ��">
-<!ENTITY torbutton.prefs.recommended_settings "માર� ફાયરફ���સ �વ�ત�તિ મા�� સ��વ�લ પ�ર���સ� ��ઠવણ�� વાપર�">
-<!ENTITY torbutton.prefs.use_polipo "પ�લિપ� વાપર�">
-<!ENTITY torbutton.prefs.custom_settings "પ�તાન� પ�ર���સ� ��ઠવણ�� વાપર�">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP પ�ર���સ�:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL પ�ર���સ�:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP પ�ર���સ�:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher પ�ર���સ�:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS ય�માન:">
-<!ENTITY torbutton.prefs.proxy.port "પ�ર��:">
-<!ENTITY torbutton.pref_connection.notice "� ��ઠવણ�� બદલવા મા�� ��રબ�ન નિષ���રિય �ર�.">
-<!ENTITY torbutton.pref_connection.more_info "વધ� માહિત�">
-<!ENTITY torbutton.pref_connection_more_info.title "મદદ">
-<!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 "પ�રાથમિ�તા�...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "��રબ�ન શર� �રવા ��લિ� �ર�">
<!ENTITY torbutton.prefs.restore_defaults "મà«?ળàªà«?ત પાàª?à«?àª? લાવà«?">
-<!ENTITY torbutton.prefs.test_settings "��ાસણ� ��ઠવણ��">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "� મા�� પ�ર���સ� નહ�:">
-<!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)">
diff --git a/src/chrome/locale/gu/torbutton.properties b/src/chrome/locale/gu/torbutton.properties
index 38489f9..fcc5d85 100644
--- a/src/chrome/locale/gu/torbutton.properties
+++ b/src/chrome/locale/gu/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = ��ર નિષ���રિય �ર
torbutton.panel.label.disabled = ��ર નિષ���રિય
torbutton.panel.label.enabled = ��ર સ��રિય
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = ��ર પ�ર���સ� ��ાસણ� સફળ!
-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 = �ાર�ય��રમ શર� �ર�
torbutton.popup.cancel = રદ� �ર�
torbutton.popup.dontask = હવ� પ�� હ�મ�શા �ાર�ય��રમ શર� �ર�
-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.
diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/gun/torbutton.dtd
+++ b/src/chrome/locale/gun/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/gun/torbutton.properties b/src/chrome/locale/gun/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/gun/torbutton.properties
+++ b/src/chrome/locale/gun/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ha/torbutton.dtd
+++ b/src/chrome/locale/ha/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ha/torbutton.properties b/src/chrome/locale/ha/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ha/torbutton.properties
+++ b/src/chrome/locale/ha/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 1255385..e0fd7c8 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "×?×?×?ר×?ת פר×?קס×?">
-<!ENTITY torbutton.prefs.recommended_settings '×?שת×?ש ×?×?×?×?ר×?ת פר×?קס×? ×?×?×?×?צ×?ת ×¢×?×?ר ×?רסת ×?"פ×?×?רפ×?קס" ש×?×?'>
-<!ENTITY torbutton.prefs.use_polipo "×?שת×?ש ×?פ×?×?×?פ×?">
-<!ENTITY torbutton.prefs.custom_settings "×?שת×?ש ×?×?×?×?ר×?ת פר×?קס×? ×?×?×?×?ר×?ת ×?ר×?ש">
-<!ENTITY torbutton.prefs.proxy.host.http "פר×?קס×? HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "פר×?קס×? SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "פר×?קס×? FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "×?×?ר×? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "פ×?ר×?:">
-<!ENTITY torbutton.pref_connection.notice "×?ש×?ת ×?ת Torbutton ×¢×? ×?× ×ª ×?×©× ×?ת ×?×?×?ר×?ת ×?×?×?">
-<!ENTITY torbutton.pref_connection.more_info "×?×?×?×¢ × ×?סף">
-<!ENTITY torbutton.pref_connection_more_info.title "×¢×?ר×?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton פ×?×¢×? ×?עת. ×?×? ×?רצ×?× ×? ×?×©× ×?ת ×?ת ×?×?×?ר×?ת ×?פר×?קס×? ש×?×?× ×? ש×? Tor, ×?× ×? ×?ש×?ת ×?ת Torbutton ×?×?×?×?ר ×?× ×?. ×?×? ×?רצ×?× ×? ×?×©× ×?ת ×?ת ×?×?×?ר×?ת Tor, ×?× ×? ×?שת×?ש ×?×?×?×?×? ×?×?×?×?ר×?ת ש×? Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "×?×?×?ת ×?×?ש×?">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "×?×?×?ר×?ת">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "×?×?×¥ ×?×?×?×? ×?×?ת×?×? ×?ת Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "×?×?ר×? ×?×?ר×?רת ×?×?×?×?">
-<!ENTITY torbutton.prefs.test_settings "×?×?×? ×?×?×?ר×?ת">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "×?×?×? פר×?קס×?×? ×¢×?×?ר:">
-<!ENTITY torbutton.prefs.no_proxy_warning "×?×?×?ר×?: ×?×?×?× ×¢ ×?ש×?×?×?ש ×?ש×?×?ת ×?×?ר×?×?×? ×?×¢×?×?">
<!ENTITY torbutton.cookiedialog.title "× ×?×? ×?×?× ×?ת ק×?ק×?×?">
<!ENTITY torbutton.cookiedialog.lockCol "×?×?×?×?">
<!ENTITY torbutton.cookiedialog.domainCol "×?×?ר×?">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "×?×?ק ×?ת ×?×? ×?ק×?ק×?×? ×?×?×? ×?×?×?× ×?×?">
<!ENTITY torbutton.cookiedialog.saveAllCookies "×?×?×? ×¢×? ק×?ק×?×? ×?×?ש×?×?">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "×?×? ת×?×? ×¢×? ק×?ק×?×? ×?×?ש×?×?">
-<!ENTITY torbutton.prefs.transparentTor "×?פע×?ת ×?×?ר ×?צ×?ר×? ×?×?ת×? × ×¨×?×?ת (×?×?רש transproxy ×?×? 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 "×?ש×?ת ת×?ספ×?ת ×?פ×?פ×? (×?×?×?×? Flash)">
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index f079f06..e4074c3 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = ×?×?×¥ ×?×?×?×?×?×? Tor
torbutton.panel.label.disabled = Tor ×?×?×?×?×?
torbutton.panel.label.enabled = Tor פ×?×¢×?
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = ×?×?×?קת ×?פר×?קס×? ש×? Tor ×¢×?ר×? ×?×?צ×?×?×?!
-torbutton.popup.test.failure = ×?×?×?קת ×?פר×?קס×? ש×? Tor × ×?ש×?×?! ×?×?×?ק ×?ת ×?×?×?ר×?ת ×?פר×?קס×? ×?-Polipo.
-torbutton.popup.test.confirm_toggle = ×?×?×?קת ×?פר×?קס×? ×?×?×?ר×?× ×? × ×?ש×?×? ×?ש×?×?×?ש ×?-Tor.\n\n×?×?×? ×?ת×? ×?×?×?×? ש×?רצ×?× ×? ×?×?×?ש×?×? ×?×?×? ×?קר×??\n\n×?ער×?: ×?×? ת×?×§× ×ª ×?ת ×?×?×¢×?×?×?, ×?ת×? ×?×?×?×? ×?×?×?×?ר ×¢×? ×?×?×?×?ק×? ×?תפר×?×? ×?×?×?ר×?ת ×?פר×?קס×? ש×? Torbutton ×?×?×? ×?×?×?×? ×?×?×?×¢×? ×?×?.
-torbutton.popup.test.ff3_notice = ×?×?×¥ ×?×?ש×?ר ×?×?×? ×?×?×?×?ק ×?ת ×?×?×?ר×?ת ×?פר×?קס×? ש×? Tor. ×?×?×?ק×? ×?×? תת×?צע ×?רקע. ×?× ×? ×?×?ת×? ×?ס×?×?× ×?ת.
torbutton.popup.external.title = ×?×?×¢×?×? ת×?×?×? ×?×?צ×?× ×??
torbutton.popup.external.app = ת×?×?× ×? ×?×?צ×?× ×?ת × ×?×?צ×? ×?×?×? ×?×?פ×? ×?:\n
torbutton.popup.external.note = \n\nש×?×? ×?×?: ת×?×?× ×?ת ×?×?צ×?× ×?×?ת ×?×?× ×? ×?×?×?×?×?ת ×?עש×?×?×?ת ×?פ×?×?×¢ ×?פר×?×?×?ת ש×?×?!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \n×?×? ק×?×?×¥ ×?×? ×?×?× ×? ×?×?×?×?, ×¢×?
torbutton.popup.launch = ×?פע×? ת×?×?× ×?
torbutton.popup.cancel = ×?×?×?×?×?
torbutton.popup.dontask = ת×?×?×? ×?פע×? ×?ת ×?ת×?×?× ×? ×?עת×? ×?×?×?×?×?
-torbutton.popup.test.no_http_proxy = ×?×?×?קת פר×?קס×? ש×? Tor: פר×?קס×? HTTP ×?ק×?×?×? ×?×?× ×? ×?×?×?×?. ×?×?×? Polipo פ×?×¢×? ×?ר×?×?×??
torbutton.popup.prompted_language = ×¢×? ×?× ×ª ×?×?×?×?ת ×?פר×?×?×?ת ×?×?×?×?רת, Torbutton ×?×?×?×? ×?×?קש ×?ת ×?×?רס×? ×?×?× ×?×?×?ת ש×? ×?תר×? ×?×?× ×?×¨× ×?. ×?×? עש×?×? ×?×?ר×?×? ×?×?×? ש×?תר×?×? ×?×?×?×?×? ×?ת×? ר×?×?×? ×?×?צ×?×? ×?×?× ×?×?×?ת.\n\n×?×?×? ×?רצ×?× ×? ×?×?קש ×?צפ×?ת ×?×?תר×?×? ×?×?× ×?×?×?ת ×?צ×?ר×? פר×?×?×?ת ×?×?×?×?רת?
torbutton.popup.no_newnym = Torbutton ×?×?× ×? ×?ס×?×?×? ×?ספק ×?×? ×?×?×?ת ×?×?ש×? ×?×?×?×?×?×?×?. ×?×?×? ×?×?ש×? ×?×? Tor Control Port.\n\n×?×?×? ×?ת×? ×?פע×?×? ×?ת
-torbutton.popup.pref_error = Torbutton ×?×?× ×? ×?×?×?×? ×?×¢×?×?×? ×?ת ×?×?×¢×?פ×?ת ×?ת×?ק×?ת ×?פר×?פ×?×?.
-torbutton.popup.permission_denied = ×?× ×? ק×?×¢ ×?רש×?×?ת ×?×?ש×?ת ×?ת×?ק×?×?×? ×?×? × ×?צ×? ×?פ×?פ×? Tor ×?×? ×?עתק ×?×?ת×? ×?×?×?ק×?×? ×?×?ש.
-torbutton.popup.device_full = ×?×?×?סק × ×¨×?×? ×?×?×? ש×?×? ×?×?ס×?×? ×¤× ×?×?. ×?× ×? ×¤× ×? ×?ק×?×? ×?×? ×?×¢×?ר ×?ת ×?פ×?פ×? Tor ×?×?×?ק×?×? ×?×?ש.
torbutton.title.prompt_torbrowser = ×?×?×?×¢ Torbutton ×?ש×?×?
torbutton.popup.prompt_torbrowser = Torbutton ×¢×?ש×?×? ×¢×?×?×? ×?×?רת: ×?×?-×?פשר ×?×?×?×?ת ×?×?ת×? ×?×?תר. עש×?× ×? ×?ת ×?ש×?× ×?×? ×?×?×? ×?×? ×?×? ×?×? ×?×?×?×? ×?×?שת×?ש ×?-Torbutton ×?×?פ×?פ×? ש×?ת×?ש×?×? ×?×? ×?×? רק ×?-Tor. ×?×?×? ×?×?תר ×?×?×?×? ×?×?×?×?×? ש×?×? ×?×?×?×?× ×? ×?תק×? ×?ש×?×? ×?ר×? ×?×?רת. ×?×? ×?רצ×?× ×?×? ×?×?×?ש×?×? ×?ש×?×?×?ש ר×?×?×? ×?פ×?×?רפ×?קס, ×¢×?×?×?×? ×?×?ס×?ר ×?ת Torbutton ×?×?×?×?ר×?×? ×?ת Tor Browser Bundle. ×?×?פ×?×?× ×? ×?פר×?×?×?ת ש×? Tor Browser ×?×¢×?×?×?×? ×?×?×?פ×?×?× ×? ×?פר×?×?×?ת ×?ר×?×?×?×?×? ש×? פ×?×?רפ×?קס, ×?פ×?×?×? ×?×? פ×?×?רפ×?קס ×?ש×?×?×?ש ×?×?×? ×¢×? Torbutton. ×?×?סרת Torbutton, ×?ש×? ×?×?×?×?×?â??ת×?ספ×?תâ??×?ר×?×?×?ת ×?×?×? ×?×?צ×? ×¢×? ×?פת×?ר ×?×?סר×? ×?×?×? ×?-Torbutton.
torbutton.popup.short_torbrowser = ×?×?×?×¢ ×?ש×?×? ×¢×? Torbutton!\nTorbutton ×¢×?ש×?×? פ×?×¢×? ת×?×?×?.\n×?×?צ×? ×¢×? ×?-Torbutton ×?×?×?×?×¢ × ×?סף.
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 56f12ac..eb4fea9 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "प�र���स� स�����">
-<!ENTITY torbutton.prefs.recommended_settings "म�र� �ायर �ा��स �थन �� लिय� स��ाय� प�र���स� स��ि�� �पय�� �र� ">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "व�यवाहारि� प�र���स� स��ि�� �ा �पय�� �र�">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP प�र���स�:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL प�र���स�:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP प�र���स�:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "���र प�र���स� ">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS �तिथ�य :">
-<!ENTITY torbutton.prefs.proxy.port "प�र��/द�वार :">
-<!ENTITY torbutton.pref_connection.notice "�न स��ि�� �� बदलन� �� लिय� ��र ब�न �� �समर�थ �र� ">
-<!ENTITY torbutton.pref_connection.more_info "�धि� �ान�ार� �� लि� ">
-<!ENTITY torbutton.pref_connection_more_info.title "सहायता">
-<!ENTITY torbutton.pref_connection_more_info.text "à¤?à¥?र बà¤?न à¤?à¤à¥? समरà¥?थà¤?à¥?त हà¥? । à¤?à¤?र à¤?प à¤?पनà¥? à¤?नà¥?य (à¤?à¥?र à¤?à¥? à¤?लावा) पà¥?रà¥?à¤?à¥?सà¥? सà¥?à¤?िà¤?à¤? à¤?à¥? बदलना à¤?ाहतà¥? हà¥? तà¥? à¤?à¥?र à¤?à¥? à¤?समरà¥?थ à¤?रà¤?à¥? à¤?धर पà¥?रतिà¤?मन à¤?रà¥? । à¤?à¤?र à¤?प à¤?पनà¥? à¤?à¥?र सà¥?à¤?िà¤?à¤? à¤?à¥? बदलना à¤?ाहतà¥? हà¥? तà¥? à¤?à¥?पिया à¤?à¥?र बà¤?न à¤?à¥? पà¥?रिà¥?रà¥?नà¥?स à¤?िà¥?à¤?à¥? à¤?ा à¤?पयà¥?à¤? à¤?रà¥? ।">
<!ENTITY torbutton.context_menu.new_identity "New Identity">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "प�रि�र�न�सस ...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "à¤?à¥?र बà¤?न à¤?à¥? à¤?रà¤?à¤à¤¿à¤¤ à¤?रनà¥? à¤?à¥? लियà¥? à¤?à¥?लिà¤? à¤?रà¥?">
<!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)">
diff --git a/src/chrome/locale/hi/torbutton.properties b/src/chrome/locale/hi/torbutton.properties
index 249ae86..1b28643 100644
--- a/src/chrome/locale/hi/torbutton.properties
+++ b/src/chrome/locale/hi/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = रद�द �र��
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.
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 4e5df23..1a47a21 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy postavke">
-<!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄ?ene proxy postavke za moju inaÄ?icu Firefoxa">
-<!ENTITY torbutton.prefs.use_polipo "Koristi Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Koristi prilagoÄ?ene proxy postavke">
-<!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 domaÄ?in:">
-<!ENTITY torbutton.prefs.proxy.port "PrikljuÄ?ak:">
-<!ENTITY torbutton.pref_connection.notice "OnemoguÄ?ite Torbutton da biste promijenili ove postavke.">
-<!ENTITY torbutton.pref_connection.more_info "Više informacija">
-<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je trenutno omoguÄ?en. Ukoliko želite promijeniti VaÅ¡e ne-Tor proxy postavke, molimo Vas da onemoguÄ?ite Torbutton i vratite se ovdje. Ukoliko želite promijeniti VaÅ¡e Tor postavke, molimo Vas, koristite prozor Torbutton postavki.">
<!ENTITY torbutton.context_menu.new_identity "New Identity">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Postavke...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "Z">
<!ENTITY torbutton.button.tooltip "Kliknite za pokretanje Torbuttona">
<!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)">
diff --git a/src/chrome/locale/hr/torbutton.properties b/src/chrome/locale/hr/torbutton.properties
index 2b77fee..8f6808d 100644
--- a/src/chrome/locale/hr/torbutton.properties
+++ b/src/chrome/locale/hr/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Kliknite da biste onemoguÄ?ili Tor
torbutton.panel.label.disabled = Tor onemoguÄ?en
torbutton.panel.label.enabled = Tor omoguÄ?en
extensions.torbutton@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ht/torbutton.dtd
+++ b/src/chrome/locale/ht/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ht/torbutton.properties b/src/chrome/locale/ht/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ht/torbutton.properties
+++ b/src/chrome/locale/ht/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 34d59a9..a0ca551 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy beállÃtások">
-<!ENTITY torbutton.prefs.recommended_settings "Az ajánlott proxy beállÃtások használata a Firefox verziómhoz">
-<!ENTITY torbutton.prefs.use_polipo "Polipo használata">
-<!ENTITY torbutton.prefs.custom_settings "Egyéni proxy beállÃtások használata">
-<!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 állomásnév:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Tiltsa le a Torbutton-t ezen beállÃtások megváltoztatásához">
-<!ENTITY torbutton.pref_connection.more_info "További információk">
-<!ENTITY torbutton.pref_connection_more_info.title "Súgó">
-<!ENTITY torbutton.pref_connection_more_info.text "A Torbutton jelenleg engedélyezett. Ha szeretné megváltoztatni a Tor nélküli proxy beállÃtásokat, kapcsolja ki Torbutton-t és térjen vissza ide. Ha szeretné megváltoztatni a Tor beállÃtásait, használja inkább a Torbutton BeállÃtások ablakát.">
<!ENTITY torbutton.context_menu.new_identity "�j személyazonosság">
<!ENTITY torbutton.context_menu.new_identity_key "S">
<!ENTITY torbutton.context_menu.preferences "BeállÃtások...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "S">
<!ENTITY torbutton.button.tooltip "Kattintson a Torbutton inicializálásához">
<!ENTITY torbutton.prefs.restore_defaults "Alapértékek visszaállÃtása">
-<!ENTITY torbutton.prefs.test_settings "BeállÃtások tesztelése">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Nincs proxy ehhez:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Figyelem: Ne használja a lentebb látható hostneveket">
<!ENTITY torbutton.cookiedialog.title "Süti védelem kezelése">
<!ENTITY torbutton.cookiedialog.lockCol "Védett">
<!ENTITY torbutton.cookiedialog.domainCol "�llomás">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "A védett kivételével az összes törlése">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Védje az új sütiket">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne védje az új sütiket">
-<!ENTITY torbutton.prefs.transparentTor "Ã?tlátszó Tor-osÃtás (Egyedi transproxy-t vagy Tor routert igényel)">
<!ENTITY torbutton.prefs.block_disk "Ne rögzÃtsen böngészÅ? elÅ?zményeket, vagy weboldal adatot (engedélyezi a Privát böngészÅ? módot)">
<!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik féltÅ?l származó sütik és nyomkövetési adatok korlátozása">
<!ENTITY torbutton.prefs.block_plugins "BöngészÅ? kiegészÃtÅ?k kikapcsolása (mint pl. a Flash)">
diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties
index fc68af6..722f45e 100644
--- a/src/chrome/locale/hu/torbutton.properties
+++ b/src/chrome/locale/hu/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Kattintson rá a Tor kikapcsolásához
torbutton.panel.label.disabled = Tor kikapcsolva
torbutton.panel.label.enabled = Tor bekapcsolva
extensions.torbutton@xxxxxxxxxxxxxx.description = A Torbutton egy gombot biztosÃt a Tor beállÃtások módosÃtásához és a gyors és könnyű takarÃtásához a privát böngészési adatoknak.
-torbutton.popup.test.success = A Tor proxy teszt sikeres!
-torbutton.popup.test.failure = Tor proxy teszt SIKERTELEN! EllenÅ?rizze a proxy és a Polipo beállÃtásokat.
-torbutton.popup.test.confirm_toggle = A legutóbbi Tor proxy teszt nem tudta a Tor-t használni.\n\nBiztos benne, hogy mindenképpen engedélyezi?\n\nMegjegyzés: Ha kijavÃtott a problémát, akkor újra futtathatja a tesztet a Torbutton Proxy beállÃtások ablakban, hogy megszüntesse ezt a figyelmeztetést.
-torbutton.popup.test.ff3_notice = Kattintson az OK gombra, a Tor proxy beállÃtások teszteléséhez. Ez a teszt a háttérben történik. Kérjük, legyen türelmes.
torbutton.popup.external.title = KülsÅ? tartalom betöltése?
torbutton.popup.external.app = Egy külsÅ? alkalmazás szükséges a kezeléshez:\n
torbutton.popup.external.note = \nMEGJEGYZÃ?S: A külsÅ? alkalmazások alaphelyzetben NEM biztonságosak és felfedhetik kilétét.\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nHa ez a fájl nem megbÃzható, akkor jobb,
torbutton.popup.launch = Alkalmazás indÃtása
torbutton.popup.cancel = Mégse
torbutton.popup.dontask = Mindig indÃtsa az alkalmazásokat mostantól
-torbutton.popup.test.no_http_proxy = Tor proxy teszt: A helyi HTTP Proxy elérhetetlen. A Polipo megfelelÅ?en működik?
torbutton.popup.prompted_language = A még több adatvédelem érdekében a Torbutton kérheti a weboldaltól, hogy angol nyelvű oldalt szolgáljon ki. Ez azt jelenti, hogy a saját nyelve helyet az oldal angolul jelenhet meg.\n\nSzeretné kérni a magasabb biztonság érdekében az angol nyelvű oldalak lekérését?
torbutton.popup.no_newnym = A Torbutton nem tud biztonságosan Ã?j személyazonosságot adni. Nincs hozzáférése a Tor vezérlÅ? porthoz.\n\nNem a Tor böngészÅ? csomagot használja?
-torbutton.popup.pref_error = A Torbutton nem tudja frissÃteni a beállÃtásokat a Tor böngészÅ? profil könyvtárában.
-torbutton.popup.permission_denied = Kérjük, vagy állÃtsa vissza a jogosultságokat a Tor Browser könyvtárhoz, vagy másolja azt egy új helyre.
-torbutton.popup.device_full = Ã?gy tűnik, hogy a lemez megtelt. Kérjük, szabadÃtson fel helyet, vagy helyezze át a Tor Browser-t egy másik háttértárolóra.
torbutton.title.prompt_torbrowser = Fontos Torbutton információ
torbutton.popup.prompt_torbrowser = A Torbutton most már másképp működik: nem kapcsolható ki többé.\n\nAzért hoztok ezt a döntést, mert nem biztonságos egy olyan böngészÅ?bÅ?l Torbuttont használni, amely Tor használatán kÃvüli is böngészésre használt. Túl soh hiba történhet, amit másképp nem tudunk javÃtani.\n\nHa szeretné a Firefox-ot normálisan használni, akkor a Torbutton-t el kell távolÃtania, és helyette letölteni a Tor BöngészÅ? Csomagot. Az adatvédelmi beállÃtásai a Tor BöngészÅ?nek továbbá magasabbak, mint a normális Firefox-nak, még akkor is, ha a Firefox Torbutton-nal került együtt felhasználásra.\n\nA Torbutton eltávolÃtásához navigáljon az Eszközök>KiegészÃtÅ?k>Kiterjesztések menüpontba., majd nyomja meg az EltávolÃtás gombot a Torbutton mellett.
torbutton.popup.short_torbrowser = Fontos Torbutton információ!\n\na Torbutton most már mindig engedélyezett.\n\nKattintson a Torbutton-ra további információkért.
diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/hy/torbutton.dtd
+++ b/src/chrome/locale/hy/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/hy/torbutton.properties b/src/chrome/locale/hy/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/hy/torbutton.properties
+++ b/src/chrome/locale/hy/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index 9153999..25ea8cc 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Pengaturan proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Gunakan pengaturan proxy yang disarankan untuk versi Firefox saya">
-<!ENTITY torbutton.prefs.use_polipo "Gunakan Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Gunakan pengaturan proxy yang disesuaikan">
-<!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 "Nonaktifkan Torbutton mengubah pengaturan ini.">
-<!ENTITY torbutton.pref_connection.more_info "Informasi lebih lanjut">
-<!ENTITY torbutton.pref_connection_more_info.title "Bantuan">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton sedang aktif. Apabila Anda ingin mengubah pengaturan proxy selain proxy Tor, Silahkan nonaktifkan Torbutton dan kembali ke sini. Apabila Anda ingin mengubah pengaturan Tor, silahkan gunakan jendela preferensi Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Identitas Baru">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Preferensi...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Kembalikan ke asal">
-<!ENTITY torbutton.prefs.test_settings "Uji pengaturan">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS V4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS V5">
-<!ENTITY torbutton.prefs.no_proxies_on "Jangan gunakan proxy untuk: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Peringatan: Hindari penggunaan hostname di atas">
<!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)">
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index abaacb5..ed812e8 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klik untuk menonaktifkan Tor
torbutton.panel.label.disabled = Tor dinonaktifkan
torbutton.panel.label.enabled = Tor diaktifkan
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Pengujian proxy Tor berhasil!
-torbutton.popup.test.failure = Pengujian proxy Tor GAGAL! Periksa pengaturan proxy dan polipo Anda.
-torbutton.popup.test.confirm_toggle = Pengujian proxy Tor terakhir gagal menggunakan Tor.\n\nApakah Anda yakin untuk tetap mengaktifkannya?\n\nCatatan: Apabila Anda telah memperbaiki masalahnya, Anda dapat melakukan pengujian ulang pada jendela Preferensi Proxy Tor untuk menghapus peringatan ini.
-torbutton.popup.test.ff3_notice = Klik OK untuk menguji pengaturan proxy Tor. Pengujian ini akan berjalan pada latar belakang. Mohon bersabar.
torbutton.popup.external.title = Muat konten eksternal?
torbutton.popup.external.app = Sebuah aplikasi eksternal butuh untuk ditangani:\n\n
torbutton.popup.external.note = \n\nCATATAN: secara default, aplikasi eksternal tidaklah aman untuk Tor dan dapat membuka penyamaran Anda!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Luncurkan aplikasi.
torbutton.popup.cancel = Batal
torbutton.popup.dontask = Selalu luncurkan aplikasi mulai dari sekarang
-torbutton.popup.test.no_http_proxy = Pengujian proxy Tor: Proxy HTTP lokal tidak dapat dijangkau. Apakah Polipo berjalan sebagaimana mestinya?
torbutton.popup.prompted_language = Untuk memberikan Anda kerahasiaan yang lebih, Torbutton akan meminta versi bahasa Inggris dari halaman web. Ini mungkin menyebabkan halaman web yang Anda ingin baca dalam bahasa asli Anda akan ditampilkan dalam bahasa Inggris. â?? â?? Apakah anda mau meminta halaman web bahasa Inggris untuk kerahasiaan yang lebih baik?
torbutton.popup.no_newnym = Torbution tidak dapat memberikan Anda identitas baru secara aman. Torbutton tidak memiliki akses terhadap Tor Control Port. â??â?? Apakah Anda sedang menjalankan paket browser Tor?
-torbutton.popup.pref_error = Torbutton tidak dapat memperbarui preferensi di dalam petunjuk profil browser Tor.
-torbutton.popup.permission_denied = Silahkan reset izin petunjuk dari browser Tor atau copy ke lokasi baru
-torbutton.popup.device_full = Disk tampaknya sudah penuh. Harap kosongkan tempat atau pindahkan browser Tor ke alat baru.
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.
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 63d0f78..b830af0 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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 "Hjálp">
-<!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 "Nýtt auðkenni">
<!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)">
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index 1e3e110..701209b 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = Hætta við
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.
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 75e3d36..2ebeeff 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Configurazione del proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Usa le impostazioni proxy consigliate per questa versione di Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Usa Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Usa impostazioni proxy personalizzate">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!ENTITY torbutton.pref_connection.notice "Disattiva Torbutton per modificare queste impostazioni">
-<!ENTITY torbutton.pref_connection.more_info "Ulteriori informazioni">
-<!ENTITY torbutton.pref_connection_more_info.title "Aiuto">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton è attualmente attivo. Se vuoi cambiare la configurazione del proxy quando non usi Tor, disabilita Torbutton e torna qui. Se vuoi modificare la configurazione quando usi Tor, usa la finestra delle preferenze di Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Nuova identità ">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Nuovo Circuito Tor per questo Sito">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Impostazioni di Privacy e Sicurezza">
<!ENTITY torbutton.prefs.restore_defaults "Reimposta i valori di default">
-<!ENTITY torbutton.prefs.test_settings "Fai un test delle impostazioni">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Nessun proxy per:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Attenzione: Evitare di usare uno degli hostnames di cui sopra">
<!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies">
<!ENTITY torbutton.cookiedialog.lockCol "Protetto">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Rimuovi tutti tranne quelli protetti">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteggi i nuovi cookie">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie">
-<!ENTITY torbutton.prefs.transparentTor "Torificazione trasparente (richiede un transproxy personalizzato o un tor router)">
<!ENTITY torbutton.prefs.priv_caption "Impostazioni Privacy">
<!ENTITY torbutton.prefs.block_disk "Non registrare la cronologia di navigazione o i dati dei siti (attiva la Navigazione Anonima)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento">
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index ef1dd41..d83c43a 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor
torbutton.panel.label.disabled = Tor disattivato
torbutton.panel.label.enabled = Tor attivato
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton fornisce un pulsante per configurare le impostazioni di Tor e rimuovere velocemente e facilmente i dati di navigazione privati.
-torbutton.popup.test.success = Il test del proxy Tor ha avuto successo!
-torbutton.popup.test.failure = Il test del proxy Tor è FALLITO! Verifica la configurazione del proxy e di Polipo.
-torbutton.popup.test.confirm_toggle = Il test più recente di un proxy Tor ha fallito nell'usare Tor.\n\nSei sicuro di volerlo abilitare comunque?\n\nNota: Se hai risolto il problema, puoi riavviare il test nella finestra Preferenze Proxy Torbutton per eliminare questo avviso.
-torbutton.popup.test.ff3_notice = Fai clic su OK per testare le impostazioni del proxy Tor. Questo test avverrà in background. Sii paziente.
torbutton.popup.external.title = Si desidera scaricare un tipo di file esterno?
torbutton.popup.external.app = Tor Browser non è in grado di aprire questo file. Sarà necessario usare un'altra applicazione per aprirlo.\n\n
torbutton.popup.external.note = Alcuni tipi di file possono far sì che le applicazioni si connettano a Internet senza usare Tor.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Per essere totalmente sicuri, si dovrebbe apr
torbutton.popup.launch = Scaricare il file
torbutton.popup.cancel = Annulla
torbutton.popup.dontask = Scaricare automaticamente i file d'ora in poi
-torbutton.popup.test.no_http_proxy = Test Tor proxy: Proxy HTTP locale non è raggiungibile. Polipo è in funzione correttamente?
torbutton.popup.prompted_language = Per aumentare la tua privacy, Torbutton può richiedere la versione inglese delle pagine web. Perciò alcune pagine che preferiresti leggere nella tua lingua potrebbero essere visualizzate in inglese.\n\nPreferisci richiedere le pagine web in inglese per una maggiore privacy?
torbutton.popup.no_newnym = Torbutton non può assegnarti una nuova identità in modo sicuro, poiché non ha accesso alla porta di controllo di Tor.\n\nStai usando Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton non può aggiornare le preferenze nella cartella profilo del Tor Browser.
-torbutton.popup.permission_denied = Si prega di reimpostare i permessi della cartella Tor Browser oppure di spostarla altrove.
-torbutton.popup.device_full = Sembra che il disco sia pieno. Liberare spazio o spostare Tor Browser in un altro dispositivo.
torbutton.title.prompt_torbrowser = Informazioni importanti su Torbutton
torbutton.popup.prompt_torbrowser = Torbutton ora funziona in modo diverso: non è più possibile disabilitarlo.\n\nQuesto cambiamento è stato apportato poiché risulta poco sicuro utilizzare Torbutton in un browser utilizzato anche senza di esso. Ci sono alcuni problemi critici che non è possibile risolvere in un modo diverso da questo.\n\nSe si desidera utilizzare Firefox normalmente (senza, quindi, Torbutton) è necessario disinstallare manualmente Torbutton ed installare Tor Browser Bundle. Le impostazioni per la privacy, inoltre, sono superiori su Tor Browser rispetto ad una normale installazione di Firefox, anche quando quest'ultimo è utilizzato con Torbutton.\n\nPer rimuovere Torbutton, andare in Strumenti -> Componenti aggiuntivi -> Estensioni e fare clic sul pulsante Disinstalla vicino a Torbutton.
torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorbutton ora è sempre abilitato.\n\nFai clic su Torbutton per ulteriori informazioni.
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index c58bd68..ad2d2ea 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "ã??ã?ã?ã?·è¨å®?">
-<!ENTITY torbutton.prefs.recommended_settings "Firefoxã?®ã??ã?ã?ã?·è¨å®?ã??使ã??">
-<!ENTITY torbutton.prefs.use_polipo "Polipoã??使ã??">
-<!ENTITY torbutton.prefs.custom_settings "ã?«ã?¹ã?¿ã? è¨å®?ã?®ã??ã?ã?ã?·ã??使ã??">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTPã??ã?ã?ã?·">
-<!ENTITY torbutton.prefs.proxy.host.https "SSLã??ã?ã?ã?·">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTPã??ã?ã?ã?·">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopherã??ã?ã?ã?·">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKSã??ã?¹ã??">
-<!ENTITY torbutton.prefs.proxy.port "ã??ã?¼ã??">
-<!ENTITY torbutton.pref_connection.notice "ã??ã??ã??ã?®è¨å®?ã??å¤?æ?´ã??ã??ã?«ã?¯Torbuttonã??ã?ªã??ã?«ã??ã?¦ã??ã? ã??ã??">
-<!ENTITY torbutton.pref_connection.more_info "詳細æ??å ±">
-<!ENTITY torbutton.pref_connection_more_info.title "ã??ã?«ã??">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbuttonã?¯ç?¾å?¨ã?ªã?³ã?«ã?ªã?£ã?¦ã??ã?¾ã??ã??ã??ã??ã??é??Torã?®è¨å®?ã??å¤?æ?´ã??ã??å ´å??ã?¯ã??ã?¾ã??Torbuttonã??ã?ªã??ã?«ã??ã?¦ã??ã? ã??ã??ã??Torã?®è¨å®?ã??å¤?æ?´ã??ã??å ´å??ã?«ã?¯Torbuttonè¨å®?ã?¦ã?£ã?³ã??ã?¦ã??使ã?£ã?¦ã??ã? ã??ã??ã??">
<!ENTITY torbutton.context_menu.new_identity "æ?°ã??ã??å?¿å??">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "ã??ã?®ã?µã?¤ã??ç?¨ã?®æ?°ã??ã?? Tor ã?µã?¼ã?ã??ã??">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Torbuttonã??å??æ??ç?¶æ??ã?«æ?»ã??">
<!ENTITY torbutton.prefs.privacy_security_settings "ã??ã?©ã?¤ã??ã?·ã?¼ã?¨ã?»ã?ã?¥ã?ªã??ã?£ã?¼ã?®è¨å®?">
<!ENTITY torbutton.prefs.restore_defaults "ã??ã??ã?©ã?«ã??è¨å®?ã?«æ?»ã??">
-<!ENTITY torbutton.prefs.test_settings "è¨å®?ã??ã??ã?¹ã??ã??ã??">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "ã??ã?ã?ã?·ã??ç?¨ã??ã?ªã??:">
-<!ENTITY torbutton.prefs.no_proxy_warning "è¦å??: 以ä¸?ã?®ã?©ã??ã?ªã??ã?¹ã??ã??ã?¼ã? ã?®ä½¿ç?¨ã??é?¿ã??ã?¦ã??ã? ã??ã??">
<!ENTITY torbutton.cookiedialog.title "Cookieä¿?è·ã??管ç??">
<!ENTITY torbutton.cookiedialog.lockCol "ä¿?è·æ¸?ã?¿">
<!ENTITY torbutton.cookiedialog.domainCol "ã??ã?¹ã??">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "ä¿?è·ã??ã??ã?¦ã??ã??ã??ã?®ä»¥å¤?å??é?¤">
<!ENTITY torbutton.cookiedialog.saveAllCookies "æ?°ã??ã??Cookieã??ä¿?è·">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "æ?°ã??ã??Cookieã??ä¿?è·ã??ã?ªã??">
-<!ENTITY torbutton.prefs.transparentTor "é??é??å??Torå?? (ã?«ã?¹ã?¿ã? é??é??å??ã??ã?ã?ã?·ã??Torã?®ã?«ã?¼ã?¿ã?¼ã??å¿?è¦?)">
<!ENTITY torbutton.prefs.priv_caption "ã??ã?©ã?¤ã??ã?·ã?¼è¨å®?">
<!ENTITY torbutton.prefs.block_disk "ã??ã?©ã?¦ã?¸ã?³ã?°å±¥æ´ã??ã?¦ã?§ã??ã?µã?¤ã??ã?®ã??ã?¼ã?¿ã??è¨?é?²ã??ã?ªã?? (ã??ã?©ã?¤ã??ã?¼ã??ã??ã?©ã?¦ã?¸ã?³ã?°ã?¢ã?¼ã??ã??æ??å?¹å??)">
<!ENTITY torbutton.prefs.restrict_thirdparty "ã?µã?¼ã??ã??ã?¼ã??ã?£ã?¼ã?®Cookieã??ã??ã?®ä»?ã?®ã??ã?©ã??ã?ã?³ã?°ã??ã?¼ã?¿ã??å?¶é??">
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index 84c7fdd..b8735d0 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = ã?¯ã?ªã??ã?¯ã??ã?¦Torã??ç?¡å?¹ã?«ã??ã??
torbutton.panel.label.disabled = Tor ç?¡å?¹
torbutton.panel.label.enabled = Tor æ??å?¹
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbuttonã?¯Torã?®è¨å®?ã??æ§?æ??ã??ã??ç´ æ?©ã??ã??ã?¤å®¹æ??ã?«ã??ã?©ã?¤ã??ã?¼ã??ã?ªé?²è¦§ã??ã?¼ã?¿ã??ã?¯ã?ªã?¢ã??ã??ã??ã?¿ã?³ã??æ??ä¾?ã??ã?¾ã??ã??
-torbutton.popup.test.success = Torã??ã?ã?¯ã?·ã?®ã??ã?¹ã??ã?«æ??å??ã??ã?¾ã??ã??
-torbutton.popup.test.failure = Torã??ã?ã?¯ã?·ã?®ã??ã?¹ã??ã?«å¤±æ??ã??ã?¾ã??ã??ã?? ã??ã?ã?¯ã?·ã?¨Polipoã?®è¨å®?ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??
-torbutton.popup.test.confirm_toggle = ç?´è¿?ã?®Torã??ã?ã?ã?·ã??ã?¹ã??ã??Torã?®ä½¿ç?¨ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n\næ?¬å½?ã?«ã??ã??ã?§ã??æ??å?¹ã?«ã??ã?¾ã??ã??ï¼?\n\n注: ã??ã?®å??é¡?ã??ä¿®æ£ã??ã??å ´å??ã?¯ã??Torbuttonã?®ã??ã?ã?ã?·è¨å®?ã?¦ã?£ã?³ã??ã?¦ã?§ã??ã?¹ã??ã?«æ?»ã??ã??ã??ã?®è¦å??ã??æ¶?ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??
-torbutton.popup.test.ff3_notice = Torã?®ã??ã?ã?ã?·è¨å®?ã??ã??ã?¹ã??ã??ã??ã?«ã?¯OKã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??ã??ã?®ã??ã?¹ã??ã?¯ã??ã??ã?¯ã?°ã?©ã?¦ã?³ã??ã?§å®?è¡?ã??ã??ã?¾ã??ã?®ã?§ã??ã??ã?°ã??ã??ã??å¾?ã?¡ã??ã? ã??ã??ã??
torbutton.popup.external.title = å¤?é?¨ã??ã?¡ã?¤ã?«ç¨®å?¥ã??ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¾ã??ã??
torbutton.popup.external.app = Tor ã??ã?©ã?¦ã?¶ã?¯ã??ã?®ã??ã?¡ã?¤ã?«ã??表示ã?§ã??ã?¾ã??ã??ã??å?¥ã?®ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?§é??ã??å¿?è¦?ã??ã??ã??ã?¾ã??ã??\n
torbutton.popup.external.note = ã??ã?¡ã?¤ã?«ã?®ã?¿ã?¤ã??ã?®ä¸ã?«ã??ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?? Tor ã??使ç?¨ã??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?«æ?¥ç¶?ã??ã??å??å? ã?¨ã?ªã??å?¯è?½æ?§ã??ã??ã??ã??ã?®ã??ã??ã??ã?¾ã??ã??\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = å®?å?¨ã?§ã??ã??ã??ã??ã?«ã?¯ã??ã?ªã??ã?©ã?¤ã?³
torbutton.popup.launch = ã??ã?¡ã?¤ã?«ã??ã??ã?¦ã?³ã?ã?¼ã??ã??ã??
torbutton.popup.cancel = ã?ã?£ã?³ã?»ã?«
torbutton.popup.dontask = ä»?ã??ã??ã??ã?¡ã?¤ã?«ã??è?ªå??ç??ã?«ã??ã?¦ã?³ã?ã?¼ã??ã??ã??
-torbutton.popup.test.no_http_proxy = Torã??ã?ã?ã?·ã??ã?¹ã??: ã?ã?¼ã?«ã?«HTTPã??ã?ã?ã?·ã?«å?°é??ã?§ã??ã?¾ã??ã??ã??Polipoã?¯æ£å¸¸ã?«å??ä½?ã??ã?¦ã??ã?¾ã??ã??ï¼?
torbutton.popup.prompted_language = ã??ã??ã??ã?©ã?¤ã??ã?·ã?¼ã??å®?ã??ã??ã??ã?«ã??Torbuttonã?¯ã?¦ã?§ã??ã??ã?¼ã?¸ã?®è?±èª?ç??ã??è¦?æ±?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã?? ã??ã??ã?¯ã??ã?ªã??ã??æ¯?å?½èª?ã?§èªã?¿ã??ã??ã?¦ã?§ã??ã??ã?¼ã?¸ã??代ã??ã??ã?«è?±èª?ã?§è¡¨ç¤ºã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??ã??\n\nã??ã??é«?ã??ã??ã?©ã?¤ã??ã?·ã?¼ã?®ã??ã??ã?«ã??è?±èª?ã?®ã?¦ã?§ã??ã??ã?¼ã?¸ã??è¦?æ±?ã??ã?¾ã??ã??ï¼?
torbutton.popup.no_newnym = Torã?³ã?³ã??ã?ã?¼ã?«ã??ã?¼ã??ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??Torbuttonã?¯æ?°ã??ã??æ?¥ç¶?çµ?è·¯ã??å®?å?¨ã?«ç?¨æ??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã??\n\nTorã??ã?©ã?¦ã?¶ã??ã?³ã??ã?«ã??èµ·å??ã??ã?¦ã??ã?¾ã??ã??ï¼?
-torbutton.popup.pref_error = Torbuttonã?¯ã??ã?ã??ã?¡ã?¤ã?«ã??ã?£ã?¬ã?¯ã??ã?ªã?«ã??ã??è¨å®?ã??ã?¢ã??ã??ã??ã?¼ã??ã?§ã??ã?¾ã??ã??ã??
-torbutton.popup.permission_denied = Torã??ã?©ã?¦ã?¶ã??ã?£ã?¬ã?¯ã??ã?ªã?®ã??ã?¼ã??ã??ã?·ã?§ã?³ã??ã?ªã?»ã??ã??ã??ã??ã??ã??æ?°ã??ã?ªå ´æ??ã?«ã?³ã??ã?¼ã??ã?¦ã??ã? ã??ã??ã??
-torbutton.popup.device_full = è¨?æ?¶è£?ç½®ã?®ç©ºã??容é??ã??ä¸?足ã??ã?¦ã??ã??ã??ã??ã?§ã??ã??空ã??容é??ã??å¢?ã??ã??ã??ã??Torã??ã?©ã?¦ã?¶ã??æ?°ã??ã?ªè¨?æ?¶è£?ç½®ã?¸ç§»å??ã??ã?¦ã??ã? ã??ã??ã??
torbutton.title.prompt_torbrowser = é??è¦?ã?ªTorbuttonã?®æ??å ±
torbutton.popup.prompt_torbrowser = Torbuttonã?¯ç?¾å?¨å?¥æ§?ã?«å??ä½?ã??ã?¦ã??ã?¾ã??ã??ã??ã??æ¢ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??ã??\n\nç§?ã??ã?¡ã?¯ã??é??Torã??ã?©ã?¦ã?¸ã?³ã?°ã?®ã??ã??ã?«ã??使ã??ã??ã?¦ã??ã??ã??ã?©ã?¦ã?¶ã?§ã?®Torbuttonã?®ä½¿ç?¨ã??å®?å?¨ã?§ã?¯ã?ªã??ã??ã??ã??ã??ã?®å¤?æ?´ã??è¡?ã??ã?¾ã??ã??ã?? ä»?ã?®æ?¹æ³?ã?§ä¿®æ£ã??ã??ã??ã?¨ã??ã?§ã??ã?ªã??ã??ã?°ã??å¤?ã??ã??ã?¾ã??ã??ã??\n\næ£å¸¸ã?«Firefoxã??使ç?¨ã??ã??ã??å ´å??ã?¯ã??Torbuttonã??ã?¢ã?³ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??Tor Browser Bundleã??ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¹ã??ã?§ã??ã?? Tor Browserã?®ã??ã?©ã?¤ã??ã?·ã?¼ç?¹æ?§ã?¯Firefoxã??Torbuttonã?¨ä½¿ã??ã??ã?¦ã??ã??æ??ã?§ã??ã??é??常ã?®Firefoxã?®ã??ã??ã??ã??ã??å?ªå?¢ã?§ã??ã??\n\nTorbuttonã??å??é?¤ã??ã??ã?«ã?¯ã??ã??ã?¼ã?«->ã?¢ã??ã?ªã?³->ã?¨ã?¯ã?¹ã??ã?³ã?·ã?§ã?³ã?«è¡?ã??ã??ã??ã??ã??ã??Torbuttonã?®é?£ã?®å??é?¤ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??
torbutton.popup.short_torbrowser = é??è¦?ã?ªTorbuttonã?®æ??å ±!\n\nTorbuttonã?¯ç?¾å?¨å¸¸ã?«æ??å?¹ã?§ã??ã??\n\n詳細ã?¯Torbuttonã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??
diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/jv/torbutton.dtd
+++ b/src/chrome/locale/jv/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/jv/torbutton.properties b/src/chrome/locale/jv/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/jv/torbutton.properties
+++ b/src/chrome/locale/jv/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ka/torbutton.properties
+++ b/src/chrome/locale/ka/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/km/torbutton.properties b/src/chrome/locale/km/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/km/torbutton.properties
+++ b/src/chrome/locale/km/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/kn/torbutton.dtd
+++ b/src/chrome/locale/kn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/kn/torbutton.properties b/src/chrome/locale/kn/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/kn/torbutton.properties
+++ b/src/chrome/locale/kn/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index d597085..0d19bd0 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "í??ë¡?ì?? ì?¤ì ?">
-<!ENTITY torbutton.prefs.recommended_settings "í??ì?¬ ì¶?ì²?ë?? í??ë¡?ì?? ì?¤ì ? ì?¬ì?©">
-<!ENTITY torbutton.prefs.use_polipo "Polipo ��">
-<!ENTITY torbutton.prefs.custom_settings "ì?¬ì?©ì?? ì§?ì ? í??ë¡?ì?? ì?¤ì ? ì?¬ì?©">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher í??ë¡?ì?? 주ì??:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS :">
-<!ENTITY torbutton.prefs.proxy.port "�� : ">
-<!ENTITY torbutton.pref_connection.notice "Torbuttonì?´ ë?¤ì??ì?? ì?¤ì ?ë?¤ì?? ë°?꾸ì§? 못í??ê²? í?©ë??ë?¤.">
-<!ENTITY torbutton.pref_connection.more_info "ì¶?ê°? ì ?ë³´">
-<!ENTITY torbutton.pref_connection_more_info.title "ë??ì??ë§?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbuttonì?´ í??ì?¬ í??ì?±í??ë??ì??ì?µë??ë?¤. ë§?ì?½ Tor í??ë¡?ì??ê°? ì??ë?? ì?¼ë°? í??ë¡?ì?? ì??ë²? ì?¤ì ?ì?? í??ì??ë ¤ë©´, Torbuttonì?? ë¹?í??ì?±í??í??ê³ ì?´ ì°½ì?¼ë¡? ë??ì??ì?¤ì?ì??ì?¤. í?¹ì?? Tor í??ë¡?ì?? ì?¤ì ?ì?? ë°?ê¾¸ê³ ì?¶ì?¼ì??ë?¤ë©´, Torbutton ì?¤ì ? í??ë©´ì?? ì?¬ì?©í?´ 주ì?¸ì??.">
<!ENTITY torbutton.context_menu.new_identity "ì??ë¡?ì?´ ì? ì??">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Tor ì??í?· ì?¬êµ¬ì¶?">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Torbutton ì?¤ì ? ì´?기í??">
<!ENTITY torbutton.prefs.privacy_security_settings "ê°?ì?¸ ì ?ë³´ì?? ë³´ì?? ì?¤ì ?">
<!ENTITY torbutton.prefs.restore_defaults "ì?¤ì ? ì´?기í??">
-<!ENTITY torbutton.prefs.test_settings "ì?¤ì ? í??ì?¤í?¸">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "ë?¤ì?? 주ì??ì??ì??ë?? í??ë¡?ì??를 ì?¬ì?©í??ì§? ì??ì?? :">
-<!ENTITY torbutton.prefs.no_proxy_warning "주ì?? : ì?´ë?¤ í?¸ì?¤í?¸ë?¤ì??ì?? ì??ë??ì??ì?? ì?¬ì?©í??ë?? ê²?ì?? í?¼í??ì?ì??ì?¤.">
<!ENTITY torbutton.cookiedialog.title "ì¿ í?¤ ë³´í?¸ ê´?리">
<!ENTITY torbutton.cookiedialog.lockCol "보��">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "ë³´í?¸ë?? ê²? ë¹¼ê³ ëª¨ë?? ì§?ì?°ê¸°">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ ë³´í?¸">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ì??ë¡?ì?´ ì¿ í?¤ë¥¼ ë³´í?¸í??ì§? ì??ì??">
-<!ENTITY torbutton.prefs.transparentTor "í?¬ëª? Toritication (ì?¬ì?©ì?? transproxyë?? Tor ë?¼ì?°í?° í??ì??)">
<!ENTITY torbutton.prefs.priv_caption "ê°?ì?¸ ì ?ë³´ ì?¤ì ?">
<!ENTITY torbutton.prefs.block_disk "ë¸?ë?¼ì?°ì§? í??ì?¤í? 리ë?? ì?¹ì?¬ì?´í?¸ ë?°ì?´í?°ë¥¼ 기ë¡?í??ì§? ë§?ì?ì??ì?¤ (Private Browsing 모ë?? í??ì?±í??)">
<!ENTITY torbutton.prefs.restrict_thirdparty "ì ? 3ì?? ì¿ í?¤ì?? ë?¤ë¥¸ ì¶?ì ? ë?°ì?´í?° ì ?í??">
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index b09f028..dad4faf 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Tor를 ë¹?í??ì?±í??í??ë ¤ë©´ í?´ë¦
torbutton.panel.label.disabled = Tor ë¹?í??ì?±í??
torbutton.panel.label.enabled = Tor í??ì?±í??
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbuttonì?? Tor ì?¤ì ?ì?? í?´ 주ë?? ë²?í?¼ì?? ì ?ê³µí??ê³ , ë¹ ë¥´ê³ ì?½ê²? ê°?ì?¸ ë¸?ë?¼ì?°ì§? ë?°ì?´í?°ë¥¼ ì§?ì?? ì¤?ë??ë?¤.
-torbutton.popup.test.success = Tor í??ë¡?ì?? í??ì?¤í?¸ ì?±ê³µ!
-torbutton.popup.test.failure = Tor í??ë¡?ì?? í??ì?¤í?¸ "ì?¤í?¨"! í??ë¡?ì??ì?? Polipo ì?¤ì ?ì?? í??ì?¸í??ì?ì??ì?¤.
-torbutton.popup.test.confirm_toggle = ìµ?ê·¼ ë??ë¶?ë¶? Tor를 ì?¬ì?©í??기 ì??í?? Tor í??ë¡?ì?? í??ì?¤í?¸ê°? ì?¤í?¨í??ì??ì?µë??ë?¤.\n\nì?´ì¨?ë? í??ì?±í??í??ì??기를 ì??í??ë?? ê²?ì?´ í??ì?¤í??ì?ë??ê¹??\n\nNote: 문ì ?를 ê³ ì¹?ì?¨ë?¤ë©´, ì?´ ê²½ê³ ë¥¼ ì??ì? 기 ì??í?´ Tor í??ë¡?ì?? ì?¤ì ?ì?? í??ì?¤í?¸ë¥¼ ë?¤ì?? í? ì?? ì??ì?µë??ë?¤.
-torbutton.popup.test.ff3_notice = OK를 ë??르ì??ë©´ Tor í??ë¡?ì?? ì?¤ì ?ì?? í??ì?¤í?¸í?©ë??ë?¤. ì?´ í??ì?¤í?¸ë?? 백그ë?¼ì?´ë??ì??ì?? ì??ì??ë?©ë??ë?¤. ì? ì?? 기ë?¤ë ¤ 쥡ì??ì?¤.
torbutton.popup.external.title = ì?¸ë¶? í??ì?¼ ì? í??ì?? ë?¤ì?´ë¡?ë?? í??ì??ê² ì?µë??ê¹??
torbutton.popup.external.app = Tor ë¸?ë?¼ì?°ì ?ë??ì?´ í??ì?¼ì?? ë³¼ ì?? ì??ì?µë??ë?¤. ë?¤ë¥¸ ì??ì?© í??ë¡?ê·¸ë?¨ì??ì?? ì?´ì?´ì?¼í?©ë??ë?¤.\n\n
torbutton.popup.external.note = í??ì?¼ ì? í??ì?? ì??ì?© í??ë¡?ê·¸ë?¨ì?´ Tor를 ì?¬ì?©í??ì§? ì??ê³ ì?¸í?°ë?·ì?? ì?°ê²°í??ë?? ì??ì?¸ì?´ ë? ì??ì??ë?? ê²?ì?´ ì??ì?µë??ë?¤.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = ì??ì ?í??기 ì??í??ì?¬ ì?¤í??ë?¼ì?¸ ì?¼ ë??
torbutton.popup.launch = í??ì?¼ì?? ë?¤ì?´ë¡?ë?? í??기
torbutton.popup.cancel = ì·¨ì??
torbutton.popup.dontask = ì§?ê¸?ë¶?í?° í??ì?¼ì?? ì??ë??ì?¼ë¡? ë?¤ì?´ë¡?ë??
-torbutton.popup.test.no_http_proxy = Tor í??ë¡?ì?? í??ì?¤í?¸: ë¡?컬 HTTP í??ë¡?ì??ì?? ì ?ê·¼í? ì?? ì??ì?µë??ë?¤. Polipoê°? í??ì?¤í?? ì??ë??ì¤? ì??ë??ê¹??
torbutton.popup.prompted_language = ë?? ë§?ì?? ê°?ì?¸ ì ?보를 ì??í?´, Torbuttonì?? ì??ì?´ ë²?ì ? ì?¹í??ì?´ì§?를 ì??ì²í? ì?? ì??ì?µë??ë?¤. ì?´ê²?ì?? ê·?í??ì?? 모êµì?´ ë??ì? ì??ì?´ë¥¼ í??ì??í??ë?? ì?¹ í??ì?´ì§?를 ì?¼ì?¼í?¬ ì?? ì??ì?µë??ë?¤.\n\në?? ë??ì?? ê°?ì?¸ ì ?보를 ì??í?´ ì??ì?´ ì?¹ í??ì?´ì§?를 ì??ì²í??ì??ê² ì?µë??ê¹??
torbutton.popup.no_newnym = Torbuttonì?? ì??ì ?í??ê²? ì??ë¡?ì?´ ì? ì??ì?? ì¤? ì?? ì??ì?µë??ë?¤. ì?´ê²?ì?? Tor 컨í?¸ë¡¤ í?¬í?¸ì?? ì ?ê·¼í? ì?? ì??ì?µë??ë?¤.\n\nTor Browser Bundleì?? ì?¬ì?©í??ê³ ê³?ì?ë??ê¹??
-torbutton.popup.pref_error = Torbuttonì?? Tor Browser í??ë¡?í??ì?¼ ë??ë ?í?´ë¥¼ ì??ë?°ì?´í?¸ í? ì?? ì??ì?µë??ë?¤.
-torbutton.popup.permission_denied = Tor Browser ë??ë ?í? 리ì?? ê¶?í??ì?? ì´?기í?? í??ì??ê±°ë??, Tor browser를 ì??ë¡?ì?´ ì??ì¹?ë¡? ì?®ê²¨ 주ì?ì??ì?¤.
-torbutton.popup.device_full = ì?´ ë??ì?¤í?¬ë?? ê°?ë?? ì°¬ ê²? ê°?ì?µë??ë?¤. ë¹? ê³µê°?ì?? ë§?ë??ì??ê±°ë?? ì??ë¡?ì?´ ì?¥ì¹?ë¡? Tor browser를 ì?®ê²¨ 주ì?ì??ì?¤.
torbutton.title.prompt_torbrowser = ì¤?ì??í?? Torbutton ì ?ë³´
torbutton.popup.prompt_torbrowser = Torbuttonì?? ì§?ê¸? ë?¤ë¥´ê²? ì??ë??í?©ë??ë?¤. ê·?í??ë?? ë??ì?´ì?? ë?? ì?? ì??ì?µë??ë?¤. ë¹?Tor ë¸?ë?¼ì?°ì§?ì?? ì?¬ì?©ë? ì?? ì??ë?? ë¸?ë?¼ì?°ì ¸ì??ì?? ì?¬ì?©í??ë?? ê²?ì?? ì??í??í??기 ë??문ì?? ì?´ ë³?í??를 ë§?ë?¤ì??ì?µë??ë?¤. ì?°ë¦¬ê°? ì?´ë?¤ ë?¤ë¥¸ ë°©ë²?ì?¼ë¡? ê³ ì¹ ì?? ì??ë?? ì??ë§?ì?? ë²?ê·¸ë?? ì??ì?µë??ë?¤. ë§?ì?½ í??ì?´ì?´í?ì?¤ë¥¼ ì?¼ë°?ì ?ì?¼ë¡? ì?¬ì?©í??기를 ì??í??ì? ë?¤ë©´ Torbuttonì?? ì?¸ì?¸ì?¤í?¨ í??ì??ê³ Tor Browser Bundleì?? ë?¤ì?´ë¡?ë?? í??ì?ì??ì?¤. Tor browserì?? í??ë?¼ì?´ë²?ì?? ì?¤ì ?ì??, ì?¬ì§?ì?´ í??ì?´ì?´í?ì?¤ê°? Torbuttonê³¼ ì?°ì??ë??ë?¼ë??, ë³´í?µì?? í??ì?´ì?´í?ì?¤ì?? ì?¤ì ?ì?? ì?°ì? í?©ë??ë?¤. Torbuttonì?? ì§?ì?°ì??ë ¤ë©´, ë??구 - ë¶?ê°? 기ë?¥ - í??ì?¥ì?? ë?¤ì?´ê°?ì??ì?? Torbutton ì??ì?? ì ?ê±° ë²?í?¼ì?? ë??르ì?ì??ì?¤.
torbutton.popup.short_torbrowser = ì¤?ì??í?? Torbutton ì ?ë³´! Torbuttonì?? ì?´ì ? í?ì?? í??ì?±í??ë?©ë??ë?¤. ë?? ë§?ì?? ì ?보를 ì??í?´ì??ë?? Torbuttonì?? ë??르ì?ì??ì?¤.
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ku/torbutton.properties b/src/chrome/locale/ku/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ku/torbutton.properties
+++ b/src/chrome/locale/ku/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/kw/torbutton.dtd
+++ b/src/chrome/locale/kw/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/kw/torbutton.properties b/src/chrome/locale/kw/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/kw/torbutton.properties
+++ b/src/chrome/locale/kw/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd
index 976f38f..cf8167b 100644
--- a/src/chrome/locale/ky/torbutton.dtd
+++ b/src/chrome/locale/ky/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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 "Ð?аÑ?дам">
-<!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 "Ð?аңÑ? инÑ?ан">
<!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)">
diff --git a/src/chrome/locale/ky/torbutton.properties b/src/chrome/locale/ky/torbutton.properties
index 0700ab3..e6e769b 100644
--- a/src/chrome/locale/ky/torbutton.properties
+++ b/src/chrome/locale/ky/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = Ð?йнÑ?Ñ?
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.
diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/lb/torbutton.dtd
+++ b/src/chrome/locale/lb/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/lb/torbutton.properties b/src/chrome/locale/lb/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/lb/torbutton.properties
+++ b/src/chrome/locale/lb/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd
index ee12fab..b3d1146 100644
--- a/src/chrome/locale/lg/torbutton.dtd
+++ b/src/chrome/locale/lg/torbutton.dtd
@@ -1,28 +1,9 @@
-<!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.preferences "Preferences...">
<!ENTITY torbutton.context_menu.preferences.key "P">
<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
<!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">
@@ -34,4 +15,3 @@
<!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)">
diff --git a/src/chrome/locale/lg/torbutton.properties b/src/chrome/locale/lg/torbutton.properties
index 7924713..971eaa7 100644
--- a/src/chrome/locale/lg/torbutton.properties
+++ b/src/chrome/locale/lg/torbutton.properties
@@ -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.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
-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,4 +10,3 @@ 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?
diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ln/torbutton.dtd
+++ b/src/chrome/locale/ln/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ln/torbutton.properties b/src/chrome/locale/ln/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ln/torbutton.properties
+++ b/src/chrome/locale/ln/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/lo/torbutton.dtd
+++ b/src/chrome/locale/lo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/lo/torbutton.properties b/src/chrome/locale/lo/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/lo/torbutton.properties
+++ b/src/chrome/locale/lo/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd
index f3b2735..5a78077 100644
--- a/src/chrome/locale/lt/torbutton.dtd
+++ b/src/chrome/locale/lt/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy nustatymai">
-<!ENTITY torbutton.prefs.recommended_settings "Naudoti mano Firefox versijai rekomenduojamus proxy nustatymus">
-<!ENTITY torbutton.prefs.use_polipo "Naudoti 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 "Prievadas:">
-<!ENTITY torbutton.pref_connection.notice "Atjunkite Torbutton kad pakeisti Å¡iuos nustatymus.">
-<!ENTITY torbutton.pref_connection.more_info "Daugiau informacijos">
-<!ENTITY torbutton.pref_connection_more_info.title "Pagalba">
-<!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 "Nauja tapatybÄ?">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Nustatymai...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Paspauskite kad aktyvuoti Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Atstatyti numatytuosius">
-<!ENTITY torbutton.prefs.test_settings "Patikrinti nustatymus">
-<!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)">
diff --git a/src/chrome/locale/lt/torbutton.properties b/src/chrome/locale/lt/torbutton.properties
index 77e5bbf..e3e4454 100644
--- a/src/chrome/locale/lt/torbutton.properties
+++ b/src/chrome/locale/lt/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Paspauskite kad atjungti Tor
torbutton.panel.label.disabled = Tor atjungtas
torbutton.panel.label.enabled = Tor įgalintas
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy testas pasisekÄ?!
-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 = Atšaukti
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 = Svarbi Torbutton informacija
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.
diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd
index c0d8df1..7192ef1 100644
--- a/src/chrome/locale/lv/torbutton.dtd
+++ b/src/chrome/locale/lv/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Starpnieka iestatījumi">
-<!ENTITY torbutton.prefs.recommended_settings "Lietot manai Firefox'a versijai ieteiktos starpnieka iestatījumus">
-<!ENTITY torbutton.prefs.use_polipo "Lietot Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Lietot starpnieka pielÄ?gotus iestatÄ«jumus">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP starpnieks:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL starpnieks:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP starpnieks:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher starpnieks:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS'a viesotÄ?js:">
-<!ENTITY torbutton.prefs.proxy.port "Ports:">
-<!ENTITY torbutton.pref_connection.notice "AtspÄ?jot Torbutton, lai mainÄ«tu Å¡os iestatÄ«jumus.">
-<!ENTITY torbutton.pref_connection.more_info "Papildu informÄ?cija">
-<!ENTITY torbutton.pref_connection_more_info.title "Palīdzība">
-<!ENTITY torbutton.pref_connection_more_info.text "Å obrÄ«d Torbutton ir iespÄ?jots. Ja vÄ?laties mainÄ«t savus Ä?rpus-Tor starpnieka iestatÄ«jumus, lÅ«dzu atspÄ?jojiet Torbutton un tad atgriezieties te. Ja vÄ?laties mainÄ«t savus Tor iestatÄ«jumus, lÅ«dzu lietojiet Torbutton'a preferenÄ?u logu.">
<!ENTITY torbutton.context_menu.new_identity "Jauna identitÄ?te">
<!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 "NoklikÅ¡Ä·inÄ?t, lai inicializÄ?tu Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Atjaunot noklusÄ?juma vÄ?rtÄ«bas">
-<!ENTITY torbutton.prefs.test_settings "PÄ?rbaudÄ«t iestatÄ«jumus">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Nav starpnieku priekš: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "BrÄ«dinÄ?jums: Izvairieties lietot ikvienu no augstÄ?k norÄ?dÄ«tajiem viesotÄ?jnosaukumiem">
<!ENTITY torbutton.cookiedialog.title "PÄ?rvaldÄ«t aizsardzÄ«bu no sÄ«kdatnÄ?m">
<!ENTITY torbutton.cookiedialog.lockCol "AizsargÄ?ts">
<!ENTITY torbutton.cookiedialog.domainCol "ViesotÄ?js">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "NoÅ?emt visas, izÅ?emot aizsargÄ?tÄ?s">
<!ENTITY torbutton.cookiedialog.saveAllCookies "AizsargÄ?t jaunÄ?s sÄ«kdatnes">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NeaizsargÄ?t jaunÄ?s sÄ«kdatnes">
-<!ENTITY torbutton.prefs.transparentTor "PÄ?rredzama torifikÄ?cija (nepiecieÅ¡ams pielÄ?gots pÄ?rstarpnieks jeb transproxy vai Tor'a marÅ¡rutÄ?tÄ?js)">
<!ENTITY torbutton.prefs.block_disk "NereÄ£istrÄ?t pÄ?rlÅ«koÅ¡anas vÄ?sturi vai tÄ«mekļa vietÅ?u datus (iespÄ?jo PrivÄ?tas pÄ?rlÅ«koÅ¡anas režīmu)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Ierobežot trešo personu sīkdatnes un citus izsekošanas datus">
<!ENTITY torbutton.prefs.block_plugins "AtspÄ?jot pÄ?rlÅ«ku spraudÅ?us (tÄ?dus kÄ? Flash)">
diff --git a/src/chrome/locale/lv/torbutton.properties b/src/chrome/locale/lv/torbutton.properties
index 0551ab9..98e51d1 100644
--- a/src/chrome/locale/lv/torbutton.properties
+++ b/src/chrome/locale/lv/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = NoklikÅ¡Ä·inÄ?t, lai atspÄ?jotu Tor
torbutton.panel.label.disabled = Tor ir atspÄ?jots
torbutton.panel.label.enabled = Tor ir iespÄ?jots
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton ir poga ar kuru konfigurÄ?t Tor iestatÄ«jumus, kÄ? arÄ« Ä?tri un Ä?rti attÄ«rÄ«t personÄ«gos pÄ?rlÅ«koÅ¡anas datus.
-torbutton.popup.test.success = Tor starpnieka pÄ?rbaude ir sekmÄ«ga!
-torbutton.popup.test.failure = Tor starpnieka pÄ?rbaudes tests NEIZDEVÄ?S! PÄ?rbaudiet starpnieka un Polipo iestatÄ«jumus.
-torbutton.popup.test.confirm_toggle = PÄ?dÄ?jÄ? Tor starpnieka pÄ?rbaudÄ? neizdevÄ?s izmantot Tor.â?? â?? Vai esat pÄ?rliecinÄ?ts, ka tomÄ?r vÄ?laties to iespÄ?jot?â?? â?? PiezÄ«me: Ja esat atrisinÄ?jis Å¡o problÄ?mu, varat atkÄ?rtoti palaist pÄ?rbaudi lodziÅ?Ä? Torbutton starpnieka preferences, lai nebÅ«tu Å¡Ä« brÄ«dinÄ?juma.
-torbutton.popup.test.ff3_notice = NoklikÅ¡Ä·iniet Labi jeb OK, lai pÄ?rbaudÄ«tu Tor starpnieka iestatÄ«jumus. Å Ä« pÄ?rbaude notiks fonÄ?. LÅ«dzu, esiet pacietÄ«gs.
torbutton.popup.external.title = IelÄ?dÄ?t Ä?rÄ?ju saturu?
torbutton.popup.external.app = NepiecieÅ¡ama Ä?rÄ?ja lietotne, lai apstrÄ?dÄ?tu:â?? â??\n
torbutton.popup.external.note = \nâ?? â??PIEZĪME: PÄ?c noklusÄ?juma Ä?rÄ?jas lietotnes NAV gana droÅ¡as Tor un var jÅ«s atklÄ?t!â??\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nJa Å¡Ä« datne nav uzticama, jums vai nu tÄ?
torbutton.popup.launch = Palaist lietotni
torbutton.popup.cancel = Atcelt
torbutton.popup.dontask = TurpmÄ?k vienmÄ?r palaist lietotnes
-torbutton.popup.test.no_http_proxy = Tor starpnieka pÄ?rbaude: HTTP vietÄ?jais starpnieks nav sasniedzams. Vai Polipo darbojas pareizi?
torbutton.popup.prompted_language = Lai nodroÅ¡inÄ?tu jums lielÄ?ku privÄ?tuma lÄ«meni, Torbutton var pieprasÄ«t tÄ«mekļa vietÅ?u angļu valodas versiju. Tas var radÄ«t situÄ?ciju, ka tÄ«mekļa vietnes, kuras izvÄ?laties lasÄ«t dzimtajÄ? valodÄ?, tiek attÄ?lotas angļu valodÄ?.â?? â?? Vai vÄ?laties pieprasÄ«t tÄ«mekļa vietnes angļu valodÄ?, lai nodroÅ¡inÄ?tu lielÄ?ku privÄ?tuma lÄ«meni?
torbutton.popup.no_newnym = Torbutton nespÄ?j droÅ¡i sniegt jums jaunu identitÄ?ti. Tai nav piekļuves pie Tor vadÄ«bas porta. â?? â?? Vai esat palaidis PÄ?rlÅ«ka Tor komplektu?
-torbutton.popup.pref_error = Torbutton nespÄ?j atjauninÄ?t preferences PÄ?rlÅ«ka Tor profila direktorijÄ?.
-torbutton.popup.permission_denied = LÅ«dzu vai nu atiestatiet pÄ?rlÅ«ka Tor direktorijas atļaujas, vai arÄ« kopÄ?jiet to uz jaunu vietu.
-torbutton.popup.device_full = Å Ä·iet, ka cietais disks ir pilns. LÅ«dzu, atbrÄ«vojiet vietu uz diska vai pÄ?rvietojiet pÄ?rlÅ«ku Tor uz citu ierÄ«ci.
torbutton.title.prompt_torbrowser = SvarÄ«ga Torbutton informÄ?cija
torbutton.popup.prompt_torbrowser = Torbutton tagad strÄ?dÄ? citÄ?dÄ?k: to vairs nevarat izslÄ?gt.\n\nMÄ?s izdarÄ«jÄ?m Å¡o izmaiÅ?u jo nav droÅ¡i izmantot Torbutton pÄ?rlÅ«kÄ?, kurÅ¡ tiek arÄ« izmantots pÄ?rlÅ«koÅ¡anai, kas neizmanto Tor. VienkÄ?rÅ¡i bija pÄ?rÄ?k daudz kļūdu, kuras mÄ?s savÄ?dÄ?k nevarÄ?jÄ?m labot.\n\nJa vÄ?laties turpinÄ?t izmantot Firefox kÄ? ierasts, atinstalÄ?jiet Torbutton un lejupielÄ?dÄ?jiet Tor Browser Bundle. Tor Browser privÄ?tuma rekvizÄ«ti ir svarÄ«gÄ?ki nekÄ? Firefox rekvizÄ«ti, pat tad ja Firefox tiek izmantots ar Torbutton.\n\nLai nonÄ?mtu Torbutton, izvÄ?lieties RÄ«ko->Pievienojumi->PaplaÅ¡inÄ?jumi jeb Tools->Addons->Extensions un noklikÅ¡Ä·iniet uz pogu NoÅ?emt jeb Remove pogu, kura atrodas blakus Torbutton.
torbutton.popup.short_torbrowser = SvarÄ«ga Torbutton informÄ?cija!\n\nTorbutton tagad ir iespÄ?jots vienmÄ?r.\n\nNoklikÅ¡Ä·iniet uz Torbutton, lai saÅ?emtu papildu informÄ?ciju.
diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/mg/torbutton.dtd
+++ b/src/chrome/locale/mg/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/mg/torbutton.properties b/src/chrome/locale/mg/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/mg/torbutton.properties
+++ b/src/chrome/locale/mg/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/mi/torbutton.dtd
+++ b/src/chrome/locale/mi/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/mi/torbutton.properties b/src/chrome/locale/mi/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/mi/torbutton.properties
+++ b/src/chrome/locale/mi/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd
index 3bbae13..2c89bd1 100644
--- a/src/chrome/locale/mk/torbutton.dtd
+++ b/src/chrome/locale/mk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?одеÑ?Ñ?ваÑ?а на пÑ?окÑ?и">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?оÑ?иÑ?Ñ?и ги подеÑ?Ñ?ваÑ?аÑ?а пÑ?епоÑ?аÑ?ани за моÑ?аÑ?а веÑ?зиÑ?а на ФаÑ?Ñ?Ñ?окÑ?">
-<!ENTITY torbutton.prefs.use_polipo "Ð?оÑ?иÑ?Ñ?и го Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Ð?оÑ?иÑ?Ñ?и Ñ?опÑ?Ñ?вени пÑ?окÑ?и-подеÑ?Ñ?ваÑ?а">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ñ?оÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?а:">
-<!ENTITY torbutton.pref_connection.notice "Ð?Ñ?клÑ?Ñ?еÑ?е го Torbutton за да ги пÑ?омениÑ?е овие пÑ?одеÑ?Ñ?ваÑ?а.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?овеÑ?е инÑ?оÑ?маÑ?ии">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?омоÑ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton е моменÑ?ално вклÑ?Ñ?ен. Ð?околкÑ? Ñ?акаÑ?е да ги пÑ?омениÑ?е подеÑ?Ñ?ваÑ?аÑ?а на Ð?аÑ?еÑ?о пÑ?окÑ?и кои Ñ?Ñ?о не Ñ?е повÑ?зани Ñ?о ТоÑ?, Ñ?ога иÑ?клÑ?Ñ?еÑ?е ги Torbutton и поÑ?оа вÑ?аÑ?еÑ?е Ñ?е Ñ?Ñ?ка. Ð?околкÑ? Ñ?акаÑ?е да ги пÑ?омениÑ?е подеÑ?Ñ?ваÑ?аÑ?а за ТоÑ?, Ñ?огаÑ? коÑ?иÑ?Ñ?еÑ?е го пÑ?озоÑ?оÑ? Ð?одеÑ?Ñ?ваÑ?а на ТоÑ?.">
<!ENTITY torbutton.context_menu.new_identity "New Identity">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Ð?одеÑ?Ñ?ваÑ?а...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Ð?ликнеÑ?е за иниÑ?иÑ?аÑ?е на Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "СÑ?андаÑ?дни подеÑ?Ñ?ваÑ?а">
-<!ENTITY torbutton.prefs.test_settings "ТеÑ?Ñ?иÑ?аÑ? ги подеÑ?Ñ?ваÑ?аÑ?а">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ð?ез пÑ?окÑ?иÑ?аÑ?е за: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Ð?нимание: избегнÑ?ваÑ?Ñ?е да наведÑ?ваÑ?е Ñ?оÑ?Ñ?ови погоÑ?е">
<!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)">
diff --git a/src/chrome/locale/mk/torbutton.properties b/src/chrome/locale/mk/torbutton.properties
index 609623b..7936dde 100644
--- a/src/chrome/locale/mk/torbutton.properties
+++ b/src/chrome/locale/mk/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Ð?ликнеÑ?е за да го иÑ?клÑ?Ñ?и
torbutton.panel.label.disabled = ТоÑ? е иÑ?клÑ?Ñ?ен
torbutton.panel.label.enabled = ТоÑ? е вклÑ?Ñ?ен
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = ТеÑ?Ñ?оÑ? за ТоÑ? пÑ?окÑ?иÑ?о беÑ?е Ñ?Ñ?пеÑ?ен!
-torbutton.popup.test.failure = ТеÑ?Ñ?оÑ? за ТоÑ? пÑ?окÑ?иÑ?о Ð?Ð? УСÐ?Ð?Ð?! Ð?Ñ?овеÑ?еÑ?е ги Ð?аÑ?иÑ?е подеÑ?Ñ?ваÑ?а на пÑ?окÑ?и или на Polipo.
-torbutton.popup.test.confirm_toggle = Ð?оÑ?ледниоÑ? Ñ?еÑ?Ñ? за ТоÑ? пÑ?окÑ?иÑ?о не Ñ?Ñ?пеа да го коÑ?иÑ?Ñ?и ТоÑ?.\n\nÐ?али Ñ?Ñ?е Ñ?игÑ?Ñ?ни дека Ñ?акаÑ?е да го вклÑ?Ñ?иÑ?е во Ñ?екоÑ? Ñ?лÑ?Ñ?аÑ??\n\nÐ?абелеÑ?ка: Ð?ко во меÑ?Ñ?вÑ?еме Ñ?Ñ?е го Ñ?еÑ?иле пÑ?облемоÑ?, можеÑ?е повÑ?оÑ?но да го напÑ?авиÑ?е Ñ?еÑ?Ñ?оÑ? во пÑ?озоÑ?оÑ? за подеÑ?Ñ?ваÑ?а на Torbutton за да пÑ?еÑ?Ñ?ане ова пÑ?едÑ?пÑ?едÑ?ваÑ?е.
-torbutton.popup.test.ff3_notice = Ð?Ñ?иÑ?иÑ?неÑ?е Ð?Ð? за да ги Ñ?еÑ?Ñ?иÑ?аÑ?е подеÑ?Ñ?ваÑ?аÑ?а за ТоÑ? пÑ?окÑ?иÑ?о. Ð?воÑ? Ñ?еÑ?Ñ? Ñ?е изведÑ?ва во позадина, Ð?е молиме за Ñ?Ñ?пение.
torbutton.popup.external.title = Ð?Ñ?иÑ?Ñ?ваÑ?е на екÑ?Ñ?еÑ?на Ñ?одÑ?жина?
torbutton.popup.external.app = Ð?оÑ?Ñ?ебна е екÑ?Ñ?еÑ?на апликаÑ?иÑ?а за Ñ?пÑ?авÑ?ваÑ?е Ñ?о:\n\n
torbutton.popup.external.note = \n\nÐ?Ð?Ð?Ð?Ð?Ð?ШÐ?Ð?: Ð?кÑ?Ñ?еÑ?ниÑ?е апликаÑ?ии обиÑ?но Ð?Ð? Ñ?е Ñ?веÑ?ни за ТоÑ? и можаÑ? да ве оÑ?кÑ?иÑ?аÑ?!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Ð?анÑ?иÑ?аÑ? Ñ?а апликаÑ?иÑ?аÑ?а
torbutton.popup.cancel = Ð?Ñ?кажи Ñ?е
torbutton.popup.dontask = Ð?Ñ?Ñ?ега наÑ?амÑ?, Ñ?екогаÑ? ланÑ?иÑ?аÑ? ги апликаÑ?ииÑ?е
-torbutton.popup.test.no_http_proxy = ТеÑ?Ñ?оÑ? за ТоÑ? пÑ?окÑ?и: локалноÑ?о HTTP пÑ?окÑ?и е недоÑ?Ñ?апно. Ð?али Polipo е вклÑ?Ñ?ен?
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.
diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ml/torbutton.dtd
+++ b/src/chrome/locale/ml/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ml/torbutton.properties b/src/chrome/locale/ml/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ml/torbutton.properties
+++ b/src/chrome/locale/ml/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/mn/torbutton.dtd
+++ b/src/chrome/locale/mn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/mn/torbutton.properties b/src/chrome/locale/mn/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/mn/torbutton.properties
+++ b/src/chrome/locale/mn/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/mr/torbutton.dtd
+++ b/src/chrome/locale/mr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/mr/torbutton.properties b/src/chrome/locale/mr/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/mr/torbutton.properties
+++ b/src/chrome/locale/mr/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ms/torbutton.dtd
+++ b/src/chrome/locale/ms/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ms/torbutton.properties b/src/chrome/locale/ms/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ms/torbutton.properties
+++ b/src/chrome/locale/ms/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/mt/torbutton.properties b/src/chrome/locale/mt/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/mt/torbutton.properties
+++ b/src/chrome/locale/mt/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd
index 83c42e9..91225d4 100644
--- a/src/chrome/locale/my/torbutton.dtd
+++ b/src/chrome/locale/my/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "á??á??á?±á?¬á??á?ºá??á?® á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸">
-<!ENTITY torbutton.prefs.recommended_settings "á??á?»á?½á??á?ºá??á?±á?¬á?ºá?· á??á?®á?¸á??á?»á?¾á?¶á??á?¼á?±á??á?½á?±á?¸ á??á?¬á?¸á??á?¾á??á?ºá?¸á?¡á??á?½á??á?º á?¡á??á?¼á?¶á??á?¼á?¯á??á?¬á?¸á??á?±á?¬ á??á??á?±á?¬á??á?ºá??á?® á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á?¡á??á?¯á?¶á?¸á??á?¼á?¯á??á??á?º">
-<!ENTITY torbutton.prefs.use_polipo "Polipo á??á?á?¯ á??á?¯á?¶á?¸á??á??á?º">
-<!ENTITY torbutton.prefs.custom_settings "á??á?á??á?ºá??á?¼á?á?¯á??á?º á??á??á?±á?¬á??á?ºá??á?® á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¯á?¶á?¸á??á??á?º">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP á??á??á?±á?¬á??á?ºá??á?® -">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL á??á??á?±á?¬á??á?ºá??á?® -">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP á??á??á?±á?¬á??á?ºá??á?® -">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher á??á??á?±á?¬á??á?ºá??á?® -">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host -">
-<!ENTITY torbutton.prefs.proxy.port "Port -">
-<!ENTITY torbutton.pref_connection.notice "á?¡á?²á??á?® á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á??á?º Torbutton á??á?á?¯ á??á?á??á?ºá??á?«á??">
-<!ENTITY torbutton.pref_connection.more_info "á??á?±á?¬á??á?ºá??á??á?º á?¡á??á?»á??á?ºá?¡á??á??á?ºá??á?»á?¬á?¸">
-<!ENTITY torbutton.pref_connection_more_info.title "á?¡á??á?°á?¡á??á?®">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton á??á?á?¯ á??á?±á?¬á??á?±á?¬á??á??á?º á??á?½á??á?ºá?·á??á?¬á?¸á??á??á?ºá?? á?¡á??á??á?ºá?? á??á??á?ºá?· Tor á??á??á?±á?¬á??á?ºá??á?® á??á??á?¯á?¶á?¸á??á?±á?¬ á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á?á?¯á??á?»á?¾á??á?ºá?? Torbutton á??á?á?¯ á??á?á??á?ºá??á?¼á?®á?¸ á?¤á??á?±á??á?¬á??á?á?¯á?· á??á?¼á??á?ºá??á?¬á??á?«á?? á?¡á??á??á?ºá?? á??á??á?ºá?· Tor á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¼á?±á?¬á??á?ºá?¸á??á?á?¯á??á?«á??á?? Torbutton á?¦á?¸á??á?¬á?¸á??á?±á?¸á??á?¾á?¯ á??á??á?ºá?¸á??á?á?¯á?¸á??á?á?¯ á??á?¯á?¶á?¸á??á?½á?²á??á?«á??">
<!ENTITY torbutton.context_menu.new_identity "á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸ á?¡á??á??á?º">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "á?¦á?¸á??á?¬á?¸á??á?±á?¸á??á?»á??á?ºá??á?»á?¬á?¸...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Torbutton á??á?á?¯ á?¡á??á??á?¼á?¯á??á??á?º á??á?¾á?á??á?ºá??á?«á??">
<!ENTITY torbutton.prefs.restore_defaults " á??á?°á??á?¡á??á?á?¯á??á?ºá?¸ á??á?¼á??á?ºá??á?¬á?¸á??á??á?º">
-<!ENTITY torbutton.prefs.test_settings "á??á??á?ºá??á?±á?¸á??á?¾á?¯ á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "á??á??á?±á?¬á??á?ºá??á?® á??á??á?á?¯á?¡á??á?ºá??á??á?ºá?· á?¡á??á?¬ -">
-<!ENTITY torbutton.prefs.no_proxy_warning "á??á??á?á??á?±á?¸á??á?»á??á?º - á?¡á??á??á?ºá??á?¾ host á?¡á??á??á?ºá??á?»á?¬á?¸ á??á?¯á?¶á?¸á??á?½á?²á??á?¾á?¯á??á?á?¯ á??á?¾á?±á?¬á??á?ºá??á?«">
<!ENTITY torbutton.cookiedialog.title "á??á?½á??á?ºá??á?®á?¸ á??á?¬á??á?½á??á?ºá??á?¾á?¯á??á?»á?¬á?¸á??á?á?¯ á??á?®á??á?¶á??á??á?ºá?·á??á?½á?²á??á??á?º">
<!ENTITY torbutton.cookiedialog.lockCol "á?¡á??á?¬á?¡á??á?½á??á?º á??á?¯á??á?ºá??á?¬á?¸á??á??á?º">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "á?¡á?¬á?¸á??á?¯á?¶á?¸á??á?á?¯ á??á??á?ºá??á?¯á??á?ºá??á?«á?? á??á?á?¯á?·á??á?±á?¬á?º á?¡á??á?¬á?¡á??á?½á??á?º á??á?¯á??á?ºá??á?¬á?¸á??á??á?º">
<!ENTITY torbutton.cookiedialog.saveAllCookies "á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¬á??á?½á??á?ºá??á??á?º">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "á??á?½á??á?ºá??á?®á?¸á??á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¬á??á?½á??á?ºá??á?¼á??á?ºá?¸ á??á??á?¼á?¯á??á??á?º">
-<!ENTITY torbutton.prefs.transparentTor "á??á?½á??á?ºá?·á??á??á?ºá?¸á??á?¼á??á?ºá??á?¬á??á?±á?¬ Tor á??á?¯á?¶á?¸á??á?½á?²á??á?¾á?¯ (á??á?á??á?ºá??á?¼á?á?¯á??á?º transproxy á??á?¾á??á?ºá?· 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)">
diff --git a/src/chrome/locale/my/torbutton.properties b/src/chrome/locale/my/torbutton.properties
index 6ab566d..043cb4a 100644
--- a/src/chrome/locale/my/torbutton.properties
+++ b/src/chrome/locale/my/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Tor á??á?á?¯ á??á?á??á?ºá??á??á?º á??á?¾á?
torbutton.panel.label.disabled = á??á?á??á?ºá??á?¬á?¸á??á?±á?¬ Tor
torbutton.panel.label.enabled = á??á?½á??á?ºá?·á??á?¬á?¸á??á?±á?¬ Tor
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor á??á??á?±á?¬á??á?ºá??á?® á??á??á?ºá?¸á??á??á?ºá??á?»á??á?º á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á??á?º!
-torbutton.popup.test.failure = Tor á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«! á??á??á?ºá?· á??á??á?±á?¬á??á?ºá??á?®á??á?¾á??á?ºá?· Polipo á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á??á?ºá??á?±á?¸á??á?«á??
-torbutton.popup.test.confirm_toggle = á??á??á?ºá??á??á?±á?¬ Tor á??á??á?±á?¬á??á?ºá??á?® á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯ á??á?¡á?±á?¬á??á?ºá??á?¼á??á?ºá??á?«á??\n\ná??á??á?ºá?¸á??á?á?¯ á??á?½á??á?ºá?·á??á??á?º á??á?±á??á?»á?¬á??á??á?¬á?¸á???\n\ná??á?¾á??á?ºá??á?»á??á?º - á?¡á??á??á?ºá?? á??á??á?ºá??á??á?º á??á?¼á?¿á??á?¬á??á?á?¯ á??á?¼á?±á??á?¾á??á?ºá?¸á??á?á?¯á??á?ºá??á?»á?¾á??á?ºá?? á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯á??á?á?¯ Torbutton á??á??á?±á?¬á??á?ºá??á?® á?¦á?¸á??á?¬á?¸á??á?±á?¸á??á?»á??á?ºá??á?»á?¬á?¸ á??á??á?ºá?¸á??á?á?¯á?¸á?? á??á?¼á?¯á??á?¯á??á?ºá??á?¼á?®á?¸ á?¤á??á??á?á??á?±á?¸á??á?»á??á?ºá??á?á?¯ á??á??á?º á??á??á?ºá??á?¾á?¬á?¸á??á?á?¯á??á?ºá??á??á?ºá??
-torbutton.popup.test.ff3_notice = Tor á??á??á?±á?¬á??á?ºá??á?® á??á?»á?á??á?ºá??á?¾á?á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á??á?ºá?¸á??á??á?ºá??á??á?º á??á?±á?¬á??á?ºá?¸á??á?¼á?®á??á?á?¯ á??á?¾á?á??á?ºá??á?«á?? á?¤á??á??á?ºá?¸á??á??á?ºá??á?¾á?¯á??á??á?º á??á?±á?¬á??á?ºá??á?¶á?? á??á?¼á??á?ºá??á?»á??á?ºá??á?¬á??á?á??á?ºá?·á??á??á?ºá?? á??á?á??á?ºá??á?¾á??á?ºá??á?±á?¸á??á??á??á?º á??á?¼á??á?ºá??á??á?ºá??
torbutton.popup.external.title = á??á?¼á??á?ºá??á??á?¾ á?¡á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?¬á??á?á?¯ á??á?½á??á?ºá?·á??á??á?º
torbutton.popup.external.app = á??á?¼á??á?ºá?? á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸ á??á??á?ºá??á?¯á??á?á?¯ á??á?¼á?±á??á?¾á??á?ºá?¸á??á??á?º á??á?á?¯á?¡á??á?ºá??á??á?º - \n\n
torbutton.popup.external.note = \n\ná??á?¾á??á?ºá??á?»á??á?º - á??á?¼á??á?ºá?? á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸á??á?»á?¬á?¸á??á??á?º á??á?¯á?¶á??á?¾á??á?ºá?¡á?¬á?¸á??á?¼á??á?ºá?· á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¬ Tor á??á??á?¯á??á?ºá??á?«á?? á??á??á?ºá?¸á?? á??á??á?ºá?·á??á?á?¯ á??á?±á?«á?ºá??á?á?¯á??á?ºá??á??á?ºá??\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \ná?¡á??á??á?ºá?? á?¤á??á?á?¯á??á?ºá??á?á?¯
torbutton.popup.launch = á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸á??á?á?¯ á??á?½á??á?ºá?·á??á??á?º
torbutton.popup.cancel = á??á?»á??á?ºá??á?á??á?ºá?¸á??á??á?º
torbutton.popup.dontask = á??á??á?¯á?¡á??á?»á?á??á?ºá??á?¾á??á??á?¼á?®á?¸ á?¡á??á?¹á??á??á?®á??á?±á?¸á??á?¾á??á?ºá?¸á??á?»á?¬á?¸á??á?á?¯ á?¡á??á?¼á?² á??á?½á??á?ºá?·á??á??á?º
-torbutton.popup.test.no_http_proxy = Tor á??á??á?±á?¬á??á?ºá??á?® á??á??á?ºá?¸á??á??á?ºá??á?»á??á?º - á??á?á?¯á??á??á?º HTTP á??á??á?±á?¬á??á?ºá??á?®á??á?á?¯ á??á??á?ºá??á?¾á??á?ºá?¸ á??á??á?¾á?®á??á?á?¯á??á?ºá??á?«á?? Polipo á??á??á?º á??á?±á?¬á??á?ºá?¸á??á?½á??á?ºá??á?½á?¬ á?¡á??á?¯á??á?º á??á?¯á??á?ºá??á?±á??á?«á??á??á?¬á?¸?
torbutton.popup.prompted_language = á??á??á?ºá?· á??á?á?¯á??á?ºá??á?±á?¸á??á?á?¯á??á?ºá??á?¬ á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¸á??á?á?¯ á??á?á?¯á??á?á?¯ á??á??á?¾á?á??á??á?ºá?? Torbutton á??á??á?º á??á?½á??á?ºá??á??á?º á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á?á?¯ á?¡á??á?ºá?¹á??á??á?á??á?º á??á?¬á??á?¬ á??á?¬á?¸á??á?¾á??á?ºá?¸á??á?¼á??á?ºá?· á??á?±á?¬á??á?ºá?¸á??á?¶á??á?±á?¸á??á?á?¯á??á?ºá??á??á?ºá?? á??á??á?ºá?¸á??á?á?¯á?·á??á?¼á?¯á??á?¯á??á?ºá??á?¼á??á?ºá?¸á??á??á?º á??á??á?ºá?· á??á?¬á??á?¬á??á?¼á??á?ºá?· á??á??á?ºá??á?¾á?¯á??á?á?¯á??á?±á?¬ á??á?½á??á?ºá??á??á?º á??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á?á?¯ á?¡á??á?ºá?¹á??á??á?á??á?º á??á?¬á??á?¬á??á??á?¼á??á?ºá?· á??á?±á?«á?ºá??á?¼á??á?±á??á??á?º á??á?¼á??á?ºá??á??á?ºá??\n\ná??á?¯á?¶á??á?¼á?¯á?¶á??á?¾á?¯ á??á?á?¯á??á?¾á?á??á??á?ºá?¡á??á?½á??á?º á?¡á??á?ºá?¹á??á??á?á??á?º á??á?¬á??á?¬á??á?¼á??á?ºá?· á??á?½á??á?ºá??á??á?ºá??á?¬á??á?»á??á?ºá??á?¾á?¬á??á?»á?¬á?¸á??á?á?¯ á??á??á?º á??á?±á?¬á??á?ºá?¸á??á?¶á??á?á?¯á?
?á??á?¬á?¸?
torbutton.popup.no_newnym = Torbutton á??á??á?º á??á??á?ºá?·á?¡á?¬á?¸ á?¡á??á?±á?¬á??á?ºá?¡á??á?¬á?¸ á?¡á??á??á?ºá??á?á?¯ á??á?¯á?¶á??á?¯á?¶á??á?¼á?¯á?¶á??á?¼á?¯á?¶ á??á??á?±á?¸á??á?á?¯á??á?ºá??á?«á?? á??á??á?ºá?¸á??á??á?º Tor á??á?á??á?ºá?¸á??á?»á?¯á??á?ºá??á?±á?¸ Port á??á?² á??á??á??á?ºá??á?±á?¬á??á?ºá??á?á?¯á??á?ºá??á?«á??\n\nTor Browser Bundle á??á?á?¯ á??á??á?º á??á?¯á?¶á?¸á??á?½á?²á??á?±á??á??á?¬á?¸?
-torbutton.popup.pref_error = Torbutton á??á??á?º á?¦á?¸â??á??á?¬á?¸á??á?±á?¸á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ Tor Browser á??á??á?á?¯á??á?á?¯á??á?ºá?¸á??á?²á?? á??á?½á??á?ºá?¸á??á?¶á??á??á?±á?¸á??á?á?¯á??á?ºá??á?«á??
-torbutton.popup.permission_denied = Tor Browser á??á?á?¯á??á?ºá??á??á?ºá?¸á??á?¼á?±á?¬á??á?ºá?¸á?¡á??á?½á??á?º á??á?½á??á?ºá?·á??á?¼á?¯á??á?»á??á?ºá??á?»á?¬á?¸á??á?á?¯ á??á?¼á??á?ºá??á?»á?á??á?ºá??á?« á??á?á?¯á?·á??á??á?¯á??á?º á??á??á?ºá?¸á??á?á?¯ á??á?±á??á?¬á?¡á??á??á?ºá??á?á?¯á?· á??á?±á?¬á?ºá??á?®á??á?°á?¸á??á?«á??
-torbutton.popup.device_full = Disk á??á?¼á??á?ºá?·á??á?±á??á?¯á?¶á??á?±á?«á?ºá??á??á?ºá?? á??á?±á??á?¬á??á?á?¯ á?¡á??á?½á??á?ºá??á?¬á?¸á??á?« (á??á?á?¯á?·) Tor Browser á??á?á?¯ á??á??á?ºá??á?á??á?á??á?¬ á?¡á??á??á?ºá??á??á?ºá??á?¯á??á?² á??á?½á?¾á?±á?·á??á?á?¯á??á?ºá??á?«á??
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.
diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/nah/torbutton.dtd
+++ b/src/chrome/locale/nah/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/nah/torbutton.properties b/src/chrome/locale/nah/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/nah/torbutton.properties
+++ b/src/chrome/locale/nah/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/nap/torbutton.dtd
+++ b/src/chrome/locale/nap/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/nap/torbutton.properties b/src/chrome/locale/nap/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/nap/torbutton.properties
+++ b/src/chrome/locale/nap/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 2f42bca..8376d7d 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxyinnstillinger">
-<!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte proxyinnstillinger for min versjon av Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Bruk Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Bruk egne proxyinnstillinger">
-<!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-vert:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for å endre på disse innstillingene.">
-<!ENTITY torbutton.pref_connection.more_info "Mer informasjon">
-<!ENTITY torbutton.pref_connection_more_info.title "Hjelp">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er for øyeblikket aktivert. Hvis du vil endre på ikke-Tor-proxyinnstillinger, vennligst deaktiver Torbutton og returner hit. Hvis du vil endre på Tor-innstillingene, vennligst bruk Torbutton-innstillingsvinduet.">
<!ENTITY torbutton.context_menu.new_identity "Ny Identitet">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Innstillinger...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Klikk for å initialisere Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett standard">
-<!ENTITY torbutton.prefs.test_settings "Test innstillinger">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ingen proxyer for:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: Unngå å bruke noen av vertsnavnene ovenfor">
<!ENTITY torbutton.cookiedialog.title "Administrér Informasjonskapslenes Beskyttelser">
<!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
<!ENTITY torbutton.cookiedialog.domainCol "Vert">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern Alle Bortsett Fra Beskyttede">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt Nye Informasjonskapsler">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke Beskytt Nye Informasjonskapsler">
-<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (krever egendefinert transproxy eller Tor-router)">
<!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleser økt)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata.">
<!ENTITY torbutton.prefs.block_plugins "Deaktiver nettlesertillegg (som f.eks Flash)">
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index 5aa7e1e..12ad8ef 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klikk for å deaktivere Tor
torbutton.panel.label.disabled = Tor er deaktivert
torbutton.panel.label.enabled = Tor er aktivert
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton tilbyr en knapp til å konfigurere Tor-innstillinger, samt rask og enkel tilgang til å slette privat nettleserhistorikk.
-torbutton.popup.test.success = Tor proxy-test vellykket!
-torbutton.popup.test.failure = Tor proxy-test feilet! Sjekk proxy og Polipo-innstillingene dine.
-torbutton.popup.test.confirm_toggle = Den nyeste Tor-proxy testen feilet å bruke Tor.\n\nEr du sikker på at du ønsker å aktivere allikevel?\n\nMerk: Hvis du har fikset problemet så kan du kjøre testen på nytt i Torbutton Proxy Innstillinger for å eliminere denne advarselen.
-torbutton.popup.test.ff3_notice = Klikk OK for å teste Tor proxy-innstillinger. Denne testen vil kjøre i bakgrunnen. Vær tålmodig.
torbutton.popup.external.title = Laste eksternt innhold?
torbutton.popup.external.app = Et eksternt program er nødvendig for å håndtere:\n\n
torbutton.popup.external.note = \n\nMERK: Eksterne program er IKKE Tor-sikker som standard og kan røpe deg!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nHvis du ikke vet om denne filen er trygg, b
torbutton.popup.launch = Start program
torbutton.popup.cancel = Avbryt
torbutton.popup.dontask = Start alltid programmer fra nå av
-torbutton.popup.test.no_http_proxy = Tor-proxy test: Lokal HTTP-proxy kan ikke nås. Kjører Polipo skikkelig?
torbutton.popup.prompted_language = For å gi deg et bedre personvern, kan Torbutton spørre om en engelskspråklig versjon av nettsider. Dette kan resultere i at nettsider du foretrekker å lese på morsmålet ditt vises på engelsk istedet.\n\nVil du spørre om engelskspråklige nettsider for å bedre personvernet?
torbutton.popup.no_newnym = Torbutton kan ikke trygt gi deg en ny identitet. Den har ikke tilgang til Tor Control Port.\n\nKjører du Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton kan ikke oppdatere innstillingene i Tor Browser profilkatalogen.
-torbutton.popup.permission_denied = Vennligst tilbakestill enten tillatelsene til Tor Browser katalogen eller kopier den til en ny beliggenhet.
-torbutton.popup.device_full = Harddisken er full. Vennligst frigjør plass eller flytt Tor Browser til en ny enhet.
torbutton.title.prompt_torbrowser = Viktig Torbutton informasjon
torbutton.popup.prompt_torbrowser = Torbutton fungerer annerledes nå. Du kan ikke skru den av lenger.\n\nVi gjorde denne forandringen fordi det ikke er sikkert å bruke Torbutton i en nettleser som også brukers til annen surfing enn Tor. \nDet var for mange bugs der til at vi kunne fikse det på en annen måte.\n\nHvis du ønsker å bruke Firefox normalt, bør du avinstallere Torbutton og laste ned Tor Browser Bundle. Personvernsinnstillingene til Tor Browser er også overlegen en normal Firefox, selv når Firefox brukes med Torbutton.\n\nFor å fjerne Torbutton, gå til Verktøy->Tillegg->Utvidelser og klikk på Fjern-knappen ved siden av Torbutton.
torbutton.popup.short_torbrowser = Viktig Torbutton informasjon!\n\nTorbutton er alltid aktivert nå.\n\nKlikk på Torbutton for mer informasjon.
diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ne/torbutton.dtd
+++ b/src/chrome/locale/ne/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ne/torbutton.properties b/src/chrome/locale/ne/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ne/torbutton.properties
+++ b/src/chrome/locale/ne/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index f377870..e5c2b3a 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy-instellingen">
-<!ENTITY torbutton.prefs.recommended_settings "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken">
-<!ENTITY torbutton.prefs.use_polipo "Polipo gebruiken">
-<!ENTITY torbutton.prefs.custom_settings "Aangepaste proxy-instellingen gebruiken">
-<!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 "Poort:">
-<!ENTITY torbutton.pref_connection.notice "Torbutton dient uitgeschakeld te worden om deze instellingen te kunnen wijzigen.">
-<!ENTITY torbutton.pref_connection.more_info "Meer informatie">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is momenteel ingeschakeld. Als u uw niet aan Tor gerelateerde proxy-instellingen wilt wijzigen dient u Torbutton uit te schakelen en dan hier terug te komen. Als u uw Tor instellingen wilt wijzigen, gebruik dan het Torbutton Voorkeuren-venster.">
<!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Nieuw tor circuit voor deze website">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
<!ENTITY torbutton.prefs.privacy_security_settings "Privacy- en beveiligingsinstellingen">
<!ENTITY torbutton.prefs.restore_defaults "Terugzetten op begintoestand">
-<!ENTITY torbutton.prefs.test_settings "Testen van de instellingen">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Geen proxy voor: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Opgelet: gebruik van bovenstaande hostnamen vermijden">
<!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen">
<!ENTITY torbutton.cookiedialog.lockCol "Beveiligd">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Verwijder alle behalve beveiligde">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe Cookies niet">
-<!ENTITY torbutton.prefs.transparentTor "Transparante Torificatie (Heeft aangepaste transparente proxy of Tor router nodig)">
<!ENTITY torbutton.prefs.priv_caption "Privacyinstellingen">
<!ENTITY torbutton.prefs.block_disk "Bewaar geen surfgeschiedenis of websitegegevens. (Schakelt Privénavigatie in.)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index 3647617..056e445 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen
torbutton.panel.label.disabled = Tor uitgeschakeld
torbutton.panel.label.enabled = Tor ingeschakeld
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton biedt een knop aan om Tor instellingen te configuren en snel en makkelijk privé surfdata op te schonen.
-torbutton.popup.test.success = Tor proxy test geslaagd!
-torbutton.popup.test.failure = Tor proxy test MISLUKT! Proxy en Polipo instellingen controlleren.
-torbutton.popup.test.confirm_toggle = De laatst uitgevoerde Tor proxy test is mislukt.\n\n Wilt U toch naar Tor wisselen ?\n\n Opmerking: Als het probleem opgelost is, kan de test in het Torbutton Proxy instellingsscherm opnieuw uitgevoerd worden om deze melding te vermijden.
-torbutton.popup.test.ff3_notice = Klik op OK om de Tor proxy instellingen te testen. Deze test gebeurt op de achtergrond. Even geduld aub.
torbutton.popup.external.title = Wilt u een extern bestandstype downloaden?
torbutton.popup.external.app = Tor Browser kan dit bestand niet weergeven. U zou het moeten openen in een andere applicatie.\n\n
torbutton.popup.external.note = Bepaalde type bestanden kunnen ervoor zorgen dat applicaties verbinding met het internet maken zonder Tor.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Om veilig te surfen, zou u alleen bestanden m
torbutton.popup.launch = Download bestand
torbutton.popup.cancel = Annuleren
torbutton.popup.dontask = Download bestanden automatisch vanaf nu
-torbutton.popup.test.no_http_proxy = Tor proxy test : De lokale HTTP proxy is niet bereikbaar. Werkt Polipo zoals het hoort ?
torbutton.popup.prompted_language = Om je meer privacy te geven kan Torbutton pagina's in de Engelse taal opvragen. Dit kan er voor zorgen dat web pagina's die je graag in je eigen taal wilt lezen in het Engels weergegeven worden. Wil je web pagina's in de Engelse taal opvragen voor betere privacy?
torbutton.popup.no_newnym = Torbutton je niet veilig een nieuwe identiteit geven. Het heeft geen toegang tot de Tor Control Port.\n\nGebruik je de Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton kan instellingen niet bijwerken in de Tor Browser profiel folder.
-torbutton.popup.permission_denied = Stel de rechten van de Tor Browser folder opnieuw in of kopieer deze naar een nieuwe lokatie.
-torbutton.popup.device_full = De schijf lijkt vol te zijn. Maak ruimte vrij of verplaats Tor Browser naar een nieuw apparaat.
torbutton.title.prompt_torbrowser = Belangrijke Torbutton informatie
torbutton.popup.prompt_torbrowser = Torbutton werkt nu anders: je kan het niet meer uitzetten.\n\nWe hebben deze verandering doorgevoerd, omdat het niet veilig is om Torbutton te gebruiken in een browser welke ook gebruikt wordt voor niet-Tor browsen. Er zaten teveel fouten in welke we niet konden repareren op een andere manier.\n\nAls je Firefox wilt blijven gebruiken op de normale manier, dan zal je Torbutten moeten deinstalleren en de Tor Browser Bundle moeten downloaden. De privacy eigenschappen van Tor Browser zijn ook superieur ten opzichte van de normale Firefox, zelfs wanneer Firefox gebruikt wordt met Torbutton.\n\nOm Torbutton te verwijderen, ga naar Extra->Add-ons->Extensies en klik dan op de knop Uitschakelen naast Torbutton.
torbutton.popup.short_torbrowser = Belangrijke Torbutton Informatie!\n\nTorbutten is nu altijd ingeschakeld.\n\nKlik op de Torbutton voor meer informatie.
diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/nn/torbutton.dtd
+++ b/src/chrome/locale/nn/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/nn/torbutton.properties b/src/chrome/locale/nn/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/nn/torbutton.properties
+++ b/src/chrome/locale/nn/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/nso/torbutton.dtd
+++ b/src/chrome/locale/nso/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/nso/torbutton.properties b/src/chrome/locale/nso/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/nso/torbutton.properties
+++ b/src/chrome/locale/nso/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/oc/torbutton.dtd
+++ b/src/chrome/locale/oc/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/oc/torbutton.properties b/src/chrome/locale/oc/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/oc/torbutton.properties
+++ b/src/chrome/locale/oc/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/or/torbutton.dtd
+++ b/src/chrome/locale/or/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/or/torbutton.properties b/src/chrome/locale/or/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/or/torbutton.properties
+++ b/src/chrome/locale/or/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index 4330980..70622d3 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_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 "��ਦ ਪਰਾ�ਸ� ਸ��ਿੰ� ਦਿ�">
-<!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 "ਸਹਾ�ਤਾ">
-<!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 "S">
<!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 "��ਸ� ਸ��ਿੰ�">
-<!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)">
diff --git a/src/chrome/locale/pa/torbutton.properties b/src/chrome/locale/pa/torbutton.properties
index 7866f6f..93bbd40 100644
--- a/src/chrome/locale/pa/torbutton.properties
+++ b/src/chrome/locale/pa/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = ਰੱਦ �ਰ�
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.
diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/pap/torbutton.dtd
+++ b/src/chrome/locale/pap/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/pap/torbutton.properties b/src/chrome/locale/pap/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/pap/torbutton.properties
+++ b/src/chrome/locale/pap/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index eabc8ef..0006944 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ustawienia proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Użyj zalecanych ustawieÅ? proxy dla mojej wersji Firefoksa">
-<!ENTITY torbutton.prefs.use_polipo "Używaj Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Użyj spersonalizowanych ustawieÅ? proxy.">
-<!ENTITY torbutton.prefs.proxy.host.http "Serwer proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Serwer proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Serwer proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Serwer proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Aby zmieniÄ? te ustawienia wyÅ?Ä?cz Torbutton.">
-<!ENTITY torbutton.pref_connection.more_info "WiÄ?cej informacji">
-<!ENTITY torbutton.pref_connection_more_info.title "Pomoc">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton jest wÅ?Ä?czony. JeÅ?li chcesz zmieniÄ? inne ustawienia proxy musisz wyÅ?Ä?czyÄ? Torbutton i powróciÄ? tutaj. JeÅ?li chcesz zmieniÄ? ustawienia proxy Tor, zrób to tutaj.">
<!ENTITY torbutton.context_menu.new_identity "Nowa TożsamoÅ?Ä?">
<!ENTITY torbutton.context_menu.new_identity_key "o">
<!ENTITY torbutton.context_menu.new_circuit "Nowy obwód dla tej strony">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomiÄ? Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Ustawienia prywatnoÅ?ci i bezpieczeÅ?stwa">
<!ENTITY torbutton.prefs.restore_defaults "Ustawienia domyÅ?lne">
-<!ENTITY torbutton.prefs.test_settings "Testuj ustawienia">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Brak proxy dla: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Uwaga: Unikaj podawania nazw hostów powyżej">
<!ENTITY torbutton.cookiedialog.title "ZarzÄ?dzaj ochronÄ? ciasteczek">
<!ENTITY torbutton.cookiedialog.lockCol "Chronione">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "UsuÅ? wszystkie oprócz chronionych">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ChroÅ? nowe ciasteczka">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nie chroÅ? nowych ciasteczek">
-<!ENTITY torbutton.prefs.transparentTor "Przezroczysta toryfikacja (wymaga wÅ?asnego transproxy lub routera Tora)">
<!ENTITY torbutton.prefs.priv_caption "Ustawienia PrywatnoÅ?ci">
<!ENTITY torbutton.prefs.block_disk "Nie zapisuj historii przeglÄ?dania i danych o stronach (wÅ?Ä?cza Tryb Prywatny)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane sÅ?użÄ?ce do Å?ledzenia">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index 7bcb6bb..7164f69 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyÅ?Ä?czyÄ? Tora
torbutton.panel.label.disabled = Tor wyÅ?Ä?czony
torbutton.panel.label.enabled = Tor wÅ?Ä?czony
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton udostÄ?pnia przycisk do konfiguracji ustawieÅ? Tora oraz szybkiego i Å?atwego usuwania prywatnych danych z przeglÄ?darki.
-torbutton.popup.test.success = Test proxy zakoÅ?czony pomyÅ?lnie!
-torbutton.popup.test.failure = Test proxy siÄ? NIE POWIÃ?DÅ?! Sprawdź swoje ustawienia proxy i Polipo.
-torbutton.popup.test.confirm_toggle = Najnowszemu testowi proxy Tor nie udaÅ?o siÄ? skorzystaÄ? z Tora.\n\nNa pewno chcesz wÅ?Ä?czyÄ? mimo tego?\n\nUwaga: JeÅ?li problem zostaÅ? poprawiony, możesz ponownie uruchomiÄ? test w oknie Preferencji Proxy Torbuttona, aby wyÅ?Ä?czyÄ? to ostrzeżenie.
-torbutton.popup.test.ff3_notice = Kliknij OK aby przetestowaÄ? ustawienia proxy. Testowanie odbywa siÄ? w tle. Prosimy o cierpliwoÅ?Ä?.
torbutton.popup.external.title = PobraÄ? zewnÄ?trzny typ pliku?
torbutton.popup.external.app = Tor Browser nie może wyÅ?wietliÄ? tego pliku. Musisz otworzyÄ? go z innej aplikacji\n\n
torbutton.popup.external.note = Niektóre typy plików mogÄ? spowodowaÄ? poÅ?Ä?czenie siÄ? aplikacji z internetem bez użycia sieci Tor.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Aby byÄ? bezpiecznym, pobrane pliki należy u
torbutton.popup.launch = Pobierz plik
torbutton.popup.cancel = Anuluj
torbutton.popup.dontask = Automatyczne pobieranie plików jest od teraz wÅ?Ä?czone
-torbutton.popup.test.no_http_proxy = Test Tor proxy: Lokalne Proxy HTTP jest nieosiÄ?galne. Czy Polipo dziaÅ?a prawidÅ?owo?
torbutton.popup.prompted_language = Aby daÄ? Ci wiÄ?cej prywatnoÅ?ci, Torbutton może żÄ?daÄ? angielskich wersji stron internetowych. To może spowodowaÄ?, że strony, które wolisz czytaÄ? we wÅ?asnym jÄ?zyku bÄ?dÄ? siÄ? zamiast tego wyÅ?wietlaÄ? po angielsku.\n\nCzy chcesz żÄ?daÄ? stron w jÄ?zyku angielskim dla lepszej prywatnoÅ?ci?
torbutton.popup.no_newnym = Torbutton nie może bezpiecznie daÄ? Ci nowej tożsamoÅ?ci. Nie ma dostÄ?pu do Portu Kontrolnego Tora.\n\nUżywasz Paczki Tora z PrzeglÄ?darkÄ??
-torbutton.popup.pref_error = Torbutton nie może zaktualizowaÄ? preferencji w katalogu profilowym PrzeglÄ?darki Tora.
-torbutton.popup.permission_denied = ProszÄ? albo ponownie ustawiÄ? uprawnienia do katalogu PrzeglÄ?darki Tora albo skopiowaÄ? go w nowe miejsce.
-torbutton.popup.device_full = Dysk zdaje siÄ? byÄ? peÅ?ny. ProszÄ? zwolniÄ? miejsce lub przenieÅ?Ä? PrzeglÄ?darkÄ? Tora na nowe urzÄ?dzenie.
torbutton.title.prompt_torbrowser = Ważne informacje o Torbuttonie
torbutton.popup.prompt_torbrowser = Torbutton teraz dziaÅ?a inaczej: nie można już go wyÅ?Ä?czyÄ?.\n\nZrobiliÅ?my tÄ? zmianÄ?, gdyż nie jest bezpiecznie używaÄ? Torbuttona w przeglÄ?darce używanej także do przeglÄ?dania sieci bez Tora. ByÅ?o za dużo bÅ?Ä?dów, których nie mogliÅ?my naprawiÄ? inaczej.\n\nJeÅ?li chcesz dalej normalnie używaÄ? Firefoksa, odinstaluj Torbutton i pobierz PaczkÄ? Tora z PrzeglÄ?darkÄ?. Cechy prywatnoÅ?ci w PrzeglÄ?darce Tora sÄ? lepsze od tych w normalnym Firefoksie, nawet gdy jest używany z Torbutonem.\n\nAby usunÄ?Ä? Torbuttona, wejdź do NarzÄ?dzia->Dodatki->Rozszerzenia i kliknij przycisk UsuÅ? obok Torbuttona.
torbutton.popup.short_torbrowser = Ważne informacje o Torbuttonie!\n\nTorbutton jest teraz ciÄ?gle wÅ?Ä?czony.\n\nKliknij Turbutton, aby dowiedzieÄ? siÄ? wiÄ?cej.
diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/pms/torbutton.dtd
+++ b/src/chrome/locale/pms/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/pms/torbutton.properties b/src/chrome/locale/pms/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/pms/torbutton.properties
+++ b/src/chrome/locale/pms/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ps/torbutton.dtd
+++ b/src/chrome/locale/ps/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ps/torbutton.properties b/src/chrome/locale/ps/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ps/torbutton.properties
+++ b/src/chrome/locale/ps/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index e2dc1dd..a95eb42 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Configurações de Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Usar as configurações de proxy recomendadas para a minha versão de Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Usar o Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Usar configurações de proxy personalizadas">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy para HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy para SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy para FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy para Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Host para SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!ENTITY torbutton.pref_connection.notice "Desabilitar o Botão do Tor para alterar essas configurações.">
-<!ENTITY torbutton.pref_connection.more_info "Mais informações">
-<!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
-<!ENTITY torbutton.pref_connection_more_info.text "O Botão do Tor está habilitado. Se deseja alterar as configurações de proxy não relacionadas ao Tor, por favor desabilite o Botão do Tor e retorne aqui. Se você deseja alterar as configurações do Tor, por favor use a janela de configurações do Botão do Tor.">
<!ENTITY torbutton.context_menu.new_identity "Nova Identidade">
<!ENTITY torbutton.context_menu.new_identity_key "Eu">
<!ENTITY torbutton.context_menu.preferences "Configurações...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Clique para iniciar o Botão do Tor">
<!ENTITY torbutton.prefs.restore_defaults "Restaurar padrão">
-<!ENTITY torbutton.prefs.test_settings "Testar configurações">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Sem Proxy para: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite usar quaisquer dos hosts acima">
<!ENTITY torbutton.cookiedialog.title "Gerenciar Proteções de Cookies">
<!ENTITY torbutton.cookiedialog.lockCol "Protegido">
<!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Prototeger Novos COOKIES">
-<!ENTITY torbutton.prefs.transparentTor "Torificação Transparente (Requer transpoxy customizado ou roteador Tor)">
<!ENTITY torbutton.prefs.block_disk "Não gravar o histórico de navegação ou dados do site (permite Navegação em modo privado)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle">
<!ENTITY torbutton.prefs.block_plugins "Desabilita plugins do browser (como o Flash)">
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index cc48df6..6a58d4b 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Clique para desabilitar Tor
torbutton.panel.label.disabled = Tor desabilitado
torbutton.panel.label.enabled = Tor habilitado
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton fornece um botão para rapidamente configurar o Tor e facilmente limpar dados de navegação privados.
-torbutton.popup.test.success = O teste do proxy Tor foi feito com sucesso.
-torbutton.popup.test.failure = O teste do proxy FALHOU! Verifique seu proxy e as configurações do Polipo.
-torbutton.popup.test.confirm_toggle = O test do proxy Tor mais recente falhou ao usar o Tor.\n\nVocê tem certeza que deseja habilitar assim mesmo?\n\nNota: Se você tiver arrumado o problema, você pode retornar ao teste na janela Torbutton Proxy Preferences para eliminar este aviso.
-torbutton.popup.test.ff3_notice = Clique OK para testar as configurações do proxy Tor. Este teste acontecerá em segundo plano. Por favor seja paciente.
torbutton.popup.external.title = Carregar conteúdo externo?
torbutton.popup.external.app = Uma aplicação externa é necessária para manipular:\n\n
torbutton.popup.external.note = \n\nNOTA: Aplicações externas N�O são seguras por padrão e podem desmascarar você!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nSe este arquivo não é confiável, você d
torbutton.popup.launch = Rode a aplicação
torbutton.popup.cancel = Cancelado
torbutton.popup.dontask = Sempre ative aplicações a partir de agora
-torbutton.popup.test.no_http_proxy = Teste do Tor proxy: HTTP Proxy local está inacessÃvel. Polipo está rodando devidamente?
torbutton.popup.prompted_language = Para proporcionar mais privacidade a você, o Torbutton pode requisitar a versão em inglês de páginas da web. Isso pode fazer com que páginas que você prefere ler na sua lÃngua nativa apareçam em Inglês.
torbutton.popup.no_newnym = O Torbutton não pode te dar uma nova identidade com segurança. Ele não tem acesso à Porta de Controle Tor.\n\\n\nVocê está usando o Tor Browser Bundle?
-torbutton.popup.pref_error = O Torbutton não pode atualizar as preferências na pasta de perfil do Tor Browser.
-torbutton.popup.permission_denied = Por favor, restaure as permissões da pasta do Tor browser ou copie-a para um outro lugar.
-torbutton.popup.device_full = Este disco parece estar cheio. Por favor, libere espaço ou mova o Tor Browser para um novo dispositivo.
torbutton.title.prompt_torbrowser = Informação Importante do Torbutton
torbutton.popup.prompt_torbrowser = O Torbutton agora funciona de forma diferente: você não pode mais desliga-lo.\n\nFizemos essa mudança porque não é seguro utilizar o Torbutton em navegador que ao mesmo tempo seja usado para navegação não-Tor. Eram causados bugs demais que não pudemos resolver de nenhuma outra forma.\n\nSe você deseja continuar usando o Firefox normalmente, você deve desinstalar o Torbutton e baixar o Tor Browser Bundle. As configurações de privacidade do Tor Browser também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá em Ferramentas->Complementes->Extensões e clique no botão remover próximo ao Torbutton.
torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora mantem-se sempre habilitado.\n\nClique no Torbutton para mais informações.
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index 67e8649..9e4dcf7 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Configurações do Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Utilize as configurações recomendadas do proxy para a minha versão do Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Utilizar as configurações do proxy personalizadas">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Hospedeiro SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!ENTITY torbutton.pref_connection.notice "Desativar o Torbutton para alterar estas configurações.">
-<!ENTITY torbutton.pref_connection.more_info "Mais informação">
-<!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
-<!ENTITY torbutton.pref_connection_more_info.text "O Torbutton está ativado. Se desejar alterar as configurações proxy que não sejam do Tor, por favor, desative o Torbutton e volte aqui. Se desejar alterar as configurações do Tor, por favor, utilize a janela de preferências do Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Nova Identidade">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Configurações de Privacidade e Segurança">
<!ENTITY torbutton.prefs.restore_defaults "Restaurar Predefinições">
-<!ENTITY torbutton.prefs.test_settings "Testar Configurações">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Nenhum proxy para: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite utilizar quaisquer nomes de hospedeiro acima">
<!ENTITY torbutton.cookiedialog.title "Gerir Proteções dos Cookies">
<!ENTITY torbutton.cookiedialog.lockCol "Protegido">
<!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Proteger Novos Cookies">
-<!ENTITY torbutton.prefs.transparentTor "Torrificação Transparente (requer transpoxy personalizado ou encaminhamento do Tor)">
<!ENTITY torbutton.prefs.priv_caption "Configurações de Privacidade">
<!ENTITY torbutton.prefs.block_disk "Não gravar o histórico de navegação ou os dados do site da Web (ativa o Modo de Navegação Privado)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento">
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index e44eadd..2c1e704 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Clique para desativar o Tor
torbutton.panel.label.disabled = Tor Desativado
torbutton.panel.label.enabled = Tor Ativado
extensions.torbutton@xxxxxxxxxxxxxx.description = o Torbutton proporciona um botão para configurar as configurações do Tor e para limpar facilmente e rapidamente os dados de navegação privados.
-torbutton.popup.test.success = Teste do proxy bem sucedido!
-torbutton.popup.test.failure = Teste do proxy Tor - FALHOU! Verifique as configurações do proxy e Polipo.
-torbutton.popup.test.confirm_toggle = O mais recente teste de utilização de Tor falhou.\n\nTem a certeza que deseja continuar mesmo assim?\n\nNota: Se já resolveu o problema, é recomendado voltar a testar a ligação nas Preferências do Torbutton para remover este aviso.
-torbutton.popup.test.ff3_notice = Clique em "CONFIRMAR" para testar as configurações do proxy Tor. Este teste será realizado em segundo plano. Por favor, seja paciente.
torbutton.popup.external.title = Transferir um tipo de ficheiro externo?
torbutton.popup.external.app = O navegador Tor não consegue exibir este ficheiro. Poderá ter que o abrir com outra aplicação.\n\n
torbutton.popup.external.note = Alguns tipos dos ficheiros podem fazer com que as aplicações liguem à Internet sem utilizar o Tor.\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Para sua segurança, só deverá abrir os fic
torbutton.popup.launch = Transferir ficheiro
torbutton.popup.cancel = Cancelar
torbutton.popup.dontask = A partir de agora, transferir automaticamente os ficheiros
-torbutton.popup.test.no_http_proxy = Teste do proxy do Tor: Proxy HTTP local inacessÃvel. O Polipo está devidamente em execução?
torbutton.popup.prompted_language = Para lhe fornecer maior privacidade, o Torbutton pode requerer o uso da versão em inglês em páginas da Internet. Isto pode causar a visualização em inglês das páginas que prefere ler em português.\n\nPretende visualizar páginas em inglês, para melhor privacidade?
torbutton.popup.no_newnym = O Torbutton não pode, em segurança, fornecer-lhe uma nova identidade. Não tem acesso à porta de controle Tor.\n\nEstá a usar o Tor Browser Bundle?
-torbutton.popup.pref_error = O Torbutton não consegue atualizar as preferências na diretoria do perfil do Navegador Tor.
-torbutton.popup.permission_denied = Por favor, reinicie as permissões da diretoria do Navegador Tor ou copie-a para uma nova localização.
-torbutton.popup.device_full = O disco parece estar cheio. Por favor, liberte espaço ou mova o Navegador Tor para um novo dispositivo.
torbutton.title.prompt_torbrowser = Informação Importante do Torbutton
torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma diferente: já não pode desligá-lo.\n\nProcedemos a esta alteração porque não é seguro usar o Torbutton num explorador também usado para buscas fora do Tor. Havia demasiados erros que não conseguimos corrigir de outra forma.\n\nSe pretende continuar a usar o Firefox normalmente, deve desinstalar o Torbutton e carregar o Tor Browser Bundle para o seu computador. As polÃticas de privacidade do Explorador do Tor também são superiores à s normais no Firefox, mesmo quando este é usado com o Torbutton.\n\nPara remover o Torbutton abra Ferramentas->Acessórios->Extensões e clique no botão Remover junto ao Torbutton.
torbutton.popup.short_torbrowser = Informação importante do Torbutton!\nO Torbutton não está sempre activo.\nClique no Torbutton para mais informação.
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 2a7e79b..c1d2cc7 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "SetÄ?rile pentru proxy">
-<!ENTITY torbutton.prefs.recommended_settings "FoloseÈ?te setÄ?rile pentru proxy recomandate pentru versiunea mea de Firefox">
-<!ENTITY torbutton.prefs.use_polipo "FoloseÈ?te Polipo">
-<!ENTITY torbutton.prefs.custom_settings "FoloseÈ?te setÄ?ri individualizate pentru proxy">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Portul:">
-<!ENTITY torbutton.pref_connection.notice "DezactivaÅ£i Torbutton pentru a schimba aceste setÄ?ri.">
-<!ENTITY torbutton.pref_connection.more_info "Informatii suplimentare">
-<!ENTITY torbutton.pref_connection_more_info.title "Ajutor">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton este activatÄ? în acest moment. DacÄ? doriÅ£i sÄ? schimbaÅ£i setÄ?rile non-proxy Tor, dezactivaÅ£i Torbutton Å?i vÄ? rugÄ?m sÄ? reveniÅ£i aici. DacÄ? doriÅ£i sÄ? vÄ? schimbaÅ£i setÄ?rile Tor, vÄ? rugÄ?m sÄ? folosiÅ£i fereastra de preferinÅ£Ä? Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Identitate noua">
<!ENTITY torbutton.context_menu.new_identity_key "l">
<!ENTITY torbutton.context_menu.preferences "PreferinÈ?e...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "ApasÄ? pentru pornirea Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "RestaureazÄ? setÄ?rile implicite">
-<!ENTITY torbutton.prefs.test_settings "SetÄ?rile pentru testÄ?ri">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Nici un proxy pentru:">
-<!ENTITY torbutton.prefs.no_proxy_warning "ATENÈ?IE: EvitaÈ?i sÄ? folosiÈ?i unul din hostname-le de mai sus">
<!ENTITY torbutton.cookiedialog.title "GestioneazÄ? ProtecÅ£ii Cookie">
<!ENTITY torbutton.cookiedialog.lockCol "Protejat">
<!ENTITY torbutton.cookiedialog.domainCol "Gazda">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Indeparteaza tot, mai putin protejat">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi">
-<!ENTITY torbutton.prefs.transparentTor "Torificare transparentÄ? (NecesitÄ? transproy sau Tor modificat)">
<!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)">
diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties
index cf8e250..95c6fd8 100644
--- a/src/chrome/locale/ro/torbutton.properties
+++ b/src/chrome/locale/ro/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click pentru a opri Tor
torbutton.panel.label.disabled = Tor a fost oprit
torbutton.panel.label.enabled = Tor a fost pornit
extensions.torbutton@xxxxxxxxxxxxxx.description = ButonulTOR ofera posibilitatea de a configura setarile browser-ului si de a golii rapid si usor datele private ale navigarii.
-torbutton.popup.test.success = Testul proxy Tor a fost efectuat cu succes!
-torbutton.popup.test.failure = Testul proxy Tor a EÅ?UAT! VerificaÅ£i setÄ?rile proxy Å?i Polipo.
-torbutton.popup.test.confirm_toggle = Cel mai recent test de proxy Tor a eÅ?uat sÄ? foloseasca Tor.\n\nEÅ?ti sigur cÄ? vrei sÄ? îl activezi oricum?\n\nObservatie: DacÄ? aÅ£i fixat problema, puteÅ£i sÄ? rulaÅ£i din nou testul Proxy Torbutton din fereastra Preferences sÄ? elimine acest avertisment.
-torbutton.popup.test.ff3_notice = ApasÄ? OK pentru a testa setÄ?rile proxy Tor. Acest test se va efectua în spate. VÄ? rugÄ?m sÄ? aveÅ£i rÄ?bdare.
torbutton.popup.external.title = SÄ? încarc conÈ?inutul extern?
torbutton.popup.external.app = O aplicaÅ£ie externÄ? este necesarÄ? sÄ? se ocupe de:\n\n
torbutton.popup.external.note = \n\nObservatie: Aplicatiile externe NU sunt sigure cu setÄ?rile implicite Tor, Å?i vÄ? pot demasca!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nDaca fisierul nu este de incredere, ar treb
torbutton.popup.launch = PorneÈ?te aplicaÈ?ia
torbutton.popup.cancel = Anulare
torbutton.popup.dontask = Ã?ntotdeauna lanseazÄ? aplicaÅ£ii de acum încolo
-torbutton.popup.test.no_http_proxy = Testul proxy Tor: Local proxy HTTP este inaccesibil. Este Polipo executat corect?
torbutton.popup.prompted_language = Pentru a va asigura o confidentialitate sporita, Torbutton poate solicita versiunea in limba engleza a paginilor web. Acest lucru poate determina afisarea in limba engleza a paginilor pe care ati fi dorit sa le cititi in limba dumneavoastra natala.\n\nDoriti sa solicitati versiunea in limba engleza a paginilor web pentru a va bucura de o confidentialitate sporita ?
torbutton.popup.no_newnym = Torbutton nu va poate oferi in siguranta o noua identitate. Nu are acces la Tor Control Port\n\nSunteti sigur ca utilizati Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton nu poate actualiza preferintele in directorul de profile al Tor Bowser.
-torbutton.popup.permission_denied = Va rugam fie sa resetati permisiunile directorului Tor Browser fie sa il copiati intr-o locatie noua.
-torbutton.popup.device_full = Discul pare sa fie plin. Va rugam sa asigurati mai mult spatiu liber pe disc sau sa mutati Tor browser pe un nou dispozitiv.
torbutton.title.prompt_torbrowser = Informatii importante Torbutton
torbutton.popup.prompt_torbrowser = Torbutton lucreaza diferit acum: nu mai poate fi inchis. Am facut aceasta schimbare deoarece Torbutton nu poate fi folosit in siguranta intr-un browser care e utilizat si pentru navigare non-Tor. Erau prea multe buguri pe care nu le puteam remedia in alt fel. Daca doriti sa continuati sa folositi Firefox normal, ar trebui sa dezinstalati Torbutton si sa descarcati Tor Browser Bundle. Proprietatile de navigare privata ale Tor Browser sunt deasemenea superioare celor ale Firefox normal, chiar si atunci cand Firefox este folosit cu Torbutton. Sa indepartati Torbutton, mergeti la Unelte->Suplimente->Extensii si faceti click pe butonul Elimina de langa Torbutton.
torbutton.popup.short_torbrowser = Informatie Torbutton importanta! Torbutton este acum permanent activat. Faceti click pe Torbutton pentru mai multe informatii.
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 36a27e6..49b9d98 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?Ñ?полÑ?зоваÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и, Ñ?екомендованнÑ?е длÑ? данной веÑ?Ñ?ии Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Ð?Ñ?полÑ?зоваÑ?Ñ? Polipo">
-<!ENTITY torbutton.prefs.custom_settings "УÑ?Ñ?ановиÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и вÑ?Ñ?Ñ?нÑ?Ñ?">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-пÑ?окÑ?и:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-пÑ?оÑ?окол:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
-<!ENTITY torbutton.pref_connection.notice "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? Torbutton длÑ? изменениÑ? наÑ?Ñ?Ñ?оек необÑ?одимо.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?одÑ?обноÑ?Ñ?и">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?омоÑ?Ñ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton вклÑ?Ñ?ен. Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е измениÑ?Ñ? наÑ?Ñ?Ñ?ойки пÑ?окÑ?и, не Ñ?влÑ?Ñ?Ñ?егоÑ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? Ñ?еÑ?и Tor, необÑ?одимо Ñ?наÑ?ала оÑ?клÑ?Ñ?иÑ?Ñ? Torbutton и заÑ?ем веÑ?нÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?да. Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е измениÑ?Ñ? наÑ?Ñ?Ñ?ойки Tor, необÑ?одимо иÑ?полÑ?зоваÑ?Ñ? окно наÑ?Ñ?Ñ?оек Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Ð?оваÑ? лиÑ?ноÑ?Ñ?Ñ?">
<!ENTITY torbutton.context_menu.new_identity_key "Я">
<!ENTITY torbutton.context_menu.new_circuit "Ð?оваÑ? Ñ?епоÑ?ка Tor длÑ? Ñ?Ñ?ого cайÑ?а">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? иниÑ?иализиÑ?оваÑ?Ñ? Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Ð?аÑ?Ñ?Ñ?ойки конÑ?иденÑ?иалÑ?ноÑ?Ñ?и и безопаÑ?ноÑ?Ñ?и">
<!ENTITY torbutton.prefs.restore_defaults "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? знаÑ?ениÑ? по Ñ?молÑ?аниÑ?">
-<!ENTITY torbutton.prefs.test_settings "Ð?Ñ?овеÑ?иÑ?Ñ? наÑ?Ñ?Ñ?ойки">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS 4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS 5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ð?еÑ? пÑ?окÑ?и длÑ?: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Ð?нимание: Ð?е вноÑ?иÑ?е никакиÑ? имен доменов в поле вÑ?Ñ?е">
<!ENTITY torbutton.cookiedialog.title "УпÑ?авление заÑ?иÑ?ой кÑ?ки-Ñ?айлов">
<!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?иÑ?ено">
<!ENTITY torbutton.cookiedialog.domainCol "Ð?едÑ?Ñ?ий Ñ?зел">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "УдалиÑ?Ñ? вÑ?е, кÑ?оме заÑ?иÑ?Ñ?ннÑ?Ñ?">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?аÑ?иÑ?аÑ?Ñ? новÑ?е кÑ?ки-Ñ?айлÑ?">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?е заÑ?иÑ?аÑ?Ñ? новÑ?е кÑ?ки-Ñ?айлÑ?">
-<!ENTITY torbutton.prefs.transparentTor "Ð?Ñ?озÑ?аÑ?наÑ? "Ñ?оÑ?иÑ?икаÑ?иÑ?" (Ñ?Ñ?ебÑ?еÑ? полÑ?зоваÑ?елÑ?Ñ?киÑ? transproxy или Tor-маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?а)">
<!ENTITY torbutton.prefs.priv_caption "Ð?аÑ?Ñ?Ñ?ойки конÑ?иденÑ?иалÑ?ноÑ?Ñ?и">
<!ENTITY torbutton.prefs.block_disk "Ð?е Ñ?оÑ?Ñ?анÑ?Ñ?Ñ? иÑ?Ñ?оÑ?иÑ? жÑ?Ñ?нала поÑ?еÑ?ений и даннÑ?е Ñ? поÑ?еÑ?аемÑ?Ñ? Ñ?айÑ?ов (акÑ?ивиÑ?Ñ?еÑ? Ñ?Ñ?нкÑ?иÑ? конÑ?иденÑ?иалÑ?ного пÑ?оÑ?моÑ?Ñ?а)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Ð?локиÑ?оваÑ?Ñ? Ñ?Ñ?оÑ?онние кÑ?ки-Ñ?айлÑ? и дÑ?Ñ?гие даннÑ?е Ñ?лежениÑ?">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index 65d1d63..5f6f439 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Ð?ажмиÑ?е, Ñ?Ñ?обÑ? оÑ?клÑ?Ñ?иÑ?Ñ?
torbutton.panel.label.disabled = Tor оÑ?клÑ?Ñ?ен
torbutton.panel.label.enabled = Tor вклÑ?Ñ?ен
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton пÑ?едÑ?Ñ?маÑ?Ñ?иваеÑ? кнопкÑ?, Ñ?Ñ?обÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? Tor и бÑ?Ñ?Ñ?Ñ?о и легко оÑ?иÑ?Ñ?иÑ?Ñ? лиÑ?нÑ?е даннÑ?е пÑ?оÑ?моÑ?Ñ?а.
-torbutton.popup.test.success = Tor proxy Ñ?еÑ?Ñ? Ñ?Ñ?пеÑ?но пÑ?ойден!
-torbutton.popup.test.failure = ТеÑ?Ñ? Tor пÑ?окÑ?и завеÑ?Ñ?илÑ?Ñ? Ð?Ð?УÐ?Ð?ЧÐ?Ð?! Ð?Ñ?овеÑ?Ñ?Ñ?е ваÑ? пÑ?окÑ?и и конÑ?игÑ?Ñ?аÑ?иÑ? Polipo.
-torbutton.popup.test.confirm_toggle = Самое поÑ?леднее иÑ?пÑ?Ñ?ание Tor пÑ?окÑ?и не Ñ?далоÑ?Ñ? иÑ?полÑ?зоваÑ?Ñ? Tor.\n\nÐ?Ñ? Ñ?веÑ?енÑ? Ñ?Ñ?о Ñ?оÑ?иÑ?е вклÑ?Ñ?иÑ?Ñ? Tor не Ñ?моÑ?Ñ?Ñ? на пÑ?овал Ñ?еÑ?Ñ?а?\n\nÐ?Ñ?имеÑ?ание: Ð?Ñ?ли пÑ?облема Ñ?еÑ?ена, можно бÑ?деÑ? повÑ?оÑ?нÑ?Ñ? иÑ?пÑ?Ñ?аний в окне 'Ð?аÑ?Ñ?Ñ?ойка пÑ?окÑ?и Torbutton' длÑ? Ñ?Ñ?Ñ?Ñ?анениÑ? Ñ?Ñ?ого пÑ?едÑ?пÑ?еждениÑ?.
-torbutton.popup.test.ff3_notice = Ð?ажмиÑ?е OK длÑ? пÑ?овеÑ?ки наÑ?Ñ?Ñ?оек Tor. ÐÑ?оÑ? Ñ?еÑ?Ñ? вÑ?полнÑ?еÑ?Ñ?Ñ? в Ñ?оне. Ð?ожалÑ?йÑ?Ñ?а, дождиÑ?еÑ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ?ов.
torbutton.popup.external.title = СкаÑ?аÑ?Ñ? внеÑ?ний Ñ?айл?
torbutton.popup.external.app = Tor Browser не можеÑ? показаÑ?Ñ? Ñ?Ñ?оÑ? Ñ?айл. Ð?ам необÑ?одимо оÑ?кÑ?Ñ?Ñ?Ñ? его Ñ? помоÑ?Ñ?Ñ? дÑ?Ñ?гого пÑ?иложениÑ?.\n\n
torbutton.popup.external.note = Ð?екоÑ?оÑ?Ñ?е Ñ?ипÑ? Ñ?айлов могÑ?Ñ? вÑ?зваÑ?Ñ? пÑ?иложениÑ?, Ñ?оединÑ?Ñ?Ñ?иеÑ?Ñ? Ñ? Ñ?еÑ?Ñ?Ñ? без иÑ?полÑ?зованиÑ? Tor.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Ð?лÑ? безопаÑ?ноÑ?Ñ?и, Ñ?екоме
torbutton.popup.launch = СкаÑ?аÑ?Ñ? Ñ?айл
torbutton.popup.cancel = Ð?Ñ?мениÑ?Ñ?
torbutton.popup.dontask = С Ñ?Ñ?ого моменÑ?а Ñ?каÑ?иваÑ?Ñ? Ñ?айлÑ? авÑ?омаÑ?иÑ?еÑ?ки
-torbutton.popup.test.no_http_proxy = Tor пÑ?окÑ?и-Ñ?еÑ?Ñ?: Ð?еÑ?Ñ?нÑ?е HTTP-пÑ?окÑ?и недоÑ?Ñ?Ñ?пнÑ?. РабоÑ?аеÑ?-ли Polipo должнÑ?м обÑ?азом?
torbutton.popup.prompted_language = Ð?лÑ? пÑ?едоÑ?Ñ?авлениÑ? болÑ?Ñ?ей пÑ?иваÑ?ноÑ?Ñ?и, Torbutton можеÑ? запÑ?аÑ?иваÑ?Ñ? веÑ?Ñ?ии Ñ?Ñ?Ñ?аниÑ? на английÑ?ком Ñ?зÑ?ке. ÐÑ?о можеÑ? повлеÑ?Ñ? оÑ?обÑ?ажение Ñ?Ñ?Ñ?аниÑ? на английÑ?ком Ñ?зÑ?ке, вмеÑ?Ñ?о оÑ?обÑ?ажениÑ? иÑ? на ваÑ?ем Ñ?одном Ñ?зÑ?ке.\n\nХоÑ?иÑ?е запÑ?аÑ?иваÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ? на английÑ?ком Ñ?зÑ?ке длÑ? болÑ?Ñ?ей пÑ?иваÑ?ноÑ?Ñ?и?
torbutton.popup.no_newnym = Torbutton не можеÑ? безопаÑ?но даÑ?Ñ? вам новÑ?Ñ? лиÑ?ноÑ?Ñ?Ñ?. Ð?н не имееÑ? доÑ?Ñ?Ñ?па к Tor Control Port.\n\nÐ?Ñ? иÑ?полÑ?зÑ?еÑ?е Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton не можеÑ? обновиÑ?Ñ? наÑ?Ñ?Ñ?ойки в папке пÑ?оÑ?илÑ? Tor Browser.
-torbutton.popup.permission_denied = Ð?ожалÑ?йÑ?Ñ?а, либо Ñ?бÑ?оÑ?Ñ?Ñ?е Ñ?азÑ?еÑ?ениÑ? длÑ? папки Tor Browser или Ñ?копиÑ?Ñ?йÑ?е еÑ? в дÑ?Ñ?гое меÑ?Ñ?о.
-torbutton.popup.device_full = Ð?оÑ?оже, Ñ?Ñ?о диÑ?к заполнен. Ð?ожалÑ?йÑ?Ñ?а, оÑ?вободиÑ?е меÑ?Ñ?о или пеÑ?емеÑ?Ñ?иÑ?е Tor Browser на дÑ?Ñ?гой диÑ?к.
torbutton.title.prompt_torbrowser = Ð?ажнаÑ? инÑ?оÑ?маÑ?иÑ? Torbutton
torbutton.popup.prompt_torbrowser = Torbutton Ñ?абоÑ?аеÑ? по-дÑ?Ñ?гомÑ?. Ð?Ñ? не можеÑ?е вÑ?клÑ?Ñ?иÑ?Ñ? его болÑ?Ñ?е â?? â?? Ð?Ñ? Ñ?делали Ñ?Ñ?о изменение, поÑ?омÑ? Ñ?Ñ?о Ñ?Ñ?о не безопаÑ?но иÑ?полÑ?зоваÑ?Ñ? Torbutton в бÑ?аÑ?зеÑ?е, коÑ?оÑ?Ñ?й Ñ?акже иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? длÑ? не-Tor пÑ?оÑ?моÑ?Ñ?а. СÑ?Ñ?еÑ?Ñ?вовали Ñ?лиÑ?ком много оÑ?ибок Ñ?ам, Ñ?Ñ?о мÑ? не могли иÑ?пÑ?авиÑ?Ñ? никаким дÑ?Ñ?гим Ñ?поÑ?обом. â?? â?? Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е пÑ?одолжаÑ?Ñ? иÑ?полÑ?зоваÑ?Ñ? Firefox ноÑ?малÑ?но, вÑ? должнÑ? Ñ?далиÑ?Ñ? Torbutton и Ñ?каÑ?аÑ?Ñ? Tor Browser Bundle. СвойÑ?Ñ?ва конÑ?иденÑ?иалÑ?ноÑ?Ñ?и Tor Browser Ñ?акже пÑ?евоÑ?Ñ?одÑ?Ñ? обÑ?Ñ?нÑ?й Firefox, даже еÑ?ли Firefox иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? Ñ? Torbutton. â?? â?? ЧÑ?обÑ? Ñ?далиÑ?Ñ? Torbutton, пеÑ?ейдÐ
¸Ñ?е в менÑ? СеÑ?виÑ?-> Ð?ополнениÑ?-> РаÑ?Ñ?иÑ?ениÑ?, а заÑ?ем нажмиÑ?е кнопкÑ? УдалиÑ?Ñ? Ñ?Ñ?дом Ñ? Torbutton.
torbutton.popup.short_torbrowser = Ð?ажнаÑ? инÑ?оÑ?маÑ?иÑ? Torbutton! â?? â?? Torbutton Ñ?епеÑ?Ñ? вÑ?егда вклÑ?Ñ?ен. â?? â?? Ð?ажмиÑ?е на Torbutton длÑ? полÑ?Ñ?ениÑ? дополниÑ?елÑ?ной инÑ?оÑ?маÑ?ии.
diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/sco/torbutton.dtd
+++ b/src/chrome/locale/sco/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/sco/torbutton.properties b/src/chrome/locale/sco/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/sco/torbutton.properties
+++ b/src/chrome/locale/sco/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd
index 1daf430..77ce90a 100644
--- a/src/chrome/locale/sk/torbutton.dtd
+++ b/src/chrome/locale/sk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Nastavenie proxy">
-<!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 "PomocnÃk">
-<!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 "Nová identita">
<!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 "Obnoviť predvolené">
-<!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)">
diff --git a/src/chrome/locale/sk/torbutton.properties b/src/chrome/locale/sk/torbutton.properties
index dc5055e..6267903 100644
--- a/src/chrome/locale/sk/torbutton.properties
+++ b/src/chrome/locale/sk/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Kliknite pre vypnutie Tor
torbutton.panel.label.disabled = Tor vypnutý
torbutton.panel.label.enabled = Tor zapnutý
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test bol úspešný!
-torbutton.popup.test.failure = Tor proxy test bol NE�SPEŠN�! Skontrolujte Vaše proxy a Polipo nastavenia.
-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 = NaÄ?ÃtaÅ¥ externý obsah?
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 = Spustiť aplikáciu
torbutton.popup.cancel = Zrušiť
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 = Dôležité Torbutton Informácie
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 = Dôležité Torbutton Informácie!\n\nTorbutton je odteraz povolený.\n\nStlaÄ?te Torbutton pre viacej informáciÃ.
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 074e67b..d18faf7 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Nastavitve posredniškega (proxy) strežnika">
-<!ENTITY torbutton.prefs.recommended_settings "Uporabi priporoÄ?ene nastavitve posredniÅ¡kega strežnika za mojo razliÄ?ico Firefoxa">
-<!ENTITY torbutton.prefs.use_polipo "uporaba polipo">
-<!ENTITY torbutton.prefs.custom_settings "Uporabi nastavitve proxy strežnika po meri">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP posredniški strežnik:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL posredniški strežnik:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP posredniški strežnik:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher posredniški strežnik:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS gostitelj:">
-<!ENTITY torbutton.prefs.proxy.port "Vrata:">
-<!ENTITY torbutton.pref_connection.notice "Ä?e želite spremeniti te nastavitve onemogoÄ?ite razÅ¡iritev Torbutton.">
-<!ENTITY torbutton.pref_connection.more_info "VeÄ? informacij">
-<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ?">
-<!ENTITY torbutton.pref_connection_more_info.text "RazÅ¡iritev Torbutton je trenutno omogoÄ?ena. Ä?e želite spremeniti nastavitve ne-Tor posredniÅ¡kega strežnika (proxy) najprej onemogoÄ?ite razÅ¡iritev Torbutton, nato pa se vrnite na to mesto. Ä?e želite spremeniti nastavitve povezave v Tor omrežje uporabite nastavitve razÅ¡iritve Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "nova indetiteta">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Nastavitve...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razširitve Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Privzete nastavitve">
-<!ENTITY torbutton.prefs.test_settings "Preveri nastavitve">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ne uporabi Proxi za: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Opozorilo: izogibaj se uporabi zgornjih oznak (hostname)">
<!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 "ne zaÅ¡Ä?iti novih piÅ¡kotkov">
-<!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)">
diff --git a/src/chrome/locale/sl/torbutton.properties b/src/chrome/locale/sl/torbutton.properties
index 4648fec..9f8156a 100644
--- a/src/chrome/locale/sl/torbutton.properties
+++ b/src/chrome/locale/sl/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klikni za izklop anonimizacije
torbutton.panel.label.disabled = Anonimizacija izkljuÄ?ena
torbutton.panel.label.enabled = Anonimizacija vkljuÄ?ena
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test je uspešen!
-torbutton.popup.test.failure = Tor proxy test NI USPEÅ EN! preveri svoje poroxy in Polipo nastavitve.
-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 = pritisni OK da preverite Tor proxy nastavitve. Test se bo izvajal v ozadju. Bodite potrpežljivi
torbutton.popup.external.title = Naloži zunanje vsebine?
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 = Zaženi program
torbutton.popup.cancel = PrekliÄ?i
torbutton.popup.dontask = Vedno zaženi program.
-torbutton.popup.test.no_http_proxy = Tor proxy test: Lokalni HTTP proxy je nedosegljiv. Ali Polipo deluje pravilno?
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 = Na disku ni veÄ? prostora. Naredite prostor ali premaknite Tor brskalnik na drugo napravo.
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.
diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/so/torbutton.dtd
+++ b/src/chrome/locale/so/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/so/torbutton.properties b/src/chrome/locale/so/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/so/torbutton.properties
+++ b/src/chrome/locale/so/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/son/torbutton.dtd
+++ b/src/chrome/locale/son/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/son/torbutton.properties b/src/chrome/locale/son/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/son/torbutton.properties
+++ b/src/chrome/locale/son/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index f3ac414..c9f35bf 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Konfigurimi i Proxy">
-<!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 "Porta:">
-<!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 "Ndihmë">
-<!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 "Identitet i Ri">
<!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)">
diff --git a/src/chrome/locale/sq/torbutton.properties b/src/chrome/locale/sq/torbutton.properties
index 268554b..1a9bd3e 100644
--- a/src/chrome/locale/sq/torbutton.properties
+++ b/src/chrome/locale/sq/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = Anullo
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.
diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd
index 78509f0..6b62886 100644
--- a/src/chrome/locale/sr/torbutton.dtd
+++ b/src/chrome/locale/sr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?оÑ?Ñ?авке поÑ?Ñ?едника">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?оÑ?иÑ?Ñ?и пÑ?епоÑ?Ñ?Ñ?ене поÑ?Ñ?авке поÑ?Ñ?едника за моÑ?е издаÑ?е Ñ?аÑ?еÑ?Ñ?окÑ?а">
-<!ENTITY torbutton.prefs.use_polipo "Ð?оÑ?иÑ?Ñ?и Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Ð?оÑ?иÑ?Ñ?и пÑ?илагоÑ?ене поÑ?Ñ?авке поÑ?Ñ?едника">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP поÑ?Ñ?едник:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL поÑ?Ñ?едник:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP поÑ?Ñ?едник:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher поÑ?Ñ?едник:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS домаÑ?ин:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
-<!ENTITY torbutton.pref_connection.notice "Ð?абÑ?ани пÑ?оменÑ? овиÑ? поÑ?Ñ?авки.">
-<!ENTITY torbutton.pref_connection.more_info "Ð?иÑ?е инÑ?оÑ?маÑ?иÑ?а">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?омоÑ?">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ñ?е Ñ?Ñ?енÑ?Ñ?но омогÑ?Ñ?ен. Ð?ко желиÑ?е да пÑ?омениÑ?е Ñ?воÑ?е поÑ?Ñ?авке поÑ?Ñ?едника невезане за Tor, молимо Ð?аÑ? да онемогÑ?Ñ?иÑ?е Torbutton и вÑ?аÑ?иÑ?е Ñ?е овде. Ð?ко желиÑ?е да пÑ?омениÑ?е Ñ?воÑ?е Tor поÑ?Ñ?авке, молимо Ð?аÑ? да коÑ?иÑ?Ñ?иÑ?е пÑ?озоÑ? за подеÑ?аваÑ?а.">
<!ENTITY torbutton.context_menu.new_identity "Ð?ов иденÑ?иÑ?еÑ?">
<!ENTITY torbutton.context_menu.new_identity_key "Ð?">
<!ENTITY torbutton.context_menu.preferences "Ð?оÑ?Ñ?авке...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "Ц">
<!ENTITY torbutton.button.tooltip "Ð?ликниÑ?е да биÑ?Ñ?е покÑ?енÑ?ли Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Ð?овÑ?аÑ?и подÑ?азÑ?мевано">
-<!ENTITY torbutton.prefs.test_settings "Ð?Ñ?овеÑ?а поÑ?Ñ?авки">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ð?ез поÑ?Ñ?едника за:">
-<!ENTITY torbutton.prefs.no_proxy_warning "УпозоÑ?еÑ?е: избегни коÑ?иÑ?Ñ?еÑ?е изнад наведене називе домаÑ?ина">
<!ENTITY torbutton.cookiedialog.title "УÑ?еди заÑ?Ñ?иÑ?Ñ? колаÑ?иÑ?а">
<!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?Ñ?иÑ?ен">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Уклони Ñ?ве оÑ?им заÑ?Ñ?иÑ?ениÑ?">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?аÑ?Ñ?иÑ?и нове колаÑ?иÑ?е">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?е Ñ?Ñ?иÑ?и нове колаÑ?иÑ?е">
-<!ENTITY torbutton.prefs.transparentTor "ТÑ?анÑ?паÑ?енÑ?а ТоÑ?иÑ?икаÑ?иÑ?а (заÑ?Ñ?ева поÑ?ебан Tor пÑ?окÑ?и или Tor Ñ?Ñ?Ñ?еÑ?)">
<!ENTITY torbutton.prefs.block_disk "Ne pamti moji istoriju pretrazivanja ili podatke sa web sajtova(Omogucava Private Browsing Mode)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju">
<!ENTITY torbutton.prefs.block_plugins "OnemogucÌ?i dodatke pretrazivaca (kao Å¡to su Flash )">
diff --git a/src/chrome/locale/sr/torbutton.properties b/src/chrome/locale/sr/torbutton.properties
index eb50993..b587448 100644
--- a/src/chrome/locale/sr/torbutton.properties
+++ b/src/chrome/locale/sr/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Ð?ликниÑ?е да биÑ?Ñ?е онемог
torbutton.panel.label.disabled = ТоÑ? Ñ?е онемогÑ?Ñ?ен
torbutton.panel.label.enabled = ТоÑ? Ñ?е омогÑ?Ñ?ен
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton nudi dugme za konfiguraciju Tor postavki i lako i brzo ciscenje pretrazivackih informacija.
-torbutton.popup.test.success = ТеÑ?Ñ?иÑ?аÑ?е поÑ?Ñ?едниÑ?ког Ñ?еÑ?веÑ?а Ñ?е Ñ?Ñ?пело!
-torbutton.popup.test.failure = Ð?е могÑ? да Ñ?еÑ?Ñ?иÑ?ам Ñ?еÑ?веÑ?. Ð?Ñ?овеÑ?иÑ?е поÑ?Ñ?едниÑ?ка подеÑ?аваÑ?а и подеÑ?аваÑ?а Ð?олипа.
-torbutton.popup.test.confirm_toggle = Ð?аÑ?новиÑ?е Ñ?еÑ?Ñ?иÑ?аÑ?е ТоÑ? поÑ?Ñ?едника ниÑ?е Ñ?Ñ?пело да Ñ?е Ñ?Ñ?клади Ñ? ТоÑ? мÑ?ежом.\n\nÐ?елиÑ?е ли ипак да га омогÑ?Ñ?иÑ?е?\n\nÐ?апомена: ако Ñ?Ñ?е пÑ?онаÑ?ли Ñ?еÑ?еÑ?е пÑ?облема, можеÑ?е поново да покÑ?енеÑ?е Ñ?еÑ?Ñ? Ñ? подеÑ?аваÑ?има поÑ?Ñ?едника ТоÑ?баÑ?она да биÑ?Ñ?е Ñ?е Ñ?еÑ?или овог Ñ?позоÑ?еÑ?а.
-torbutton.popup.test.ff3_notice = Ð?ликниÑ?е на â??У Ñ?едÑ?â?? да иÑ?пÑ?обаÑ?е подеÑ?аваÑ?а ТоÑ? поÑ?Ñ?едника. Ð?ва пÑ?оба Ñ?е Ñ?е одигÑ?аÑ?и Ñ? позадини. Ð?Ñ?диÑ?е Ñ?Ñ?Ñ?пÑ?иви.
torbutton.popup.external.title = УÑ?иÑ?аÑ?и Ñ?поÑ?ни Ñ?адÑ?жаÑ??
torbutton.popup.external.app = Ð?оÑ?Ñ?ебан Ñ?е Ñ?поÑ?ни пÑ?огÑ?ам за Ñ?Ñ?коваÑ?е:\n\n
torbutton.popup.external.note = \n\nÐ?апомена: Ñ?поÑ?ни пÑ?огÑ?ами не гаÑ?анÑ?Ñ?Ñ?Ñ? безбедноÑ?Ñ? и могÑ? ваÑ? оÑ?кÑ?иÑ?и!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nÐ?ко немаÑ?е повеÑ?еÑ?а Ñ? о
torbutton.popup.launch = Ð?окÑ?ени пÑ?огÑ?ам
torbutton.popup.cancel = Ð?Ñ?кажи
torbutton.popup.dontask = Ð?дÑ?ад Ñ?век покÑ?еÑ?и пÑ?огÑ?аме
-torbutton.popup.test.no_http_proxy = Ð?Ñ?оба ТоÑ? поÑ?Ñ?едника: локални HTTP поÑ?Ñ?едник Ñ?е недоÑ?Ñ?Ñ?пан. Ð?Ñ?овеÑ?иÑ?е да ли Ñ?е Ð?олипо иÑ?пÑ?авно подеÑ?ен.
torbutton.popup.prompted_language = Ð?а би вам обезбедио боÑ?Ñ? пÑ?иваÑ?ноÑ?Ñ?, ТоÑ?баÑ?он може да заÑ?Ñ?ева енглеÑ?кÑ? веÑ?зиÑ?Ñ? инÑ?еÑ?неÑ? Ñ?Ñ?Ñ?аниÑ?а. Ð?бог Ñ?ога, могÑ?Ñ?е Ñ?е да Ñ?е Ñ?е Ñ?Ñ?Ñ?аниÑ?е коÑ?е биÑ?Ñ?е инаÑ?е Ñ?иÑ?али на маÑ?еÑ?Ñ?ем Ñ?езикÑ? пÑ?иказиваÑ?и на енглеÑ?ком Ñ?езикÑ?.\n\nÐ?елиÑ?е ли да заÑ?Ñ?еваÑ?е Ñ?Ñ?Ñ?аниÑ?е на енглеÑ?ком Ñ?езикÑ? Ñ? Ñ?иÑ?Ñ? боÑ?е пÑ?иваÑ?ноÑ?Ñ?и?
torbutton.popup.no_newnym = ТоÑ?баÑ?он не може безбедно да вам додели нови иденÑ?иÑ?еÑ? Ñ?еÑ? нема пÑ?иÑ?Ñ?Ñ?п ТоÑ? конÑ?Ñ?олном поÑ?Ñ?Ñ?.\n\nÐ?оÑ?иÑ?Ñ?иÑ?е ли ТоÑ? пÑ?егледаÑ??
-torbutton.popup.pref_error = ТоÑ?баÑ?он не може да ажÑ?Ñ?иÑ?а подеÑ?аваÑ?а Ñ? Ñ?аÑ?Ñ?икли за пÑ?оÑ?иле ТоÑ? пÑ?егледаÑ?а.
-torbutton.popup.permission_denied = Ð?ониÑ?Ñ?иÑ?е дозволе Ñ?аÑ?Ñ?икле Ñ? коÑ?оÑ? Ñ?е налази ТоÑ? пÑ?егледаÑ? или Ñ?е пÑ?емеÑ?Ñ?иÑ?е на новÑ? локаÑ?иÑ?Ñ?.
-torbutton.popup.device_full = Ð?згледа да Ñ?е диÑ?к пÑ?н. Ð?Ñ?лободиÑ?е неÑ?Ñ?о пÑ?оÑ?Ñ?оÑ?а или пÑ?емеÑ?Ñ?иÑ?е ТоÑ? пÑ?егледаÑ? на нови Ñ?Ñ?еÑ?аÑ?.
torbutton.title.prompt_torbrowser = Vazne Torbutton informacije
torbutton.popup.prompt_torbrowser = Torbutton sada funkcionise drugacije: vise ga ne mozete iskljuciti.\n\nNapravili smo ovu promenu jer nije sigurno koristiti Torbutton u pretrazivacu koji je takodjer koristen za pretrazivanje van Tor-a. Jednostavno ima previse gresaka da ih nismo mogli resiti na bilo koji drugi nacin.\n\nAko zelite da nastavite korisiti Firefox kao i obicno, trebate izbrisati Torbutton i preuzeti Tor paket sa interneta. Postavke za privatnost Tor pretrazivaca su dosta bolje od onih koje Firefox nudi, cak i kad koristite Firefox sa Torbutton dodatkom.\n\nDa izbriste Torbutton, kliknite na Tools->Addons->Extensions i zatim kliknite na Remove dugme pored Torbutton dodatka.
torbutton.popup.short_torbrowser = Vazne Torbutton informacije\n\nTorbutton je sada stalno ukljucen.\n\nKliknite na Torbutton za vise informacija.
diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/st/torbutton.dtd
+++ b/src/chrome/locale/st/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/st/torbutton.properties b/src/chrome/locale/st/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/st/torbutton.properties
+++ b/src/chrome/locale/st/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/su/torbutton.dtd
+++ b/src/chrome/locale/su/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/su/torbutton.properties b/src/chrome/locale/su/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/su/torbutton.properties
+++ b/src/chrome/locale/su/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 4978d15..f65b669 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Inställningar för proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Använd rekommenderade proxy-inställningar för min version av Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Använd Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Använd egen inställning för proxyn">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy för HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy för SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy för FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy för Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS värd:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.pref_connection.notice "Inaktivera Torbutton för att ändra dessa inställningar.">
-<!ENTITY torbutton.pref_connection.more_info "Mer information">
-<!ENTITY torbutton.pref_connection_more_info.title "Hjälp">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton är aktiverad. Om du vill ändra inställningar för proxy utan Tor, inaktivera Tor och kom tillbaka hit. Om du vill ändra inställningar för Tor, använd Torbutton-inställningarna.">
<!ENTITY torbutton.context_menu.new_identity "Ny identitet">
<!ENTITY torbutton.context_menu.new_identity_key "N">
<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbsidan">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Klicka för att installera Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Integritet- och säkerhetsinställningar">
<!ENTITY torbutton.prefs.restore_defaults "�terställ till standard">
-<!ENTITY torbutton.prefs.test_settings "Testa inställningar">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ingen proxy för:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Varning: Undvik att använda värdnamn här ovan">
<!ENTITY torbutton.cookiedialog.title "Hantera skyddade kakor">
<!ENTITY torbutton.cookiedialog.lockCol "Skyddad">
<!ENTITY torbutton.cookiedialog.domainCol "Värd">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Ta bort alla icke-skyddade">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya kakor">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya kakor">
-<!ENTITY torbutton.prefs.transparentTor "Transparent torifikation (Kräver skräddarsydd transproxy eller Tor router)">
<!ENTITY torbutton.prefs.priv_caption "Sekretessinställningar">
<!ENTITY torbutton.prefs.block_disk "Spara ingen historik eller webbplatsdata (aktiverar privat surfning)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index 217c2c8..e04426e 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor
torbutton.panel.label.disabled = Tor inaktiv
torbutton.panel.label.enabled = Tor aktiv
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton ger en knapp för att konfigurera Tor inställningar och snabbt och enkelt rensa privat surfdata.
-torbutton.popup.test.success = Tor-proxy testet lyckades!
-torbutton.popup.test.failure = Tor proxy MISSLYCKADES! Kontrollera din proxy och inställningar polipo.
-torbutton.popup.test.confirm_toggle = Det senaste Tor proxy testet misslyckades att använda Tor.\n\n�r du säker att du vill aktivera ändå?\n\nNotera: Om du fixat problemet kan du köra om testet i Torbuttons Proxy Preferenser för att eliminera denna varning.
-torbutton.popup.test.ff3_notice = Klicka på OK för att testa Tors proxyinställningar. Detta test kommer att ske i bakgrunden. Ha tålamod.
torbutton.popup.external.title = Hämta hem en extern filtyp?
torbutton.popup.external.app = Tor Browser kan inte visa filen. Du behöver öppna den i ett annat program.\n\n
torbutton.popup.external.note = Vissa typer av filer kan få program att ansluta till internet utan att använda Tor.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Det är säkrast att öppna filer du har häm
torbutton.popup.launch = Hämta hem filen
torbutton.popup.cancel = Avbryt
torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen
-torbutton.popup.test.no_http_proxy = Tor proxy test: Lokal HTTP Proxy är onåbar. �r Polipo igång ordentligt?
torbutton.popup.prompted_language = För ett bättre integritetsskydd kan Torbutton begära den engelska versionen av webbsidor. Detta kan göra att webbsidor som du föredrar att läsa på ditt modersmål visas på engelska istället.\\\n\\\n Vill du visa sidor på engelska för att få ett bättre integritetsskydd?
torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton kan inte uppdatera inställningar i Tor Browser profilen katalog.
-torbutton.popup.permission_denied = Du antingen återställa behörigheterna Tor Browser katalogen eller kopiera den till en ny plats.
-torbutton.popup.device_full = Skivan verkar vara full. Vänligen frigöra utrymme eller flytta Tor webbläsare till en ny enhet.
torbutton.title.prompt_torbrowser = Viktig information om Torbutton
torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Tor Browser.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton.
torbutton.popup.short_torbrowser = Viktig information om Torbutton!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för mer information.
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/sw/torbutton.properties b/src/chrome/locale/sw/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/sw/torbutton.properties
+++ b/src/chrome/locale/sw/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd
index ed4f8e1..ee8f465 100644
--- a/src/chrome/locale/ta/torbutton.dtd
+++ b/src/chrome/locale/ta/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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 "�தவி">
-<!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)">
diff --git a/src/chrome/locale/ta/torbutton.properties b/src/chrome/locale/ta/torbutton.properties
index 2f6b0db..800a594 100644
--- a/src/chrome/locale/ta/torbutton.properties
+++ b/src/chrome/locale/ta/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = ரத�த���ய�
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.
diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/te/torbutton.dtd
+++ b/src/chrome/locale/te/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/te/torbutton.properties b/src/chrome/locale/te/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/te/torbutton.properties
+++ b/src/chrome/locale/te/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/tg/torbutton.dtd
+++ b/src/chrome/locale/tg/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/tg/torbutton.properties b/src/chrome/locale/tg/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/tg/torbutton.properties
+++ b/src/chrome/locale/tg/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 6b7d4db..9525f2d 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "�ำห����า Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "�ำ���า Proxy �ี��หมาะสมมา����ั� Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "�ำ Proxy �ี��ำห��มา���">
-<!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 "à¸?à¹?à¸à¸¡à¸¹à¸¥à¹?à¸?ิà¹?มà¹?à¸?ิม">
-<!ENTITY torbutton.pref_connection_more_info.title "à¸?วามà¸?à¹?วยà¹?หลืà¸">
-<!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 "สร�า��ัว���หม�">
<!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)">
diff --git a/src/chrome/locale/th/torbutton.properties b/src/chrome/locale/th/torbutton.properties
index 150fe6c..cea4206 100644
--- a/src/chrome/locale/th/torbutton.properties
+++ b/src/chrome/locale/th/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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 = ย��ลิ�
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.
diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ti/torbutton.dtd
+++ b/src/chrome/locale/ti/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ti/torbutton.properties b/src/chrome/locale/ti/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ti/torbutton.properties
+++ b/src/chrome/locale/ti/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/tk/torbutton.dtd
+++ b/src/chrome/locale/tk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/tk/torbutton.properties b/src/chrome/locale/tk/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/tk/torbutton.properties
+++ b/src/chrome/locale/tk/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index eb18fdb..f0ed069 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu Ayarları">
-<!ENTITY torbutton.prefs.recommended_settings "Firefox sürümüm için önerilen vekil sunucu ayarları kullanılsın">
-<!ENTITY torbutton.prefs.use_polipo "Polipo Kullanılsın">
-<!ENTITY torbutton.prefs.custom_settings "�zel vekil sunucu ayarları kullanılsın">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Vekil Sunucusu:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Vekil Sunucusu:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Vekil Sunucusu:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Vekil Sunucusu:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Sunucusu:">
-<!ENTITY torbutton.prefs.proxy.port "Kapı:">
-<!ENTITY torbutton.pref_connection.notice "Bu ayarları uygulamak için Torbutton devre dıÅ?ı bırakılsın.">
-<!ENTITY torbutton.pref_connection.more_info "Ayrıntılı bilgiler">
-<!ENTITY torbutton.pref_connection_more_info.title "Yardım">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Å?u anda etkin. Tor-DıÅ?ı vekil sunucu ayarlarını deÄ?iÅ?tirmek istiyorsanız, Torbutton uygulamasını devre dıÅ?ı bırakıp buraya geri gelin. Tor ayarlarınızı deÄ?iÅ?tirmek istiyorsanız Torbutton ayarları penceresini kullanın.">
<!ENTITY torbutton.context_menu.new_identity "Yeni Kimlik">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Bu site için Tor devresini yenile">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Torbutton uygulamasını baÅ?latmak için tıklayın">
<!ENTITY torbutton.prefs.privacy_security_settings "Gizlilik ve Güvenlik Ayarları">
<!ENTITY torbutton.prefs.restore_defaults "Varsayılanları Yükle">
-<!ENTITY torbutton.prefs.test_settings "Ayarları Sına">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Å?unun için vekil sunucu yok:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Uyarı: Yukarıdaki sunucu adlarını kullanmaktan kaçının">
<!ENTITY torbutton.cookiedialog.title "�erez Koruması Yönetimi">
<!ENTITY torbutton.cookiedialog.lockCol "KorunmuÅ?">
<!ENTITY torbutton.cookiedialog.domainCol "Sunucu">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar DıÅ?ında Tümünü Sil">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Ã?erezleri Koru">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Ã?erezleri Koruma">
-<!ENTITY torbutton.prefs.transparentTor "Saydam Tor Ä°letiÅ?imi (özel transproxy yada Tor yönelticisi gerekir)">
<!ENTITY torbutton.prefs.priv_caption "Gizlilik Ayarları">
<!ENTITY torbutton.prefs.block_disk "Tarama geçmiÅ?ini ve web sitesi bilgileri kaydedilmesin (Gizli Tarama Kipi kullanılır)">
<!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf çerez ve diÄ?er iz sürücü bilgiler engellensin">
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index 309096c..357a6eb 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Tor yazılımını devre dıÅ?ı bırakmak iç
torbutton.panel.label.disabled = Tor Devre DıÅ?ı
torbutton.panel.label.enabled = Tor Etkin
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton, Tor ayarlarını yapabileceÄ?iniz ve kiÅ?isel tarama verilerini hızlı ve kolayca silebileceÄ?iniz bir düÄ?me sunar.
-torbutton.popup.test.success = Tor vekil sunucu sınaması baÅ?arılı!
-torbutton.popup.test.failure = Tor vekil sunucu sınaması baÅ?arısız oldu! Lütfen vekil sunucunuzu ve Polipo ayarlarını denetleyin.
-torbutton.popup.test.confirm_toggle = Son Tor vekil sunucu sınamasında Tor kullanılamadı.\n\nYine de etkinleÅ?tirmek ister misiniz?\n\nNot: Sorunu çözdüyseniz bu uyarıyı kaldırmak için Torbutton Vekil Sunucu Ayarları bölümünden sınamayı yeniden yapabilirsiniz.
-torbutton.popup.test.ff3_notice = Tor vekil sunucu ayarlarını sınamak için Tamam üzerine tıklayın. Bu sınama artalanda yapılacak. Lütfen sabırlı olun.
torbutton.popup.external.title = DıÅ? bir dosya türü indirilsin mi?
torbutton.popup.external.app = Tor Browser bu dosyayı görüntüleyemiyor. BaÅ?ka bir uygulamayla açmanız gerekecek.\n
torbutton.popup.external.note = Bazı dosya türleri uygulamaların Tor kullanmadan Ä°nternet baÄ?lantısı kurmasına neden olabilir.\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları ya
torbutton.popup.launch = Dosyayı indir
torbutton.popup.cancel = Ä°ptal\n
torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin
-torbutton.popup.test.no_http_proxy = Tor vekil sunucu sınaması: Yerel HTTP vekil sunucusuna ulaÅ?ılamıyor. Polipo düzgün çalıÅ?ıyor mu?
torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfaların İngilizce sürümlerini göstermeyi isteyebilir. Bu özellik, web sayfalarının ana diliniz yerine İngilizce görüntülenmesine neden olabilir.\n\nDaha iyi gizlilik için web sayfalarının İngilizce sürümlerinin görüntülenmesini ister misiniz?
torbutton.popup.no_newnym = Torbutton size yeni bir güvenli kimlik saÄ?layamadı. Tor Denetim Kapısına giriÅ? yapılamıyor.\n\nTor Browser Bundle yazılımını çalıÅ?tırdıÄ?ınıza emin olun.
-torbutton.popup.pref_error = Torbutton, Tor Browser profil klasörünün içindeki ayarları güncelleyemedi.
-torbutton.popup.permission_denied = Lütfen Tor Browser klasörünün izinlerini sıfırlayın ya da baÅ?ka bir konuma taÅ?ıyın.
-torbutton.popup.device_full = Disk dolmuÅ? görünüyor. Lütfen diskte yer açın ya da Tor Browser yazılımını baÅ?ka bir aygıt üzerine taÅ?ıyın.
torbutton.title.prompt_torbrowser = Ã?nemli Torbutton Bilgisi
torbutton.popup.prompt_torbrowser = Torbutton Å?imdi farklı çalıÅ?ıyor: artık kapatamıyorsunuz.\n\nBu deÄ?iÅ?ikliÄ?i yapmamızın nedeni Tor-DıÅ?ı kullanılan bir tarayıcıda Torbutton kullanmanın güvenli olmaması. BaÅ?ka türlü çözemeyeceÄ?imiz birçok hata vardı.\n\nFirefox tarayıcısını normal olarak kullanmak istiyorsanız, Torbutton yazılımını kaldırıp Tor Browser Bundle paketini indirebilirsiniz. Tor Browser gizlilik özellikleri normal Firefox tarayıcısına, hatta Torbutton ile kullanan Firefox ikilisine göre çok daha üstündür.\n\nTorbutton yazılımını kaldırmak için, Araçlar->Eklentiler->Uzantılar bölümüne gidin ve Torbutton yazılımının yanındaki Kaldır düÄ?mesine tıklayın.
torbutton.popup.short_torbrowser = Ã?nemli Torbutton Bilgisi!\n\nTorbutton artık kapatılamayacak Å?ekilde etkinleÅ?tirildi.\n\nAyrıntılı bilgi almak için Torbutton üzerine tıklayın.
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 407d025..978b9b6 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Ð?аÑ?амеÑ?Ñ?и пÑ?окÑ?Ñ?">
-<!ENTITY torbutton.prefs.recommended_settings "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?екомендованÑ? паÑ?амеÑ?Ñ?и длÑ? моÑ?Ñ? веÑ?Ñ?Ñ?Ñ? Firefox">
-<!ENTITY torbutton.prefs.use_polipo "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и звиÑ?айнÑ? налаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ?">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP пÑ?окÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL пÑ?окÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP пÑ?окÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher пÑ?окÑ?Ñ?:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Ð?Ñ?зол SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Ð?оÑ?Ñ?:">
-<!ENTITY torbutton.pref_connection.notice "Ð?имкнÑ?Ñ?Ñ? Torbutton, Ñ?об змÑ?ниÑ?и Ñ?Ñ? налаÑ?Ñ?Ñ?ваннÑ?">
-<!ENTITY torbutton.pref_connection.more_info "Ð?Ñ?лÑ?Ñ?е Ñ?нÑ?оÑ?маÑ?Ñ?Ñ?">
-<!ENTITY torbutton.pref_connection_more_info.title "Ð?овÑ?дка">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton заÑ?аз Ñ?вÑ?мкнено. ЯкÑ?о Ð?и бажаÑ?Ñ?е змÑ?ниÑ?и налаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ? (не Tor-пÑ?окÑ?Ñ?), пÑ?оÑ?Ñ? вимкнÑ?Ñ?и Torbutton Ñ?а повеÑ?нÑ?Ñ?иÑ?Ñ? Ñ?Ñ?ди. ЯкÑ?о ж бажана змÑ?на Ñ?оÑ?каÑ?имеÑ?Ñ?Ñ?Ñ? Tor-пÑ?окÑ?Ñ?, пÑ?оÑ?Ñ? Ñ?е Ñ?обиÑ?и Ñ?еÑ?ез вÑ?кно налаÑ?Ñ?Ñ?ваннÑ? Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Ð?ова оÑ?обиÑ?Ñ?Ñ?Ñ?Ñ?Ñ?">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "Ð?алаÑ?Ñ?Ñ?ваннÑ?...">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "Ð?лаÑ?нÑ?Ñ?Ñ? длÑ? запÑ?Ñ?кÑ? Torbutton">
<!ENTITY torbutton.prefs.restore_defaults "Ð?а Ð?амовÑ?Ñ?ваннÑ?м">
-<!ENTITY torbutton.prefs.test_settings "Ð?еÑ?евÑ?Ñ?иÑ?и Ð?аÑ?Ñ?Ñ?ойки">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ð?е викоÑ?иÑ?Ñ?овÑ?ваÑ?и пÑ?окÑ?Ñ? длÑ?: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Увага: УникайÑ?е викоÑ?иÑ?Ñ?аннÑ? бÑ?дÑ? Ñ?кого з ниÑ?езазнаÑ?ениÑ? Ñ?оÑ?Ñ?Ñ?в">
<!ENTITY torbutton.cookiedialog.title "Ð?еÑ?Ñ?ваÑ?и Ð?аÑ?иÑ?Ñ?ом Ð?Ñ?кÑ?в">
<!ENTITY torbutton.cookiedialog.lockCol "Ð?аÑ?иÑ?ено">
<!ENTITY torbutton.cookiedialog.domainCol "ХоÑ?Ñ?">
@@ -40,7 +21,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "Ð?идалиÑ?и УÑ?Ñ?, Ð?кÑ?Ñ?м Ð?аÑ?иÑ?ениÑ?">
<!ENTITY torbutton.cookiedialog.saveAllCookies "Ð?аÑ?иÑ?аÑ?и Ð?овÑ? Ð?Ñ?ки">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ð?е Ð?аÑ?иÑ?аÑ?и Ð?овÑ? Ð?Ñ?ки">
-<!ENTITY torbutton.prefs.transparentTor "Ð?Ñ?озоÑ?а ТоÑ?Ñ?Ñ?Ñ?каÑ?Ñ?Ñ? (Ð?имагаÑ? коÑ?иÑ?Ñ?Ñ?ваÑ?Ñ?киÑ? transproxy або Tor-маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?оÑ?а)">
<!ENTITY torbutton.prefs.block_disk "Ð?е збеÑ?Ñ?гаÑ?и Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? пеÑ?еглÑ?дÑ?в або данÑ? з вÑ?двÑ?дÑ?ваниÑ? Ñ?айÑ?Ñ?в (акÑ?ивÑ?Ñ? Ñ?Ñ?нкÑ?Ñ?Ñ? пÑ?иваÑ?ного пеÑ?еглÑ?дÑ?)">
<!ENTITY torbutton.prefs.restrict_thirdparty "Ð?локÑ?ваÑ?и Ñ?Ñ?оÑ?оннÑ? кÑ?ки Ñ?а Ñ?нÑ?Ñ? данÑ? вÑ?дÑ?Ñ?еженнÑ?">
<!ENTITY torbutton.prefs.block_plugins "Ð?имкнÑ?Ñ?и Ñ?озÑ?иÑ?еннÑ? пеÑ?еглÑ?даÑ?а (Ñ?акÑ? Ñ?к Flash)">
diff --git a/src/chrome/locale/uk/torbutton.properties b/src/chrome/locale/uk/torbutton.properties
index e4dbb08..c12fe3e 100644
--- a/src/chrome/locale/uk/torbutton.properties
+++ b/src/chrome/locale/uk/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Ð?аÑ?иÑ?нÑ?Ñ?Ñ? аби вимкнÑ?Ñ?и Tor
torbutton.panel.label.disabled = Tor Ð?имкнено
torbutton.panel.label.enabled = Tor УвÑ?мкнено
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton пеÑ?едбаÑ?аÑ? кнопкÑ?, Ñ?об налаÑ?Ñ?Ñ?ваÑ?и Tor Ñ? Ñ?видко Ñ?а легко оÑ?иÑ?Ñ?иÑ?и оÑ?обиÑ?Ñ?Ñ? данÑ? пеÑ?еглÑ?дÑ?.
-torbutton.popup.test.success = ТеÑ?Ñ? пÑ?оеÑ?Ñ?-Ñ?еÑ?веÑ?а Tor пÑ?ойÑ?ов Ñ?Ñ?пÑ?Ñ?но!
-torbutton.popup.test.failure = ТеÑ?Ñ? пÑ?окÑ?Ñ?-Ñ?еÑ?веÑ?а Ð?Ð? Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð?! Ð?еÑ?евÑ?Ñ?Ñ?е Ñ?вÑ?й пÑ?окÑ?Ñ?-Ñ?еÑ?веÑ? Ñ?а паÑ?амеÑ?Ñ?и Polipo.
-torbutton.popup.test.confirm_toggle = Самий оÑ?Ñ?аннÑ?й Tor пÑ?окÑ?Ñ? Ñ?еÑ?Ñ? не в змозÑ? викоÑ?иÑ?Ñ?овÑ?ваÑ?и Tor.\\n\n\\n\nÐ?и впевненÑ?, Ñ?о ви Ñ?оÑ?еÑ?е вклÑ?Ñ?иÑ?и Ñ? бÑ?дÑ?-Ñ?комÑ? випадкÑ??\\n\n\\n\nÐ?Ñ?имÑ?Ñ?ка: ЯкÑ?о ви виÑ?Ñ?Ñ?или пÑ?облемÑ?, ви можеÑ?е пеÑ?езапÑ?Ñ?Ñ?иÑ?и Ñ?еÑ?Ñ? Ñ? вÑ?кнÑ? 'Ð?алаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ? Torbutton', Ñ?об Ñ?Ñ?Ñ?нÑ?Ñ?и Ñ?е попеÑ?едженнÑ?.
-torbutton.popup.test.ff3_notice = Ð?аÑ?иÑ?нÑ?Ñ?Ñ? OK, Ñ?об пеÑ?евÑ?Ñ?иÑ?и налаÑ?Ñ?Ñ?ваннÑ? Tor пÑ?окÑ?Ñ?. Цей Ñ?еÑ?Ñ? бÑ?де виконÑ?ваÑ?иÑ?Ñ? Ñ? Ñ?оновомÑ? Ñ?ежимÑ?. Ð?Ñ?дÑ? лаÑ?ка, бÑ?дÑ?Ñ?е Ñ?еÑ?плÑ?Ñ?Ñ?.
torbutton.popup.external.title = Ð?аванÑ?ажиÑ?и зовнÑ?Ñ?нÑ?й вмÑ?Ñ?Ñ??
torbutton.popup.external.app = Ð?овнÑ?Ñ?нÑ? пÑ?икладна пÑ?огÑ?ама необÑ?Ñ?дна длÑ? обÑ?обки:\\n\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 = Ð?апÑ?Ñ?Ñ?иÑ?и додаÑ?ок
torbutton.popup.cancel = Ð?Ñ?дмова
torbutton.popup.dontask = Ð?авжди запÑ?Ñ?каÑ?и додаÑ?ки з Ñ?Ñ?ого моменÑ?Ñ?
-torbutton.popup.test.no_http_proxy = Tor пÑ?окÑ?Ñ? Ñ?еÑ?Ñ?: Ð?окалÑ?ний пÑ?окÑ?Ñ?-Ñ?еÑ?веÑ? HTTP â?? недоÑ?Ñ?Ñ?пний. Чи пÑ?аÑ?Ñ?Ñ? Polipo належним Ñ?ином?
torbutton.popup.prompted_language = Ð?лÑ? наданнÑ? бÑ?лÑ?Ñ?оÑ? пÑ?иваÑ?ноÑ?Ñ?Ñ?, Torbutton може запиÑ?Ñ?ваÑ?и веÑ?Ñ?Ñ?Ñ? Ñ?Ñ?оÑ?Ñ?нок англÑ?йÑ?Ñ?коÑ? мовоÑ?. Це може Ñ?пÑ?иÑ?иниÑ?и вÑ?добÑ?аженнÑ? Ñ?Ñ?оÑ?Ñ?нок англÑ?йÑ?Ñ?коÑ? мовоÑ?, замÑ?Ñ?Ñ?Ñ? вÑ?добÑ?аженнÑ? Ñ?Ñ? на ваÑ?Ñ?й Ñ?Ñ?днÑ?й мовÑ?.\\n\n\\n\nЧи ви бажаÑ?Ñ?е запиÑ?Ñ?ваÑ?и Ñ?Ñ?оÑ?Ñ?нки англÑ?йÑ?Ñ?коÑ? мовоÑ? длÑ? бÑ?лÑ?Ñ?оÑ? пÑ?иваÑ?ноÑ?Ñ?Ñ??
torbutton.popup.no_newnym = Torbutton не може безпеÑ?но даÑ?и вам новÑ? оÑ?обиÑ?Ñ?Ñ?Ñ?Ñ?Ñ?. Ð?Ñ?н не маÑ? доÑ?Ñ?Ñ?пÑ? до Tor Control Port.\\n\n\\n\nÐ?и викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?е Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton не може оновиÑ?и налаÑ?Ñ?Ñ?ваннÑ? в папÑ?Ñ? пÑ?оÑ?Ñ?лÑ? Ð?еÑ?еглÑ?даÑ?а Tor.
-torbutton.popup.permission_denied = Ð?Ñ?дÑ? лаÑ?ка, або Ñ?кинÑ?Ñ?е дозволи длÑ? папки Ð?еÑ?еглÑ?даÑ?а Tor або Ñ?копÑ?Ñ?йÑ?е Ñ?Ñ? в Ñ?нÑ?е мÑ?Ñ?Ñ?е.
-torbutton.popup.device_full = СÑ?оже, Ñ?о диÑ?к заповнений. Ð?Ñ?дÑ? лаÑ?ка, звÑ?лÑ?нÑ?Ñ?Ñ? мÑ?Ñ?Ñ?е або пеÑ?емÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Ð?еÑ?еглÑ?даÑ? Tor на Ñ?нÑ?ий пÑ?иÑ?Ñ?Ñ?Ñ?й.
torbutton.title.prompt_torbrowser = Ð?ажлива Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? Torbutton
torbutton.popup.prompt_torbrowser = Torbutton вже пÑ?аÑ?Ñ?Ñ? по-Ñ?нÑ?омÑ?: Ð?и бÑ?лÑ?Ñ?е не можеÑ?е його вимкнÑ?Ñ?и.\\n\n\\n\nÐ?и зÑ?обили Ñ?Ñ? змÑ?нÑ?, Ñ?омÑ? Ñ?о Ñ?е не безпеÑ?но викоÑ?иÑ?Ñ?овÑ?ваÑ?и Torbutton в бÑ?аÑ?зеÑ?Ñ?, Ñ?кий Ñ?акож викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? длÑ? не-Tor пеÑ?еглÑ?дÑ?. Ð?Ñ?нÑ?вало занадÑ?о багаÑ?о помилок, Ñ?ак Ñ?о ми не змогли випÑ?авиÑ?и нÑ?Ñ?ким Ñ?нÑ?им Ñ?поÑ?обом.\\n\n\\n\nЯкÑ?о ви Ñ?оÑ?еÑ?е пÑ?одовжÑ?ваÑ?и викоÑ?иÑ?Ñ?овÑ?ваÑ?и Firefox ноÑ?малÑ?но, ви повиннÑ? видалиÑ?и Torbutton Ñ? заванÑ?ажиÑ?и Tor Browser Bundle. Ð?алаÑ?Ñ?Ñ?ваннÑ? конÑ?Ñ?денÑ?Ñ?йноÑ?Ñ?Ñ? Tor Browser Ñ?акож пеÑ?евеÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?акÑ? Ñ? звиÑ?айномÑ? Firefox, навÑ?Ñ?Ñ?, Ñ?кÑ?о Firefox викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? з Torbutton.\\n\n\\n\nЩоб
видалиÑ?и Torbutton, пеÑ?ейдÑ?Ñ?Ñ? в менÑ? СеÑ?вÑ?Ñ?-> Ð?оповненнÑ?-> РозÑ?иÑ?еннÑ?, а поÑ?Ñ?м наÑ?иÑ?нÑ?Ñ?Ñ? кнопкÑ? Ð?идалиÑ?и поÑ?Ñ?Ñ? з Torbutton.
torbutton.popup.short_torbrowser = Ð?ажлива Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? Torbutton!\\n\n\\n\nTorbutton Ñ?епеÑ? завжди вклÑ?Ñ?ений.\\n\n\\n\nÐ?аÑ?иÑ?нÑ?Ñ?Ñ? на Torbutton длÑ? оÑ?Ñ?иманнÑ? додаÑ?ковоÑ? Ñ?нÑ?оÑ?маÑ?Ñ?Ñ?.
diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ur/torbutton.dtd
+++ b/src/chrome/locale/ur/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ur/torbutton.properties b/src/chrome/locale/ur/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ur/torbutton.properties
+++ b/src/chrome/locale/ur/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/ve/torbutton.dtd
+++ b/src/chrome/locale/ve/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/ve/torbutton.properties b/src/chrome/locale/ve/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/ve/torbutton.properties
+++ b/src/chrome/locale/ve/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index ec685a9..92c1120 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Các Thiết láºp Proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Dùng thiết láºp proxy khuyến nghá»? cho phiên bản trình duyá»?t Firefox của tôi">
-<!ENTITY torbutton.prefs.use_polipo "Dùng Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Dùng thiết láºp proxy tùy biến">
-<!ENTITY torbutton.prefs.proxy.host.http "Proxy giao thức HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Proxy giao thức SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy giao thức FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Cá»?ng:">
-<!ENTITY torbutton.pref_connection.notice "Vô hiá»?u Torbutton Ä?á»? thay Ä?á»?i các thiết Ä?ặt nà y.">
-<!ENTITY torbutton.pref_connection.more_info "Thêm thông tin">
-<!ENTITY torbutton.pref_connection_more_info.title "Trợ giúp">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton hiá»?n Ä?ang Ä?ược hiá»?u hóa. Nếu bạn muá»?n thay Ä?á»?i thiết láºp proxy không thuá»?c chÆ°Æ¡ng trình Tor, vui lòng tắt Torbutton và quay trá»? lại Ä?ây. Nếu bạn muá»?n thay Ä?á»?i thiết láºp từ Tor, vui lòng dùng cá»a sá»? tùy chá»?nh Torbutton.">
<!ENTITY torbutton.context_menu.new_identity "Giám Ä?á»?nh Má»?i">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "Vòng Tor m�i cho trang nà y">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "Nhấp Ä?á»? nháºn diá»?n Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "Cà i Ä?ặt Riêng tÆ° và Bảo máºt">
<!ENTITY torbutton.prefs.restore_defaults "Khôi phục Mặc Ä?á»?nh">
-<!ENTITY torbutton.prefs.test_settings "Thiết láºp Thá» nghiá»?m">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Không có Ủy nhi�m cho:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Cảnh báo: Tránh sỠdụng bất kỳ tên máy chủ � trên">
<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
<!ENTITY torbutton.cookiedialog.lockCol "Protected">
<!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -43,7 +24,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.priv_caption "Cà i Ä?ặt Riêng tÆ°">
<!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">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index a401338..34169dc 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Nhấn Ä?á»? tắt Tor
torbutton.panel.label.disabled = Tor b� tắt
torbutton.panel.label.enabled = Tor Ä?ược báºt
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = ThỠnghi�m Tor thà nh công!
-torbutton.popup.test.failure = Tor proxy kiá»?m tra có lá»?i! Kiá»?m tra proxy và những cà i Ä?ặt của Polipo của bạn.
-torbutton.popup.test.confirm_toggle = Cuá»?c thá» nghiá»?m Tor ủy nhiá»?m gần Ä?ây nhất Ä?ã thất bại trong viá»?c xá» dụng Tor.\n\nBạn có chắc là bạn muá»?n báºt lên không?\n\nLÆ°u ý: Nếu bạn Ä?ã sá»a Ä?ược vấn Ä?á»?, bạn có thá»? chạy kiá»?m tra lại trong cá»a sá»? những Tùy thÃch Ủy nhiá»?m của Torbutton Ä?á»? loại bá»? cảnh báo nà y.
-torbutton.popup.test.ff3_notice = Nhấn OK Ä?á»? thá» nghiá»?m thiết láºp proxy Tor. Thá» nghiá»?m nà y sẽ diá»?n ra trong háºu cảnh. Xin hãy kiên nhẫn.
torbutton.popup.external.title = Download an external file type?
torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n
torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f
torbutton.popup.launch = Download file
torbutton.popup.cancel = Hủy b�
torbutton.popup.dontask = Automatically download files from now on
-torbutton.popup.test.no_http_proxy = Thá» nghiá»?m Tor ủy nhiá»?m: HTTP ủy nhiá»?m Ä?á»?a phÆ°Æ¡ng không thá»? tá»?i Ä?ược. Polipo có Ä?ang chạy Ä?úng cách không?
torbutton.popup.prompted_language = Ä?á»? bạn có thêm sÆ° riêng tÆ°, Torbutton có thá»? yêu cầu trang mạng sá» dụng phiên bản Tiếng Anh. Ä?ây có thá»? là nguyên nhân trang mạng mà bạn Ä?á»? nghá»? hiá»?n thá»? tiến bản Ä?á»?a lại hiá»?n thá»? Tiếng Anh.\n\nBạn có muá»?n yêu cầu trang mạng tiếng anh Ä?á»? có thêm sá»± riêng tÆ°?
torbutton.popup.no_newnym = Torbutton có thá»? Ä?Æ°a bạn má»?t danh tÃnh má»?i má»?t cách không an toà n. Nó không há»? truy cáºp và o Tor Control Port.\n\nCó phải bạn Ä?ang dùng Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton không thá»? cáºp nháºt thiết láºp trong thÆ° mục há»? sÆ¡.
-torbutton.popup.permission_denied = Hảy cà i lại quyá»?n truy cáºp cho thÆ° mục của trình duyá»?t Tor hoặc chép nó vô má»?t thÆ° mục má»?i.
-torbutton.popup.device_full = á»? lÆ°u trữ Ä?ã Ä?ầy, Hảy chuẩn bá»? thêm chá»? trá»?ng hoặc di chuyá»?n trình duyá»?t Tor qua má»?t thiết bá»? má»?i.
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.
diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/wa/torbutton.dtd
+++ b/src/chrome/locale/wa/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/wa/torbutton.properties b/src/chrome/locale/wa/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/wa/torbutton.properties
+++ b/src/chrome/locale/wa/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/wo/torbutton.dtd
+++ b/src/chrome/locale/wo/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/wo/torbutton.properties b/src/chrome/locale/wo/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/wo/torbutton.properties
+++ b/src/chrome/locale/wo/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 280f682..58f72fb 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "代ç??设置">
-<!ENTITY torbutton.prefs.recommended_settings "该ç??æ?¬ç?? Firefox 使ç?¨æ?¨è??代ç??设置">
-<!ENTITY torbutton.prefs.use_polipo "使� Polipo">
-<!ENTITY torbutton.prefs.custom_settings "è?ªå®?ä¹?代ç??设置">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS 代ç??ï¼?">
-<!ENTITY torbutton.prefs.proxy.port "端��">
-<!ENTITY torbutton.pref_connection.notice "ç¦?æ¢ Torbutton æ?´æ?¹è¿?äº?设置ã??">
-<!ENTITY torbutton.pref_connection.more_info "��信�">
-<!ENTITY torbutton.pref_connection_more_info.title "帮�">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton å½?å??å·²å?¯ç?¨ã??å¦?é??对 Tor ä¹?å¤?ç??代ç??设置è¿?è¡?æ?´æ?¹ï¼?请ç¦?ç?¨ Torbutton å??å??è¿?å??è¿?é??ã??å¦?é??æ?´æ?¹ Tor ç??设置ï¼?请å?¨ Torbutton é¦?é??项çª?å?£ä¸è¿?è¡?设置ã??">
<!ENTITY torbutton.context_menu.new_identity "�身份">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.new_circuit "为æ¤ç«?ç?¹ä½¿ç?¨æ?° Tor 线路">
@@ -27,11 +13,6 @@
<!ENTITY torbutton.button.tooltip "ç?¹æ¤å??å§?å?? Torbutton">
<!ENTITY torbutton.prefs.privacy_security_settings "é??ç§?ä¸?å®?å?¨è®¾ç½®">
<!ENTITY torbutton.prefs.restore_defaults "���认设置">
-<!ENTITY torbutton.prefs.test_settings "æµ?è¯?代ç??设置">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "ä¸?使ç?¨ä»£ç??ç??å?°å??:">
-<!ENTITY torbutton.prefs.no_proxy_warning "è¦å??ï¼?请ä¸?è¦?使ç?¨ä¸?è¿°ä»»ä½?主æ?ºå??ã??">
<!ENTITY torbutton.cookiedialog.title "管ç??å??ä¿?æ?¤ç?? Cookie">
<!ENTITY torbutton.cookiedialog.lockCol "å??ä¿?æ?¤">
<!ENTITY torbutton.cookiedialog.domainCol "æ??å?¡å?¨">
@@ -43,7 +24,6 @@
<!ENTITY torbutton.cookiedialog.removeAllBut "å?¨é?¨ç§»é?¤ä»?ä¿?ç??å??ä¿?æ?¤ç?? Cookie">
<!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿?æ?¤æ?°ç?? Cookie">
<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ä¸?ä¿?æ?¤æ?°ç?? Cookie">
-<!ENTITY torbutton.prefs.transparentTor "Tor 强å??é??æ??代ç??ï¼?é??è¦?è?ªè®¾ TransProxy æ?? Tor è·¯ç?±ï¼?">
<!ENTITY torbutton.prefs.priv_caption "é??ç§?设置">
<!ENTITY torbutton.prefs.block_disk "ç¦?æ¢è®°å½?æµ?è§?å??å?²æ??ç½?ç«?æ?°æ?®ï¼?å?¯ç?¨é??ç§?æµ?è§?模å¼?ï¼?">
<!ENTITY torbutton.prefs.restrict_thirdparty "é??å?¶ç¬¬ä¸?æ?¹ cookie å??å?¶ä»?æ?°æ?®è·?踪ç¨?åº?">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 7379381..52484d7 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = ���� Tor
torbutton.panel.label.disabled = Tor 已��
torbutton.panel.label.enabled = Tor 已��
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton æ?¯ä¸?个æ??é?®ï¼?å?¯å¯¹â??Tor 设置â??è¿?è¡?ä¿®æ?¹ï¼?并å?¯å¿«é??è??æ?¹ä¾¿å?°æ¸?é?¤æµ?è§?å?¨é??ç§?æ?°æ?®ã??
-torbutton.popup.test.success = Tor 代ç??æµ?è¯?æ??å??ï¼?
-torbutton.popup.test.failure = Tor 代ç??æµ?è¯?失败ï¼?请æ£?æ?¥ä»£ç??å?? Polipo 设置ã??
-torbutton.popup.test.confirm_toggle = ä¸?ä¸?次 Tor 代ç??æµ?è¯?失败ã??\n\næ?¨è¿?è¦?å?¯ç?¨ä»£ç??å??ï¼?\n\n注æ??ï¼?å¦?æ??æ?¨å·²ç»?解å?³äº?代ç??é?®é¢?ï¼?请æ??å¼? Torbutton 代ç??设置çª?å?£ï¼?æ¶?é?¤æ¤è¦å??ã??
-torbutton.popup.test.ff3_notice = å??å?»â??ç¡®å®?â??æµ?è¯? Tor ç??代ç??设置ã??æµ?è¯?å°?å?¨å??å?°è¿?è¡?ï¼?请è??å¿?ç?å¾?ã??
torbutton.popup.external.title = ä¸?è½½ä¸?个å¤?é?¨æ??件类å??ï¼?
torbutton.popup.external.app = Tor Browser æ? æ³?æ?¾ç¤ºæ¤æ??件ã??æ?¨é??è¦?ç?¨å?¶ä»?åº?ç?¨ç¨?åº?æ??å¼?å®?ã??\n\n
torbutton.popup.external.note = é?¨å??æ??件类å??å?¯è?½ä¼?导è?´åº?ç?¨ç¨?åº?å?¨ä¸?使ç?¨ Tor ç??æ??å?µä¸?è¿?æ?¥äº?è??ç½?ã??\n\n
@@ -22,12 +18,8 @@ torbutton.popup.external.suggest = 为���起����该��离线�
torbutton.popup.launch = ä¸?è½½æ??件
torbutton.popup.cancel = å??æ¶?
torbutton.popup.dontask = 以å??è?ªå?¨ä¸?è½½æ??件
-torbutton.popup.test.no_http_proxy = Tor 代ç??æµ?è¯?ï¼?æ?¬å?° HTTP 代ç??ä¸?å?¯è¾¾ï¼?æ?¨ç?? Polipo æ£å¸¸å?¯å?¨äº?å??ï¼?
torbutton.popup.prompted_language = 为äº?æ?´å¥½å?°ä¿?æ?¤é??ç§?ï¼? Torbutton å?¯ä»¥è¯·æ±?ç½?页ç??è?±è¯ç??æ?¬ã??è¿?å?¯è?½å¯¼è?´æ?¨å¸?æ??æµ?è§?ç??æ?¬å??è¯è¨?ç??ç½?页以è?±è¯æ?¾ç¤ºã??\n\n为äº?æ?´å¥½å?°ä¿?æ?¤é??ç§?ï¼?æ?¯å?¦è¯·æ±?ç½?页以è?±è¯æ?¾ç¤ºï¼?
torbutton.popup.no_newnym = Torbutton æ? æ³?å®?å?¨å?°ä¸ºæ?¨å??æ?¢ä¸?个æ?°èº«ä»½ã??å®?æ? æ³?访é?® Tor ç??æ?§å?¶ç«¯å?£ã??\n\næ?¨ç?®å??æ£å?¨ä½¿ç?¨ Tor æµ?è§?å?¨å¥?件å??ï¼?
-torbutton.popup.pref_error = Torbutton æ? æ³?æ?´æ?° Tor æµ?è§?å?¨é??ç½®ç?®å½?ä¸ç??é¦?é??项ã??
-torbutton.popup.permission_denied = 请é??ç½® Tor æµ?è§?å?¨ç?®å½?ç??æ??件æ??é??æ??å°?å?¶å¤?å?¶å?°ä¸?个æ?°ä½?ç½®ã??
-torbutton.popup.device_full = 硬ç??空é?´å·²æ»¡ã??请é??æ?¾ä¸?äº?空é?´æ??å°? Tor æµ?è§?å?¨ç§»å?¨è?³å?¶ä»?æ?°è®¾å¤?ã??
torbutton.title.prompt_torbrowser = Torbutton é??è¦?ä¿¡æ?¯
torbutton.popup.prompt_torbrowser = Torbutton å·¥ä½?æ?¹å¼?æ??æ??æ?¹å??ï¼?å®?ä¸?å??æ?¯æ??临æ?¶å?³é?ã??\n\nå??å?ºè¿?ç§?æ?¹å??æ?¯å? 为å?¨é??å?¿å??æµ?è§?ç??æµ?è§?å?¨ä¸ï¼?å??æ?¶ä½¿ç?¨ Torbutton 并ä¸?å®?å?¨ã??æ??太å¤?æ? æ³?å??æ??ç??é??误ã??\n\nå¦?æ??æ?¨å¸?æ??æ£å¸¸ä½¿ç?¨ Firefox ï¼?请å?¸è½½ Torbutton æ??件ï¼?ä¸?è½½ Tor æµ?è§?å?¨å¥?件ã??Tor æµ?è§?å?¨ç??é??ç§?ç?¹æ?§ä¼?äº?æ?®é??ç?? Firefox ï¼?å?³ä½¿Firefoxä¸ä½¿ç?¨äº?Torbuttonã??\n\n移é?¤ Torbuttonï¼?请å?° å·¥å?·Tools->é??å? ç»?件Addons->æ?©å±?Extensions ä¸ï¼?å?¨ Torbutton æ??ç?¹å?»å?¸è½½ã??
torbutton.popup.short_torbrowser = Torbutton é??è¦?ä¿¡æ?¯ï¼?\n\nTorbutton ç?®å??å·²ç?¥å¤?äº?å?¯ç?¨ç?¶æ??ã??\n\nç?¹å?» Torbutton è?·å??æ?´å¤?ä¿¡æ?¯ã??
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/zh-HK/torbutton.properties b/src/chrome/locale/zh-HK/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/zh-HK/torbutton.properties
+++ b/src/chrome/locale/zh-HK/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index dd8f504..3e521cc 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -1,17 +1,3 @@
-<!ENTITY torbutton.prefs.tor_settings "Proxy è¨å®?">
-<!ENTITY torbutton.prefs.recommended_settings "å?¨Firefox 使ç?¨å»ºè°ç?? Proxy è¨å®?">
-<!ENTITY torbutton.prefs.use_polipo "使� Polipo">
-<!ENTITY torbutton.prefs.custom_settings "使ç?¨è?ªè¨?ç??Proxy è¨å®?">
-<!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 "å??ç?¨Torbuttonä¾?æ?¹è®?è¨å®?">
-<!ENTITY torbutton.pref_connection.more_info "����">
-<!ENTITY torbutton.pref_connection_more_info.title "幫�">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton ç?¾å?¨å·²ç¶?å??ç?¨ã??å¦?æ??æ?¨æ?³æ?¹è®?é??-Tor Proxyç??è¨å®?ï¼?è«?å??ç?¨Torbutton並å??å?°é??è£?ã??å¦?æ??æ?¨æ?³æ?¹è®?Torç??è¨å®?ï¼?è«?使ç?¨Torbutton è¨ç½®è¦?çª?ã??">
<!ENTITY torbutton.context_menu.new_identity "æ?´æ??身份">
<!ENTITY torbutton.context_menu.new_identity_key "I">
<!ENTITY torbutton.context_menu.preferences "è¨ç½®...(P)">
@@ -24,11 +10,6 @@
<!ENTITY torbutton.context_menu.cookieProtections.key "C">
<!ENTITY torbutton.button.tooltip "é»?æ??以å??å§? Torbutton">
<!ENTITY torbutton.prefs.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)">
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index e17ddf2..129d4d0 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = é»?æ??以å??ç?¨ Tor
torbutton.panel.label.disabled = Tor å·²å??ç?¨
torbutton.panel.label.enabled = Tor å·²å??ç?¨
extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy 測試é??é??!
-torbutton.popup.test.failure = Tor proxy 測試失æ??! è«?å??次檢æ?¥æ?¨ Proxy è?? Polipo è¨å®?ã??
-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 = æ??ä¸? OK å¾?é??å§?測試 Tor Proxy è¨å®?ã??é??å??測試æ??å?¨è??æ?¯é??ä½?ã??è«?ç¨?å¾?ã??
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 = \nå¦?æ??é??å??æª?æ¡?æ?¯ä¸?被信任ç??ï¼?æ?¨
torbutton.popup.launch = å??å??æ??ç?¨ç¨?å¼?
torbutton.popup.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 ç?¡æ³?å®?å?¨ç??給æ?¨ä¸?å??æ?°ç??身å??ã??å®?ç?¡æ³?å?å?? Tor æ?§å?¶é?£æ?¥å? ã??\n\næ?¨æ£å?¨ä½¿ç?¨ 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 = ç£?ç¢?空é??å?¯è?½å·²æ»¿ã??è«?空å?ºä¸?äº?空é??æ??æ?¯å°? Tor Browser æ?¬ç§»è?³å?¦ä¸?å??è£?ç½®ã??
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.
diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd
index ed9793e..ee8f465 100644
--- a/src/chrome/locale/zu/torbutton.dtd
+++ b/src/chrome/locale/zu/torbutton.dtd
@@ -1,17 +1,3 @@
-<!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)">
diff --git a/src/chrome/locale/zu/torbutton.properties b/src/chrome/locale/zu/torbutton.properties
index d8c1430..ee5b1f9 100644
--- a/src/chrome/locale/zu/torbutton.properties
+++ b/src/chrome/locale/zu/torbutton.properties
@@ -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@xxxxxxxxxxxxxx.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.
diff --git a/src/chrome/skin/p.png b/src/chrome/skin/p.png
deleted file mode 100644
index aa65cab..0000000
Binary files a/src/chrome/skin/p.png and /dev/null differ
diff --git a/src/chrome/skin/poff.png b/src/chrome/skin/poff.png
deleted file mode 100644
index 5ab9e61..0000000
Binary files a/src/chrome/skin/poff.png and /dev/null differ
diff --git a/src/chrome/skin/punknown.png b/src/chrome/skin/punknown.png
deleted file mode 100644
index 346b6a5..0000000
Binary files a/src/chrome/skin/punknown.png and /dev/null differ
diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css
index 2c6bbfb..5bdcaa6 100644
--- a/src/chrome/skin/torbutton.css
+++ b/src/chrome/skin/torbutton.css
@@ -32,25 +32,6 @@ toolbar[iconsize="small"] #torbutton-button[tbUpdateNeeded="true"] {
-moz-image-region: rect(1px, 17px, 17px, 1px);
}
-#torbutton-panel {
- list-style-image: url("chrome://torbutton/skin/tor-16.png");
-}
-#torbutton-panel[tbstatus="on"] {
- list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png");
-}
-#torbutton-panel[tbstatus="off"] {
- list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png");
-}
-toolbar[iconsize="small"] #torbutton-panel {
- list-style-image: url("chrome://torbutton/skin/tor-16.png");
-}
-toolbar[iconsize="small"] #torbutton-panel[tbstatus="on"] {
- list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png");
-}
-toolbar[iconsize="small"] #torbutton-panel[tbstatus="off"] {
- list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png");
-}
-
#torbutton-button-tb {
list-style-image: url("chrome://torbutton/skin/tor-24.png");
}
@@ -89,18 +70,6 @@ toolbar[iconsize="small"] #torbutton-button-tb-msg[tbstatus="off"] {
list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png");
}
-statusbarpanel#plugins-status {
- list-style-image: url("chrome://torbutton/skin/punknown.png");
-}
-
-statusbarpanel#plugins-status[status="1"] {
- list-style-image: url("chrome://torbutton/skin/p.png");
-}
-
-statusbarpanel#plugins-status[status="0"] {
- list-style-image: url("chrome://torbutton/skin/poff.png");
-}
-
#torbutton-checkForUpdate[tbUpdateNeeded] {
font-weight: bold;
}
diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js
index c06fef7..33e5800 100644
--- a/src/components/cookie-jar-selector.js
+++ b/src/components/cookie-jar-selector.js
@@ -161,8 +161,7 @@ function CookieJarSelector() {
};
this.addProtectedCookie = function(cookie) {
- var tor_enabled = this.prefs.getBoolPref("extensions.torbutton.tor_enabled");
- var name = tor_enabled? "tor" : "nontor";
+ var name = "tor";
var cookies = this.getProtectedCookies(name);
if (typeof(cookies) == "undefined" || cookies == null
@@ -229,8 +228,7 @@ function CookieJarSelector() {
};
this.protectCookies = function(cookies) {
- var tor_enabled = this.prefs.getBoolPref("extensions.torbutton.tor_enabled");
- var name = tor_enabled? "tor" : "nontor";
+ var name = "tor";
this._writeProtectCookies(cookies,name);
if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) {
// save protected cookies to file
@@ -438,22 +436,10 @@ function CookieJarSelector() {
return;
}
jarThis.logger.log(3, "Got timer update. Saving changed cookies to jar.");
- var tor_enabled =
- jarThis.prefs.getBoolPref("extensions.torbutton.tor_enabled");
-
- if(tor_enabled !=
- jarThis.prefs.getBoolPref("extensions.torbutton.settings_applied")) {
- jarThis.logger.log(3, "Neat. Timer fired during transition.");
- return;
- }
this.cookie_changed = false;
- if(tor_enabled) {
- jarThis.saveCookies("tor");
- } else {
- jarThis.saveCookies("nontor");
- }
+ jarThis.saveCookies("tor");
jarThis.logger.log(2, "Timer done. Cookies saved");
}
};
@@ -509,7 +495,9 @@ CookieJarSelector.prototype =
var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
this.timerCallback.cookie_changed = true;
- if (aData == "added" && prefs.getBoolPref("extensions.torbutton.cookie_auto_protect") && ((!prefs.getBoolPref("extensions.torbutton.tor_memory_jar") && prefs.getBoolPref("extensions.torbutton.tor_enabled")) || (!prefs.getBoolPref("extensions.torbutton.nontor_memory_jar") && !prefs.getBoolPref("extensions.torbutton.tor_enabled"))))
+ if (aData == "added"
+ && prefs.getBoolPref("extensions.torbutton.cookie_auto_protect")
+ && !prefs.getBoolPref("extensions.torbutton.tor_memory_jar"))
{
this.addProtectedCookie(aSubject.QueryInterface(Components.interfaces.nsICookie2));//protect the new cookie!
}
diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js
index 7b22a90..e56fed3 100644
--- a/src/components/external-app-blocker.js
+++ b/src/components/external-app-blocker.js
@@ -1,4 +1,4 @@
-// Bug 1506 Android P1/TBB P5: This code providers users with notification
+// Bug 1506 Android P1/TBB P5: This code provides users with notification
// in the event of external app launch. We want it to exist in the desktop
// port, but it is probably useless for Android.
@@ -61,11 +61,6 @@ ExternalAppBlocker.prototype =
// method of nsIClassInfo
getHelperForLanguage: function(count) { return null; },
- /* Determine whether we should ask the user to run the app */
- _blockApp: function() {
- return this._prefs.getBoolPref("extensions.torbutton.tor_enabled");
- },
-
// Returns true if launch should proceed.
_confirmLaunch: function() {
if (!this._prefs.getBoolPref("extensions.torbutton.launch_warning")) {
@@ -106,7 +101,7 @@ ExternalAppBlocker.prototype =
if (topic == "external-app-requested") {
this.logger.log(3, "External app requested");
// subject.data is true if the launch should be canceled.
- if (this._blockApp() && (subject instanceof Ci.nsISupportsPRBool)
+ if ((subject instanceof Ci.nsISupportsPRBool)
&& !subject.data /* not canceled already */
&& !this._confirmLaunch()) {
subject.data = true; // The user said to cancel the launch.
diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js
index de39e64..467019e 100644
--- a/src/components/startup-observer.js
+++ b/src/components/startup-observer.js
@@ -8,11 +8,7 @@
* Cases tested (each during Tor and Non-Tor, FF4 and FF3.6)
* 1. Crash
* 2. Upgrade
- * 3. Uninstall:
- * XXX: Currently broken. Need
- * https://developer.mozilla.org/en/Addons/Add-on_Manager/AddonListener#onOperationCancelled%28%29
- * https://developer.mozilla.org/en/Addons/Add-on_Manager/AddonManager#addAddonListener%28%29
- * 4. Fresh install
+ * 3. Fresh install
*
*************************************************************************/
@@ -24,20 +20,14 @@ const Cr = Components.results;
const kMODULE_NAME = "Startup";
const kMODULE_CONTRACTID = "@torproject.org/startup-observer;1";
const kMODULE_CID = Components.ID("06322def-6fde-4c06-aef6-47ae8e799629");
-const TORBUTTON_EXTENSION_UUID = "{E0204BD5-9D31-402B-A99D-A6AA8FFEBDCA}";
function StartupObserver() {
- this._uninstall = false;
this.logger = Components.classes["@torproject.org/torbutton-logger;1"]
.getService(Components.interfaces.nsISupports).wrappedJSObject;
this._prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
this.logger.log(3, "Startup Observer created");
- var observerService = Cc["@mozilla.org/observer-service;1"].
- getService(Ci.nsIObserverService);
- observerService.addObserver(this, "quit-application-granted", false);
-
var env = Cc["@mozilla.org/process/environment;1"]
.getService(Ci.nsIEnvironment);
var prefName = "browser.startup.homepage";
@@ -64,49 +54,9 @@ function StartupObserver() {
} catch(e) {
this.logger.log(4, "Early proxy change failed. Will try again at profile load. Error: "+e);
}
-
- // Bug 1506 P2/P3: You probably want to register this observer to clean up
- // prefs if you're going to support using normal firefox.
- Components.utils.import("resource://gre/modules/AddonManager.jsm");
- this.onEnabling = this.onOperationCancelled;
- this.onDisabling = this.onUninstalling;
- AddonManager.addAddonListener(this);
}
StartupObserver.prototype = {
- // AddonListeners. We need to listen to see if we are about to be
- // disabled or uninstalled. We also need to track this, and listen
- // for an arbitrary "cancel" event that changes the current state.
- // XXX: If firefox crashes before quit here, and still manages to uninstall
- // us somehow, we will leave the browser in a sorry state... Let's hope they
- // have the sense not to uninstall addons after an improper shutdown/crash
- // (or at least give us this event again in that case).
- // Bug 1506 P2/P3: You probably want to register this observer to clean up
- // prefs if you're going to support using normal firefox.
- onUninstalling: function(addon, needsRestart) {
- if (addon.id.toUpperCase() == TORBUTTON_EXTENSION_UUID) {
- this._uninstall = true;
- this.logger.log(4, "User requested disable/uninstall of Torbutton. Preparing for death.");
-
- if (!needsRestart) {
- this.logger.log(5,
- "Torbutton uninstalled/disabled, but a restart is not needed? How can this happen?");
- }
- }
- },
-
- // This is done in the constructor. JS doesn't allow this...
- //onDisabling: this.onUninstalling,
-
- // Bug 1506 P2/P3: You probably want to register this observer to clean up
- // prefs if you're going to support using normal firefox.
- onOperationCancelled: function(addon) {
- if (addon.id.toUpperCase() == TORBUTTON_EXTENSION_UUID) {
- this.logger.log(4, "Uninstall of Torbutton canceled. Hurray!");
- this._uninstall = false;
- }
- },
-
// Bug 6803: We need to get the env vars early due to
// some weird proxy caching code that showed up in FF15.
// Otherwise, homepage domain loads fail forever.
@@ -116,37 +66,27 @@ StartupObserver.prototype = {
.getService(Components.interfaces.nsIEnvironment);
if (environ.exists("TOR_SOCKS_PORT")) {
- this._prefs.setIntPref('extensions.torbutton.socks_port',
- parseInt(environ.get("TOR_SOCKS_PORT")));
if (this.is_tbb) {
- this._prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT")));
-
- // XXX: Hack for TBB people who alternate between transproxy and non
- this._prefs.setCharPref('extensions.torbutton.settings_method', 'recommended');
- this._prefs.setBoolPref('extensions.torbutton.saved.transparentTor', false);
+ this._prefs.setIntPref('network.proxy.socks_port',
+ parseInt(environ.get("TOR_SOCKS_PORT")));
this._prefs.setBoolPref('network.proxy.socks_remote_dns', true);
this._prefs.setIntPref('network.proxy.type', 1);
}
this.logger.log(3, "Reset socks port to "+environ.get("TOR_SOCKS_PORT"));
- } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') {
- this._prefs.setIntPref('extensions.torbutton.socks_port', 9150);
+ } else {
+ this._prefs.setIntPref('network.proxy.socks_port', 9150);
}
if (environ.exists("TOR_SOCKS_HOST")) {
- this._prefs.setCharPref('extensions.torbutton.socks_host', environ.get("TOR_SOCKS_HOST"));
if (this.is_tbb) {
this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST"));
}
- } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') {
- this._prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1');
+ } else {
+ this._prefs.setCharPref('network.proxy.socks', '127.0.0.1');
}
if (environ.exists("TOR_TRANSPROXY")) {
this.logger.log(3, "Resetting Tor settings to transproxy");
- this._prefs.setCharPref('extensions.torbutton.settings_method', 'transparent');
- this._prefs.setBoolPref('extensions.torbutton.saved.transparentTor', true);
- this._prefs.setIntPref('extensions.torbutton.socks_port', 0);
- this._prefs.setCharPref('extensions.torbutton.socks_host', "");
if (this.is_tbb) {
this._prefs.setBoolPref('network.proxy.socks_remote_dns', false);
this._prefs.setIntPref('network.proxy.type', 0);
@@ -170,32 +110,6 @@ StartupObserver.prototype = {
this._prefs.setBoolPref("extensions.torbutton.startup", true);
this.setProxySettings();
- } else if (topic == "quit-application-granted") {
- // Bug 1506 P2/P3: You probably want to register this observer to clean up
- // prefs if you're going to support using normal firefox.
- this.logger.log(3, "Got firefox quit event.");
- var chrome = null;
- try {
- var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var chrome = wm.getMostRecentWindow("navigator:browser");
- } catch(e) {
- this.logger.log(3, "Exception on shutdown window: "+e);
- }
-
- if (this._uninstall) {
- if (chrome) {
- chrome.torbutton_disable_tor();
- this.logger.log(4,
- "Disabling Torbutton prior to uninstall.");
- } else {
- this.logger.log(5,
- "User asked to uninstall, but we have no window!");
- }
- }
-
- this.logger.log(3, "Torbutton normal exit.");
- //this.unregister();
}
// In all cases, force prefs to be synced to disk
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index 1e46694..a3105da 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -4,71 +4,20 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo
// Display prefs
pref("extensions.torbutton.display_circuit", true);
-pref("extensions.torbutton.display_panel",true);
-pref("extensions.torbutton.panel_style",'text');
pref("extensions.torbutton@xxxxxxxxxxxxxx.description", "chrome://torbutton/locale/torbutton.properties");
pref("extensions.torbutton.updateNeeded", false);
pref("extensions.torbutton.hide_sync_ui", true);
-// proxy prefs
-pref("extensions.torbutton.settings_method",'recommended');
-pref("extensions.torbutton.use_privoxy",true);
-pref("extensions.torbutton.http_proxy","");
-pref("extensions.torbutton.http_port",0);
-pref("extensions.torbutton.https_proxy","");
-pref("extensions.torbutton.https_port",0);
-pref("extensions.torbutton.ftp_proxy","");
-pref("extensions.torbutton.ftp_port",0);
-pref("extensions.torbutton.gopher_proxy","");
-pref("extensions.torbutton.gopher_port",0);
-pref("extensions.torbutton.socks_host","");
-pref("extensions.torbutton.socks_port",0);
-pref("extensions.torbutton.socks_version",5);
+// Tor check and proxy prefs
pref("extensions.torbutton.test_enabled",true);
pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true";);
pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__";);
pref("extensions.torbutton.local_tor_check",true);
-pref("extensions.torbutton.test_failed",false);
-pref("extensions.torbutton.no_proxies_on","");
pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions";);
pref("extensions.torbutton.versioncheck_enabled",true);
pref("extensions.torbutton.use_nontor_proxy",false);
-// XXX: wtf prefs? These seem not actually connected, but govern
-// if user wants own tor proxy settings
-pref("extensions.torbutton.custom.http_proxy","");
-pref("extensions.torbutton.custom.http_port",0);
-pref("extensions.torbutton.custom.https_proxy","");
-pref("extensions.torbutton.custom.https_port",0);
-pref("extensions.torbutton.custom.ftp_proxy","");
-pref("extensions.torbutton.custom.ftp_port",0);
-pref("extensions.torbutton.custom.gopher_proxy","");
-pref("extensions.torbutton.custom.gopher_port",0);
-pref("extensions.torbutton.custom.socks_host","");
-pref("extensions.torbutton.custom.socks_port",0);
-pref("extensions.torbutton.custom.socks_version",5);
-
-// saved prefs:
-pref("extensions.torbutton.saved.type", 0);
-pref("extensions.torbutton.saved.http_proxy", "");
-pref("extensions.torbutton.saved.http_port",0);
-pref("extensions.torbutton.saved.https_proxy","");
-pref("extensions.torbutton.saved.https_port",0);
-pref("extensions.torbutton.saved.ftp_proxy","");
-pref("extensions.torbutton.saved.ftp_port",0);
-pref("extensions.torbutton.saved.gopher_proxy","");
-pref("extensions.torbutton.saved.gopher_port",0);
-pref("extensions.torbutton.saved.socks_host","");
-pref("extensions.torbutton.saved.socks_version",0);
-pref("extensions.torbutton.saved.socks_port",0);
-pref("extensions.torbutton.saved.socks_remote_dns",false);
-pref("extensions.torbutton.saved.no_proxies_on","");
-pref("extensions.torbutton.saved.transparentTor",false);
-
// State prefs:
-pref("extensions.torbutton.tor_enabled",false);
-pref("extensions.torbutton.proxies_applied",false);
-pref("extensions.torbutton.settings_applied",false);
pref("extensions.torbutton.startup",false);
pref("extensions.torbutton.inserted_button",false);
pref("extensions.torbutton.prompted_language",false);
@@ -81,21 +30,16 @@ pref("extensions.torbutton.startup_resize_period", true);
// Security prefs:
pref("extensions.torbutton.no_tor_plugins",true);
-pref("extensions.torbutton.cookie_jars",false);
pref("extensions.torbutton.cookie_protections",true);
pref("extensions.torbutton.cookie_auto_protect",false);
-pref("extensions.torbutton.dual_cookie_jars",true);
pref("extensions.torbutton.spoof_english",true);
pref("extensions.torbutton.clear_http_auth",true);
-pref("extensions.torbutton.close_tor",false);
-pref("extensions.torbutton.close_nontor",false);
pref("extensions.torbutton.close_newnym",true);
pref("extensions.torbutton.resize_new_windows",true);
pref("extensions.torbutton.resize_windows",true);
pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last
pref("extensions.torbutton.tor_memory_jar",false);
pref("extensions.torbutton.nontor_memory_jar",false);
-pref("extensions.torbutton.tz_string","");
pref("extensions.torbutton.launch_warning",true);
// Opt out of Firefox addon pings:
// https://developer.mozilla.org/en/Addons/Working_with_AMO
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits