[tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 01 Sep '16
by gk＠torproject.org 01 Sep '16
01 Sep '16
commit 082d1c5e03617458f366b597256597bbde079889
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Wed Aug 31 14:28:32 2016 -0400
fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
Add support for HTTPS Everywhere 5.2.2 and newer, which is no longer
an unpacked extension.
---
tools/update-packaging/make_full_update.sh | 3 +-
tools/update-packaging/make_incremental_update.sh | 79 ++++++++++++++++++-----
2 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh
index f0bd7f6..872221a 100755
--- a/tools/update-packaging/make_full_update.sh
+++ b/tools/update-packaging/make_full_update.sh
@@ -72,7 +72,8 @@ list_files files
list_symlinks symlinks symlink_targets
# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms,
-# we should remove the following lines:
+# we should remove the following lines (which remove entire directories
+# which, if present, contain old, unpacked copies of HTTPS Everywhere):
# Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it
# exists. The extension ID got changed with the version bump to 5.1.0.
ext_path='TorBrowser/Data/Browser/profile.default/extensions'
diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh
index 15af172..dc9097e 100755
--- a/tools/update-packaging/make_incremental_update.sh
+++ b/tools/update-packaging/make_incremental_update.sh
@@ -91,6 +91,7 @@ fi
# 770996 but in Tor Browser we do not need that fix.
requested_forced_updates=""
directories_to_remove=""
+extra_files_to_remove=""
while getopts "hqf:" flag
do
@@ -131,7 +132,8 @@ archivefiles="updatev2.manifest updatev3.manifest"
# releases, add them to the "force updates" list.
ext_path='TorBrowser/Data/Browser/profile.default/extensions'
if [ -d "$newdir/$ext_path" ]; then
- https_everywhere='https-everywhere-eff(a)eff.org'
+ https_everywhere_dir='https-everywhere-eff(a)eff.org'
+ https_everywhere_xpi='https-everywhere-eff(a)eff.org.xpi'
noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi'
# NoScript is a packed extension, so we simply compare the old and the new
@@ -146,21 +148,57 @@ if [ -d "$newdir/$ext_path" ]; then
requested_forced_updates="$requested_forced_updates $noscript_path"
fi
- # HTTPS Everywhere is an unpacked extension, so we need to determine if any of
- # the unpacked files have changed. Since that is messy, we simply compare the
- # old extension's install.rdf file to the new one.
- https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf"
- diff "$olddir/$https_everywhere_install_rdf" \
- "$newdir/$https_everywhere_install_rdf" > /dev/null
- rc=$?
- if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then
- notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command"
- exit 2
- elif [ $rc -ge 1 ]; then
- requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*"
- # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it
- # exists. The extension ID got changed with the version bump to 5.1.0.
- directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere"
+ # As of HTTPS Everywhere 5.1.0, the extension ID gained "-eff".
+ # As of HTTPS Everywhere 5.2.2, the extension is packed (i.e., it remains
+ # an .xpi after it is installed in the browser profile).
+ force_https_update=0
+ remove_unpacked_https_e_dirs=0
+ unpacked_https_e_install_rdf="$ext_path/$https_everywhere_dir/install.rdf"
+ packed_https_e_path="$ext_path/$https_everywhere_xpi"
+ if [ -d "$newdir/$ext_path/$https_everywhere_dir" ]; then
+ # The new HTTPS-E extension is unpacked, and presumably the old one is
+ # too. We need to determine if any of the unpacked files have changed.
+ # Since that is messy, we simply compare the old install.rdf file to the
+ # new one.
+ diff "$olddir/$unpacked_https_e_install_rdf" \
+ "$newdir/$unpacked_https_e_install_rdf" > /dev/null
+ rc=$?
+ if [ $rc -gt 1 -a -e "$olddir/$unpacked_https_e_install_rdf" ]; then
+ notice "Unexpected exit $rc from $unpacked_https_e_install_rdf diff command"
+ exit 2
+ elif [ $rc -ge 1 ]; then
+ force_https_update=1
+ remove_unpacked_https_e_dirs=1
+ # In case we still ship an unpacked HTTPS-E extension but the user has
+ # updated to a packed one, arrange for the packed one to be removed.
+ extra_files_to_remove="$extra_files_to_remove $packed_https_e_path"
+ fi
+ elif [ -d "$olddir/$ext_path/$https_everywhere_dir" ]; then
+ # The old HTTPS-E extension is unpacked but the new one is packed.
+ force_https_update=1
+ remove_unpacked_https_e_dirs=1
+ else
+ # Both the old and new HTTPS-E extensions are packed. In this case we can
+ # simply compare the .xpi files to determine if the extension has changed.
+ diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null
+ rc=$?
+ if [ $rc -gt 1 ]; then
+ notice "Unexpected exit $rc from $packed_https_e_path diff command"
+ exit 2
+ elif [ $rc -eq 1 ]; then
+ force_https_update=1
+ fi
+ fi
+
+ if [ $force_https_update -ne 0 ]; then
+ requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere_dir/* $packed_https_e_path"
+ if [ "$remove_unpacked_https_e_dirs" -ne 0 ]; then
+ # The old version was unpacked, so remove the entire directory to ensure
+ # that the replace is "clean." Also, make sure we delete the pre 5.1.0
+ # HTTPS Everywhere as well in case it exists (the extension ID got
+ # changed with the version bump to 5.1.0).
+ directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere_dir"
+ fi
fi
fi
# END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal
@@ -376,6 +414,15 @@ notice ""
notice "Adding file and directory remove instructions from file 'removed-files'"
append_remove_instructions "$newdir" "$updatemanifestv2" "$updatemanifestv3"
+# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms,
+# we should remove the following lines:
+for f in $extra_files_to_remove; do
+ notice " remove \"$f\""
+ echo "remove \"$f\"" >> "$updatemanifestv2"
+ echo "remove \"$f\"" >> "$updatemanifestv3"
+done
+# END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal
+
notice ""
notice "Adding directory remove instructions for directories that no longer exist"
num_olddirs=${#olddirs[*]}
1
0
[tor-launcher/master] Bug 14272: Make Tor Launcher work with Unix Domain Socket option
by gk＠torproject.org 01 Sep '16
by gk＠torproject.org 01 Sep '16
01 Sep '16
commit 8871259c966755233b134a5ddb2b4926539d25c6
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Wed Aug 31 15:26:08 2016 -0400
Bug 14272: Make Tor Launcher work with Unix Domain Socket option
On non-Windows platforms, use a Unix domain socket by default for the
Tor control port. New preferences:
extensions.torlauncher.control_port_use_socket (Boolean)
extensions.torlauncher.control_socket_path (path string)
New environment variable: TOR_CONTROL_SOCKET
When starting tor, always include a ControlPort argument so that
users can use environment variables to switch between the two control
port types.
Add a public TorGetControlSocketFile() function that Torbutton will
use to retrieve the socket file (an nsIFile) when a Unix domain
socket is in use.
Moved the getTorFile() function to our utilities module.
---
src/components/tl-process.js | 253 +++----------------------------------
src/components/tl-protocol.js | 100 ++++++++++++---
src/defaults/preferences/prefs.js | 14 ++-
src/modules/tl-util.jsm | 257 +++++++++++++++++++++++++++++++++++++-
4 files changed, 370 insertions(+), 254 deletions(-)
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 8e42feb..c1bbdda 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -31,8 +31,6 @@ TorProcessService.prototype =
{
kContractID : "@torproject.org/torlauncher-process-service;1",
kServiceName : "Tor Launcher Process Service",
- kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}",
- kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}",
kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"),
kTorLauncherExtPath: "tor-launcher(a)torproject.org", // This could vary.
@@ -308,11 +306,6 @@ TorProcessService.prototype =
mProtocolSvc: null,
mTorProcess: null, // nsIProcess
mTorProcessStartTime: null, // JS Date.now()
- // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used.
- // (cached; access via this._isUserDataOutsideOfAppDir)
- mIsUserDataOutsideOfAppDir: undefined,
- mAppDir: null, // nsIFile (cached; access via this._appDir)
- mDataDir: null, // nsIFile (cached; access via this._dataDir)
mControlConnTimer: null,
mControlConnDelayMS: 0,
mQuitSoon: false, // Quit was requested by the user; do so soon.
@@ -333,11 +326,14 @@ TorProcessService.prototype =
// Get the Tor data directory first so it is created before we try to
// construct paths to files that will be inside it.
- var dataDir = this._getTorFile("tordatadir", true);
- var exeFile = this._getTorFile("tor", false);
- var torrcFile = this._getTorFile("torrc", true);
- var torrcDefaultsFile = this._getTorFile("torrc-defaults", false);
+ var dataDir = TorLauncherUtil.getTorFile("tordatadir", true);
+ var exeFile = TorLauncherUtil.getTorFile("tor", false);
+ var torrcFile = TorLauncherUtil.getTorFile("torrc", true);
+ var torrcDefaultsFile =
+ TorLauncherUtil.getTorFile("torrc-defaults", false);
var hashedPassword = this.mProtocolSvc.TorGetPassword(true);
+ var controlSocketFile = this.mProtocolSvc.TorGetControlSocketFile();
+ var controlPort = this.mProtocolSvc.TorGetControlPort();
var detailsKey;
if (!exeFile)
@@ -359,7 +355,6 @@ TorProcessService.prototype =
return;
}
-
// The geoip and geoip6 files are in the same directory as torrc-defaults.
var geoipFile = torrcDefaultsFile.clone();
geoipFile.leafName = "geoip";
@@ -384,6 +379,19 @@ TorProcessService.prototype =
args.push("HashedControlPassword");
args.push(hashedPassword);
+ // Include a ControlPort argument to support switching between
+ // a TCP port and a Unix domain socket.
+ let controlPortArg;
+ if (controlSocketFile)
+ controlPortArg = "unix:" + controlSocketFile.path;
+ else if (controlPort)
+ controlPortArg = "" + controlPort;
+ if (controlPortArg)
+ {
+ args.push("ControlPort");
+ args.push(controlPortArg);
+ }
+
var pid = this._getpid();
if (0 != pid)
{
@@ -692,227 +700,6 @@ TorProcessService.prototype =
return argsArray;
},
- // Returns an nsIFile.
- // If aCreate is true and the file doesn't exist, it is created.
- _getTorFile: function(aTorFileType, aCreate)
- {
- if (!aTorFileType)
- return null;
-
- let isRelativePath = true;
- let isUserData = (aTorFileType != "tor") &&
- (aTorFileType != "torrc-defaults");
- let prefName = "extensions.torlauncher." + aTorFileType + "_path";
- let path = TorLauncherUtil.getCharPref(prefName);
- if (path)
- {
- let re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//;
- isRelativePath = !re.test(path);
- }
- else
- {
- // Get default path.
- if (this._isUserDataOutsideOfAppDir)
- {
- // This block is used for the TorBrowser-Data/ case.
- if (TorLauncherUtil.isWindows)
- {
- if ("tor" == aTorFileType)
- path = "TorBrowser\\Tor\\tor.exe";
- else if ("torrc-defaults" == aTorFileType)
- path = "TorBrowser\\Tor\\torrc-defaults";
- else if ("torrc" == aTorFileType)
- path = "Tor\\torrc";
- else if ("tordatadir" == aTorFileType)
- path = "Tor";
- }
- else if (TorLauncherUtil.isMac)
- {
- if ("tor" == aTorFileType)
- path = "Contents/Resources/TorBrowser/Tor/tor";
- else if ("torrc-defaults" == aTorFileType)
- path = "Contents/Resources/TorBrowser/Tor/torrc-defaults";
- else if ("torrc" == aTorFileType)
- path = "Tor/torrc";
- else if ("tordatadir" == aTorFileType)
- path = "Tor";
- }
- else // Linux and others.
- {
- if ("tor" == aTorFileType)
- path = "TorBrowser/Tor/tor";
- else if ("torrc-defaults" == aTorFileType)
- path = "TorBrowser/Tor/torrc-defaults";
- else if ("torrc" == aTorFileType)
- path = "Tor/torrc";
- else if ("tordatadir" == aTorFileType)
- path = "Tor";
- }
- }
- else if (TorLauncherUtil.isWindows)
- {
- // This block is used for the non-TorBrowser-Data/ case.
- if ("tor" == aTorFileType)
- path = "Tor\\tor.exe";
- else if ("torrc-defaults" == aTorFileType)
- path = "Data\\Tor\\torrc-defaults";
- else if ("torrc" == aTorFileType)
- path = "Data\\Tor\\torrc";
- else if ("tordatadir" == aTorFileType)
- path = "Data\\Tor";
- }
- else // Linux, Mac OS and others.
- {
- // This block is also used for the non-TorBrowser-Data/ case.
- if ("tor" == aTorFileType)
- path = "Tor/tor";
- else if ("torrc-defaults" == aTorFileType)
- path = "Data/Tor/torrc-defaults";
- else if ("torrc" == aTorFileType)
- path = "Data/Tor/torrc";
- else if ("tordatadir" == aTorFileType)
- path = "Data/Tor";
- }
- }
-
- if (!path)
- return null;
-
- try
- {
- let f;
- if (isRelativePath)
- {
- // Turn 'path' into an absolute path.
- if (this._isUserDataOutsideOfAppDir)
- {
- let baseDir = isUserData ? this._dataDir : this._appDir;
- f = baseDir.clone();
- }
- else
- {
- f = this._appDir.clone();
- f.append("TorBrowser");
- }
- f.appendRelativePath(path);
- }
- else
- {
- f = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile);
- f.initWithPath(path);
- }
-
- if (!f.exists() && aCreate)
- {
- try
- {
- if ("tordatadir" == aTorFileType)
- f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
- else
- f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
- }
- catch (e)
- {
- TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e);
- return null;
- }
- }
-
- if (f.exists())
- {
- try { f.normalize(); } catch(e) {}
-
- return f;
- }
-
- TorLauncherLogger.log(4, aTorFileType + " file not found: " + f.path);
- }
- catch(e)
- {
- TorLauncherLogger.safelog(4, "_getTorFile " + aTorFileType +
- " failed for " + path + ": ", e);
- }
-
- return null; // File not found or error (logged above).
- }, // _getTorFile()
-
- get _isUserDataOutsideOfAppDir()
- {
- if (this.mIsUserDataOutsideOfAppDir == undefined)
- {
- // Determine if we are using a "side-by-side" data model by checking
- // whether the user profile is outside of the app directory.
- try
- {
- let ds = Cc["@mozilla.org/file/directory_service;1"]
- .getService(Ci.nsIProperties);
- let profDir = ds.get("ProfD", Ci.nsIFile);
- this.mIsUserDataOutsideOfAppDir = !this._appDir.contains(profDir);
- }
- catch (e)
- {
- this.mIsUserDataOutsideOfAppDir = false;
- }
- }
-
- return this.mIsUserDataOutsideOfAppDir;
- }, // get _isUserDataOutsideOfAppDir
-
- // Returns an nsIFile that points to the application directory.
- // May throw.
- get _appDir()
- {
- if (!this.mAppDir)
- {
- let topDir = Cc["@mozilla.org/file/directory_service;1"]
- .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile);
- let appInfo = Cc["@mozilla.org/xre/app-info;1"]
- .getService(Ci.nsIXULAppInfo);
- // On Linux and Windows, we want to return the Browser/ directory.
- // Because topDir ("CurProcD") points to Browser/browser on those
- // platforms, we need to go up one level.
- // On Mac OS, we want to return the TorBrowser.app/ directory.
- // Because topDir points to Contents/Resources/browser on Mac OS,
- // we need to go up 3 levels.
- let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1;
- if ((appInfo.ID == this.kThunderbirdID) ||
- (appInfo.ID == this.kInstantbirdID))
- {
- // On Thunderbird/Instantbird, the topDir is the root dir and not
- // browser/, so we need to iterate one level less than Firefox.
- --tbbBrowserDepth;
- }
-
- while (tbbBrowserDepth > 0)
- {
- let didRemove = (topDir.leafName != ".");
- topDir = topDir.parent;
- if (didRemove)
- tbbBrowserDepth--;
- }
-
- this.mAppDir = topDir;
- }
-
- return this.mAppDir;
- }, // get _appDir
-
- // Returns an nsIFile that points to the TorBrowser-Data/ directory.
- // This function is only used when this._isUserDataOutsideOfAppDir == true.
- // May throw.
- get _dataDir()
- {
- if (!this.mDataDir)
- {
- let ds = Cc["@mozilla.org/file/directory_service;1"]
- .getService(Ci.nsIProperties);
- let profDir = ds.get("ProfD", Ci.nsIFile);
- this.mDataDir = profDir.parent.parent;
- }
-
- return this.mDataDir;
- }, // get _dataDir
-
_getpid: function()
{
// Use nsIXULRuntime.processID if it is available.
diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js
index fdc2394..d394b53 100644
--- a/src/components/tl-protocol.js
+++ b/src/components/tl-protocol.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, The Tor Project, Inc.
+// Copyright (c) 2016, The Tor Project, Inc.
// See LICENSE for licensing information.
// TODO: Some code came from torbutton.js (pull in copyright and license?)
//
@@ -17,6 +17,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil",
"resource://torlauncher/modules/tl-util.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger",
"resource://torlauncher/modules/tl-logger.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+ "resource://gre/modules/FileUtils.jsm");
function TorProtocolService()
@@ -31,23 +33,44 @@ function TorProtocolService()
try
{
- var env = Cc["@mozilla.org/process/environment;1"]
+ let isWindows = TorLauncherUtil.isWindows;
+ let env = Cc["@mozilla.org/process/environment;1"]
.getService(Ci.nsIEnvironment);
-
- if (env.exists("TOR_CONTROL_HOST"))
- this.mControlHost = env.get("TOR_CONTROL_HOST");
- else
+ // Determine how Tor Launcher will connect to the Tor control port.
+ // Environment variables get top priority followed by preferences.
+ if (!isWindows && env.exists("TOR_CONTROL_SOCKET"))
{
- this.mControlHost = TorLauncherUtil.getCharPref(
- "extensions.torlauncher.control_host", "127.0.0.1");
+ let socketPath = env.get("TOR_CONTROL_SOCKET");
+ this.mControlSocketFile = new FileUtils.File(socketPath);
}
-
- if (env.exists("TOR_CONTROL_PORT"))
- this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10);
else
{
- this.mControlPort = TorLauncherUtil.getIntPref(
+ // Check for TCP host and port environment variables.
+ if (env.exists("TOR_CONTROL_HOST"))
+ this.mControlHost = env.get("TOR_CONTROL_HOST");
+ if (env.exists("TOR_CONTROL_PORT"))
+ this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10);
+
+ let useSocket = !isWindows && TorLauncherUtil.getBoolPref(
+ "extensions.torlauncher.control_port_use_socket", true);
+ if (!this.mControlHost && !this.mControlPort && useSocket)
+ {
+ this.mControlSocketFile = TorLauncherUtil.getTorFile("control_socket",
+ false);
+ }
+ else
+ {
+ if (!this.mControlHost)
+ {
+ this.mControlHost = TorLauncherUtil.getCharPref(
+ "extensions.torlauncher.control_host", "127.0.0.1");
+ }
+ if (!this.mControlPort)
+ {
+ this.mControlPort = TorLauncherUtil.getIntPref(
"extensions.torlauncher.control_port", 9151);
+ }
+ }
}
// Populate mControlPassword so it is available when starting tor.
@@ -141,6 +164,19 @@ TorProtocolService.prototype =
kCmdStatusOK: 250,
kCmdStatusEventNotification: 650,
+ TorGetControlSocketFile: function()
+ {
+ if (!this.mControlSocketFile)
+ return undefined;
+
+ return this.mControlSocketFile.clone();
+ },
+
+ TorGetControlPort: function()
+ {
+ return this.mControlPort;
+ },
+
// Returns Tor password string or null if an error occurs.
TorGetPassword: function(aPleaseHash)
{
@@ -512,6 +548,7 @@ TorProtocolService.prototype =
mConsoleSvc: null,
mControlPort: null,
mControlHost: null,
+ mControlSocketFile: null, // An nsIFile if using a UNIX domain socket.
mControlPassword: null, // JS string that contains hex-encoded password.
mControlConnection: null, // This is cached and reused.
mEventMonitorConnection: null,
@@ -560,12 +597,43 @@ TorProtocolService.prototype =
var conn;
try
{
- var sts = Cc["@mozilla.org/network/socket-transport-service;1"]
+ let sts = Cc["@mozilla.org/network/socket-transport-service;1"]
.getService(Ci.nsISocketTransportService);
- TorLauncherLogger.log(2, "Opening control connection to " +
+ let socket;
+ if (this.mControlSocketFile)
+ {
+ let exists = this.mControlSocketFile.exists();
+ if (!exists)
+ {
+ TorLauncherLogger.log(5, "Control port socket does not exist: " +
+ this.mControlSocketFile.path);
+ }
+ else
+ {
+ let isSpecial = this.mControlSocketFile.isSpecial();
+ if (!isSpecial)
+ {
+ TorLauncherLogger.log(5, "Control port socket is not a socket: " +
+ this.mControlSocketFile.path);
+ }
+ else
+ {
+ TorLauncherLogger.log(2, "Opening control connection to socket " +
+ this.mControlSocketFile.path);
+ socket = sts.createUnixDomainTransport(this.mControlSocketFile);
+ }
+ }
+ }
+ else
+ {
+ TorLauncherLogger.log(2, "Opening control connection to " +
this.mControlHost + ":" + this.mControlPort);
- var socket = sts.createTransport(null, 0, this.mControlHost,
- this.mControlPort, null);
+ socket = sts.createTransport(null, 0, this.mControlHost,
+ this.mControlPort, null);
+ }
+
+ if (!socket)
+ return null;
// Our event monitor connection is non-blocking and unbuffered (an
// asyncWait() call is used so we only read data when we know that
diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
index 2c0a95e..500fe2f 100644
--- a/src/defaults/preferences/prefs.js
+++ b/src/defaults/preferences/prefs.js
@@ -2,16 +2,24 @@
pref("intl.locale.matchOS", true);
pref("extensions.torlauncher.prompt_for_locale", true);
+pref("extensions.torlauncher.start_tor", true);
+pref("extensions.torlauncher.prompt_at_startup", true);
+
pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=note, 5=warn
pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog
pref("extensions.torlauncher.max_tor_log_entries", 1000);
+// By default, a Unix domain socket at a default location is used for
+// the Tor control port.
+// Change control_port_use_socket to false to use a TCP connection
+// instead, as defined by control_host and control_port.
+// Modify control_socket_path to override the default socket location. If a
+// relative path is used, it is handled like torrc_path (see below).
+pref("extensions.torlauncher.control_port_use_socket", true);
+pref("extensions.torlauncher.control_socket_path", "");
pref("extensions.torlauncher.control_host", "127.0.0.1");
pref("extensions.torlauncher.control_port", 9151);
-pref("extensions.torlauncher.start_tor", true);
-pref("extensions.torlauncher.prompt_at_startup", true);
-
// The tor_path is relative to the application directory. On Linux and
// Windows this is the Browser/ directory that contains the firefox
// executables, and on Mac OS it is the TorBrowser.app directory.
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 7f93f39..992ef5b 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, The Tor Project, Inc.
+// Copyright (c) 2016, The Tor Project, Inc.
// See LICENSE for licensing information.
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
@@ -11,14 +11,19 @@ let EXPORTED_SYMBOLS = [ "TorLauncherUtil" ];
const Cc = Components.classes;
const Ci = Components.interfaces;
+const Cu = Components.utils;
const kPropBundleURI = "chrome://torlauncher/locale/torlauncher.properties";
const kPropNamePrefix = "torlauncher.";
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger",
+ "resource://torlauncher/modules/tl-logger.jsm");
+
let TorLauncherUtil = // Public
{
get isMac()
{
- return ("Darwin" == TLUtilInternal._OS);
+ return TLUtilInternal._isMac;
},
get isWindows()
@@ -381,6 +386,163 @@ let TorLauncherUtil = // Public
return undefined;
},
+
+ // Returns an nsIFile.
+ // If aTorFileType is "control_socket", aCreate is ignored and there is
+ // no requirement that the socket exist.
+ // For all other file types, null is returned if the file does not exist
+ // and it cannot be created (it will be created if aCreate is true).
+ getTorFile: function(aTorFileType, aCreate)
+ {
+ if (!aTorFileType)
+ return null;
+
+ let isRelativePath = true;
+ let isUserData = (aTorFileType != "tor") &&
+ (aTorFileType != "torrc-defaults");
+ let isControlSocket = ("control_socket" == aTorFileType);
+ let prefName = "extensions.torlauncher." + aTorFileType + "_path";
+ let path = this.getCharPref(prefName);
+ if (path)
+ {
+ let re = (this.isWindows) ? /^[A-Za-z]:\\/ : /^\//;
+ isRelativePath = !re.test(path);
+ }
+ else
+ {
+ // Get default path.
+ if (TLUtilInternal._isUserDataOutsideOfAppDir)
+ {
+ // This block is used for the TorBrowser-Data/ case.
+ if (this.isWindows)
+ {
+ if ("tor" == aTorFileType)
+ path = "TorBrowser\\Tor\\tor.exe";
+ else if ("torrc-defaults" == aTorFileType)
+ path = "TorBrowser\\Tor\\torrc-defaults";
+ else if ("torrc" == aTorFileType)
+ path = "Tor\\torrc";
+ else if ("tordatadir" == aTorFileType)
+ path = "Tor";
+ }
+ else if (this.isMac)
+ {
+ if ("tor" == aTorFileType)
+ path = "Contents/Resources/TorBrowser/Tor/tor";
+ else if ("torrc-defaults" == aTorFileType)
+ path = "Contents/Resources/TorBrowser/Tor/torrc-defaults";
+ else if ("torrc" == aTorFileType)
+ path = "Tor/torrc";
+ else if ("tordatadir" == aTorFileType)
+ path = "Tor";
+ else if (isControlSocket)
+ path = "Tor/control.socket";
+ }
+ else // Linux and others.
+ {
+ if ("tor" == aTorFileType)
+ path = "TorBrowser/Tor/tor";
+ else if ("torrc-defaults" == aTorFileType)
+ path = "TorBrowser/Tor/torrc-defaults";
+ else if ("torrc" == aTorFileType)
+ path = "Tor/torrc";
+ else if ("tordatadir" == aTorFileType)
+ path = "Tor";
+ else if (isControlSocket)
+ path = "Tor/control.socket";
+ }
+ }
+ else if (this.isWindows)
+ {
+ // This block is used for the non-TorBrowser-Data/ case.
+ if ("tor" == aTorFileType)
+ path = "Tor\\tor.exe";
+ else if ("torrc-defaults" == aTorFileType)
+ path = "Data\\Tor\\torrc-defaults";
+ else if ("torrc" == aTorFileType)
+ path = "Data\\Tor\\torrc";
+ else if ("tordatadir" == aTorFileType)
+ path = "Data\\Tor";
+ }
+ else // Linux, Mac OS and others.
+ {
+ // This block is also used for the non-TorBrowser-Data/ case.
+ if ("tor" == aTorFileType)
+ path = "Tor/tor";
+ else if ("torrc-defaults" == aTorFileType)
+ path = "Data/Tor/torrc-defaults";
+ else if ("torrc" == aTorFileType)
+ path = "Data/Tor/torrc";
+ else if ("tordatadir" == aTorFileType)
+ path = "Data/Tor";
+ else if (isControlSocket)
+ path = "Data/Tor/control.socket";
+ }
+ }
+
+ if (!path)
+ return null;
+
+ try
+ {
+ let f;
+ if (isRelativePath)
+ {
+ // Turn 'path' into an absolute path.
+ if (TLUtilInternal._isUserDataOutsideOfAppDir)
+ {
+ let baseDir = isUserData ? TLUtilInternal._dataDir
+ : TLUtilInternal._appDir;
+ f = baseDir.clone();
+ }
+ else
+ {
+ f = TLUtilInternal._appDir.clone();
+ f.append("TorBrowser");
+ }
+ f.appendRelativePath(path);
+ }
+ else
+ {
+ f = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile);
+ f.initWithPath(path);
+ }
+
+ if (!f.exists() && !isControlSocket && aCreate)
+ {
+ try
+ {
+ if ("tordatadir" == aTorFileType)
+ f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
+ else
+ f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
+ }
+ catch (e)
+ {
+ TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e);
+ return null;
+ }
+ }
+
+ // If the file exists or the control socket was requested, normalize
+ // the path and return a file object. The control socket will be
+ // created by tor.
+ if (f.exists() || isControlSocket)
+ {
+ try { f.normalize(); } catch(e) {}
+ return f;
+ }
+
+ TorLauncherLogger.log(4, aTorFileType + " file not found: " + f.path);
+ }
+ catch(e)
+ {
+ TorLauncherLogger.safelog(4, "getTorFile " + aTorFileType +
+ " failed for " + path + ": ", e);
+ }
+
+ return null; // File not found or error (logged above).
+ }, // getTorFile()
};
@@ -389,9 +551,17 @@ Object.freeze(TorLauncherUtil);
let TLUtilInternal = // Private
{
+ kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}",
+ kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}",
+
mPrefsSvc : null,
mStringBundle : null,
mOS : "",
+ // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used.
+ mIsUserDataOutsideOfAppDir: undefined, // Boolean (cached; access via
+ // this._isUserDataOutsideOfAppDir)
+ mAppDir: null, // nsIFile (cached; access via this._appDir)
+ mDataDir: null, // nsIFile (cached; access via this._dataDir)
_init: function()
{
@@ -421,6 +591,89 @@ let TLUtilInternal = // Private
return this.mOS;
},
+
+ get _isMac()
+ {
+ return ("Darwin" == this._OS);
+ },
+
+ get _isUserDataOutsideOfAppDir()
+ {
+ if (this.mIsUserDataOutsideOfAppDir == undefined)
+ {
+ // Determine if we are using a "side-by-side" data model by checking
+ // whether the user profile is outside of the app directory.
+ try
+ {
+ let ds = Cc["@mozilla.org/file/directory_service;1"]
+ .getService(Ci.nsIProperties);
+ let profDir = ds.get("ProfD", Ci.nsIFile);
+ this.mIsUserDataOutsideOfAppDir = !this._appDir.contains(profDir);
+ }
+ catch (e)
+ {
+ this.mIsUserDataOutsideOfAppDir = false;
+ }
+ }
+
+ return this.mIsUserDataOutsideOfAppDir;
+ }, // get _isUserDataOutsideOfAppDir
+
+ // Returns an nsIFile that points to the application directory.
+ // May throw.
+ get _appDir()
+ {
+ if (!this.mAppDir)
+ {
+ let topDir = Cc["@mozilla.org/file/directory_service;1"]
+ .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile);
+ let appInfo = Cc["@mozilla.org/xre/app-info;1"]
+ .getService(Ci.nsIXULAppInfo);
+ // On Linux and Windows, we want to return the Browser/ directory.
+ // Because topDir ("CurProcD") points to Browser/browser on those
+ // platforms, we need to go up one level.
+ // On Mac OS, we want to return the TorBrowser.app/ directory.
+ // Because topDir points to Contents/Resources/browser on Mac OS,
+ // we need to go up 3 levels.
+ let tbbBrowserDepth = (this._isMac) ? 3 : 1;
+ if ((appInfo.ID == this.kThunderbirdID) ||
+ (appInfo.ID == this.kInstantbirdID))
+ {
+ // On Thunderbird/Instantbird, the topDir is the root dir and not
+ // browser/, so we need to iterate one level less than Firefox.
+ --tbbBrowserDepth;
+ }
+
+ while (tbbBrowserDepth > 0)
+ {
+ let didRemove = (topDir.leafName != ".");
+ topDir = topDir.parent;
+ if (didRemove)
+ tbbBrowserDepth--;
+ }
+
+ this.mAppDir = topDir;
+ }
+
+ return this.mAppDir;
+ }, // get _appDir
+
+ // Returns an nsIFile that points to the TorBrowser-Data/ directory.
+ // This function is only used when this._isUserDataOutsideOfAppDir == true.
+ // May throw.
+ get _dataDir()
+ {
+ if (!this.mDataDir)
+ {
+ let ds = Cc["@mozilla.org/file/directory_service;1"]
+ .getService(Ci.nsIProperties);
+ let profDir = ds.get("ProfD", Ci.nsIFile);
+ this.mDataDir = profDir.parent.parent;
+ }
+
+ return this.mDataDir;
+ }, // get _dataDir
+
};
1
0
commit 32ddac7015be571c336be686b4f901103d0d36f6
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Sep 1 07:57:01 2016 +0000
Fix typo
---
src/modules/tl-util.jsm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 992ef5b..528b752 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -389,7 +389,7 @@ let TorLauncherUtil = // Public
// Returns an nsIFile.
// If aTorFileType is "control_socket", aCreate is ignored and there is
- // no requirement that the socket exist.
+ // no requirement that the socket exists.
// For all other file types, null is returned if the file does not exist
// and it cannot be created (it will be created if aCreate is true).
getTorFile: function(aTorFileType, aCreate)
1
0
[torbutton/master] fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
by gk＠torproject.org 30 Aug '16
by gk＠torproject.org 30 Aug '16
30 Aug '16
commit 1648da8461dfed9975ac83fdb03aa745b6c8d49b
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Aug 30 15:48:03 2016 -0400
fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
Restore previous behavior: do not reset the SOCKS-related preferences when
the TOR_SOCKS_HOST and TOR_SOCKS_PORT environment variables are not set.
---
src/components/startup-observer.js | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js
index 467019e..f083482 100644
--- a/src/components/startup-observer.js
+++ b/src/components/startup-observer.js
@@ -73,16 +73,12 @@ StartupObserver.prototype = {
this._prefs.setIntPref('network.proxy.type', 1);
}
this.logger.log(3, "Reset socks port to "+environ.get("TOR_SOCKS_PORT"));
- } else {
- this._prefs.setIntPref('network.proxy.socks_port', 9150);
}
if (environ.exists("TOR_SOCKS_HOST")) {
if (this.is_tbb) {
this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST"));
}
- } else {
- this._prefs.setCharPref('network.proxy.socks', '127.0.0.1');
}
if (environ.exists("TOR_TRANSPROXY")) {
1
0
[tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 1211567 - Enable domain socket support for SOCKS; r=bagder
by gk＠torproject.org 30 Aug '16
by gk＠torproject.org 30 Aug '16
30 Aug '16
commit cde73b2295b75898ca435ed9f78541eccf6c34cb
Author: Liang-Heng Chen <xeonchen(a)mozilla.com>
Date: Thu Jun 30 11:23:40 2016 +0800
Bug 1211567 - Enable domain socket support for SOCKS; r=bagder
MozReview-Commit-ID: 9yMFckwPf6C
--HG--
extra : rebase_source : 17f006f17f97f015403153879cd8b50e482cfc8c
---
netwerk/base/nsProtocolProxyService.cpp | 22 +++++--
netwerk/base/nsProtocolProxyService.h | 5 +-
netwerk/socket/nsSOCKSIOLayer.cpp | 101 ++++++++++++++++++++++++++------
3 files changed, 104 insertions(+), 24 deletions(-)
diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp
index 593d0af..5d8dc4b 100644
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -398,6 +398,16 @@ proxy_GetBoolPref(nsIPrefBranch *aPrefBranch,
aResult = temp;
}
+static inline bool
+IsHostDomainSocket(const nsACString& aHost)
+{
+#ifdef XP_UNIX
+ return Substring(aHost, 0, 5) == "file:";
+#else
+ return false;
+#endif // XP_UNIX
+}
+
//----------------------------------------------------------------------------
static const int32_t PROXYCONFIG_DIRECT4X = 3;
@@ -623,7 +633,7 @@ nsProtocolProxyService::PrefsChanged(nsIPrefBranch *prefBranch,
proxy_GetIntPref(prefBranch, PROXY_PREF("ftp_port"), mFTPProxyPort);
if (!pref || !strcmp(pref, PROXY_PREF("socks")))
- proxy_GetStringPref(prefBranch, PROXY_PREF("socks"), mSOCKSProxyHost);
+ proxy_GetStringPref(prefBranch, PROXY_PREF("socks"), mSOCKSProxyTarget);
if (!pref || !strcmp(pref, PROXY_PREF("socks_port")))
proxy_GetIntPref(prefBranch, PROXY_PREF("socks_port"), mSOCKSProxyPort);
@@ -1871,8 +1881,9 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel *channel,
uint32_t proxyFlags = 0;
if ((flags & RESOLVE_PREFER_SOCKS_PROXY) &&
- !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) {
- host = &mSOCKSProxyHost;
+ !mSOCKSProxyTarget.IsEmpty() &&
+ (IsHostDomainSocket(mSOCKSProxyTarget) || mSOCKSProxyPort > 0)) {
+ host = &mSOCKSProxyTarget;
if (mSOCKSProxyVersion == 4)
type = kProxyType_SOCKS4;
else
@@ -1908,8 +1919,9 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel *channel,
type = kProxyType_HTTP;
port = mFTPProxyPort;
}
- else if (!mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) {
- host = &mSOCKSProxyHost;
+ else if (!mSOCKSProxyTarget.IsEmpty() &&
+ (IsHostDomainSocket(mSOCKSProxyTarget) || mSOCKSProxyPort > 0)) {
+ host = &mSOCKSProxyTarget;
if (mSOCKSProxyVersion == 4)
type = kProxyType_SOCKS4;
else
diff --git a/netwerk/base/nsProtocolProxyService.h b/netwerk/base/nsProtocolProxyService.h
index e9813c8..1e1ea7d 100644
--- a/netwerk/base/nsProtocolProxyService.h
+++ b/netwerk/base/nsProtocolProxyService.h
@@ -382,8 +382,9 @@ protected:
nsCString mHTTPSProxyHost;
int32_t mHTTPSProxyPort;
-
- nsCString mSOCKSProxyHost;
+
+ // mSOCKSProxyTarget could be a host or a domain socket path.
+ nsCString mSOCKSProxyTarget;
int32_t mSOCKSProxyPort;
int32_t mSOCKSProxyVersion;
bool mSOCKSProxyRemoteDNS;
diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp
index 568c700..b26408d 100644
--- a/netwerk/socket/nsSOCKSIOLayer.cpp
+++ b/netwerk/socket/nsSOCKSIOLayer.cpp
@@ -19,8 +19,10 @@
#include "nsIDNSListener.h"
#include "nsICancelable.h"
#include "nsThreadUtils.h"
+#include "nsIURL.h"
#include "mozilla/Logging.h"
#include "mozilla/net/DNS.h"
+#include "mozilla/unused.h"
using mozilla::LogLevel;
using namespace mozilla::net;
@@ -113,6 +115,54 @@ private:
PRStatus ReadFromSocket(PRFileDesc *fd);
PRStatus WriteToSocket(PRFileDesc *fd);
+ bool IsHostDomainSocket()
+ {
+#ifdef XP_UNIX
+ nsAutoCString proxyHost;
+ mProxy->GetHost(proxyHost);
+ return Substring(proxyHost, 0, 5) == "file:";
+#else
+ return false;
+#endif // XP_UNIX
+ }
+
+ nsresult SetDomainSocketPath(const nsACString& aDomainSocketPath,
+ NetAddr* aProxyAddr)
+ {
+#ifdef XP_UNIX
+ nsresult rv;
+ MOZ_ASSERT(aProxyAddr);
+
+ nsCOMPtr<nsIURL> url = do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv);
+ if (NS_WARN_IF(NS_FAILED(rv))) {
+ return rv;
+ }
+
+ if (NS_WARN_IF(NS_FAILED(rv = url->SetSpec(aDomainSocketPath)))) {
+ return rv;
+ }
+
+ nsAutoCString path;
+ if (NS_WARN_IF(NS_FAILED(rv = url->GetPath(path)))) {
+ return rv;
+ }
+
+ if (sizeof(aProxyAddr->local.path) <= path.Length()) {
+ NS_WARNING("domain socket path too long.");
+ return NS_ERROR_FAILURE;
+ }
+
+ aProxyAddr->raw.family = AF_UNIX;
+ strcpy(aProxyAddr->local.path, path.get());
+
+ return NS_OK;
+#else
+ mozilla::Unused << aProxyAddr;
+ mozilla::Unused << aDomainSocketPath;
+ return NS_ERROR_NOT_IMPLEMENTED;
+#endif
+ }
+
private:
State mState;
uint8_t * mData;
@@ -422,29 +472,40 @@ nsSOCKSSocketInfo::ConnectToProxy(PRFileDesc *fd)
mVersion = 5;
}
+ nsAutoCString proxyHost;
+ mProxy->GetHost(proxyHost);
+
int32_t proxyPort;
mProxy->GetPort(&proxyPort);
int32_t addresses = 0;
do {
- if (addresses++)
- mDnsRec->ReportUnusable(proxyPort);
-
- rv = mDnsRec->GetNextAddr(proxyPort, &mInternalProxyAddr);
- // No more addresses to try? If so, we'll need to bail
- if (NS_FAILED(rv)) {
- nsCString proxyHost;
- mProxy->GetHost(proxyHost);
- LOGERROR(("socks: unable to connect to SOCKS proxy, %s",
- proxyHost.get()));
- return PR_FAILURE;
- }
+ if (IsHostDomainSocket()) {
+ rv = SetDomainSocketPath(proxyHost, &mInternalProxyAddr);
+ if (NS_FAILED(rv)) {
+ LOGERROR(("socks: unable to connect to SOCKS proxy, %s",
+ proxyHost.get()));
+ return PR_FAILURE;
+ }
+ } else {
+ if (addresses++) {
+ mDnsRec->ReportUnusable(proxyPort);
+ }
+
+ rv = mDnsRec->GetNextAddr(proxyPort, &mInternalProxyAddr);
+ // No more addresses to try? If so, we'll need to bail
+ if (NS_FAILED(rv)) {
+ LOGERROR(("socks: unable to connect to SOCKS proxy, %s",
+ proxyHost.get()));
+ return PR_FAILURE;
+ }
- if (MOZ_LOG_TEST(gSOCKSLog, LogLevel::Debug)) {
- char buf[kIPv6CStrBufSize];
- NetAddrToString(&mInternalProxyAddr, buf, sizeof(buf));
- LOGDEBUG(("socks: trying proxy server, %s:%hu",
- buf, ntohs(mInternalProxyAddr.inet.port)));
+ if (MOZ_LOG_TEST(gSOCKSLog, LogLevel::Debug)) {
+ char buf[kIPv6CStrBufSize];
+ NetAddrToString(&mInternalProxyAddr, buf, sizeof(buf));
+ LOGDEBUG(("socks: trying proxy server, %s:%hu",
+ buf, ntohs(mInternalProxyAddr.inet.port)));
+ }
}
NetAddr proxy = mInternalProxyAddr;
@@ -973,6 +1034,12 @@ nsSOCKSSocketInfo::DoHandshake(PRFileDesc *fd, int16_t oflags)
switch (mState) {
case SOCKS_INITIAL:
+ if (IsHostDomainSocket()) {
+ mState = SOCKS_DNS_COMPLETE;
+ mLookupStatus = NS_OK;
+ return ConnectToProxy(fd);
+ }
+
return StartDNS(fd);
case SOCKS_DNS_IN_PROGRESS:
PR_SetError(PR_IN_PROGRESS_ERROR, 0);
1
0
[torbutton/maint-1.9.5] Bug 18589: Clear site security settings during New Identity
by gk＠torproject.org 29 Aug '16
by gk＠torproject.org 29 Aug '16
29 Aug '16
commit 3c04ec4654270f2896db0efffc4bc72edc2e3018
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 26 11:30:19 2016 +0000
Bug 18589: Clear site security settings during New Identity
We need to clear site security settings (like HSTS) explicitely now
as they don't belong to the permissions manager anymore.
---
src/chrome/content/torbutton.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 3256335..311c6f6 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1696,7 +1696,8 @@ function torbutton_new_identity() {
* h. last open location url
* i. clear content prefs
* j. permissions
- * k. IndexedDB and asmjscache storage
+ * k. site security settings (e.g. HSTS)
+ * l. IndexedDB and asmjscache storage
* 3. Sends tor the NEWNYM signal to get a new circuit
* 4. Opens a new window with the default homepage
* 5. Closes this window
@@ -1799,16 +1800,21 @@ function torbutton_do_new_identity() {
m_tb_prefs.setIntPref("security.OCSP.enabled", 0);
m_tb_prefs.setIntPref("security.OCSP.enabled", ocsp);
- // This clears the STS cache and site permissions on Tor Browser
+ // This clears the site permissions on Tor Browser
// XXX: Tie to some kind of disk-ok pref?
try {
Services.perms.removeAll();
} catch(e) {
// Actually, this catch does not appear to be needed. Leaving it in for
// safety though.
- torbutton_log(3, "Can't clear STS/Permissions: Not Tor Browser: "+e);
+ torbutton_log(3, "Can't clear permissions: Not Tor Browser: "+e);
}
+ // Clear site security settings
+ let sss = Cc["@mozilla.org/ssservice;1"].
+ getService(Ci.nsISiteSecurityService);
+ sss.clearAll();
+
// This clears the undo tab history.
var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo");
m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0);
1
0
[torbutton/master] Bug 18589: Clear site security settings during New Identity
by gk＠torproject.org 29 Aug '16
by gk＠torproject.org 29 Aug '16
29 Aug '16
commit 6dc853740b0e2be39f17b1a1857f2610de42548c
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 26 11:30:19 2016 +0000
Bug 18589: Clear site security settings during New Identity
We need to clear site security settings (like HSTS) explicitely now
as they don't belong to the permissions manager anymore.
---
src/chrome/content/torbutton.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index d7c42bd..e0fc931 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1114,7 +1114,8 @@ function torbutton_new_identity() {
* h. last open location url
* i. clear content prefs
* j. permissions
- * k. IndexedDB and asmjscache storage
+ * k. site security settings (e.g. HSTS)
+ * l. IndexedDB and asmjscache storage
* 3. Sends tor the NEWNYM signal to get a new circuit
* 4. Opens a new window with the default homepage
* 5. Closes this window
@@ -1215,16 +1216,21 @@ function torbutton_do_new_identity() {
m_tb_prefs.setIntPref("security.OCSP.enabled", 0);
m_tb_prefs.setIntPref("security.OCSP.enabled", ocsp);
- // This clears the STS cache and site permissions on Tor Browser
+ // This clears the site permissions on Tor Browser
// XXX: Tie to some kind of disk-ok pref?
try {
Services.perms.removeAll();
} catch(e) {
// Actually, this catch does not appear to be needed. Leaving it in for
// safety though.
- torbutton_log(3, "Can't clear STS/Permissions: Not Tor Browser: "+e);
+ torbutton_log(3, "Can't clear permissions: Not Tor Browser: "+e);
}
+ // Clear site security settings
+ let sss = Cc["@mozilla.org/ssservice;1"].
+ getService(Ci.nsISiteSecurityService);
+ sss.clearAll();
+
// This clears the undo tab history.
var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo");
m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0);
1
0
[torbutton/master] Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
by gk＠torproject.org 26 Aug '16
by gk＠torproject.org 26 Aug '16
26 Aug '16
commit 1b41636c9351b46bbcb2094a65c65a4407b60a37
Author: Kathy Brade <brade(a)pearlcrescent.com>
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = ÐÑказ
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = 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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = 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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = 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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = 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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = à€°à€Šà¥à€Š à€à€°à¥à€
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = 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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = ÐйМÑÑ
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy 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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = àš°à©±àšŠ àšàš°à©
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test 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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test 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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = 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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = ர஀à¯à®€à¯à®à¯à®¯à¯
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = àž¢àžà¹àž¥àžŽàž
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy 枬詊éé!
-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(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
@@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe
torbutton.popup.launch = Launch application
torbutton.popup.cancel = Cancel
torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
torbutton.title.prompt_torbrowser = Important Torbutton Information
torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
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#onOper…
- * https://developer.mozilla.org/en/Addons/Add-on_Manager/AddonManager#addAddo…
- * 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(a)torproject.org.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
1
0
[tor-browser/tor-browser-45.3.0esr-6.0-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 23 Aug '16
by gk＠torproject.org 23 Aug '16
23 Aug '16
commit 7c50120b217807b98a8a99d16c53b760d2119280
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Jul 26 11:49:20 2016 -0400
fixup! Bug 13252 - Do not store data in the app bundle
For Orfox, store browser data in the app home directory.
Fixes bug 19706.
---
toolkit/xre/nsXREDirProvider.cpp | 2 ++
xpcom/io/TorFileUtils.cpp | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index e3c1449..f50fed1 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -1280,6 +1280,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal)
nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir));
NS_ENSURE_SUCCESS(rv, rv);
+#if !defined(ANDROID)
#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser"));
#else
@@ -1287,6 +1288,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal)
XPCOM_FILE_PATH_SEPARATOR "Browser"));
#endif
NS_ENSURE_SUCCESS(rv, rv);
+#endif
if (aLocal) {
rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp
index 2b0b100..c45961a 100644
--- a/xpcom/io/TorFileUtils.cpp
+++ b/xpcom/io/TorFileUtils.cpp
@@ -81,6 +81,13 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile)
}
#endif
+#elif defined(ANDROID)
+ // Orfox stores data in the app home directory.
+ const char* homeDir = getenv("HOME");
+ if (!homeDir || !*homeDir)
+ return NS_ERROR_FAILURE;
+ nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+ getter_AddRefs(tbDataDir));
#else
// User data is embedded within the application directory (i.e.,
// TOR_BROWSER_DATA_OUTSIDE_APP_DIR is not defined).
1
0
[tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 23 Aug '16
by gk＠torproject.org 23 Aug '16
23 Aug '16
commit b8726ee81e6eca2e302e2ea85c0d09ad22be1ec5
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Jul 26 11:49:20 2016 -0400
fixup! Bug 13252 - Do not store data in the app bundle
For Orfox, store browser data in the app home directory.
Fixes bug 19706.
---
toolkit/xre/nsXREDirProvider.cpp | 2 ++
xpcom/io/TorFileUtils.cpp | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index e3c1449..f50fed1 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -1280,6 +1280,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal)
nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir));
NS_ENSURE_SUCCESS(rv, rv);
+#if !defined(ANDROID)
#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser"));
#else
@@ -1287,6 +1288,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal)
XPCOM_FILE_PATH_SEPARATOR "Browser"));
#endif
NS_ENSURE_SUCCESS(rv, rv);
+#endif
if (aLocal) {
rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp
index 2b0b100..c45961a 100644
--- a/xpcom/io/TorFileUtils.cpp
+++ b/xpcom/io/TorFileUtils.cpp
@@ -81,6 +81,13 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile)
}
#endif
+#elif defined(ANDROID)
+ // Orfox stores data in the app home directory.
+ const char* homeDir = getenv("HOME");
+ if (!homeDir || !*homeDir)
+ return NS_ERROR_FAILURE;
+ nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+ getter_AddRefs(tbDataDir));
#else
// User data is embedded within the application directory (i.e.,
// TOR_BROWSER_DATA_OUTSIDE_APP_DIR is not defined).
1
0