- tbb-commits - lists.torproject.org

[torbutton/master] Bug 20399: Remove obsolete font attempt prefs
by gk＠torproject.org 19 Oct '16

19 Oct '16

commit 2d88aa4d7239c3d386c69396c8d0d40ddd23a952 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 18 17:23:45 2016 -0700 Bug 20399: Remove obsolete font attempt prefs --- src/chrome/content/torbutton.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5b03ba0..3c05047 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1746,12 +1746,6 @@ function torbutton_update_fingerprinting_prefs() { if (m_tb_tbb) { if (mode) { - // Use TBB pref defaults for these two. - if(m_tb_prefs.prefHasUserValue("browser.display.max_font_attempts")) - m_tb_prefs.clearUserPref("browser.display.max_font_attempts"); - if(m_tb_prefs.prefHasUserValue("browser.display.max_font_count")) - m_tb_prefs.clearUserPref("browser.display.max_font_count"); - // Governed also by the spoof_english dialog.. if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) { m_tb_prefs.setCharPref("intl.accept_languages", "en-US, en"); @@ -1762,9 +1756,6 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setBoolPref("javascript.use_us_english_locale", false); } } else { - m_tb_prefs.setIntPref("browser.display.max_font_attempts",-1); - m_tb_prefs.setIntPref("browser.display.max_font_count",-1); - if(m_tb_prefs.prefHasUserValue("intl.accept_languages")) m_tb_prefs.clearUserPref("intl.accept_languages"); }

1 0

[torbutton/master] Bug 20388: Consolidate Services.prefs references
by gk＠torproject.org 18 Oct '16

18 Oct '16

commit 2cef75462d4a7f640b4586c0cd50b6679b9fc7ae Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 17 14:21:36 2016 -0700 Bug 20388: Consolidate Services.prefs references --- src/chrome/content/torbutton.js | 76 ++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 47 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fa4009a..5b03ba0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -18,9 +18,10 @@ const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; const k_tb_tor_resize_warn_pref = "extensions.torbutton.startup_resize_period" +var m_tb_prefs = Services.prefs; + // status var m_tb_wasinited = false; -var m_tb_prefs = false; var m_tb_plugin_string = false; var m_tb_is_main_window = false; var m_tb_hidden_browser = false; @@ -50,16 +51,12 @@ var torbutton_window_pref_observer = { register: function() { - var pref_service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranchInternal); - this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); - this._branch.addObserver("extensions.torbutton", this, false); + m_tb_prefs.addObserver("extensions.torbutton", this, false); }, unregister: function() { - if (!this._branch) return; - this._branch.removeObserver("extensions.torbutton", this); + m_tb_prefs.removeObserver("extensions.torbutton", this); }, // topic: what event occurred @@ -84,21 +81,18 @@ var torbutton_unique_pref_observer = register: function() { this.forced_ua = false; - var pref_service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranchInternal); - this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); - this._branch.addObserver("extensions.torbutton", this, false); - this._branch.addObserver("network.cookie", this, false); - this._branch.addObserver("browser.privatebrowsing.autostart", this, false); - this._branch.addObserver("javascript", this, false); - this._branch.addObserver("gfx", this, false); - this._branch.addObserver("noscript", this, false); - this._branch.addObserver("media", this, false); - this._branch.addObserver("mathml", this, false); - this._branch.addObserver("svg", this, false); - this._branch.addObserver("plugin.disable", this, false); - this._branch.addObserver("privacy.thirdparty.isolate", this, false); - this._branch.addObserver("privacy.resistFingerprinting", this, false); + m_tb_prefs.addObserver("extensions.torbutton", this, false); + m_tb_prefs.addObserver("network.cookie", this, false); + m_tb_prefs.addObserver("browser.privatebrowsing.autostart", this, false); + m_tb_prefs.addObserver("javascript", this, false); + m_tb_prefs.addObserver("gfx", this, false); + m_tb_prefs.addObserver("noscript", this, false); + m_tb_prefs.addObserver("media", this, false); + m_tb_prefs.addObserver("mathml", this, false); + m_tb_prefs.addObserver("svg", this, false); + m_tb_prefs.addObserver("plugin.disable", this, false); + m_tb_prefs.addObserver("privacy.thirdparty.isolate", this, false); + m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -108,16 +102,15 @@ var torbutton_unique_pref_observer = unregister: function() { - if (!this._branch) return; - this._branch.removeObserver("extensions.torbutton", this); - this._branch.removeObserver("network.cookie", this); - this._branch.removeObserver("browser.privatebrowsing.autostart", this); - this._branch.removeObserver("javascript", this); - this._branch.removeObserver("gfx", this); - this._branch.removeObserver("noscript", this); - this._branch.removeObserver("media", this); - this._branch.removeObserver("mathml", this); - this._branch.removeObserver("svg", this); + m_tb_prefs.removeObserver("extensions.torbutton", this); + m_tb_prefs.removeObserver("network.cookie", this); + m_tb_prefs.removeObserver("browser.privatebrowsing.autostart", this); + m_tb_prefs.removeObserver("javascript", this); + m_tb_prefs.removeObserver("gfx", this); + m_tb_prefs.removeObserver("noscript", this); + m_tb_prefs.removeObserver("media", this); + m_tb_prefs.removeObserver("mathml", this); + m_tb_prefs.removeObserver("svg", this); var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); @@ -281,9 +274,6 @@ function torbutton_init() { } m_tb_wasinited = true; - m_tb_prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - // Determine if we are running inside Tor Browser. var cur_version; try { @@ -1342,9 +1332,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Syncing prefs"); // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + m_tb_prefs.savePrefFile(null); torbutton_log(3, "New Identity: Clearing permissions"); @@ -1750,9 +1738,7 @@ function torbutton_update_disk_prefs() { } catch (e) {} // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + m_tb_prefs.savePrefFile(null); } function torbutton_update_fingerprinting_prefs() { @@ -1797,9 +1783,7 @@ function torbutton_update_fingerprinting_prefs() { // XXX: How do we undo timezone? // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + m_tb_prefs.savePrefFile(null); } function torbutton_update_thirdparty_prefs() { @@ -1815,9 +1799,7 @@ function torbutton_update_thirdparty_prefs() { m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !isolate); // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); + m_tb_prefs.savePrefFile(null); } var torbutton_sec_ml_bool_prefs = {

1 0

[tor-browser-bundle/master] Bug 20184: OS X builds are still not reproducible
by gk＠torproject.org 18 Oct '16

18 Oct '16

commit 04a9af0eb1e6466ce6a7007a46d73fb7a38442e8 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 9 11:12:43 2016 +0000 Bug 20184: OS X builds are still not reproducible We ecountered on some machines failures to reproduce OS X builds. The investigation seems to indicate that our old toolchain plays a crucial role in this. This patch replaces this old toolchain with a more modern clang/cctools for building the tor part of the bundle. Resorting to `faketime` again was necessary to cope with inserted timestamps. --- gitian/descriptors/mac/gitian-tor.yml | 44 +++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index f2f4b01..ee1d848 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -4,19 +4,21 @@ distro: "debian" suites: - "wheezy" architectures: -- "i386" +- "amd64" packages: - "unzip" - "automake" +- "faketime" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor.git" "dir": "tor" files: -- "versions" +- "clang-linux64-wheezy-utils.zip" +- "cctools.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" -- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" +- "versions" - "dzip.sh" - "openssl-mac64-utils.zip" - "libevent-mac64-utils.zip" @@ -33,35 +35,47 @@ script: | fi export TZ=UTC export LC_ALL=C - export REFERENCE_DATETIME + export FAKETIME=$REFERENCE_DATETIME umask 0022 # mkdir -p $INSTDIR/bin/ mkdir -p $TORBINDIR/ mkdir -p $TORCONFIGDIR/ mkdir -p $OUTDIR/ - # - # dpkg requires sbin directories in the PATH - export PATH="/usr/sbin:/sbin:$PATH" - sudo dpkg -i *.deb - tar xaf multiarch-darwin*tar.xz - export PATH="$PATH:$HOME/build/apple-osx/bin/" + + # Extracting and copying all the necessary utilities and libraries. We still + # need the 10.6 SDK if we want to support OSX 10.6. + ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb + tar xaf data.tar.gz + tar xaf cctools.tar.gz + unzip clang-linux64-wheezy-utils.zip unzip -d $INSTDIR openssl-mac64-utils.zip unzip -d $INSTDIR libevent-mac64-utils.zip cp $INSTDIR/libevent/lib/libevent-*.dylib $TORBINDIR/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` + # Setting the proper flags and variables + # ld needs libLTO.so from llvm + export LD_LIBRARY_PATH="/home/debian/build/clang/lib" + export PATH="/home/debian/build/cctools/bin:$PATH" + CROSS_CCTOOLS_PATH="/home/debian/build/cctools" + CROSS_SYSROOT="/home/debian/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" + FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" + export CC="/home/debian/build/clang/bin/clang $FLAGS" + export CXX="/home/debian/build/clang/bin/clang++ $FLAGS" + export CPP="/home/debian/build/clang/bin/clang $FLAGS -E" + export LLVMCONFIG="/home/debian/build/clang/bin/llvm-config" + export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" + # Building tor - # XXX Clean up these flags? - export CFLAGS="-m64 -I${INSTDIR}/openssl/include -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export LDFLAGS="-m64 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" cd tor git update-index --refresh -q mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - ./configure --enable-static-openssl --disable-asciidoc --host=i686-apple-darwin11 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR + ./configure --enable-static-openssl --disable-asciidoc --host=x86_64-apple-darwin10 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 make $MAKEOPTS make install cd $INSTDIR @@ -69,7 +83,7 @@ script: | cp share/tor/geoip $TORCONFIGDIR/ cp share/tor/geoip6 $TORCONFIGDIR/ cd $TORBINDIR/ - i686-apple-darwin11-install_name_tool -change $INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + x86_64-apple-darwin10-install_name_tool -change $INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor # Grabbing the result cd $INSTDIR

1 0

[torbutton/master] Bug 18093: Remove 'Restore Defaults' button
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 7a0efdf6a99969007792d418a6bbfd5e0da4b3cf Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 6 21:58:50 2016 -0700 Bug 18093: Remove 'Restore Defaults' button --- src/chrome/content/preferences.js | 57 ------------------------------------ src/chrome/content/preferences.xul | 4 +-- src/chrome/content/torbutton_util.js | 24 --------------- src/chrome/locale/en/torbutton.dtd | 1 - 4 files changed, 1 insertion(+), 85 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 28f5955..1d85cde 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -54,63 +54,6 @@ function torbutton_prefs_save(doc) { } } -function torbutton_prefs_reset_defaults() { - var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - var tmpcnt = new Object(); - var children; - var i; - var loglevel = o_torprefs.getIntPref("loglevel"); - var logmthd = o_torprefs.getIntPref("logmethod"); - - torbutton_log(3, "Starting Pref reset"); - - // 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 - // are notified by that same thread, immediately. Since torbutton's - // 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. - - children = o_torprefs.getChildList("" , tmpcnt); - for(i = 0; i < children.length; i++) { - if(o_torprefs.prefHasUserValue(children[i])) - o_torprefs.clearUserPref(children[i]); - } - - // Keep logging the same. - o_torprefs.setIntPref("loglevel", loglevel); - o_torprefs.setIntPref("logmethod", logmthd); - - torbutton_log(3, "Resetting browser prefs"); - - // Reset browser prefs that torbutton touches just in case - // they get horked. Better everything gets set back to default - // than some arcane pref gets wedged with no clear way to fix it. - // Technical users who tuned these by themselves will be able to fix it. - // It's the non-technical ones we should make it easy for - torbutton_reset_browser_prefs(); - - // 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); - win.torbutton_update_security_slider(); - - torbutton_log(4, "Preferences reset to defaults"); - torbutton_prefs_init(window.document); - - // In all cases, force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); -} - function torbutton_toggle_slider(doc, pos) { doc.getElementById("torbutton_sec_slider").value = pos; // Make sure the custom checkbox is unchecked as the user seems to want one diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 62f649f..574932e 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -8,9 +8,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" title="&torbutton.prefs.security_settings;" - buttons="accept,cancel,extra1" - buttonlabelextra1="&torbutton.prefs.restore_defaults;" - ondialogextra1="torbutton_prefs_reset_defaults();" + buttons="accept,cancel" persist="screenX screenY width height" onload="torbutton_prefs_init(document)" align="stretch" diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index 1558ced..f1263f1 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -52,30 +52,6 @@ function torbutton_get_prefbranch(branch_name) { return o_branch; } -// Bug 1506 P3: This would be a semi-polite thing to do on uninstall -// for pure Firefox users. The most polite thing would be to save -// all their original prefs.. But meh? -function torbutton_reset_browser_prefs() { - var o_all_prefs = torbutton_get_prefbranch(''); - var prefs = ["network.http.sendSecureXSiteReferrer", - "network.http.sendRefererHeader", "dom.storage.enabled", - "extensions.update.enabled", "app.update.enabled", - "app.update.auto", "browser.search.update", - "browser.cache.memory.enable", "network.http.use-cache", - "browser.cache.disk.enable", "browser.safebrowsing.enabled", - "browser.send_pings", "browser.safebrowsing.remoteLookups", - "network.security.ports.banned", "browser.search.suggest.enabled", - "security.enable_java", "browser.history_expire_days", - "browser.download.manager.retention", "browser.formfill.enable", - "signon.rememberSignons", "plugin.disable_full_page_plugin_for_types", - "browser.bookmarks.livemark_refresh_seconds", - "network.cookie.lifetimePolicy" ]; - for(var i = 0; i < prefs.length; i++) { - if(o_all_prefs.prefHasUserValue(prefs[i])) - o_all_prefs.clearUserPref(prefs[i]); - } -} - // load localization strings function torbutton_get_stringbundle() { diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 0ea18e5..56f663e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -12,7 +12,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.security_settings "Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host">

1 0

[tor-browser-bundle/master] Revert "Bug 13893: Make Tor Browser compatible with EMET"
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 48b0c33bf651baaaa972e81490b3896dd332437e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 17 11:52:19 2016 +0000 Revert "Bug 13893: Make Tor Browser compatible with EMET" This reverts commit 0348263efd1cb8a9eca8737f3dc7734ef75e0966. Firefox is not ready for GCC 6 yet. See #20381 for further details. --- gitian/descriptors/windows/gitian-utils.yml | 7 - gitian/patches/gcc_62_1.patch | 23 - gitian/patches/gcc_62_2.patch | 1198 --------------------------- gitian/versions.alpha | 6 +- gitian/versions.nightly | 6 +- 5 files changed, 6 insertions(+), 1234 deletions(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index d3598e2..9c31834 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -35,8 +35,6 @@ files: - "nsis.tar.bz2" - "nsis-debian.tar.xz" - "nsis-missing-unistd-include.patch" -- "gcc_62_1.patch" -- "gcc_62_2.patch" script: | INSTDIR="$HOME/install" source versions @@ -81,11 +79,6 @@ script: | mkdir gcc cd gcc tar -xjvf ../gcc.tar.bz2 - cd gcc-* - # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77459. - patch -p1 < ~/build/gcc_62_1.patch - patch -p1 < ~/build/gcc_62_2.patch - cd .. # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > ~/build/msvcr100.spec sed 's/msvcrt/msvcr100/' -i ~/build/msvcr100.spec diff --git a/gitian/patches/gcc_62_1.patch b/gitian/patches/gcc_62_1.patch deleted file mode 100644 index 7ca36d8..0000000 --- a/gitian/patches/gcc_62_1.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1ec6206ea80ceb5df843ea0bc4ef04d9ab17257e Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Wed, 14 Sep 2016 12:53:19 +0000 -Subject: [PATCH 1/2] Revert "2015-09-17 Catherine Moore - <clm(a)codesourcery.com>" - -This reverts commit a63a17505346bb3a91ce3de6fe238264c4d849ac. - -diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc -index f25304c..308802e 100644 ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -32,7 +32,6 @@ - #include <debug/safe_local_iterator.h> - - #include <cassert> --#include <cstdio> - - #include <algorithm> // for std::min - #include <functional> // for _Hash_impl --- -2.9.3 - diff --git a/gitian/patches/gcc_62_2.patch b/gitian/patches/gcc_62_2.patch deleted file mode 100644 index 7dbd826..0000000 --- a/gitian/patches/gcc_62_2.patch +++ /dev/null @@ -1,1198 +0,0 @@ -From 0fbc32fdb5e0119877b0fd608d8855af0e4e376e Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Wed, 14 Sep 2016 12:54:30 +0000 -Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"2015-09-17=20=20Fran=C3=A7ois=20D?= - =?UTF-8?q?umont=20=20<fdumont(a)gcc.gnu.org>"?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 426075db14da88357dd104345b5edea369f1d5c6. - -diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h -index 72db612..7d4f027 100644 ---- a/libstdc++-v3/include/debug/formatter.h -+++ b/libstdc++-v3/include/debug/formatter.h -@@ -132,13 +132,6 @@ namespace __gnu_debug - - class _Error_formatter - { -- // Tags denoting the type of parameter for construction -- struct _Is_iterator { }; -- struct _Is_iterator_value_type { }; -- struct _Is_sequence { }; -- struct _Is_instance { }; -- -- public: - /// Whether an iterator is constant, mutable, or unknown - enum _Constness - { -@@ -160,6 +153,13 @@ namespace __gnu_debug - __last_state - }; - -+ // Tags denoting the type of parameter for construction -+ struct _Is_iterator { }; -+ struct _Is_iterator_value_type { }; -+ struct _Is_sequence { }; -+ struct _Is_instance { }; -+ -+ public: - // A parameter that may be referenced by an error message - struct _Parameter - { -@@ -375,16 +375,15 @@ namespace __gnu_debug - - void - _M_print_field(const _Error_formatter* __formatter, -- const char* __name) const _GLIBCXX_DEPRECATED; -+ const char* __name) const; - - void -- _M_print_description(const _Error_formatter* __formatter) -- const _GLIBCXX_DEPRECATED; -+ _M_print_description(const _Error_formatter* __formatter) const; - }; - - template<typename _Iterator> -- _Error_formatter& -- _M_iterator(const _Iterator& __it, const char* __name = 0) -+ const _Error_formatter& -+ _M_iterator(const _Iterator& __it, const char* __name = 0) const - { - if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__it, __name, -@@ -393,59 +392,57 @@ namespace __gnu_debug - } - - template<typename _Iterator> -- _Error_formatter& -+ const _Error_formatter& - _M_iterator_value_type(const _Iterator& __it, -- const char* __name = 0) -+ const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = - _Parameter(__it, __name, _Is_iterator_value_type()); - return *this; - } - -- _Error_formatter& -- _M_integer(long __value, const char* __name = 0) -+ const _Error_formatter& -+ _M_integer(long __value, const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__value, __name); - return *this; - } - -- _Error_formatter& -- _M_string(const char* __value, const char* __name = 0) -+ const _Error_formatter& -+ _M_string(const char* __value, const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__value, __name); - return *this; - } - - template<typename _Sequence> -- _Error_formatter& -- _M_sequence(const _Sequence& __seq, const char* __name = 0) -+ const _Error_formatter& -+ _M_sequence(const _Sequence& __seq, const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__seq, __name, - _Is_sequence()); - return *this; - } - - template<typename _Type> -- _Error_formatter& -- _M_instance(const _Type& __inst, const char* __name = 0) -+ const _Error_formatter& -+ _M_instance(const _Type& __inst, const char* __name = 0) const - { -- if (_M_num_parameters < __max_parameters) -+ if (_M_num_parameters < std::size_t(__max_parameters)) - _M_parameters[_M_num_parameters++] = _Parameter(__inst, __name, - _Is_instance()); - return *this; - } - -- _Error_formatter& -- _M_message(const char* __text) -+ const _Error_formatter& -+ _M_message(const char* __text) const - { _M_text = __text; return *this; } - -- // Kept const qualifier for backward compatibility, to keep the same -- // exported symbol. -- _Error_formatter& -+ const _Error_formatter& - _M_message(_Debug_msg_id __id) const throw (); - - _GLIBCXX_NORETURN void -@@ -453,38 +450,40 @@ namespace __gnu_debug - - template<typename _Tp> - void -- _M_format_word(char*, int, const char*, _Tp) -- const throw () _GLIBCXX_DEPRECATED; -+ _M_format_word(char*, int, const char*, _Tp) const throw (); - - void -- _M_print_word(const char* __word) const _GLIBCXX_DEPRECATED; -+ _M_print_word(const char* __word) const; - - void -- _M_print_string(const char* __string) const _GLIBCXX_DEPRECATED; -+ _M_print_string(const char* __string) const; - - private: -- _Error_formatter(const char* __file, unsigned int __line) -- : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0) -- { } -+ _Error_formatter(const char* __file, std::size_t __line) -+ : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0), -+ _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) -+ { _M_get_max_length(); } - - void -- _M_get_max_length() const throw () _GLIBCXX_DEPRECATED; -+ _M_get_max_length() const throw (); - - enum { __max_parameters = 9 }; - - const char* _M_file; -- unsigned int _M_line; -- _Parameter _M_parameters[__max_parameters]; -- unsigned int _M_num_parameters; -- const char* _M_text; -+ std::size_t _M_line; -+ mutable _Parameter _M_parameters[__max_parameters]; -+ mutable std::size_t _M_num_parameters; -+ mutable const char* _M_text; -+ mutable std::size_t _M_max_length; -+ enum { _M_indent = 4 } ; -+ mutable std::size_t _M_column; -+ mutable bool _M_first_line; -+ mutable bool _M_wordwrap; - - public: -- static _Error_formatter& -- _M_at(const char* __file, unsigned int __line) -- { -- static _Error_formatter __formatter(__file, __line); -- return __formatter; -- } -+ static _Error_formatter -+ _M_at(const char* __file, std::size_t __line) -+ { return _Error_formatter(__file, __line); } - }; - } // namespace __gnu_debug - -diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc -index 308802e..8f7eaa3 100644 ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -22,19 +22,18 @@ - // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - // <http://www.gnu.org/licenses/>. - --#include <bits/move.h> --#include <bits/stl_iterator_base_types.h> -- --#include <debug/formatter.h> -+#include <debug/debug.h> - #include <debug/safe_base.h> - #include <debug/safe_unordered_base.h> - #include <debug/safe_iterator.h> - #include <debug/safe_local_iterator.h> -- -+#include <algorithm> - #include <cassert> -- --#include <algorithm> // for std::min --#include <functional> // for _Hash_impl -+#include <cstring> -+#include <cctype> -+#include <cstdio> -+#include <cstdlib> -+#include <functional> - - #include <cxxabi.h> // for __cxa_demangle - -@@ -525,123 +524,37 @@ namespace __gnu_debug - - namespace - { -- using _Error_formatter = __gnu_debug::_Error_formatter; -- using _Parameter = __gnu_debug::_Error_formatter::_Parameter; -- -- template<typename _Tp> -- int -- format_word(char* buf, int n, const char* fmt, _Tp s) -- { return std::min(__builtin_snprintf(buf, n, fmt, s), n - 1); } -- -- void -- get_max_length(std::size_t& max_length) -- { -- const char* nptr = std::getenv("GLIBCXX_DEBUG_MESSAGE_LENGTH"); -- if (nptr) -- { -- char* endptr; -- const unsigned long ret = std::strtoul(nptr, &endptr, 0); -- if (*nptr != '\0' && *endptr == '\0') -- max_length = ret; -- } -- } -- -- struct PrintContext -- { -- PrintContext() -- : _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false) -- { get_max_length(_M_max_length); } -- -- std::size_t _M_max_length; -- enum { _M_indent = 4 } ; -- std::size_t _M_column; -- bool _M_first_line; -- bool _M_wordwrap; -- }; -- -- void -- print_word(PrintContext& ctx, const char* word, -- std::ptrdiff_t count = -1) -- { -- size_t length = count >= 0 ? count : __builtin_strlen(word); -- if (length == 0) -- return; -- -- // Consider first '\n' at begining cause it impacts column. -- if (word[0] == '\n') -- { -- fprintf(stderr, "\n"); -- ctx._M_column = 1; -- ++word; -- --length; -- -- if (length == 0) -- return; -- } -- -- size_t visual_length -- = isspace(word[length - 1]) ? length - 1 : length; -- if (visual_length == 0 -- || !ctx._M_wordwrap -- || (ctx._M_column + visual_length < ctx._M_max_length) -- || (visual_length >= ctx._M_max_length && ctx._M_column == 1)) -- { -- // If this isn't the first line, indent -- if (ctx._M_column == 1 && !ctx._M_first_line) -- { -- char spacing[ctx._M_indent + 1]; -- for (int i = 0; i < ctx._M_indent; ++i) -- spacing[i] = ' '; -- spacing[ctx._M_indent] = '\0'; -- fprintf(stderr, "%s", spacing); -- ctx._M_column += ctx._M_indent; -- } -- -- int written = fprintf(stderr, "%s", word); -- -- if (word[length - 1] == '\n') -- { -- ctx._M_first_line = false; -- ctx._M_column = 1; -- } -- else -- ctx._M_column += written; -- } -- else -- { -- print_word(ctx, "\n", 1); -- print_word(ctx, word, count); -- } -- } -- - void -- print_type(PrintContext& ctx, -- const type_info* info, -- const char* unknown_name) -+ print_type(const __gnu_debug::_Error_formatter* __formatter, -+ const type_info* __info, -+ const char* __unknown_name) - { -- if (!info) -- print_word(ctx, unknown_name); -+ if (!__info) -+ __formatter->_M_print_word(__unknown_name); - else - { -- int status; -- char* demangled_name = -- __cxxabiv1::__cxa_demangle(info->name(), NULL, NULL, &status); -- print_word(ctx, status == 0 ? demangled_name : info->name()); -- free(demangled_name); -+ int __status; -+ char* __demangled_name = -+ __cxxabiv1::__cxa_demangle(__info->name(), NULL, NULL, &__status); -+ __formatter->_M_print_word(__status == 0 -+ ? __demangled_name : __info->name()); -+ free(__demangled_name); - } - } - - bool -- print_field(PrintContext& ctx, -- const char* name, const _Parameter::_Type& type) -+ print_field( -+ const __gnu_debug::_Error_formatter* __formatter, -+ const char* __name, -+ const __gnu_debug::_Error_formatter::_Parameter::_Type& __variant) - { -- if (__builtin_strcmp(name, "name") == 0) -+ if (strcmp(__name, "name") == 0) - { -- assert(type._M_name); -- print_word(ctx, type._M_name); -+ assert(__variant._M_name); -+ __formatter->_M_print_word(__variant._M_name); - } -- else if (__builtin_strcmp(name, "type") == 0) -- print_type(ctx, type._M_type, "<unknown type>"); -+ else if (strcmp(__name, "type") == 0) -+ print_type(__formatter, __variant._M_type, "<unknown type>"); - else - return false; - -@@ -649,17 +562,21 @@ namespace - } - - bool -- print_field(PrintContext& ctx, -- const char* name, const _Parameter::_Instance& inst) -+ print_field( -+ const __gnu_debug::_Error_formatter* __formatter, -+ const char* __name, -+ const __gnu_debug::_Error_formatter::_Parameter::_Instance& __variant) - { -- const _Parameter::_Type& type = inst; -- if (print_field(ctx, name, type)) -+ const __gnu_debug::_Error_formatter::_Parameter::_Type& __type = __variant; -+ if (print_field(__formatter, __name, __type)) - { } -- else if (__builtin_strcmp(name, "address") == 0) -+ else if (strcmp(__name, "address") == 0) - { -- char buf[64]; -- int ret = __builtin_sprintf(buf, "%p", inst._M_address); -- print_word(ctx, buf, ret); -+ const int __bufsize = 64; -+ char __buf[__bufsize]; -+ __formatter->_M_format_word(__buf, __bufsize, "%p", -+ __variant._M_address); -+ __formatter->_M_print_word(__buf); - } - else - return false; -@@ -668,390 +585,278 @@ namespace - } - - void -- print_field(PrintContext& ctx, const _Parameter& param, const char* name) -- { -- assert(param._M_kind != _Parameter::__unused_param); -- const int bufsize = 64; -- char buf[bufsize]; -- -- const auto& variant = param._M_variant; -- switch (param._M_kind) -- { -- case _Parameter::__iterator: -- { -- const auto& iterator = variant._M_iterator; -- if (print_field(ctx, name, iterator)) -- { } -- else if (__builtin_strcmp(name, "constness") == 0) -- { -- static const char* -- constness_names[_Error_formatter::__last_constness] = -- { -- "<unknown>", -- "constant", -- "mutable" -- }; -- print_word(ctx, constness_names[iterator._M_constness]); -- } -- else if (__builtin_strcmp(name, "state") == 0) -- { -- static const char* -- state_names[_Error_formatter::__last_state] = -- { -- "<unknown>", -- "singular", -- "dereferenceable (start-of-sequence)", -- "dereferenceable", -- "past-the-end", -- "before-begin" -- }; -- print_word(ctx, state_names[iterator._M_state]); -- } -- else if (__builtin_strcmp(name, "sequence") == 0) -- { -- assert(iterator._M_sequence); -- int written = __builtin_sprintf(buf, "%p", iterator._M_sequence); -- print_word(ctx, buf, written); -- } -- else if (__builtin_strcmp(name, "seq_type") == 0) -- print_type(ctx, iterator._M_seq_type, "<unknown seq_type>"); -- else -- assert(false); -- } -- break; -- -- case _Parameter::__sequence: -- if (!print_field(ctx, name, variant._M_sequence)) -- assert(false); -- break; -- -- case _Parameter::__integer: -- if (__builtin_strcmp(name, "name") == 0) -- { -- assert(variant._M_integer._M_name); -- print_word(ctx, variant._M_integer._M_name); -- } -- else -- assert(false); -- break; -- -- case _Parameter::__string: -- if (__builtin_strcmp(name, "name") == 0) -- { -- assert(variant._M_string._M_name); -- print_word(ctx, variant._M_string._M_name); -- } -- else -- assert(false); -- break; -- -- case _Parameter::__instance: -- if (!print_field(ctx, name, variant._M_instance)) -- assert(false); -- break; -- -- case _Parameter::__iterator_value_type: -- if (!print_field(ctx, name, variant._M_iterator_value_type)) -- assert(false); -- break; -- -- default: -- assert(false); -- break; -- } -- } -- -- void -- print_description(PrintContext& ctx, const _Parameter::_Type& type) -+ print_description( -+ const __gnu_debug::_Error_formatter* __formatter, -+ const __gnu_debug::_Error_formatter::_Parameter::_Type& __variant) - { -- if (type._M_name) -+ if (__variant._M_name) - { -- const int bufsize = 64; -- char buf[bufsize]; -- int written -- = format_word(buf, bufsize, "\"%s\"", type._M_name); -- print_word(ctx, buf, written); -+ const int __bufsize = 64; -+ char __buf[__bufsize]; -+ __formatter->_M_format_word(__buf, __bufsize, "\"%s\"", -+ __variant._M_name); -+ __formatter->_M_print_word(__buf); - } - -- print_word(ctx, " {\n"); -+ __formatter->_M_print_word(" {\n"); - -- if (type._M_type) -+ if (__variant._M_type) - { -- print_word(ctx, " type = "); -- print_type(ctx, type._M_type, "<unknown type>"); -- print_word(ctx, ";\n"); -+ __formatter->_M_print_word(" type = "); -+ print_type(__formatter, __variant._M_type, "<unknown type>"); -+ __formatter->_M_print_word(";\n"); - } - } - -+ - void -- print_description(PrintContext& ctx, const _Parameter::_Instance& inst) -+ print_description( -+ const __gnu_debug::_Error_formatter* __formatter, -+ const __gnu_debug::_Error_formatter::_Parameter::_Instance& __variant) - { -- const int bufsize = 64; -- char buf[bufsize]; -+ const int __bufsize = 64; -+ char __buf[__bufsize]; - -- if (inst._M_name) -+ if (__variant._M_name) - { -- int written -- = format_word(buf, bufsize, "\"%s\" ", inst._M_name); -- print_word(ctx, buf, written); -+ __formatter->_M_format_word(__buf, __bufsize, "\"%s\" ", -+ __variant._M_name); -+ __formatter->_M_print_word(__buf); - } - -- int written -- = __builtin_sprintf(buf, "@ 0x%p {\n", inst._M_address); -- print_word(ctx, buf, written); -+ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p {\n", -+ __variant._M_address); -+ __formatter->_M_print_word(__buf); - -- if (inst._M_type) -+ if (__variant._M_type) - { -- print_word(ctx, " type = "); -- print_type(ctx, inst._M_type, "<unknown type>"); -+ __formatter->_M_print_word(" type = "); -+ print_type(__formatter, __variant._M_type, "<unknown type>"); - } - } -+} - -+namespace __gnu_debug -+{ - void -- print_description(PrintContext& ctx, const _Parameter& param) -+ _Error_formatter::_Parameter:: -+ _M_print_field(const _Error_formatter* __formatter, const char* __name) const - { -- const int bufsize = 128; -- char buf[bufsize]; -+ assert(this->_M_kind != _Parameter::__unused_param); -+ const int __bufsize = 64; -+ char __buf[__bufsize]; - -- const auto& variant = param._M_variant; -- switch (param._M_kind) -- { -- case _Parameter::__iterator: -+ switch (_M_kind) -+ { -+ case __iterator: -+ if (print_field(__formatter, __name, _M_variant._M_iterator)) -+ { } -+ else if (strcmp(__name, "constness") == 0) - { -- const auto& ite = variant._M_iterator; -- -- print_word(ctx, "iterator "); -- print_description(ctx, ite); -- -- if (ite._M_type) -- { -- if (ite._M_constness != _Error_formatter::__unknown_constness) -- { -- print_word(ctx, " ("); -- print_field(ctx, param, "constness"); -- print_word(ctx, " iterator)"); -- } -- -- print_word(ctx, ";\n"); -- } -- -- if (ite._M_state != _Error_formatter::__unknown_state) -+ static const char* __constness_names[__last_constness] = - { -- print_word(ctx, " state = "); -- print_field(ctx, param, "state"); -- print_word(ctx, ";\n"); -- } -- -- if (ite._M_sequence) -+ "<unknown>", -+ "constant", -+ "mutable" -+ }; -+ __formatter->_M_print_word(__constness_names[_M_variant. -+ _M_iterator. -+ _M_constness]); -+ } -+ else if (strcmp(__name, "state") == 0) -+ { -+ static const char* __state_names[__last_state] = - { -- print_word(ctx, " references sequence "); -- if (ite._M_seq_type) -- { -- print_word(ctx, "with type '"); -- print_field(ctx, param, "seq_type"); -- print_word(ctx, "' "); -- } -- -- int written -- = __builtin_sprintf(buf, "@ 0x%p\n", ite._M_sequence); -- print_word(ctx, buf, written); -- } -- -- print_word(ctx, "}\n", 2); -+ "<unknown>", -+ "singular", -+ "dereferenceable (start-of-sequence)", -+ "dereferenceable", -+ "past-the-end", -+ "before-begin" -+ }; -+ __formatter->_M_print_word(__state_names[_M_variant. -+ _M_iterator._M_state]); - } -- break; -- -- case _Parameter::__sequence: -- print_word(ctx, "sequence "); -- print_description(ctx, variant._M_sequence); -- -- if (variant._M_sequence._M_type) -- print_word(ctx, ";\n", 2); -- -- print_word(ctx, "}\n", 2); -- break; -- -- case _Parameter::__instance: -- print_word(ctx, "instance "); -- print_description(ctx, variant._M_instance); -- -- if (variant._M_instance._M_type) -- print_word(ctx, ";\n", 2); -- -- print_word(ctx, "}\n", 2); -- break; -- -- case _Parameter::__iterator_value_type: -- print_word(ctx, "iterator::value_type "); -- print_description(ctx, variant._M_iterator_value_type); -- print_word(ctx, "}\n", 2); -- break; -- -- default: -- break; -- } -+ else if (strcmp(__name, "sequence") == 0) -+ { -+ assert(_M_variant._M_iterator._M_sequence); -+ __formatter->_M_format_word(__buf, __bufsize, "%p", -+ _M_variant._M_iterator._M_sequence); -+ __formatter->_M_print_word(__buf); -+ } -+ else if (strcmp(__name, "seq_type") == 0) -+ print_type(__formatter, _M_variant._M_iterator._M_seq_type, -+ "<unknown seq_type>"); -+ else -+ assert(false); -+ break; -+ case __sequence: -+ if (!print_field(__formatter, __name, _M_variant._M_sequence)) -+ assert(false); -+ break; -+ case __integer: -+ if (strcmp(__name, "name") == 0) -+ { -+ assert(_M_variant._M_integer._M_name); -+ __formatter->_M_print_word(_M_variant._M_integer._M_name); -+ } -+ else -+ assert(false); -+ break; -+ case __string: -+ if (strcmp(__name, "name") == 0) -+ { -+ assert(_M_variant._M_string._M_name); -+ __formatter->_M_print_word(_M_variant._M_string._M_name); -+ } -+ else -+ assert(false); -+ break; -+ case __instance: -+ if (!print_field(__formatter, __name, _M_variant._M_instance)) -+ assert(false); -+ break; -+ case __iterator_value_type: -+ if (!print_field(__formatter, __name, _M_variant._M_iterator_value_type)) -+ assert(false); -+ break; -+ default: -+ assert(false); -+ break; -+ } - } - - void -- print_string(PrintContext& ctx, const char* string, -- const _Parameter* parameters, std::size_t num_parameters) -+ _Error_formatter::_Parameter:: -+ _M_print_description(const _Error_formatter* __formatter) const - { -- const char* start = string; -- const int bufsize = 128; -- char buf[bufsize]; -- int bufindex = 0; -+ const int __bufsize = 128; -+ char __buf[__bufsize]; - -- while (*start) -+ switch (_M_kind) - { -- if (isspace(*start)) -- { -- buf[bufindex++] = *start++; -- buf[bufindex] = '\0'; -- print_word(ctx, buf, bufindex); -- bufindex = 0; -- continue; -- } -+ case __iterator: -+ __formatter->_M_print_word("iterator "); -+ print_description(__formatter, _M_variant._M_iterator); - -- if (*start != '%') -+ if (_M_variant._M_iterator._M_type) - { -- // Normal char. -- buf[bufindex++] = *start++; -- continue; -- } -- -- if (*++start == '%') -- { -- // Escaped '%' -- buf[bufindex++] = *start++; -- continue; -+ if (_M_variant._M_iterator._M_constness != __unknown_constness) -+ { -+ __formatter->_M_print_word(" ("); -+ _M_print_field(__formatter, "constness"); -+ __formatter->_M_print_word(" iterator)"); -+ } -+ __formatter->_M_print_word(";\n"); - } - -- // We are on a parameter property reference, we need to flush buffer -- // first. -- if (bufindex != 0) -+ if (_M_variant._M_iterator._M_state != __unknown_state) - { -- buf[bufindex] = '\0'; -- print_word(ctx, buf, bufindex); -- bufindex = 0; -+ __formatter->_M_print_word(" state = "); -+ _M_print_field(__formatter, "state"); -+ __formatter->_M_print_word(";\n"); - } - -- // Get the parameter number -- assert(*start >= '1' && *start <= '9'); -- size_t param_index = *start - '0' - 1; -- assert(param_index < num_parameters); -- const auto& param = parameters[param_index]; -- -- // '.' separates the parameter number from the field -- // name, if there is one. -- ++start; -- if (*start != '.') -+ if (_M_variant._M_iterator._M_sequence) - { -- assert(*start == ';'); -- ++start; -- if (param._M_kind == _Parameter::__integer) -+ __formatter->_M_print_word(" references sequence "); -+ if (_M_variant._M_iterator._M_seq_type) - { -- int written -- = __builtin_sprintf(buf, "%ld", -- param._M_variant._M_integer._M_value); -- print_word(ctx, buf, written); -+ __formatter->_M_print_word("with type `"); -+ _M_print_field(__formatter, "seq_type"); -+ __formatter->_M_print_word("' "); - } -- else if (param._M_kind == _Parameter::__string) -- print_string(ctx, param._M_variant._M_string._M_value, -- parameters, num_parameters); -- continue; -- } - -- // Extract the field name we want -- const int max_field_len = 16; -- char field[max_field_len]; -- int field_idx = 0; -- ++start; -- while (*start != ';') -- { -- assert(*start); -- assert(field_idx < max_field_len - 1); -- field[field_idx++] = *start++; -+ __formatter->_M_format_word(__buf, __bufsize, "@ 0x%p\n", -+ _M_variant._M_iterator._M_sequence); -+ __formatter->_M_print_word(__buf); - } -- ++start; -- field[field_idx] = '\0'; - -- print_field(ctx, param, field); -- } -+ __formatter->_M_print_word("}\n"); -+ break; -+ case __sequence: -+ __formatter->_M_print_word("sequence "); -+ print_description(__formatter, _M_variant._M_sequence); - -- // Might need to flush. -- if (bufindex) -- { -- buf[bufindex] = '\0'; -- print_word(ctx, buf, bufindex); -+ if (_M_variant._M_sequence._M_type) -+ __formatter->_M_print_word(";\n"); -+ -+ __formatter->_M_print_word("}\n"); -+ break; -+ case __instance: -+ __formatter->_M_print_word("instance "); -+ print_description(__formatter, _M_variant._M_instance); -+ -+ if (_M_variant._M_instance._M_type) -+ __formatter->_M_print_word(";\n"); -+ -+ __formatter->_M_print_word("}\n"); -+ break; -+ case __iterator_value_type: -+ __formatter->_M_print_word("iterator::value_type "); -+ print_description(__formatter, _M_variant._M_iterator_value_type); -+ __formatter->_M_print_word("}\n"); -+ break; -+ default: -+ break; - } - } --} - --namespace __gnu_debug --{ -- _Error_formatter& -+ const _Error_formatter& - _Error_formatter::_M_message(_Debug_msg_id __id) const throw () -- { -- return const_cast<_Error_formatter*>(this) -- ->_M_message(_S_debug_messages[__id]); -- } -+ { return this->_M_message(_S_debug_messages[__id]); } - - void - _Error_formatter::_M_error() const - { -- const int bufsize = 128; -- char buf[bufsize]; -+ const int __bufsize = 128; -+ char __buf[__bufsize]; - - // Emit file & line number information -- bool go_to_next_line = false; -- PrintContext ctx; -+ _M_column = 1; -+ _M_wordwrap = false; - if (_M_file) - { -- int written = format_word(buf, bufsize, "%s:", _M_file); -- print_word(ctx, buf, written); -- go_to_next_line = true; -+ _M_format_word(__buf, __bufsize, "%s:", _M_file); -+ _M_print_word(__buf); -+ _M_column += strlen(__buf); - } - - if (_M_line > 0) - { -- int written = __builtin_sprintf(buf, "%u:", _M_line); -- print_word(ctx, buf, written); -- go_to_next_line = true; -+ _M_format_word(__buf, __bufsize, "%u:", _M_line); -+ _M_print_word(__buf); -+ _M_column += strlen(__buf); - } - -- if (go_to_next_line) -- print_word(ctx, "\n", 1); -- -- if (ctx._M_max_length) -- ctx._M_wordwrap = true; -- -- print_word(ctx, "Error: "); -+ if (_M_max_length) -+ _M_wordwrap = true; -+ _M_print_word("error: "); - - // Print the error message - assert(_M_text); -- print_string(ctx, _M_text, _M_parameters, _M_num_parameters); -- print_word(ctx, ".\n", 2); -+ _M_print_string(_M_text); -+ _M_print_word(".\n"); - - // Emit descriptions of the objects involved in the operation -- ctx._M_first_line = true; -- ctx._M_wordwrap = false; -- bool has_header = false; -- for (unsigned int i = 0; i < _M_num_parameters; ++i) -+ _M_wordwrap = false; -+ bool __has_noninteger_parameters = false; -+ for (unsigned int __i = 0; __i < _M_num_parameters; ++__i) - { -- switch (_M_parameters[i]._M_kind) -+ switch (_M_parameters[__i]._M_kind) - { - case _Parameter::__iterator: - case _Parameter::__sequence: - case _Parameter::__instance: - case _Parameter::__iterator_value_type: -- if (!has_header) -+ if (!__has_noninteger_parameters) - { -- print_word(ctx, "\nObjects involved in the operation:\n"); -- has_header = true; -+ _M_first_line = true; -+ _M_print_word("\nObjects involved in the operation:\n"); -+ __has_noninteger_parameters = true; - } -- print_description(ctx, _M_parameters[i]); -+ _M_parameters[__i]._M_print_description(this); - break; -- - default: - break; - } -@@ -1060,39 +865,172 @@ namespace __gnu_debug - abort(); - } - -- // Deprecated methods kept for backward compatibility. -- void -- _Error_formatter::_Parameter::_M_print_field( -- const _Error_formatter*, const char*) const -- { } -- -- void -- _Error_formatter::_Parameter::_M_print_description(const _Error_formatter*) const -- { } -- - template<typename _Tp> - void -- _Error_formatter::_M_format_word(char*, int, const char*, _Tp) -- const throw () -- { } -+ _Error_formatter::_M_format_word(char* __buf, -+ int __n __attribute__ ((__unused__)), -+ const char* __fmt, _Tp __s) const throw () -+ { -+#ifdef _GLIBCXX_USE_C99 -+ std::snprintf(__buf, __n, __fmt, __s); -+#else -+ std::sprintf(__buf, __fmt, __s); -+#endif -+ } - - void -- _Error_formatter::_M_print_word(const char*) const -- { } -+ _Error_formatter::_M_print_word(const char* __word) const -+ { -+ if (!_M_wordwrap) -+ { -+ fprintf(stderr, "%s", __word); -+ return; -+ } -+ -+ size_t __length = strlen(__word); -+ if (__length == 0) -+ return; -+ -+ size_t __visual_length -+ = __word[__length - 1] == '\n' ? __length - 1 : __length; -+ if (__visual_length == 0 -+ || (_M_column + __visual_length < _M_max_length) -+ || (__visual_length >= _M_max_length && _M_column == 1)) -+ { -+ // If this isn't the first line, indent -+ if (_M_column == 1 && !_M_first_line) -+ { -+ char __spacing[_M_indent + 1]; -+ for (int i = 0; i < _M_indent; ++i) -+ __spacing[i] = ' '; -+ __spacing[_M_indent] = '\0'; -+ fprintf(stderr, "%s", __spacing); -+ _M_column += _M_indent; -+ } -+ -+ fprintf(stderr, "%s", __word); -+ -+ if (__word[__length - 1] == '\n') -+ { -+ _M_first_line = false; -+ _M_column = 1; -+ } -+ else -+ _M_column += __length; -+ } -+ else -+ { -+ _M_print_word("\n"); -+ _M_print_word(__word); -+ } -+ } - - void -- _Error_formatter::_M_print_string(const char*) const -- { } -+ _Error_formatter:: -+ _M_print_string(const char* __string) const -+ { -+ const char* __start = __string; -+ const char* __finish = __start; -+ const int __bufsize = 128; -+ char __buf[__bufsize]; -+ -+ while (*__start) -+ { -+ if (*__start != '%') -+ { -+ // [__start, __finish) denotes the next word -+ __finish = __start; -+ while (isalnum(*__finish)) -+ ++__finish; -+ if (__start == __finish) -+ ++__finish; -+ if (isspace(*__finish)) -+ ++__finish; -+ -+ const ptrdiff_t __len = __finish - __start; -+ assert(__len < __bufsize); -+ memcpy(__buf, __start, __len); -+ __buf[__len] = '\0'; -+ _M_print_word(__buf); -+ __start = __finish; -+ -+ // Skip extra whitespace -+ while (*__start == ' ') -+ ++__start; -+ -+ continue; -+ } -+ -+ ++__start; -+ assert(*__start); -+ if (*__start == '%') -+ { -+ _M_print_word("%"); -+ ++__start; -+ continue; -+ } -+ -+ // Get the parameter number -+ assert(*__start >= '1' && *__start <= '9'); -+ size_t __param_index = *__start - '0' - 1; -+ assert(__param_index < _M_num_parameters); -+ const auto& __param = _M_parameters[__param_index]; -+ -+ // '.' separates the parameter number from the field -+ // name, if there is one. -+ ++__start; -+ if (*__start != '.') -+ { -+ assert(*__start == ';'); -+ ++__start; -+ __buf[0] = '\0'; -+ if (__param._M_kind == _Parameter::__integer) -+ { -+ _M_format_word(__buf, __bufsize, "%ld", -+ __param._M_variant._M_integer._M_value); -+ _M_print_word(__buf); -+ } -+ else if (__param._M_kind == _Parameter::__string) -+ _M_print_string(__param._M_variant._M_string._M_value); -+ continue; -+ } -+ -+ // Extract the field name we want -+ enum { __max_field_len = 16 }; -+ char __field[__max_field_len]; -+ int __field_idx = 0; -+ ++__start; -+ while (*__start != ';') -+ { -+ assert(*__start); -+ assert(__field_idx < __max_field_len-1); -+ __field[__field_idx++] = *__start++; -+ } -+ ++__start; -+ __field[__field_idx] = 0; -+ -+ __param._M_print_field(this, __field); -+ } -+ } - - void - _Error_formatter::_M_get_max_length() const throw () -- { } -+ { -+ const char* __nptr = std::getenv("GLIBCXX_DEBUG_MESSAGE_LENGTH"); -+ if (__nptr) -+ { -+ char* __endptr; -+ const unsigned long __ret = std::strtoul(__nptr, &__endptr, 0); -+ if (*__nptr != '\0' && *__endptr == '\0') -+ _M_max_length = __ret; -+ } -+ } - - // Instantiations. - template - void - _Error_formatter::_M_format_word(char*, int, const char*, -- const void*) const; -+ const void*) const; - - template - void -@@ -1101,10 +1039,10 @@ namespace __gnu_debug - template - void - _Error_formatter::_M_format_word(char*, int, const char*, -- std::size_t) const; -+ std::size_t) const; - - template - void - _Error_formatter::_M_format_word(char*, int, const char*, -- const char*) const; -+ const char*) const; - } // namespace __gnu_debug --- -2.9.3 - diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f0b32d9..898e781 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -MINGW_TAG=4e270fefffda8f8123c0d64b77a6855dc3c732b1 # fix Fx compilation +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix @@ -49,7 +49,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=6.2.0 +GCC_VER=5.1.0 CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -117,7 +117,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 +GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 20c4ae4..f6dbb68 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -32,7 +32,7 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -MINGW_TAG=4e270fefffda8f8123c0d64b77a6855dc3c732b1 # fix Fx compilation +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master @@ -56,7 +56,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=6.2.0 +GCC_VER=5.1.0 CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -124,7 +124,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 +GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da

1 0

[torbutton/master] Bug 20373: Prevent redundant dialogs opening
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 52fbcbfa9df65d56dce5b1654c4d56012b3ff6a9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Oct 15 19:59:16 2016 -0700 Bug 20373: Prevent redundant dialogs opening --- src/chrome/content/torbutton.js | 14 +++++++------- src/modules/utils.js | 24 +++++++++++++++++++++++- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0f1046a..fa4009a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -9,6 +9,7 @@ let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); let { Services } = Cu.import("resource://gre/modules/Services.jsm"); +let { showDialog } = Cu.import("resource://torbutton/modules/utils.js"); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -824,9 +825,7 @@ function torbutton_on_abouttor_load(aDoc) { label: button_label, accessKey: 'S', popup: null, - callback: function() { - window.openDialog("chrome://torbutton/content/preferences.xul", - "torbutton-preferences","chrome");} + callback: torbutton_open_prefs_dialog, }]; let priority = box.PRIORITY_INFO_LOW; @@ -2127,14 +2126,15 @@ function torbutton_check_protections() // Bug 1506 P2: I think cookie protections is a neat feature. function torbutton_open_cookie_dialog() { - window.openDialog('chrome://torbutton/content/torcookiedialog.xul','Cookie Protections', - 'centerscreen,chrome,dialog,modal,resizable'); + showDialog(window, 'chrome://torbutton/content/torcookiedialog.xul', + 'Cookie Protections', 'centerscreen,chrome,dialog,modal,resizable'); } // Bug 1506 P2/P3: Prefs are handled differently on android, I guess? function torbutton_open_prefs_dialog() { - window.openDialog("chrome://torbutton/content/preferences.xul","torbutton-preferences","centerscreen, chrome"); - torbutton_log(2, 'opened preferences window'); + showDialog(window, "chrome://torbutton/content/preferences.xul", + "torbutton-preferences","centerscreen, chrome"); + torbutton_log(2, 'opened preferences window'); } // Bug 1506 P0: Support code for checking Firefox versions. Not needed. diff --git a/src/modules/utils.js b/src/modules/utils.js index eb0746b..514ef51 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -52,5 +52,27 @@ var getEnv = function (name) { return env.exists(name) ? env.get(name) : undefined; }; +// ## Windows + +// __dialogsByName__. +// Map of window names to dialogs. +let dialogsByName = {}; + +// __showDialog(parent, url, name, features, arg1, arg2, ...)__. +// Like window.openDialog, but if the window is already +// open, just focuses it instead of opening a new one. +var showDialog = function (parent, url, name, features) { + let existingDialog = dialogsByName[name]; + if (existingDialog && !existingDialog.closed) { + existingDialog.focus(); + return existingDialog; + } else { + let newDialog = parent.openDialog.apply(parent, + Array.slice(arguments, 1)); + dialogsByName[name] = newDialog; + return newDialog; + } +}; + // Export utility functions for external use. -let EXPORTED_SYMBOLS = ["bindPrefAndInit", "getPrefValue", "getEnv"]; +let EXPORTED_SYMBOLS = ["bindPrefAndInit", "getPrefValue", "getEnv", "showDialog"];

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 20304: SOCKS socket does not support spaces and other special characters
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 48a73d262e04c2a90cf660445568cbcf01e83b9c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 6 14:09:04 2016 -0400 Bug 20304: SOCKS socket does not support spaces and other special characters Correctly decode file URL paths before using for them in Unix domain socket paths. The upstream bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1308275. --- netwerk/socket/nsSOCKSIOLayer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp index b26408d..be69725 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -20,6 +20,8 @@ #include "nsICancelable.h" #include "nsThreadUtils.h" #include "nsIURL.h" +#include "nsIFile.h" +#include "nsNetUtil.h" #include "mozilla/Logging.h" #include "mozilla/net/DNS.h" #include "mozilla/unused.h" @@ -133,17 +135,15 @@ private: nsresult rv; MOZ_ASSERT(aProxyAddr); - nsCOMPtr<nsIURL> url = do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv); + nsCOMPtr<nsIFile> socketFile; + rv = NS_GetFileFromURLSpec(aDomainSocketPath, + getter_AddRefs(socketFile)); 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)))) { + if (NS_WARN_IF(NS_FAILED(rv = socketFile->GetNativePath(path)))) { return rv; }

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 20244.2: Add "privacy.thirdparty.isolate" checkbox
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit e5c3cd25ed459765a91d1b364151c46afaca36c0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 6 21:09:43 2016 +0000 Bug 20244.2: Add "privacy.thirdparty.isolate" checkbox --- .../components/preferences/in-content/privacy.js | 33 ++++++++++++++++++++++ .../components/preferences/in-content/privacy.xul | 13 +++++++++ .../en-US/chrome/browser/preferences/privacy.dtd | 2 ++ 3 files changed, 48 insertions(+) diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js index 3ec0afe..69f9156 100644 --- a/browser/components/preferences/in-content/privacy.js +++ b/browser/components/preferences/in-content/privacy.js @@ -299,6 +299,39 @@ var gPrivacyPane = { } }, + // THIRD PARTY ISOLATION + + /** + * Converts from privacy.thirdparty.isolate pref to boolean checkbox. + * Note that during uplift, Mozilla changed the name to + * privacy.firstparty.isolate, and also changed it to a boolean, + * so this function is likely not needed after uplifting. + */ + readThirdPartyIsolate: function () + { + var pref = document.getElementById("privacy.thirdparty.isolate"); + switch (pref.value) + { + case 0: // Off + return false; + case 1: // PBM only + return true; + case 2: // Always + return true; + default: + return undefined; + } + }, + + /** + * Convert from checkbox to private.thirdparty.isolate pref. + */ + writeThirdPartyIsolate: function () + { + var checkbox = document.getElementById("thirdpartyIsolateCB"); + return checkbox.checked ? 2 : 0; + }, + // PRIVATE BROWSING /** diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index bdadcc5..d180ee2 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -19,6 +19,9 @@ <preference id="privacy.trackingprotection.pbmode.enabled" name="privacy.trackingprotection.pbmode.enabled" type="bool"/> + <preference id="privacy.thirdparty.isolate" + name="privacy.thirdparty.isolate" + type="int"/> <preference id="privacy.resistFingerprinting" name="privacy.resistFingerprinting" type="bool"/> @@ -130,6 +133,16 @@ preference="pref.privacy.disable_button.change_blocklist"/> </hbox> </vbox> + <vbox id="thirdpartyIsolate"> + <hbox align="center"> + <checkbox id="thirdpartyIsolateCB" + preference="privacy.thirdparty.isolate" + accesskey="&thirdpartyIsolate.accesskey;" + label="&thirdpartyIsolate.label;" + onsyncfrompreference="return gPrivacyPane.readThirdPartyIsolate();" + onsynctopreference="return gPrivacyPane.writeThirdPartyIsolate();"/> + </hbox> + </vbox> <vbox id="resistFingerprinting"> <hbox align="center"> <checkbox id="resistFingerprintingCB" diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd index ce3330e..614200e 100644 --- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -13,6 +13,8 @@ <!ENTITY trackingProtectionPBM5.label "Use Tracking Protection in Private Windows"> <!ENTITY trackingProtectionPBM5.accesskey "v"> <!ENTITY trackingProtectionPBMLearnMore.label "Learn more"> +<!ENTITY thirdpartyIsolate.label "Restrict third party cookies and other tracking data"> +<!ENTITY thirdpartyIsolate.accesskey "R"> <!ENTITY resistFingerprinting.label "Change details that distinguish you from other Tor Browser users"> <!ENTITY resistFingerprinting.accesskey "F"> <!ENTITY changeBlockList.label "Change Block List">

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 20244.1: Add "privacy.resistFingerprinting" checkbox
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 1b92582f7ef5bec693b01bc78672122add405834 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 3 08:29:35 2016 +0000 Bug 20244.1: Add "privacy.resistFingerprinting" checkbox --- browser/components/preferences/in-content/privacy.xul | 11 +++++++++++ browser/locales/en-US/chrome/browser/preferences/privacy.dtd | 2 ++ 2 files changed, 13 insertions(+) diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index beb1800..bdadcc5 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -19,6 +19,9 @@ <preference id="privacy.trackingprotection.pbmode.enabled" name="privacy.trackingprotection.pbmode.enabled" type="bool"/> + <preference id="privacy.resistFingerprinting" + name="privacy.resistFingerprinting" + type="bool"/>  <preference id="pref.privacy.disable_button.cookie_exceptions" @@ -127,6 +130,14 @@ preference="pref.privacy.disable_button.change_blocklist"/> </hbox> </vbox> + <vbox id="resistFingerprinting"> + <hbox align="center"> + <checkbox id="resistFingerprintingCB" + preference="privacy.resistFingerprinting" + accesskey="&resistFingerprinting.accesskey;" + label="&resistFingerprinting.label;" /> + </hbox> + </vbox> </groupbox>  diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd index cb2dce6..ce3330e 100644 --- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd @@ -13,6 +13,8 @@ <!ENTITY trackingProtectionPBM5.label "Use Tracking Protection in Private Windows"> <!ENTITY trackingProtectionPBM5.accesskey "v"> <!ENTITY trackingProtectionPBMLearnMore.label "Learn more"> +<!ENTITY resistFingerprinting.label "Change details that distinguish you from other Tor Browser users"> +<!ENTITY resistFingerprinting.accesskey "F"> <!ENTITY changeBlockList.label "Change Block List"> <!ENTITY changeBlockList.accesskey "C">

1 0

[torbutton/master] Bug 20244.5: Remove obsolete Privacy Settings group
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit ea0d6dc4ebc59c594162202e142549356075a981 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 4 23:42:00 2016 +0000 Bug 20244.5: Remove obsolete Privacy Settings group --- src/chrome/content/preferences.js | 3 --- src/chrome/content/preferences.xul | 8 +++----- src/chrome/locale/af/torbutton.dtd | 3 --- src/chrome/locale/ak/torbutton.dtd | 3 --- src/chrome/locale/am/torbutton.dtd | 3 --- src/chrome/locale/ar/torbutton.dtd | 5 ----- src/chrome/locale/arn/torbutton.dtd | 3 --- src/chrome/locale/ast/torbutton.dtd | 3 --- src/chrome/locale/az/torbutton.dtd | 3 --- src/chrome/locale/be/torbutton.dtd | 3 --- src/chrome/locale/bg/torbutton.dtd | 3 --- src/chrome/locale/bms/torbutton.dtd | 2 -- src/chrome/locale/bn-IN/torbutton.dtd | 3 --- src/chrome/locale/bn/torbutton.dtd | 3 --- src/chrome/locale/bo/torbutton.dtd | 3 --- src/chrome/locale/br/torbutton.dtd | 3 --- src/chrome/locale/bs/torbutton.dtd | 3 --- src/chrome/locale/ca/torbutton.dtd | 3 --- src/chrome/locale/cs/torbutton.dtd | 3 --- src/chrome/locale/csb/torbutton.dtd | 3 --- src/chrome/locale/cy/torbutton.dtd | 3 --- src/chrome/locale/da/torbutton.dtd | 3 --- src/chrome/locale/de/torbutton.dtd | 5 ----- src/chrome/locale/dz/torbutton.dtd | 3 --- src/chrome/locale/el/torbutton.dtd | 3 --- src/chrome/locale/en/torbutton.dtd | 10 ++++------ src/chrome/locale/eo/torbutton.dtd | 3 --- src/chrome/locale/es/torbutton.dtd | 5 ----- src/chrome/locale/et/torbutton.dtd | 3 --- src/chrome/locale/eu/torbutton.dtd | 5 ----- src/chrome/locale/fa/torbutton.dtd | 5 ----- src/chrome/locale/fi/torbutton.dtd | 3 --- src/chrome/locale/fil/torbutton.dtd | 3 --- src/chrome/locale/fo/torbutton.dtd | 3 --- src/chrome/locale/fr/torbutton.dtd | 5 ----- src/chrome/locale/fur/torbutton.dtd | 3 --- src/chrome/locale/fy/torbutton.dtd | 3 --- src/chrome/locale/ga/torbutton.dtd | 3 --- src/chrome/locale/gl/torbutton.dtd | 3 --- src/chrome/locale/gu/torbutton.dtd | 3 --- src/chrome/locale/gun/torbutton.dtd | 3 --- src/chrome/locale/ha/torbutton.dtd | 3 --- src/chrome/locale/he/torbutton.dtd | 3 --- src/chrome/locale/hi/torbutton.dtd | 3 --- src/chrome/locale/hr/torbutton.dtd | 3 --- src/chrome/locale/ht/torbutton.dtd | 3 --- src/chrome/locale/hu/torbutton.dtd | 3 --- src/chrome/locale/hy/torbutton.dtd | 3 --- src/chrome/locale/id/torbutton.dtd | 3 --- src/chrome/locale/is/torbutton.dtd | 3 --- src/chrome/locale/it/torbutton.dtd | 5 ----- src/chrome/locale/ja/torbutton.dtd | 5 ----- src/chrome/locale/jv/torbutton.dtd | 3 --- src/chrome/locale/ka/torbutton.dtd | 3 --- src/chrome/locale/km/torbutton.dtd | 3 --- src/chrome/locale/kn/torbutton.dtd | 3 --- src/chrome/locale/ko/torbutton.dtd | 5 ----- src/chrome/locale/ku/torbutton.dtd | 3 --- src/chrome/locale/kw/torbutton.dtd | 3 --- src/chrome/locale/ky/torbutton.dtd | 3 --- src/chrome/locale/lb/torbutton.dtd | 3 --- src/chrome/locale/lg/torbutton.dtd | 2 -- src/chrome/locale/ln/torbutton.dtd | 3 --- src/chrome/locale/lo/torbutton.dtd | 3 --- src/chrome/locale/lt/torbutton.dtd | 3 --- src/chrome/locale/lv/torbutton.dtd | 3 --- src/chrome/locale/mg/torbutton.dtd | 3 --- src/chrome/locale/mi/torbutton.dtd | 3 --- src/chrome/locale/mk/torbutton.dtd | 3 --- src/chrome/locale/ml/torbutton.dtd | 3 --- src/chrome/locale/mn/torbutton.dtd | 3 --- src/chrome/locale/mr/torbutton.dtd | 3 --- src/chrome/locale/ms/torbutton.dtd | 3 --- src/chrome/locale/mt/torbutton.dtd | 3 --- src/chrome/locale/my/torbutton.dtd | 3 --- src/chrome/locale/nah/torbutton.dtd | 3 --- src/chrome/locale/nap/torbutton.dtd | 3 --- src/chrome/locale/nb/torbutton.dtd | 3 --- src/chrome/locale/ne/torbutton.dtd | 3 --- src/chrome/locale/nl/torbutton.dtd | 5 ----- src/chrome/locale/nn/torbutton.dtd | 3 --- src/chrome/locale/nso/torbutton.dtd | 3 --- src/chrome/locale/oc/torbutton.dtd | 3 --- src/chrome/locale/or/torbutton.dtd | 3 --- src/chrome/locale/pa/torbutton.dtd | 3 --- src/chrome/locale/pap/torbutton.dtd | 3 --- src/chrome/locale/pl/torbutton.dtd | 5 ----- src/chrome/locale/pms/torbutton.dtd | 3 --- src/chrome/locale/ps/torbutton.dtd | 3 --- src/chrome/locale/pt-BR/torbutton.dtd | 3 --- src/chrome/locale/pt/torbutton.dtd | 5 ----- src/chrome/locale/ro/torbutton.dtd | 3 --- src/chrome/locale/ru/torbutton.dtd | 5 ----- src/chrome/locale/sco/torbutton.dtd | 3 --- src/chrome/locale/sk/torbutton.dtd | 3 --- src/chrome/locale/sl/torbutton.dtd | 3 --- src/chrome/locale/so/torbutton.dtd | 3 --- src/chrome/locale/son/torbutton.dtd | 3 --- src/chrome/locale/sq/torbutton.dtd | 3 --- src/chrome/locale/sr/torbutton.dtd | 3 --- src/chrome/locale/st/torbutton.dtd | 3 --- src/chrome/locale/su/torbutton.dtd | 3 --- src/chrome/locale/sv/torbutton.dtd | 5 ----- src/chrome/locale/sw/torbutton.dtd | 3 --- src/chrome/locale/ta/torbutton.dtd | 3 --- src/chrome/locale/te/torbutton.dtd | 3 --- src/chrome/locale/tg/torbutton.dtd | 3 --- src/chrome/locale/th/torbutton.dtd | 3 --- src/chrome/locale/ti/torbutton.dtd | 3 --- src/chrome/locale/tk/torbutton.dtd | 3 --- src/chrome/locale/tr/torbutton.dtd | 5 ----- src/chrome/locale/uk/torbutton.dtd | 3 --- src/chrome/locale/ur/torbutton.dtd | 3 --- src/chrome/locale/ve/torbutton.dtd | 3 --- src/chrome/locale/vi/torbutton.dtd | 5 ----- src/chrome/locale/wa/torbutton.dtd | 3 --- src/chrome/locale/wo/torbutton.dtd | 3 --- src/chrome/locale/zh-CN/torbutton.dtd | 5 ----- src/chrome/locale/zh-HK/torbutton.dtd | 3 --- src/chrome/locale/zh-TW/torbutton.dtd | 3 --- src/chrome/locale/zu/torbutton.dtd | 3 --- 121 files changed, 7 insertions(+), 400 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index eb71019..28f5955 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -12,7 +12,6 @@ function torbutton_prefs_init(doc) { var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - // Privacy and security settings let sec_slider = doc.getElementById('torbutton_sec_slider'); let sec_custom = doc.getElementById('torbutton_sec_custom'); let custom_values = o_torprefs.getBoolPref('security_custom'); @@ -41,8 +40,6 @@ function torbutton_prefs_save(doc) { torbutton_log(2, "called prefs_save()"); var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - // Privacy and Security Settings - o_torprefs.setBoolPref('security_custom', doc.getElementById('torbutton_sec_custom').checked); o_torprefs.setIntPref('security_slider', diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 3a54635..62f649f 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -7,7 +7,7 @@ <dialog id="torbutton-prefs" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" - title="&torbutton.prefs.privacy_security_settings;" + title="&torbutton.prefs.security_settings;" buttons="accept,cancel,extra1" buttonlabelextra1="&torbutton.prefs.restore_defaults;" ondialogextra1="torbutton_prefs_reset_defaults();" @@ -15,15 +15,13 @@ onload="torbutton_prefs_init(document)" align="stretch" pack="center" + maxheight="350" + maxwidth="400" ondialogaccept="torbutton_prefs_save(document)" > <script type="application/x-javascript" src="torbutton_util.js"/> <script type="application/x-javascript" src="preferences.js"/> <vbox flex="1" align="stretch"> - <groupbox> - <caption label="&torbutton.prefs.priv_caption;" - tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> - </groupbox> <groupbox align="stretch" flex="1">  <caption label="&torbutton.prefs.sec_caption;"/> <hbox flex="1" align="stretch"> diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/af/torbutton.dtd +++ b/src/chrome/locale/af/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ak/torbutton.dtd +++ b/src/chrome/locale/ak/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/am/torbutton.dtd +++ b/src/chrome/locale/am/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 67e510c..e86ca90 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "دائرة تور جديدة لهذا الموقع"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "إعدادات الخصوصية والأمان..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "إعدادات شبكة تور..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "تحقق من تحديثات متصفح تور..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "إعدادات أمان ملفات تعريف الارتباط..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "انقر لبدء زر تور"> -<!ENTITY torbutton.prefs.privacy_security_settings "إعدادات الأمان والخصوصيّة"> <!ENTITY torbutton.prefs.restore_defaults "استعادة الافتراضيات"> <!ENTITY torbutton.cookiedialog.title "إدارة إعدادت الحماية لملفات تعريف الارتباط"> <!ENTITY torbutton.cookiedialog.lockCol "محمية"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "إزالة الكل لكن استمر في الحماية"> <!ENTITY torbutton.cookiedialog.saveAllCookies "احم ملفات تعريف الارتباط الجديدة"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "لا تحم ملفات تعريف الارتباط الجديدة"> -<!ENTITY torbutton.prefs.priv_caption "إعدادات الخصوصية"> <!ENTITY torbutton.prefs.restrict_thirdparty "تقييد الـCookies الخاصة بالطرف الثالث و بيانات التتبع الأخري."> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> <!ENTITY torbutton.prefs.sec_caption "مستوى الأمان"> diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/arn/torbutton.dtd +++ b/src/chrome/locale/arn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ast/torbutton.dtd +++ b/src/chrome/locale/ast/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd index d583418..85999d7 100644 --- a/src/chrome/locale/az/torbutton.dtd +++ b/src/chrome/locale/az/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Seçimlər..."> -<!ENTITY torbutton.context_menu.preferences.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/be/torbutton.dtd +++ b/src/chrome/locale/be/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd index be87171..d95c6d5 100644 --- a/src/chrome/locale/bg/torbutton.dtd +++ b/src/chrome/locale/bg/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Нова самоличност"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd index 110938d..8a7c825 100644 --- a/src/chrome/locale/bms/torbutton.dtd +++ b/src/chrome/locale/bms/torbutton.dtd @@ -1,5 +1,3 @@ -<!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 စတင္ရန္ ကလစ္လုပ္ပါ"> diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/bn-IN/torbutton.dtd +++ b/src/chrome/locale/bn-IN/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/bn/torbutton.dtd +++ b/src/chrome/locale/bn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/bo/torbutton.dtd +++ b/src/chrome/locale/bo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/br/torbutton.dtd +++ b/src/chrome/locale/br/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd index 27f1723..0933934 100644 --- a/src/chrome/locale/bs/torbutton.dtd +++ b/src/chrome/locale/bs/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Prioriteti..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Zaštita kolačića"> diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd index ad2cc9f..1ee6378 100644 --- a/src/chrome/locale/ca/torbutton.dtd +++ b/src/chrome/locale/ca/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova identitat"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferències..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Protecció de les galetes"> diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index 93f1124..60b96de 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova identita"> <!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.preferences "Nastavení..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Ochrana před cookies"> diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/csb/torbutton.dtd +++ b/src/chrome/locale/csb/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd index 9251931..e3a3500 100644 --- a/src/chrome/locale/cy/torbutton.dtd +++ b/src/chrome/locale/cy/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Dewisiadau"> -<!ENTITY torbutton.context_menu.preferences.key "p"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index 22b4726..78f4a8e 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Ny identitet"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Indstillinger..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Hent bundt-opdatering Tor Browser Bundle ..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "O"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 3544642..aff98bf 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "N"> <!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal für diese Seite"> <!ENTITY torbutton.context_menu.new_circuit_key "B"> -<!ENTITY torbutton.context_menu.preferences "Privatssphäre- und Sicherheits-Einstellungen..."> -<!ENTITY torbutton.context_menu.preferences.key "E"> <!ENTITY torbutton.context_menu.networksettings "Tor-Netzwerk-Einstellungen..."> -<!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Suche nach Tor-Browser-Aktualisierungen..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutz..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Cookie-Schutz verwalten"> <!ENTITY torbutton.cookiedialog.lockCol "Geschützt"> @@ -24,7 +20,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.priv_caption "Privatsphären-Einstellungen"> <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere Überwachungsdaten einschränken"> <!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die Sie von anderen Tor-Browser-Benutzern unterscheiden"> <!ENTITY torbutton.prefs.sec_caption "Sicherheitslevel"> diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/dz/torbutton.dtd +++ b/src/chrome/locale/dz/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index 69366e2..4b1bb43 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Νέα Ταυτότητα"> <!ENTITY torbutton.context_menu.new_identity_key "Τ"> -<!ENTITY torbutton.context_menu.preferences "Επιλογές..."> -<!ENTITY torbutton.context_menu.preferences.key "Ε"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Λυψη του Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Προστασία Cookies"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 908c375..9fd9dae 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -2,16 +2,16 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> -<!ENTITY torbutton.context_menu.preferences.key "P"> +<!ENTITY torbutton.context_menu.preferences "Security Settings…"> +<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> +<!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!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.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.security_settings "Security Settings"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> @@ -24,8 +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.priv_caption "Privacy Settings"> -<!ENTITY torbutton.prefs.priv_caption_tooltip "When checked, the following settings help to keep your identity and browsing history private. We strongly recommend that you keep all privacy boxes checked for normal Tor Browser use."> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd index 9790100..e10afbb 100644 --- a/src/chrome/locale/eo/torbutton.dtd +++ b/src/chrome/locale/eo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova idento"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Agordoj…"> -<!ENTITY torbutton.context_menu.preferences.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "P"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 95a6d5c..a945042 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este sitio"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Configuración de privacidad y seguridad..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Configuración de red Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "G"> <!ENTITY torbutton.context_menu.downloadUpdate "Comprobar actualización del Navegador Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "a"> <!ENTITY torbutton.context_menu.cookieProtections "Protecciones de cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Administrar protecciones de cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Protegidas"> @@ -24,7 +20,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.priv_caption "Parámetros de privacidad"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios del Navegador Tor"> <!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad"> diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/et/torbutton.dtd +++ b/src/chrome/locale/et/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 97a7d33..9d745a5 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Pribatutasun eta segurtasun ezarpenak..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Tor Sarearen Ezarpenak..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser eguneraketa egiaztatu"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie babesak..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Cookie Babesak kudeatu"> <!ENTITY torbutton.cookiedialog.lockCol "Babestuta"> @@ -24,7 +20,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.priv_caption "Pribatutasun ezarpenak"> <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu"> <!ENTITY torbutton.prefs.sec_caption "Segurtasun maila"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 28ae8ce..cfe1f66 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "شبکه جدید Tor برای این سایت"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "حفظ حریم خصوصی و تنظیمات امنیتی"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "تنظیمات شبکه تور"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "بررسی بروز رسانی Tor Browser ..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "حفاظت کوکی ها..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "جهت شروع دكمه تُرکليک کنيد"> -<!ENTITY torbutton.prefs.privacy_security_settings "حفظ حریم خصوصی و تنظیمات امنیتی"> <!ENTITY torbutton.prefs.restore_defaults "بازگرداندن تنظیمات به حالت پیش‌فرض"> <!ENTITY torbutton.cookiedialog.title "مديريت حفاظت کلوچک‌ها"> <!ENTITY torbutton.cookiedialog.lockCol "حفاظت شده"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "حذف تمام کلوچک‌های حفاظت نشده"> <!ENTITY torbutton.cookiedialog.saveAllCookies "حفاظت از کلوچک‌های جديد"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "عدم حفاظت از کلوچک‌های جديد"> -<!ENTITY torbutton.prefs.priv_caption "تنظیمات حریم خصوصی"> <!ENTITY torbutton.prefs.restrict_thirdparty "محدود‌كردن كوكى‌هاى طرف سوم و داده‌هاى پيگردى ديگر"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> <!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd index aa6d2b7..40475ae 100644 --- a/src/chrome/locale/fi/torbutton.dtd +++ b/src/chrome/locale/fi/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Uusi identiteetti"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Asetukset..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Lataa Tor Browser Bundle -päivitys..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "L"> <!ENTITY torbutton.context_menu.cookieProtections "Evästeiden suojaukset"> diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/fil/torbutton.dtd +++ b/src/chrome/locale/fil/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/fo/torbutton.dtd +++ b/src/chrome/locale/fo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 1b34290..184a9a6 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Paramètres de confidentialité et de sécurité"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du Navigateur Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Protections contre les cookies"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Gérer les protections de cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protégé"> @@ -24,7 +20,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.priv_caption "Paramètres de vie privée"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage"> <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distinguent des autres utilisateurs du Navigateur Tor"> <!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/fur/torbutton.dtd +++ b/src/chrome/locale/fur/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/fy/torbutton.dtd +++ b/src/chrome/locale/fy/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ga/torbutton.dtd +++ b/src/chrome/locale/ga/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd index f9d0387..a01b1b0 100644 --- a/src/chrome/locale/gl/torbutton.dtd +++ b/src/chrome/locale/gl/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova identidade"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd index cd91200..c228516 100644 --- a/src/chrome/locale/gu/torbutton.dtd +++ b/src/chrome/locale/gu/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "પ્રાથમિકતાઓ..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/gun/torbutton.dtd +++ b/src/chrome/locale/gun/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ha/torbutton.dtd +++ b/src/chrome/locale/ha/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index 713efad..4b1edc4 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "זהות חדשה"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "הגדרות"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "הגנות קוקיז"> diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd index 9076425..924a6e2 100644 --- a/src/chrome/locale/hi/torbutton.dtd +++ b/src/chrome/locale/hi/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "प्रिफ़रेन्सस ..."> -<!ENTITY torbutton.context_menu.preferences.key "P/प"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A/अ"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd index a878ecb..2cea64c 100644 --- a/src/chrome/locale/hr/torbutton.dtd +++ b/src/chrome/locale/hr/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Postavke..."> -<!ENTITY torbutton.context_menu.preferences.key "p"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "O"> <!ENTITY torbutton.context_menu.cookieProtections "Zaštite kolačića"> diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ht/torbutton.dtd +++ b/src/chrome/locale/ht/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index 5cf204b..f0fa66e 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -1,9 +1,6 @@ <!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..."> -<!ENTITY torbutton.context_menu.preferences.key "B"> <!ENTITY torbutton.context_menu.networksettings "Hálózati beállítások megnyitása"> -<!ENTITY torbutton.context_menu.networksettings.key "M"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Böngésző csomag frissítésének letöltése"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Süti védelem"> diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/hy/torbutton.dtd +++ b/src/chrome/locale/hy/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd index c8a9cc2..73c4ed7 100644 --- a/src/chrome/locale/id/torbutton.dtd +++ b/src/chrome/locale/id/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Identitas Baru"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferensi..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index f5c88ae..629ea24 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nýtt auðkenni"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 97df051..307f6a7 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nuovo Circuito Tor per questo Sito"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Impostazioni sicurezza e privacy..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Impostazioni di rete di Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Controllo per aggiornamento Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Protezioni dei Cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Gestisci protezione Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protetto"> @@ -24,7 +20,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.priv_caption "Impostazioni Privacy"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index ed84140..37c4c68 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "このサイト用の新しい Tor サーキット"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "プライバシーとセキュリティー設定"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Torネットワークの設定..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "TorBrowserのアップデートを確認"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie の防御"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbuttonを初期状態に戻す"> -<!ENTITY torbutton.prefs.privacy_security_settings "プライバシーとセキュリティーの設定"> <!ENTITY torbutton.prefs.restore_defaults "デフォルト設定に戻す"> <!ENTITY torbutton.cookiedialog.title "Cookie保護を管理"> <!ENTITY torbutton.cookiedialog.lockCol "保護済み"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "保護されているもの以外削除"> <!ENTITY torbutton.cookiedialog.saveAllCookies "新しいCookieを保護"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCookieを保護しない"> -<!ENTITY torbutton.prefs.priv_caption "プライバシー設定"> <!ENTITY torbutton.prefs.restrict_thirdparty "サードパーティーのCookieやその他のトラッキングデータを制限"> <!ENTITY torbutton.prefs.resist_fingerprinting "あなたとほかのTorブラウザのユーザーを区別する詳細を変更"> <!ENTITY torbutton.prefs.sec_caption "セキュリティレベル"> diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/jv/torbutton.dtd +++ b/src/chrome/locale/jv/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/km/torbutton.dtd +++ b/src/chrome/locale/km/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/kn/torbutton.dtd +++ b/src/chrome/locale/kn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 77e5f1f..61b4d53 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Tor 서킷 재구축"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "개인정보 및 보안 관련 설정..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "토르 네트워크 설정..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "토르 브라우저 업데이트 체크하기..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "쿠키 보호...."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> -<!ENTITY torbutton.prefs.privacy_security_settings "개인 정보와 보안 설정"> <!ENTITY torbutton.prefs.restore_defaults "설정 초기화"> <!ENTITY torbutton.cookiedialog.title "쿠키 보호 관리"> <!ENTITY torbutton.cookiedialog.lockCol "보호됨"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "보호된 것 빼고 모두 지우기"> <!ENTITY torbutton.cookiedialog.saveAllCookies "새로운 쿠키 보호"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "새로운 쿠키를 보호하지 않음"> -<!ENTITY torbutton.prefs.priv_caption "개인 정보 설정"> <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> <!ENTITY torbutton.prefs.sec_caption "보안 등급"> diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ku/torbutton.dtd +++ b/src/chrome/locale/ku/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/kw/torbutton.dtd +++ b/src/chrome/locale/kw/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd index a77fab2..815e56d 100644 --- a/src/chrome/locale/ky/torbutton.dtd +++ b/src/chrome/locale/ky/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Жаңы инсан"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/lb/torbutton.dtd +++ b/src/chrome/locale/lb/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd index b3d1146..ee8c0d2 100644 --- a/src/chrome/locale/lg/torbutton.dtd +++ b/src/chrome/locale/lg/torbutton.dtd @@ -1,5 +1,3 @@ -<!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"> diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ln/torbutton.dtd +++ b/src/chrome/locale/ln/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/lo/torbutton.dtd +++ b/src/chrome/locale/lo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd index 527eadb..247820d 100644 --- a/src/chrome/locale/lt/torbutton.dtd +++ b/src/chrome/locale/lt/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nauja tapatybė"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Nustatymai..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Slapukų apsaugos"> diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd index 1d4ea05..aed81db 100644 --- a/src/chrome/locale/lv/torbutton.dtd +++ b/src/chrome/locale/lv/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Jauna identitāte"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Atvērt tīkla iestatījumus..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Lejuplādēt Pārlūka Tor pakotnes jauninājumu..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Aizsardzība no sīkdatnēm"> diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mg/torbutton.dtd +++ b/src/chrome/locale/mg/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mi/torbutton.dtd +++ b/src/chrome/locale/mi/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd index 6d522d2..ba2b2cb 100644 --- a/src/chrome/locale/mk/torbutton.dtd +++ b/src/chrome/locale/mk/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Подесувања..."> -<!ENTITY torbutton.context_menu.preferences.key "Z"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "Z"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ml/torbutton.dtd +++ b/src/chrome/locale/ml/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mn/torbutton.dtd +++ b/src/chrome/locale/mn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mr/torbutton.dtd +++ b/src/chrome/locale/mr/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ms/torbutton.dtd +++ b/src/chrome/locale/ms/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/mt/torbutton.dtd +++ b/src/chrome/locale/mt/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd index 18d2ef8..5bd7e2f 100644 --- a/src/chrome/locale/my/torbutton.dtd +++ b/src/chrome/locale/my/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "အထောက်အထား အသစ်"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "ဦးစားပေးချက်များ..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "ကွတ်ကီး ကာကွယ်မှုများ"> diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/nah/torbutton.dtd +++ b/src/chrome/locale/nah/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/nap/torbutton.dtd +++ b/src/chrome/locale/nap/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd index 4ded8d7..7e5150f 100644 --- a/src/chrome/locale/nb/torbutton.dtd +++ b/src/chrome/locale/nb/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Ny Identitet"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Innstillinger..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Åpne nettverksinnstillinger..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Last ned Tor Browser Bundle oppdatering..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsel Beskyttelser"> diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ne/torbutton.dtd +++ b/src/chrome/locale/ne/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index cc99538..710a24b 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nieuw tor circuit voor deze website"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Privacy- en beveiligingsinstellingen..."> -<!ENTITY torbutton.context_menu.preferences.key "V"> <!ENTITY torbutton.context_menu.networksettings "Tor netwerk instellingen"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie beveiligingen..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Beheer Cookie Beveiligingen"> <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd"> @@ -24,7 +20,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.priv_caption "Privacyinstellingen"> <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden"> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/nn/torbutton.dtd +++ b/src/chrome/locale/nn/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/nso/torbutton.dtd +++ b/src/chrome/locale/nso/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/oc/torbutton.dtd +++ b/src/chrome/locale/oc/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/or/torbutton.dtd +++ b/src/chrome/locale/or/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd index a81a741..f198b7c 100644 --- a/src/chrome/locale/pa/torbutton.dtd +++ b/src/chrome/locale/pa/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "p"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/pap/torbutton.dtd +++ b/src/chrome/locale/pap/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 6eacd3e..6a42d11 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "o"> <!ENTITY torbutton.context_menu.new_circuit "Nowy obwód dla tej strony"> <!ENTITY torbutton.context_menu.new_circuit_key "c"> -<!ENTITY torbutton.context_menu.preferences "Ustawienia Prywatności i Bezpieczeństwa..."> -<!ENTITY torbutton.context_menu.preferences.key "U"> <!ENTITY torbutton.context_menu.networksettings "Ustawienia Sieci Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "s"> <!ENTITY torbutton.context_menu.downloadUpdate "Sprawdź czy są aktualizacje Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "u"> <!ENTITY torbutton.context_menu.cookieProtections "Ochrona plików cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "c"> <!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.cookiedialog.title "Zarządzaj ochroną ciasteczek"> <!ENTITY torbutton.cookiedialog.lockCol "Chronione"> @@ -24,7 +20,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.priv_caption "Ustawienia Prywatności"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane służące do śledzenia"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zmień szczegóły odróżniające Cię od innych użytkowników Przeglądarki Tora"> <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeństwa"> diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/pms/torbutton.dtd +++ b/src/chrome/locale/pms/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ps/torbutton.dtd +++ b/src/chrome/locale/ps/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 0da50f9..d7de048 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nova Identidade"> <!ENTITY torbutton.context_menu.new_identity_key "Eu"> -<!ENTITY torbutton.context_menu.preferences "Configurações..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Abrir Configurações de Rede"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Baixar atualização do pacote Tor para navegadores..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Proteções para Cookies"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index d262db8..e0247b5 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Configurações de Segurança e Privacidade..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Procurar por atualizações do Navegador Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Proteções de Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Gerir Proteções dos Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protegido"> @@ -24,7 +20,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.priv_caption "Configurações de Privacidade"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento"> <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que o diferencia dos outros utilizadores do Navegador Tor"> <!ENTITY torbutton.prefs.sec_caption "Nível de Segurança"> diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd index 03bdb6e..a367d00 100644 --- a/src/chrome/locale/ro/torbutton.dtd +++ b/src/chrome/locale/ro/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Identitate noua"> <!ENTITY torbutton.context_menu.new_identity_key "l"> -<!ENTITY torbutton.context_menu.preferences "Preferințe..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Protectii Cookie-uri."> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index c2df4fc..d13ff00 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "Я"> <!ENTITY torbutton.context_menu.new_circuit "Новая цепочка Tor для этого cайта"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Настройки конфиденциальности и безопасности"> -<!ENTITY torbutton.context_menu.preferences.key "Н"> <!ENTITY torbutton.context_menu.networksettings "Настройки сети Tor"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Проверить на наличие обновлений Tor Browser"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Защита куки-файла"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Нажмите, чтобы инициализировать Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Настройки конфиденциальности и безопасности"> <!ENTITY torbutton.prefs.restore_defaults "Восстановить значения по умолчанию"> <!ENTITY torbutton.cookiedialog.title "Управление защитой куки-файлов"> <!ENTITY torbutton.cookiedialog.lockCol "Защищено"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Удалить все, кроме защищённых"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Защищать новые куки-файлы"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> -<!ENTITY torbutton.prefs.priv_caption "Настройки конфиденциальности"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки-файлы и другие данные слежения"> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/sco/torbutton.dtd +++ b/src/chrome/locale/sco/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd index ef9e28c..4478825 100644 --- a/src/chrome/locale/sk/torbutton.dtd +++ b/src/chrome/locale/sk/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Nová identita"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd index b0ce2ac..40828c9 100644 --- a/src/chrome/locale/sl/torbutton.dtd +++ b/src/chrome/locale/sl/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "nova indetiteta"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Nastavitve..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "piškotkina zaščita"> diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/so/torbutton.dtd +++ b/src/chrome/locale/so/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/son/torbutton.dtd +++ b/src/chrome/locale/son/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd index 7e3df0b..8daad7b 100644 --- a/src/chrome/locale/sq/torbutton.dtd +++ b/src/chrome/locale/sq/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Identitet i Ri"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd index 71ee79f..200e911 100644 --- a/src/chrome/locale/sr/torbutton.dtd +++ b/src/chrome/locale/sr/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Нов идентитет"> <!ENTITY torbutton.context_menu.new_identity_key "И"> -<!ENTITY torbutton.context_menu.preferences "Поставке..."> -<!ENTITY torbutton.context_menu.preferences.key "П"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Preuzmite Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Дозволе за колачиће"> diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/st/torbutton.dtd +++ b/src/chrome/locale/st/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/su/torbutton.dtd +++ b/src/chrome/locale/su/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index f8c0e67..e9d9a27 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "N"> <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbsidan"> <!ENTITY torbutton.context_menu.new_circuit_key "S"> -<!ENTITY torbutton.context_menu.preferences "Inställningar för privatliv och säkerhet..."> -<!ENTITY torbutton.context_menu.preferences.key "I"> <!ENTITY torbutton.context_menu.networksettings "Tor nätverksinställningar..."> -<!ENTITY torbutton.context_menu.networksettings.key "Ö"> <!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor webbläsare..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Skydd mot Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!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.cookiedialog.title "Hantera skyddade kakor"> <!ENTITY torbutton.cookiedialog.lockCol "Skyddad"> @@ -24,7 +20,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.priv_caption "Sekretessinställningar"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data"> <!ENTITY torbutton.prefs.resist_fingerprinting "Ändra detailjer som utmärker dig ifrån andra Tor Browser användare"> <!ENTITY torbutton.prefs.sec_caption "Säkerhetsnivå"> diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/sw/torbutton.dtd +++ b/src/chrome/locale/sw/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ta/torbutton.dtd +++ b/src/chrome/locale/ta/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/te/torbutton.dtd +++ b/src/chrome/locale/te/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/tg/torbutton.dtd +++ b/src/chrome/locale/tg/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd index 3336433..70d1df2 100644 --- a/src/chrome/locale/th/torbutton.dtd +++ b/src/chrome/locale/th/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "สร้างตัวตนใหม่"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ti/torbutton.dtd +++ b/src/chrome/locale/ti/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/tk/torbutton.dtd +++ b/src/chrome/locale/tk/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index b67fd14..d6c87d1 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Bu site için Tor devresini yenile"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Gizlilik ve Güvenlik Ayarları..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Tor Ağ Ayarları..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser Güncelleme Denetimi..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Çerez Koruması..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Çerez Koruması Yönetimi"> <!ENTITY torbutton.cookiedialog.lockCol "Korunmuş"> @@ -24,7 +20,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.priv_caption "Gizlilik Ayarları"> <!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf çerez ve diğer iz sürücü bilgiler engellensin"> <!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor Browser kullanıcılarından sizi ayıran ayrıntılar değiştirilsin"> <!ENTITY torbutton.prefs.sec_caption "Güvenlik Düzeyi"> diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd index 7df0268..d551178 100644 --- a/src/chrome/locale/uk/torbutton.dtd +++ b/src/chrome/locale/uk/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "Нова особистість"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Налаштування..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Відкрити Налаштування Мережі..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Завантажити пакет оновлень переглядача Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Захист куки"> diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ur/torbutton.dtd +++ b/src/chrome/locale/ur/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/ve/torbutton.dtd +++ b/src/chrome/locale/ve/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 4cfa289..25fbcec 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Vòng Tor mới cho trang này"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Cài đặt Riêng tư và Bảo mật..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Cài đặt Mạng Tor..."> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Kiểm tra việc cập nhật trình duyệt Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Bảo vệ Cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!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.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> @@ -24,7 +20,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.priv_caption "Cài đặt Riêng tư"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Mức độ Bảo mật"> diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/wa/torbutton.dtd +++ b/src/chrome/locale/wa/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/wo/torbutton.dtd +++ b/src/chrome/locale/wo/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 347deeb..a73d4dd 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -2,16 +2,12 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "为此站点使用新 Tor 线路"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "隐私与安全设置…"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Tor 网络设置…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser 检查更新…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie 保护…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "隐私与安全设置"> <!ENTITY torbutton.prefs.restore_defaults "恢复默认设置"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> @@ -24,7 +20,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "全部移除仅保留受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.saveAllCookies "保护新的 Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保护新的 Cookie"> -<!ENTITY torbutton.prefs.priv_caption "隐私设置"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/zh-HK/torbutton.dtd +++ b/src/chrome/locale/zh-HK/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index ebc2dda..0f98a7a 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "更換身份"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "設置...(P)"> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd index 1aa3704..d8d88e4 100644 --- a/src/chrome/locale/zu/torbutton.dtd +++ b/src/chrome/locale/zu/torbutton.dtd @@ -1,9 +1,6 @@ <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> -<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">

1 0