- tbb-commits - lists.torproject.org

[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.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

[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

[torbutton/master] Bug 20244.4: Remove 'Change details that distinguish you...' checkbox
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit ee88e783a98b22e743b943cc144cb6b79c70706e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 4 23:38:57 2016 +0000 Bug 20244.4: Remove 'Change details that distinguish you...' checkbox Also, remove the 'extensions.torbutton.resist_fingerprinting' pref and just use the 'privacy.resistFingerprinting' pref instead. We will use this to implement a checkbox in the about:preferences#privacy page. --- src/chrome/content/preferences.js | 2 -- src/chrome/content/preferences.xul | 3 --- src/chrome/content/torbutton.js | 6 +++--- src/defaults/preferences/preferences.js | 2 -- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index b14309d..eb71019 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -13,7 +13,6 @@ function torbutton_prefs_init(doc) { var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); // Privacy and security settings - doc.getElementById('torbutton_resistFingerprinting').checked = o_torprefs.getBoolPref('resist_fingerprinting'); let sec_slider = doc.getElementById('torbutton_sec_slider'); let sec_custom = doc.getElementById('torbutton_sec_custom'); let custom_values = o_torprefs.getBoolPref('security_custom'); @@ -44,7 +43,6 @@ function torbutton_prefs_save(doc) { // Privacy and Security Settings - o_torprefs.setBoolPref('resist_fingerprinting', doc.getElementById('torbutton_resistFingerprinting').checked); 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 b54d799..3a54635 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -23,9 +23,6 @@ <groupbox> <caption label="&torbutton.prefs.priv_caption;" tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> - <checkbox id="torbutton_resistFingerprinting" - label="&torbutton.prefs.resist_fingerprinting;" - tooltiptext="&torbutton.prefs.resist_fingerprinting_tooltip;"/> </groupbox> <groupbox align="stretch" flex="1">  <caption label="&torbutton.prefs.sec_caption;"/> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d768a9f..0f1046a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -97,6 +97,7 @@ var torbutton_unique_pref_observer = 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); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -174,7 +175,7 @@ var torbutton_unique_pref_observer = case "extensions.torbutton.use_nontor_proxy": torbutton_use_nontor_proxy(); break; - case "extensions.torbutton.resist_fingerprinting": + case "privacy.resistFingerprinting": case "extensions.torbutton.spoof_english": torbutton_update_fingerprinting_prefs(); break; @@ -1756,7 +1757,7 @@ function torbutton_update_disk_prefs() { } function torbutton_update_fingerprinting_prefs() { - var mode = m_tb_prefs.getBoolPref("extensions.torbutton.resist_fingerprinting"); + var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting"); if (m_tb_tbb) { if (mode) { @@ -1791,7 +1792,6 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setBoolPref("dom.enable_performance", !mode); m_tb_prefs.setBoolPref("plugin.expose_full_path", !mode); m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", !mode); - m_tb_prefs.setBoolPref("privacy.resistFingerprinting", mode); m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode); diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index b9a6584..3284bde 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -44,8 +44,6 @@ pref("extensions.torbutton.launch_warning",true); // https://developer.mozilla.org/en/Addons/Working_with_AMO pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false); -pref("extensions.torbutton.resist_fingerprinting", true); - // Security Slider pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false);

1 0

[torbutton/master] Bug 20244.6: Overlay checkboxes to use torbutton translations
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 7f16ada703d07b1b0140eaf12dd3e93864c14568 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Oct 5 00:15:47 2016 +0000 Bug 20244.6: Overlay checkboxes to use torbutton translations --- src/chrome.manifest | 1 + src/chrome/content/privacy-prefs-overlay.xul | 13 +++++++++++++ src/chrome/locale/en/torbutton.dtd | 2 ++ 3 files changed, 16 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index 78da042..ed3f5cf 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -14,6 +14,7 @@ overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/abou # UI customization overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul +overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul # Strings for the about:tbupdate page override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd diff --git a/src/chrome/content/privacy-prefs-overlay.xul b/src/chrome/content/privacy-prefs-overlay.xul new file mode 100644 index 0000000..952f9b6 --- /dev/null +++ b/src/chrome/content/privacy-prefs-overlay.xul @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE page SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + +<overlay id="privacy-prefs-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <checkbox id="thirdpartyIsolateCB" + label="&torbutton.prefs.restrict_thirdparty;" + accesskey="&torbutton.prefs.restrict_thirdparty.accesskey;"/> + <checkbox id="resistFingerprintingCB" + label="&torbutton.prefs.resist_fingerprinting;" + accesskey="&torbutton.prefs.resist_fingerprinting.accesskey;"/> +</overlay> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 9fd9dae..0ea18e5 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -25,8 +25,10 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> <!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"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Security Level"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">

1 0

[torbutton/master] Bug 20244.3: Remove 'restrict third party cookies...' checkbox
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 2978978e64fbc9164185564a19d56d5fea0b25d8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 4 23:37:19 2016 +0000 Bug 20244.3: Remove 'restrict third party cookies...' checkbox Also, we remove the 'extensions.torbutton.restrict_thirdparty' and use the 'privacy.thirdparty.isolate' pref. At the same time we will need to add a checkbox to the about:preferences#privacy page that toggles 'privacy.thirdparty.isolate'. Note that 'privacy.thirdparty.isolate' will be renamed to 'privacy.firstparty.isolate' in Firefox 52. --- src/chrome/content/preferences.js | 2 -- src/chrome/content/preferences.xul | 3 --- src/chrome/content/torbutton.js | 25 +++++++++---------------- src/defaults/preferences/preferences.js | 1 - 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index ad166eb..b14309d 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -14,7 +14,6 @@ function torbutton_prefs_init(doc) { // Privacy and security settings doc.getElementById('torbutton_resistFingerprinting').checked = o_torprefs.getBoolPref('resist_fingerprinting'); - doc.getElementById('torbutton_restrictThirdParty').checked = o_torprefs.getBoolPref('restrict_thirdparty'); let sec_slider = doc.getElementById('torbutton_sec_slider'); let sec_custom = doc.getElementById('torbutton_sec_custom'); let custom_values = o_torprefs.getBoolPref('security_custom'); @@ -46,7 +45,6 @@ function torbutton_prefs_save(doc) { // Privacy and Security Settings o_torprefs.setBoolPref('resist_fingerprinting', doc.getElementById('torbutton_resistFingerprinting').checked); - o_torprefs.setBoolPref('restrict_thirdparty', doc.getElementById('torbutton_restrictThirdParty').checked); 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 1f64d09..b54d799 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -23,9 +23,6 @@ <groupbox> <caption label="&torbutton.prefs.priv_caption;" tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> - <checkbox id="torbutton_restrictThirdParty" - label="&torbutton.prefs.restrict_thirdparty;" - tooltiptext="&torbutton.prefs.restrict_thirdparty_tooltip;"/> <checkbox id="torbutton_resistFingerprinting" label="&torbutton.prefs.resist_fingerprinting;" tooltiptext="&torbutton.prefs.resist_fingerprinting_tooltip;"/> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9151b8a..d768a9f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -96,6 +96,7 @@ var torbutton_unique_pref_observer = 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); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -156,11 +157,11 @@ var torbutton_unique_pref_observer = switch (data) { case "network.cookie.cookieBehavior": var val = m_tb_prefs.getIntPref("network.cookie.cookieBehavior"); - var block_thirdparty = m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty"); + var block_thirdparty = m_tb_prefs.getIntPref("privacy.thirdparty.isolate") !== 0; if (val == 0 && block_thirdparty) // Allow all cookies - m_tb_prefs.setBoolPref("extensions.torbutton.restrict_thirdparty", false); + m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 0); else if (val == 1 && !block_thirdparty) // Block third party cookies - m_tb_prefs.setBoolPref("extensions.torbutton.restrict_thirdparty", true); + m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 2); break; case "plugin.disable": @@ -177,7 +178,7 @@ var torbutton_unique_pref_observer = case "extensions.torbutton.spoof_english": torbutton_update_fingerprinting_prefs(); break; - case "extensions.torbutton.restrict_thirdparty": + case "privacy.thirdparty.isolate": torbutton_update_thirdparty_prefs(); break; case "extensions.torbutton.hide_sync_ui": @@ -1803,24 +1804,16 @@ function torbutton_update_fingerprinting_prefs() { } function torbutton_update_thirdparty_prefs() { - var mode = m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty"); + let isolate = m_tb_prefs.getIntPref("privacy.thirdparty.isolate") !== 0; - try { - if (mode) { - m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 2); - } else { - m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 0); - } - } catch(e) {} - - if (mode) { + if (isolate) { m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 1); } else { m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 0); } - m_tb_prefs.setBoolPref("dom.workers.sharedWorkers.enabled", !mode); - m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !mode); + m_tb_prefs.setBoolPref("dom.workers.sharedWorkers.enabled", !isolate); + 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"] diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 5d056f4..b9a6584 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -45,7 +45,6 @@ pref("extensions.torbutton.launch_warning",true); pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false); pref("extensions.torbutton.resist_fingerprinting", true); -pref("extensions.torbutton.restrict_thirdparty", true); // Security Slider pref("extensions.torbutton.security_slider", 4);

1 0

[torbutton/master] Bug 20244.2: Remove 'disable browser plugins' checkbox
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit aa05941ee0144026fb843b6f5a2098aed5e17b46 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Oct 2 22:27:21 2016 -0700 Bug 20244.2: Remove 'disable browser plugins' checkbox This patch also removes the 'extensions.torbutton.no_tor_plugin' pref and simply uses the 'plugin.disable' pref instead. Thanks to our patch for Bug 10280 in tor-browser.git, buttons on the plugins section of about:addons already let you "Enable plugins" and "Disable plugins" (i.e., toggle the 'plugin.disable' pref). Also it's probably better to remove this footgun in the UI. --- src/chrome/content/preferences.js | 2 -- src/chrome/content/preferences.xul | 3 --- src/chrome/content/torbutton.js | 15 +++++++-------- src/chrome/locale/af/torbutton.dtd | 1 - src/chrome/locale/ak/torbutton.dtd | 1 - src/chrome/locale/am/torbutton.dtd | 1 - src/chrome/locale/ar/torbutton.dtd | 1 - src/chrome/locale/arn/torbutton.dtd | 1 - src/chrome/locale/ast/torbutton.dtd | 1 - src/chrome/locale/az/torbutton.dtd | 1 - src/chrome/locale/be/torbutton.dtd | 1 - src/chrome/locale/bg/torbutton.dtd | 1 - src/chrome/locale/bn-IN/torbutton.dtd | 1 - src/chrome/locale/bn/torbutton.dtd | 1 - src/chrome/locale/bo/torbutton.dtd | 1 - src/chrome/locale/br/torbutton.dtd | 1 - src/chrome/locale/bs/torbutton.dtd | 1 - src/chrome/locale/ca/torbutton.dtd | 1 - src/chrome/locale/cs/torbutton.dtd | 1 - src/chrome/locale/csb/torbutton.dtd | 1 - src/chrome/locale/cy/torbutton.dtd | 1 - src/chrome/locale/da/torbutton.dtd | 1 - src/chrome/locale/de/torbutton.dtd | 1 - src/chrome/locale/dz/torbutton.dtd | 1 - src/chrome/locale/el/torbutton.dtd | 1 - src/chrome/locale/en/torbutton.dtd | 2 -- src/chrome/locale/eo/torbutton.dtd | 1 - src/chrome/locale/es/torbutton.dtd | 1 - src/chrome/locale/et/torbutton.dtd | 1 - src/chrome/locale/eu/torbutton.dtd | 1 - src/chrome/locale/fa/torbutton.dtd | 1 - src/chrome/locale/fi/torbutton.dtd | 1 - src/chrome/locale/fil/torbutton.dtd | 1 - src/chrome/locale/fo/torbutton.dtd | 1 - src/chrome/locale/fr/torbutton.dtd | 1 - src/chrome/locale/fur/torbutton.dtd | 1 - src/chrome/locale/fy/torbutton.dtd | 1 - src/chrome/locale/ga/torbutton.dtd | 1 - src/chrome/locale/gl/torbutton.dtd | 1 - src/chrome/locale/gu/torbutton.dtd | 1 - src/chrome/locale/gun/torbutton.dtd | 1 - src/chrome/locale/ha/torbutton.dtd | 1 - src/chrome/locale/he/torbutton.dtd | 1 - src/chrome/locale/hi/torbutton.dtd | 1 - src/chrome/locale/hr/torbutton.dtd | 1 - src/chrome/locale/ht/torbutton.dtd | 1 - src/chrome/locale/hu/torbutton.dtd | 1 - src/chrome/locale/hy/torbutton.dtd | 1 - src/chrome/locale/id/torbutton.dtd | 1 - src/chrome/locale/is/torbutton.dtd | 1 - src/chrome/locale/it/torbutton.dtd | 1 - src/chrome/locale/ja/torbutton.dtd | 1 - src/chrome/locale/jv/torbutton.dtd | 1 - src/chrome/locale/ka/torbutton.dtd | 1 - src/chrome/locale/km/torbutton.dtd | 1 - src/chrome/locale/kn/torbutton.dtd | 1 - src/chrome/locale/ko/torbutton.dtd | 1 - src/chrome/locale/ku/torbutton.dtd | 1 - src/chrome/locale/kw/torbutton.dtd | 1 - src/chrome/locale/ky/torbutton.dtd | 1 - src/chrome/locale/lb/torbutton.dtd | 1 - src/chrome/locale/ln/torbutton.dtd | 1 - src/chrome/locale/lo/torbutton.dtd | 1 - src/chrome/locale/lt/torbutton.dtd | 1 - src/chrome/locale/lv/torbutton.dtd | 1 - src/chrome/locale/mg/torbutton.dtd | 1 - src/chrome/locale/mi/torbutton.dtd | 1 - src/chrome/locale/mk/torbutton.dtd | 1 - src/chrome/locale/ml/torbutton.dtd | 1 - src/chrome/locale/mn/torbutton.dtd | 1 - src/chrome/locale/mr/torbutton.dtd | 1 - src/chrome/locale/ms/torbutton.dtd | 1 - src/chrome/locale/mt/torbutton.dtd | 1 - src/chrome/locale/my/torbutton.dtd | 1 - src/chrome/locale/nah/torbutton.dtd | 1 - src/chrome/locale/nap/torbutton.dtd | 1 - src/chrome/locale/nb/torbutton.dtd | 1 - src/chrome/locale/ne/torbutton.dtd | 1 - src/chrome/locale/nl/torbutton.dtd | 1 - src/chrome/locale/nn/torbutton.dtd | 1 - src/chrome/locale/nso/torbutton.dtd | 1 - src/chrome/locale/oc/torbutton.dtd | 1 - src/chrome/locale/or/torbutton.dtd | 1 - src/chrome/locale/pa/torbutton.dtd | 1 - src/chrome/locale/pap/torbutton.dtd | 1 - src/chrome/locale/pl/torbutton.dtd | 1 - src/chrome/locale/pms/torbutton.dtd | 1 - src/chrome/locale/ps/torbutton.dtd | 1 - src/chrome/locale/pt-BR/torbutton.dtd | 1 - src/chrome/locale/pt/torbutton.dtd | 1 - src/chrome/locale/ro/torbutton.dtd | 1 - src/chrome/locale/ru/torbutton.dtd | 1 - src/chrome/locale/sco/torbutton.dtd | 1 - src/chrome/locale/sk/torbutton.dtd | 1 - src/chrome/locale/sl/torbutton.dtd | 1 - src/chrome/locale/so/torbutton.dtd | 1 - src/chrome/locale/son/torbutton.dtd | 1 - src/chrome/locale/sq/torbutton.dtd | 1 - src/chrome/locale/sr/torbutton.dtd | 1 - src/chrome/locale/st/torbutton.dtd | 1 - src/chrome/locale/su/torbutton.dtd | 1 - src/chrome/locale/sv/torbutton.dtd | 1 - src/chrome/locale/sw/torbutton.dtd | 1 - src/chrome/locale/ta/torbutton.dtd | 1 - src/chrome/locale/te/torbutton.dtd | 1 - src/chrome/locale/tg/torbutton.dtd | 1 - src/chrome/locale/th/torbutton.dtd | 1 - src/chrome/locale/ti/torbutton.dtd | 1 - src/chrome/locale/tk/torbutton.dtd | 1 - src/chrome/locale/tr/torbutton.dtd | 1 - src/chrome/locale/uk/torbutton.dtd | 1 - src/chrome/locale/ur/torbutton.dtd | 1 - src/chrome/locale/ve/torbutton.dtd | 1 - src/chrome/locale/vi/torbutton.dtd | 1 - src/chrome/locale/wa/torbutton.dtd | 1 - src/chrome/locale/wo/torbutton.dtd | 1 - src/chrome/locale/zh-CN/torbutton.dtd | 1 - src/chrome/locale/zh-HK/torbutton.dtd | 1 - src/chrome/locale/zh-TW/torbutton.dtd | 1 - src/chrome/locale/zu/torbutton.dtd | 1 - src/defaults/preferences/preferences.js | 1 - 121 files changed, 7 insertions(+), 132 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 7f94491..ad166eb 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -14,7 +14,6 @@ function torbutton_prefs_init(doc) { // Privacy and security settings doc.getElementById('torbutton_resistFingerprinting').checked = o_torprefs.getBoolPref('resist_fingerprinting'); - doc.getElementById('torbutton_blockPlugins').checked = o_torprefs.getBoolPref('no_tor_plugins'); doc.getElementById('torbutton_restrictThirdParty').checked = o_torprefs.getBoolPref('restrict_thirdparty'); let sec_slider = doc.getElementById('torbutton_sec_slider'); let sec_custom = doc.getElementById('torbutton_sec_custom'); @@ -47,7 +46,6 @@ function torbutton_prefs_save(doc) { // Privacy and Security Settings o_torprefs.setBoolPref('resist_fingerprinting', doc.getElementById('torbutton_resistFingerprinting').checked); - o_torprefs.setBoolPref('no_tor_plugins', doc.getElementById('torbutton_blockPlugins').checked); o_torprefs.setBoolPref('restrict_thirdparty', doc.getElementById('torbutton_restrictThirdParty').checked); o_torprefs.setBoolPref('security_custom', doc.getElementById('torbutton_sec_custom').checked); diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 06715ad..1f64d09 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -23,9 +23,6 @@ <groupbox> <caption label="&torbutton.prefs.priv_caption;" tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> - <checkbox id="torbutton_blockPlugins" - label="&torbutton.prefs.block_plugins;" - tooltiptext="&torbutton.prefs.block_plugins_tooltip;"/> <checkbox id="torbutton_restrictThirdParty" label="&torbutton.prefs.restrict_thirdparty;" tooltiptext="&torbutton.prefs.restrict_thirdparty_tooltip;"/> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 04701cb..9151b8a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -95,6 +95,7 @@ var torbutton_unique_pref_observer = 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); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -162,9 +163,9 @@ var torbutton_unique_pref_observer = m_tb_prefs.setBoolPref("extensions.torbutton.restrict_thirdparty", true); break; - case "extensions.torbutton.no_tor_plugins": + case "plugin.disable": torbutton_toggle_plugins( - m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins")); + m_tb_prefs.getBoolPref("plugin.disable")); break; case "browser.privatebrowsing.autostart": torbutton_update_disk_prefs(); @@ -516,11 +517,11 @@ function torbutton_confirm_plugins() { m_tb_prefs.setBoolPref("extensions.torbutton.confirm_plugins", !askAgain.value); - // The pref observer for no_tor_plugins will set the appropriate plugin state. + // The pref observer for "plugin.disable" will set the appropriate plugin state. // So, we only touch the pref if it has changed. if (no_plugins != - m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins")) - m_tb_prefs.setBoolPref("extensions.torbutton.no_tor_plugins", no_plugins); + m_tb_prefs.getBoolPref("plugin.disable")) + m_tb_prefs.setBoolPref("plugin.disable", no_plugins); else torbutton_toggle_plugins(no_plugins); @@ -1697,8 +1698,6 @@ function torbutton_tor_check_ok() // toggles plugins: true for disabled, false for enabled function torbutton_toggle_plugins(disable_plugins) { if (m_tb_tbb) { - m_tb_prefs.setBoolPref("plugin.disable", disable_plugins); - var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); var P=PH.getPluginTags({}); for(var i=0; i<P.length; i++) { @@ -2321,7 +2320,7 @@ function torbutton_do_startup() if(m_tb_prefs.getBoolPref("extensions.torbutton.startup")) { // Bug 1506: Still want to do this torbutton_toggle_plugins( - m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins")); + m_tb_prefs.getBoolPref("plugin.disable")); // Bug 1506: Should probably be moved to an XPCOM component torbutton_do_main_window_startup(); diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/af/torbutton.dtd +++ b/src/chrome/locale/af/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ak/torbutton.dtd +++ b/src/chrome/locale/ak/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/am/torbutton.dtd +++ b/src/chrome/locale/am/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 6709420..67e510c 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -26,7 +26,6 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "لا تحم ملفات تعريف الارتباط الجديدة"> <!ENTITY torbutton.prefs.priv_caption "إعدادات الخصوصية"> <!ENTITY torbutton.prefs.restrict_thirdparty "تقييد الـCookies الخاصة بالطرف الثالث و بيانات التتبع الأخري."> -<!ENTITY torbutton.prefs.block_plugins "تعطيل إضافات المتصفح (مثل فلاش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> <!ENTITY torbutton.prefs.sec_caption "مستوى الأمان"> <!ENTITY torbutton.prefs.sec_low "منخفض (افتراضي)"> diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/arn/torbutton.dtd +++ b/src/chrome/locale/arn/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ast/torbutton.dtd +++ b/src/chrome/locale/ast/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd index e2fd7dd..d583418 100644 --- a/src/chrome/locale/az/torbutton.dtd +++ b/src/chrome/locale/az/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/be/torbutton.dtd +++ b/src/chrome/locale/be/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd index d5cd049..be87171 100644 --- a/src/chrome/locale/bg/torbutton.dtd +++ b/src/chrome/locale/bg/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/bn-IN/torbutton.dtd +++ b/src/chrome/locale/bn-IN/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/bn/torbutton.dtd +++ b/src/chrome/locale/bn/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/bo/torbutton.dtd +++ b/src/chrome/locale/bo/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/br/torbutton.dtd +++ b/src/chrome/locale/br/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd index 7b8ecbe..27f1723 100644 --- a/src/chrome/locale/bs/torbutton.dtd +++ b/src/chrome/locale/bs/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd index 6b6f85d..ad2cc9f 100644 --- a/src/chrome/locale/ca/torbutton.dtd +++ b/src/chrome/locale/ca/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index 3737819..93f1124 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/csb/torbutton.dtd +++ b/src/chrome/locale/csb/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd index eb647de..9251931 100644 --- a/src/chrome/locale/cy/torbutton.dtd +++ b/src/chrome/locale/cy/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index cafb1fc..22b4726 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begræns tredjeparts-cookies og andre registreringsdata"> -<!ENTITY torbutton.prefs.block_plugins "Slå browser-udvidelser fra (såsom Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Tilpas detaljer som adskiller dig fra andre Tor Browser-brugere"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index a2c1701..3544642 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Browser-Erweiterungen deaktivieren (wie z.B. Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die Sie von anderen Tor-Browser-Benutzern unterscheiden"> <!ENTITY torbutton.prefs.sec_caption "Sicherheitslevel"> <!ENTITY torbutton.prefs.sec_low "gering (Standard)"> diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/dz/torbutton.dtd +++ b/src/chrome/locale/dz/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index fc02968..69366e2 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Προστασία Νέων Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Να Μη γίνεται Προστασία Νέων Cookie"> <!ENTITY torbutton.prefs.restrict_thirdparty "Περιορισμος των cookies τριτων και αλλων δεδομενων παρακολουθησης"> -<!ENTITY torbutton.prefs.block_plugins "Απενεργοποίηση προσθέτων περιηγητή (σα το Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Αλλάξτε τις λεπτομέρειες που σας διακρίνει από άλλους χρήστες του Tor Browser "> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 5a1c4a6..908c375 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -28,8 +28,6 @@ <!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.block_plugins "Disable browser plugins (such as Flash)"> -<!ENTITY torbutton.prefs.block_plugins_tooltip "Keep this box checked to stop all binary plugins from being loaded. Plugins are a serious privacy risk because they can leak your browsing history or otherwise make you easy to track."> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Security Level"> diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd index 8ea9486..9790100 100644 --- a/src/chrome/locale/eo/torbutton.dtd +++ b/src/chrome/locale/eo/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 3d716a7..95a6d5c 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Desactivar complementos del navegador (como Flash)"> <!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"> <!ENTITY torbutton.prefs.sec_low "Bajo (por defecto)"> diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/et/torbutton.dtd +++ b/src/chrome/locale/et/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index a5eaa85..97a7d33 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Nabigatzaile pluginak ezgaitu (Flash bezala)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu"> <!ENTITY torbutton.prefs.sec_caption "Segurtasun maila"> <!ENTITY torbutton.prefs.sec_low "Baxua (lehentsia)"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 92c2bfc..28ae8ce 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -26,7 +26,6 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "عدم حفاظت از کلوچک‌های جديد"> <!ENTITY torbutton.prefs.priv_caption "تنظیمات حریم خصوصی"> <!ENTITY torbutton.prefs.restrict_thirdparty "محدود‌كردن كوكى‌هاى طرف سوم و داده‌هاى پيگردى ديگر"> -<!ENTITY torbutton.prefs.block_plugins "غيرفعال‌كردن افزايه‌هاى مرورگر (مثل فلش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> <!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> <!ENTITY torbutton.prefs.sec_low "پایین (به طور پیش فرض)"> diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd index 3a4a1db..aa6d2b7 100644 --- a/src/chrome/locale/fi/torbutton.dtd +++ b/src/chrome/locale/fi/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evästeet"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Älä suojaa uusia evästeitä"> <!ENTITY torbutton.prefs.restrict_thirdparty "Estä kolmannen osapuolen evästeet ja muut seurantatiedot"> -<!ENTITY torbutton.prefs.block_plugins "Poista liitännäiset (Flash yms.) käytöstä"> <!ENTITY torbutton.prefs.resist_fingerprinting "Muuta lisätietoja, jotka erottavat sinut muista Tor Browser -käyttäjistä"> diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/fil/torbutton.dtd +++ b/src/chrome/locale/fil/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/fo/torbutton.dtd +++ b/src/chrome/locale/fo/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index fdbd8a6..1b34290 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Désactiver les greffons du navigateur (tels que Flash)"> <!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é"> <!ENTITY torbutton.prefs.sec_low "Faible (par défaut)"> diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/fur/torbutton.dtd +++ b/src/chrome/locale/fur/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/fy/torbutton.dtd +++ b/src/chrome/locale/fy/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ga/torbutton.dtd +++ b/src/chrome/locale/ga/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd index aeed940..f9d0387 100644 --- a/src/chrome/locale/gl/torbutton.dtd +++ b/src/chrome/locale/gl/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd index ae4d9b8..cd91200 100644 --- a/src/chrome/locale/gu/torbutton.dtd +++ b/src/chrome/locale/gu/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/gun/torbutton.dtd +++ b/src/chrome/locale/gun/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ha/torbutton.dtd +++ b/src/chrome/locale/ha/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index a2b4ec7..713efad 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "הגן על קוקיז חדשים"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "אל תגן על קוקיז חדשים"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "השבת תוספות דפדפן (כגון Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd index faf0e15..9076425 100644 --- a/src/chrome/locale/hi/torbutton.dtd +++ b/src/chrome/locale/hi/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd index eac5ca7..a878ecb 100644 --- a/src/chrome/locale/hr/torbutton.dtd +++ b/src/chrome/locale/hr/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ht/torbutton.dtd +++ b/src/chrome/locale/ht/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index e3a50f2..5cf204b 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Védje az új sütiket"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne védje az új sütiket"> <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik féltől származó sütik és nyomkövetési adatok korlátozása"> -<!ENTITY torbutton.prefs.block_plugins "Böngésző kiegészítők kikapcsolása (mint pl. a Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Változtassa meg a részleteket, amik megkülönböztetik a többi Tor böngésző felhasználótól"> diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/hy/torbutton.dtd +++ b/src/chrome/locale/hy/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd index 52ac230..c8a9cc2 100644 --- a/src/chrome/locale/id/torbutton.dtd +++ b/src/chrome/locale/id/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index e0d131c..f5c88ae 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index a1e36bd..97df051 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Disabilita i plugin del browser (come Flash)"> <!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"> <!ENTITY torbutton.prefs.sec_low "Basso (default)"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 5d16b6b..ed84140 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -26,7 +26,6 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCookieを保護しない"> <!ENTITY torbutton.prefs.priv_caption "プライバシー設定"> <!ENTITY torbutton.prefs.restrict_thirdparty "サードパーティーのCookieやその他のトラッキングデータを制限"> -<!ENTITY torbutton.prefs.block_plugins "ブラウザのプラグイン(フラッシュなど)を無効化"> <!ENTITY torbutton.prefs.resist_fingerprinting "あなたとほかのTorブラウザのユーザーを区別する詳細を変更"> <!ENTITY torbutton.prefs.sec_caption "セキュリティレベル"> <!ENTITY torbutton.prefs.sec_low "低い(デフォルト)"> diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/jv/torbutton.dtd +++ b/src/chrome/locale/jv/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/km/torbutton.dtd +++ b/src/chrome/locale/km/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/kn/torbutton.dtd +++ b/src/chrome/locale/kn/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index f07eae6..77e5f1f 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -26,7 +26,6 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "새로운 쿠키를 보호하지 않음"> <!ENTITY torbutton.prefs.priv_caption "개인 정보 설정"> <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> -<!ENTITY torbutton.prefs.block_plugins "브라우저 플러그인 비활성화 (예 : 플래시)"> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> <!ENTITY torbutton.prefs.sec_caption "보안 등급"> <!ENTITY torbutton.prefs.sec_low "낮음 (기본)"> diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ku/torbutton.dtd +++ b/src/chrome/locale/ku/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/kw/torbutton.dtd +++ b/src/chrome/locale/kw/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd index cf55502..a77fab2 100644 --- a/src/chrome/locale/ky/torbutton.dtd +++ b/src/chrome/locale/ky/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/lb/torbutton.dtd +++ b/src/chrome/locale/lb/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ln/torbutton.dtd +++ b/src/chrome/locale/ln/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/lo/torbutton.dtd +++ b/src/chrome/locale/lo/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd index 9eafa01..527eadb 100644 --- a/src/chrome/locale/lt/torbutton.dtd +++ b/src/chrome/locale/lt/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd index 5424cd3..1d4ea05 100644 --- a/src/chrome/locale/lv/torbutton.dtd +++ b/src/chrome/locale/lv/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Aizsargāt jaunās sīkdatnes"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neaizsargāt jaunās sīkdatnes"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ierobežot trešo personu sīkdatnes un citus izsekošanas datus"> -<!ENTITY torbutton.prefs.block_plugins "Atspējot pārlūku spraudņus (tādus kā Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Mainīt informāciju, kura dara Jūs atšķirīgus no citiem Pārlūka Tor lietotājiem"> diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/mg/torbutton.dtd +++ b/src/chrome/locale/mg/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/mi/torbutton.dtd +++ b/src/chrome/locale/mi/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd index c365aaf..6d522d2 100644 --- a/src/chrome/locale/mk/torbutton.dtd +++ b/src/chrome/locale/mk/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ml/torbutton.dtd +++ b/src/chrome/locale/ml/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/mn/torbutton.dtd +++ b/src/chrome/locale/mn/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/mr/torbutton.dtd +++ b/src/chrome/locale/mr/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ms/torbutton.dtd +++ b/src/chrome/locale/ms/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/mt/torbutton.dtd +++ b/src/chrome/locale/mt/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd index ce34a21..18d2ef8 100644 --- a/src/chrome/locale/my/torbutton.dtd +++ b/src/chrome/locale/my/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "ကွတ်ကီးသစ်များကို ကာကွယ်ရန်"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ကွတ်ကီးသစ်များကို ကာကွယ်ခြင်း မပြုရန်"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/nah/torbutton.dtd +++ b/src/chrome/locale/nah/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/nap/torbutton.dtd +++ b/src/chrome/locale/nap/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd index e2e8305..4ded8d7 100644 --- a/src/chrome/locale/nb/torbutton.dtd +++ b/src/chrome/locale/nb/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt Nye Informasjonskapsler"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke Beskytt Nye Informasjonskapsler"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata."> -<!ENTITY torbutton.prefs.block_plugins "Deaktiver nettlesertillegg (som f.eks Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre Tor Browser brukere."> diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ne/torbutton.dtd +++ b/src/chrome/locale/ne/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 22fd46a..cc99538 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Schakel browserplug-ins uit (zoals Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_low "Laag (standaard)"> diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/nn/torbutton.dtd +++ b/src/chrome/locale/nn/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/nso/torbutton.dtd +++ b/src/chrome/locale/nso/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/oc/torbutton.dtd +++ b/src/chrome/locale/oc/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/or/torbutton.dtd +++ b/src/chrome/locale/or/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd index c6430de..a81a741 100644 --- a/src/chrome/locale/pa/torbutton.dtd +++ b/src/chrome/locale/pa/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/pap/torbutton.dtd +++ b/src/chrome/locale/pap/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index f2cd78e..6eacd3e 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Wyłącz wtyczki przeglądarki (takie jak Flash)"> <!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"> <!ENTITY torbutton.prefs.sec_low "Niski (domyślny)"> diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/pms/torbutton.dtd +++ b/src/chrome/locale/pms/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ps/torbutton.dtd +++ b/src/chrome/locale/ps/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index bfb2dc9..0da50f9 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Prototeger Novos COOKIES"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle"> -<!ENTITY torbutton.prefs.block_plugins "Desabilita plugins do browser (como o Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os dados que distinguem você de outros usuários do Tor Browser"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index cd95c2a..d262db8 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Desativar extensões de navegador (tal como Flash)"> <!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"> <!ENTITY torbutton.prefs.sec_low "Baixo (predefinição)"> diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd index afe5570..03bdb6e 100644 --- a/src/chrome/locale/ro/torbutton.dtd +++ b/src/chrome/locale/ro/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 7e53f4b..c2df4fc 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -26,7 +26,6 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> <!ENTITY torbutton.prefs.priv_caption "Настройки конфиденциальности"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки-файлы и другие данные слежения"> -<!ENTITY torbutton.prefs.block_plugins "Отключить расширения браузера (такие как Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/sco/torbutton.dtd +++ b/src/chrome/locale/sco/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd index 9c50c09..ef9e28c 100644 --- a/src/chrome/locale/sk/torbutton.dtd +++ b/src/chrome/locale/sk/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd index 99be7c0..b0ce2ac 100644 --- a/src/chrome/locale/sl/torbutton.dtd +++ b/src/chrome/locale/sl/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ne zaščiti novih piškotkov"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/so/torbutton.dtd +++ b/src/chrome/locale/so/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/son/torbutton.dtd +++ b/src/chrome/locale/son/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd index 480ce05..7e3df0b 100644 --- a/src/chrome/locale/sq/torbutton.dtd +++ b/src/chrome/locale/sq/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd index 4a257da..71ee79f 100644 --- a/src/chrome/locale/sr/torbutton.dtd +++ b/src/chrome/locale/sr/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Заштити нове колачиће"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не штити нове колачиће"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju"> -<!ENTITY torbutton.prefs.block_plugins "Onemogući dodatke pretrazivaca (kao što su Flash )"> <!ENTITY torbutton.prefs.resist_fingerprinting "Promenite detalje koji vas razlikuju od drugih korisnika Tor pretrazivaca."> diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/st/torbutton.dtd +++ b/src/chrome/locale/st/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/su/torbutton.dtd +++ b/src/chrome/locale/su/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 7f8c9af..f8c0e67 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Inaktivera insticksmoduler (så som Flash)"> <!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å"> <!ENTITY torbutton.prefs.sec_low "Låg (förvald)"> diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/sw/torbutton.dtd +++ b/src/chrome/locale/sw/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ta/torbutton.dtd +++ b/src/chrome/locale/ta/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/te/torbutton.dtd +++ b/src/chrome/locale/te/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/tg/torbutton.dtd +++ b/src/chrome/locale/tg/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd index 0a78cac..3336433 100644 --- a/src/chrome/locale/th/torbutton.dtd +++ b/src/chrome/locale/th/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ti/torbutton.dtd +++ b/src/chrome/locale/ti/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/tk/torbutton.dtd +++ b/src/chrome/locale/tk/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 34986f9..b67fd14 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Tarayıcı eklentileri engellensin (Flash gibi)"> <!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"> <!ENTITY torbutton.prefs.sec_low "Düşük (varsayılan)"> diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd index 205be94..7df0268 100644 --- a/src/chrome/locale/uk/torbutton.dtd +++ b/src/chrome/locale/uk/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Захищати Нові Куки"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не Захищати Нові Куки"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокувати сторонні куки та інші дані відстеження"> -<!ENTITY torbutton.prefs.block_plugins "Вимкнути розширення переглядача (такі як Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Змінити відомості, що відрізняють вас від інших користувачів переглядача Tor"> diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ur/torbutton.dtd +++ b/src/chrome/locale/ur/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/ve/torbutton.dtd +++ b/src/chrome/locale/ve/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 516306e..4cfa289 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -26,7 +26,6 @@ <!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.block_plugins "Disable browser plugins (such as Flash)"> <!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"> <!ENTITY torbutton.prefs.sec_low "Thấp (mặc định)"> diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/wa/torbutton.dtd +++ b/src/chrome/locale/wa/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/wo/torbutton.dtd +++ b/src/chrome/locale/wo/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 5b292a9..347deeb 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -26,7 +26,6 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保护新的 Cookie"> <!ENTITY torbutton.prefs.priv_caption "隐私设置"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> -<!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_low "低（默认）"> diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/zh-HK/torbutton.dtd +++ b/src/chrome/locale/zh-HK/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index ab94893..ebc2dda 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd index 9f0f938..1aa3704 100644 --- a/src/chrome/locale/zu/torbutton.dtd +++ b/src/chrome/locale/zu/torbutton.dtd @@ -22,5 +22,4 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index cb9474f..5d056f4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -29,7 +29,6 @@ pref("extensions.torbutton.maximize_warnings_remaining", 0); pref("extensions.torbutton.startup_resize_period", true); // Security prefs: -pref("extensions.torbutton.no_tor_plugins",true); pref("extensions.torbutton.cookie_protections",true); pref("extensions.torbutton.cookie_auto_protect",false); pref("extensions.torbutton.spoof_english",true);

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

[torbutton/master] Bug 20244.1: Remove "block-disk" checkbox from Privacy & Security Settings
by gk＠torproject.org 17 Oct '16

17 Oct '16

commit 6d785fa1bf95f997a95b867538ba3353d9a76a58 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Oct 2 21:40:33 2016 -0700 Bug 20244.1: Remove "block-disk" checkbox from Privacy & Security Settings An equivalent checkbox, "Always use private browsing mode" is already available in about:preferences#privacy. Better to leave it more hidden from the user in any case, as it is inadvisable to disable private browsing mode. We remove the 'extensions.torbutton.block_disk' pref and use the 'browser.privatebrowsing.autostart' pref instead, because they are equivalent. --- src/chrome/content/preferences.js | 57 --------------------------------- src/chrome/content/preferences.xul | 4 --- src/chrome/content/torbutton.js | 24 +++++++------- src/chrome/locale/af/torbutton.dtd | 1 - src/chrome/locale/ak/torbutton.dtd | 1 - src/chrome/locale/am/torbutton.dtd | 1 - src/chrome/locale/ar/torbutton.dtd | 2 -- src/chrome/locale/arn/torbutton.dtd | 1 - src/chrome/locale/ast/torbutton.dtd | 1 - src/chrome/locale/az/torbutton.dtd | 1 - src/chrome/locale/be/torbutton.dtd | 1 - src/chrome/locale/bg/torbutton.dtd | 1 - src/chrome/locale/bn-IN/torbutton.dtd | 1 - src/chrome/locale/bn/torbutton.dtd | 1 - src/chrome/locale/bo/torbutton.dtd | 1 - src/chrome/locale/br/torbutton.dtd | 1 - src/chrome/locale/bs/torbutton.dtd | 1 - src/chrome/locale/ca/torbutton.dtd | 1 - src/chrome/locale/cs/torbutton.dtd | 1 - src/chrome/locale/csb/torbutton.dtd | 1 - src/chrome/locale/cy/torbutton.dtd | 1 - src/chrome/locale/da/torbutton.dtd | 1 - src/chrome/locale/de/torbutton.dtd | 2 -- src/chrome/locale/dz/torbutton.dtd | 1 - src/chrome/locale/el/torbutton.dtd | 1 - src/chrome/locale/en/torbutton.dtd | 3 -- src/chrome/locale/eo/torbutton.dtd | 1 - src/chrome/locale/es/torbutton.dtd | 2 -- src/chrome/locale/et/torbutton.dtd | 1 - src/chrome/locale/eu/torbutton.dtd | 2 -- src/chrome/locale/fa/torbutton.dtd | 2 -- src/chrome/locale/fi/torbutton.dtd | 1 - src/chrome/locale/fil/torbutton.dtd | 1 - src/chrome/locale/fo/torbutton.dtd | 1 - src/chrome/locale/fr/torbutton.dtd | 2 -- src/chrome/locale/fur/torbutton.dtd | 1 - src/chrome/locale/fy/torbutton.dtd | 1 - src/chrome/locale/ga/torbutton.dtd | 1 - src/chrome/locale/gl/torbutton.dtd | 1 - src/chrome/locale/gu/torbutton.dtd | 1 - src/chrome/locale/gun/torbutton.dtd | 1 - src/chrome/locale/ha/torbutton.dtd | 1 - src/chrome/locale/he/torbutton.dtd | 1 - src/chrome/locale/hi/torbutton.dtd | 1 - src/chrome/locale/hr/torbutton.dtd | 1 - src/chrome/locale/ht/torbutton.dtd | 1 - src/chrome/locale/hu/torbutton.dtd | 1 - src/chrome/locale/hy/torbutton.dtd | 1 - src/chrome/locale/id/torbutton.dtd | 1 - src/chrome/locale/is/torbutton.dtd | 1 - src/chrome/locale/it/torbutton.dtd | 2 -- src/chrome/locale/ja/torbutton.dtd | 2 -- src/chrome/locale/jv/torbutton.dtd | 1 - src/chrome/locale/ka/torbutton.dtd | 1 - src/chrome/locale/km/torbutton.dtd | 1 - src/chrome/locale/kn/torbutton.dtd | 1 - src/chrome/locale/ko/torbutton.dtd | 2 -- src/chrome/locale/ku/torbutton.dtd | 1 - src/chrome/locale/kw/torbutton.dtd | 1 - src/chrome/locale/ky/torbutton.dtd | 1 - src/chrome/locale/lb/torbutton.dtd | 1 - src/chrome/locale/ln/torbutton.dtd | 1 - src/chrome/locale/lo/torbutton.dtd | 1 - src/chrome/locale/lt/torbutton.dtd | 1 - src/chrome/locale/lv/torbutton.dtd | 1 - src/chrome/locale/mg/torbutton.dtd | 1 - src/chrome/locale/mi/torbutton.dtd | 1 - src/chrome/locale/mk/torbutton.dtd | 1 - src/chrome/locale/ml/torbutton.dtd | 1 - src/chrome/locale/mn/torbutton.dtd | 1 - src/chrome/locale/mr/torbutton.dtd | 1 - src/chrome/locale/ms/torbutton.dtd | 1 - src/chrome/locale/mt/torbutton.dtd | 1 - src/chrome/locale/my/torbutton.dtd | 1 - src/chrome/locale/nah/torbutton.dtd | 1 - src/chrome/locale/nap/torbutton.dtd | 1 - src/chrome/locale/nb/torbutton.dtd | 1 - src/chrome/locale/ne/torbutton.dtd | 1 - src/chrome/locale/nl/torbutton.dtd | 2 -- src/chrome/locale/nn/torbutton.dtd | 1 - src/chrome/locale/nso/torbutton.dtd | 1 - src/chrome/locale/oc/torbutton.dtd | 1 - src/chrome/locale/or/torbutton.dtd | 1 - src/chrome/locale/pa/torbutton.dtd | 1 - src/chrome/locale/pap/torbutton.dtd | 1 - src/chrome/locale/pl/torbutton.dtd | 2 -- src/chrome/locale/pms/torbutton.dtd | 1 - src/chrome/locale/ps/torbutton.dtd | 1 - src/chrome/locale/pt-BR/torbutton.dtd | 1 - src/chrome/locale/pt/torbutton.dtd | 2 -- src/chrome/locale/ro/torbutton.dtd | 1 - src/chrome/locale/ru/torbutton.dtd | 2 -- src/chrome/locale/sco/torbutton.dtd | 1 - src/chrome/locale/sk/torbutton.dtd | 1 - src/chrome/locale/sl/torbutton.dtd | 1 - src/chrome/locale/so/torbutton.dtd | 1 - src/chrome/locale/son/torbutton.dtd | 1 - src/chrome/locale/sq/torbutton.dtd | 1 - src/chrome/locale/sr/torbutton.dtd | 1 - src/chrome/locale/st/torbutton.dtd | 1 - src/chrome/locale/su/torbutton.dtd | 1 - src/chrome/locale/sv/torbutton.dtd | 2 -- src/chrome/locale/sw/torbutton.dtd | 1 - src/chrome/locale/ta/torbutton.dtd | 1 - src/chrome/locale/te/torbutton.dtd | 1 - src/chrome/locale/tg/torbutton.dtd | 1 - src/chrome/locale/th/torbutton.dtd | 1 - src/chrome/locale/ti/torbutton.dtd | 1 - src/chrome/locale/tk/torbutton.dtd | 1 - src/chrome/locale/tr/torbutton.dtd | 2 -- src/chrome/locale/uk/torbutton.dtd | 1 - src/chrome/locale/ur/torbutton.dtd | 1 - src/chrome/locale/ve/torbutton.dtd | 1 - src/chrome/locale/vi/torbutton.dtd | 2 -- src/chrome/locale/wa/torbutton.dtd | 1 - src/chrome/locale/wo/torbutton.dtd | 1 - src/chrome/locale/zh-CN/torbutton.dtd | 2 -- src/chrome/locale/zh-HK/torbutton.dtd | 1 - src/chrome/locale/zh-TW/torbutton.dtd | 1 - src/chrome/locale/zu/torbutton.dtd | 1 - src/components/cookie-jar-selector.js | 8 ++--- src/defaults/preferences/preferences.js | 1 - 122 files changed, 17 insertions(+), 213 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index ee81568..7f94491 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -13,7 +13,6 @@ function torbutton_prefs_init(doc) { var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); // Privacy and security settings - doc.getElementById('torbutton_blockDisk').checked = o_torprefs.getBoolPref('block_disk'); doc.getElementById('torbutton_resistFingerprinting').checked = o_torprefs.getBoolPref('resist_fingerprinting'); doc.getElementById('torbutton_blockPlugins').checked = o_torprefs.getBoolPref('no_tor_plugins'); doc.getElementById('torbutton_restrictThirdParty').checked = o_torprefs.getBoolPref('restrict_thirdparty'); @@ -46,20 +45,6 @@ function torbutton_prefs_save(doc) { var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); // Privacy and Security Settings - o_torprefs.setBoolPref('block_disk', doc.getElementById('torbutton_blockDisk').checked); - // If we have NoScript enabled we set `noscript.volatilePrivatePermissions` - // to `true` if we are blocking disk records and to `false` if we are - // enabling them. - try { - if ("@maone.net/noscript-service;1" in Components.classes) { - let o_noscriptprefs = torbutton_get_prefbranch('noscript.'); - if (o_torprefs.getBoolPref('block_disk')) { - o_noscriptprefs.setBoolPref('volatilePrivatePermissions', true); - } else { - o_noscriptprefs.setBoolPref('volatilePrivatePermissions', false); - } - } - } catch (e) {} o_torprefs.setBoolPref('resist_fingerprinting', doc.getElementById('torbutton_resistFingerprinting').checked); o_torprefs.setBoolPref('no_tor_plugins', doc.getElementById('torbutton_blockPlugins').checked); @@ -184,45 +169,3 @@ function torbutton_set_slider_text(doc, custom) { break; } } - -function torbutton_prefs_check_disk() { - let o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - let old_mode = o_torprefs.getBoolPref('block_disk'); - let mode = document.getElementById('torbutton_blockDisk').checked; - - if (mode === old_mode) { - // Either revert, or uncheck. - return; - } - - let sb = Cc["@mozilla.org/intl/stringbundle;1"] - .getService(Ci.nsIStringBundleService); - let bundle = sb.createBundle("chrome://browser/locale/preferences/preferences.properties"); - let brandName = sb.createBundle("chrome://branding/locale/brand.properties").GetStringFromName("brandShortName"); - - let msg = bundle.formatStringFromName(mode ? - "featureEnableRequiresRestart" : "featureDisableRequiresRestart", - [brandName], 1); - let title = bundle.formatStringFromName("shouldRestartTitle", [brandName], 1); - let prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService); - let shouldProceed = prompts.confirm(window, title, msg) - if (shouldProceed) { - let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"] - .createInstance(Ci.nsISupportsPRBool); - let obsSvc = Cc["@mozilla.org/observer-service;1"] - .getService(Ci.nsIObserverService); - obsSvc.notifyObservers(cancelQuit, "quit-application-requested", - "restart"); - shouldProceed = !cancelQuit.data; - - if (shouldProceed) { - document.documentElement.acceptDialog(); - let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"] - .getService(Ci.nsIAppStartup); - appStartup.quit(Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart); - return; - } - } - - document.getElementById('torbutton_blockDisk').checked = old_mode; -} diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 205c187..06715ad 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -23,10 +23,6 @@ <groupbox> <caption label="&torbutton.prefs.priv_caption;" tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> - <checkbox id="torbutton_blockDisk" - label="&torbutton.prefs.block_disk;" - oncommand="torbutton_prefs_check_disk();" - tooltiptext="&torbutton.prefs.block_disk_tooltip;"/> <checkbox id="torbutton_blockPlugins" label="&torbutton.prefs.block_plugins;" tooltiptext="&torbutton.prefs.block_plugins_tooltip;"/> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index e18c4e6..04701cb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -153,12 +153,6 @@ var torbutton_unique_pref_observer = if (topic != "nsPref:changed") return; switch (data) { - case "browser.privatebrowsing.autostart": - var mode = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart"); - var ourmode = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk"); - if (mode != ourmode) - m_tb_prefs.setBoolPref("extensions.torbutton.block_disk", mode); - break; case "network.cookie.cookieBehavior": var val = m_tb_prefs.getIntPref("network.cookie.cookieBehavior"); var block_thirdparty = m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty"); @@ -172,7 +166,7 @@ var torbutton_unique_pref_observer = torbutton_toggle_plugins( m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins")); break; - case "extensions.torbutton.block_disk": + case "browser.privatebrowsing.autostart": torbutton_update_disk_prefs(); break; case "extensions.torbutton.use_nontor_proxy": @@ -392,7 +386,7 @@ function torbutton_init() { // XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we // don't allow things saved to disk. This is an ad-hoc fix to work around // #19417. Once this is properly solved we should remove this code again. - if (m_tb_prefs.getBoolPref("extensions.torbutton.block_disk")) { + if (m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart")) { let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing"); try { // This works only by setting the pref to `true` otherwise we get an @@ -1723,9 +1717,8 @@ function torbutton_toggle_plugins(disable_plugins) { } function torbutton_update_disk_prefs() { - var mode = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk"); + var mode = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart"); - m_tb_prefs.setBoolPref("browser.privatebrowsing.autostart", mode); m_tb_prefs.setBoolPref("browser.cache.disk.enable", !mode); m_tb_prefs.setBoolPref("places.history.enabled", !mode); @@ -1747,6 +1740,15 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setIntPref("browser.download.manager.retention", 2); } + // If we have NoScript enabled we set `noscript.volatilePrivatePermissions` + // to `true` if we are blocking disk records and to `false` if we are + // enabling them. + try { + if ("@maone.net/noscript-service;1" in Components.classes) { + m_tb_prefs.setBoolPref("volatilePrivatePermissions", mode); + } + } catch (e) {} + // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefService); @@ -2120,7 +2122,7 @@ function torbutton_check_protections() // XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR // See https://trac.torproject.org/projects/tor/ticket/10353 for more info. - document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk"); + document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart"); if (!m_tb_control_pass || (!m_tb_control_socket_file && !m_tb_control_port)) { document.getElementById("torbutton-new-identity").disabled = true; diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/af/torbutton.dtd +++ b/src/chrome/locale/af/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ak/torbutton.dtd +++ b/src/chrome/locale/ak/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/am/torbutton.dtd +++ b/src/chrome/locale/am/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index b12013b..6709420 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -25,7 +25,6 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "احم ملفات تعريف الارتباط الجديدة"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "لا تحم ملفات تعريف الارتباط الجديدة"> <!ENTITY torbutton.prefs.priv_caption "إعدادات الخصوصية"> -<!ENTITY torbutton.prefs.block_disk "لا تسجل سجل التصفح أو بيانات المواقع الألكترونية (تفعيل التصفح الخصوصي)"> <!ENTITY torbutton.prefs.restrict_thirdparty "تقييد الـCookies الخاصة بالطرف الثالث و بيانات التتبع الأخري."> <!ENTITY torbutton.prefs.block_plugins "تعطيل إضافات المتصفح (مثل فلاش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.prefs.sec_custom "قيم مخصصة"> <!ENTITY torbutton.circuit_display.title "دائرة تور لهذا الموقع"> - diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/arn/torbutton.dtd +++ b/src/chrome/locale/arn/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ast/torbutton.dtd +++ b/src/chrome/locale/ast/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd index 68a3f88..e2fd7dd 100644 --- a/src/chrome/locale/az/torbutton.dtd +++ b/src/chrome/locale/az/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/be/torbutton.dtd +++ b/src/chrome/locale/be/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd index 1c6f284..d5cd049 100644 --- a/src/chrome/locale/bg/torbutton.dtd +++ b/src/chrome/locale/bg/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/bn-IN/torbutton.dtd +++ b/src/chrome/locale/bn-IN/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/bn/torbutton.dtd +++ b/src/chrome/locale/bn/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/bo/torbutton.dtd +++ b/src/chrome/locale/bo/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/br/torbutton.dtd +++ b/src/chrome/locale/br/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd index ee65693..7b8ecbe 100644 --- a/src/chrome/locale/bs/torbutton.dtd +++ b/src/chrome/locale/bs/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd index 37c705f..6b6f85d 100644 --- a/src/chrome/locale/ca/torbutton.dtd +++ b/src/chrome/locale/ca/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index eb7dc36..3737819 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/csb/torbutton.dtd +++ b/src/chrome/locale/csb/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd index c46b25d..eb647de 100644 --- a/src/chrome/locale/cy/torbutton.dtd +++ b/src/chrome/locale/cy/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index a697bd7..cafb1fc 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle pånær beskyttede"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies"> -<!ENTITY torbutton.prefs.block_disk "Undlad at registrere historik for browsing eller data for websteder (aktiverer tilstanden Privat browsing)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begræns tredjeparts-cookies og andre registreringsdata"> <!ENTITY torbutton.prefs.block_plugins "Slå browser-udvidelser fra (såsom Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Tilpas detaljer som adskiller dig fra andre Tor Browser-brugere"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 670a33e..a2c1701 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "Browser-Verlauf und Internetdaten nicht speichern (aktiviert den privaten Browser-Modus)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere Überwachungsdaten einschränken"> <!ENTITY torbutton.prefs.block_plugins "Browser-Erweiterungen deaktivieren (wie z.B. Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die Sie von anderen Tor-Browser-Benutzern unterscheiden"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Von Webseiten bereitgestellte Schriftartdateien sind gesperrt."> <!ENTITY torbutton.prefs.sec_custom "Eigene Werte"> <!ENTITY torbutton.circuit_display.title "Tor-Kanal für diese Seite"> - diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/dz/torbutton.dtd +++ b/src/chrome/locale/dz/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index 2a896a1..fc02968 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Αφαίρεση Όλων Εκτός από των Προστατευμένων"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Προστασία Νέων Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Να Μη γίνεται Προστασία Νέων Cookie"> -<!ENTITY torbutton.prefs.block_disk "Καμμια καταγραφη του ιστορικυυ περιήγησης ή δεδομένων ιστοσελίδας (ενεργοποιηση της κατάστασης ιδιωτικής περιήγησης) "> <!ENTITY torbutton.prefs.restrict_thirdparty "Περιορισμος των cookies τριτων και αλλων δεδομενων παρακολουθησης"> <!ENTITY torbutton.prefs.block_plugins "Απενεργοποίηση προσθέτων περιηγητή (σα το Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Αλλάξτε τις λεπτομέρειες που σας διακρίνει από άλλους χρήστες του Tor Browser "> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 92b6eed..5a1c4a6 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -26,8 +26,6 @@ <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> -<!ENTITY torbutton.prefs.block_disk_tooltip "Keep this box checked to avoid saving sensitive data to disk, including the browser cache, your browsing history, the cookie database, your download history, intermediate TLS certificates, and permissions you have granted to websites."> <!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.block_plugins "Disable browser plugins (such as Flash)"> @@ -64,4 +62,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.prefs.sec_custom "Custom Values"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> - diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd index 4bbc98f..8ea9486 100644 --- a/src/chrome/locale/eo/torbutton.dtd +++ b/src/chrome/locale/eo/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 570abae..3d716a7 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "No registrar historial de navegación o datos del sitio web (habilita Modo de Navegación Privada)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> <!ENTITY torbutton.prefs.block_plugins "Desactivar complementos del navegador (como Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios del Navegador Tor"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Los ficheros de fuentes proporcionados por el sitio web están bloqueados."> <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados"> <!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio"> - diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/et/torbutton.dtd +++ b/src/chrome/locale/et/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 5275cdd..a5eaa85 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "Ez grabatu nabigatze historia edo webgune datuak (Nabigatze pribatu modua gaitzen du)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu"> <!ENTITY torbutton.prefs.block_plugins "Nabigatzaile pluginak ezgaitu (Flash bezala)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Webguneak hornitutako letra fitxategiak blokeatuta daude."> <!ENTITY torbutton.prefs.sec_custom "Balio pertsonalizatuak"> <!ENTITY torbutton.circuit_display.title "Gune honetako Tor zirkuitua"> - diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index f1413bb..92c2bfc 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -25,7 +25,6 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "حفاظت از کلوچک‌های جديد"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "عدم حفاظت از کلوچک‌های جديد"> <!ENTITY torbutton.prefs.priv_caption "تنظیمات حریم خصوصی"> -<!ENTITY torbutton.prefs.block_disk "ثبت‌نكردن تاريخچه يا داده‌هاى وب‌گاه (گشت و گذار ‌خصوصى فعال مى‌كند)"> <!ENTITY torbutton.prefs.restrict_thirdparty "محدود‌كردن كوكى‌هاى طرف سوم و داده‌هاى پيگردى ديگر"> <!ENTITY torbutton.prefs.block_plugins "غيرفعال‌كردن افزايه‌هاى مرورگر (مثل فلش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "فایل های فونتی که در وب سایت ارائه می شوند مسدود شده است."> <!ENTITY torbutton.prefs.sec_custom "تنظیم سفارشی"> <!ENTITY torbutton.circuit_display.title "مدار Tor برای این سایت"> - diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd index bb3356a..3a4a1db 100644 --- a/src/chrome/locale/fi/torbutton.dtd +++ b/src/chrome/locale/fi/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Poista kaikki paitsi suojatut"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evästeet"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Älä suojaa uusia evästeitä"> -<!ENTITY torbutton.prefs.block_disk "Älä säilytä selaushistoriaa tai verkkosivuston tietoa (käynnistää yksityisen selauksen)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Estä kolmannen osapuolen evästeet ja muut seurantatiedot"> <!ENTITY torbutton.prefs.block_plugins "Poista liitännäiset (Flash yms.) käytöstä"> <!ENTITY torbutton.prefs.resist_fingerprinting "Muuta lisätietoja, jotka erottavat sinut muista Tor Browser -käyttäjistä"> diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/fil/torbutton.dtd +++ b/src/chrome/locale/fil/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/fo/torbutton.dtd +++ b/src/chrome/locale/fo/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index a6b0c1a..fdbd8a6 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "Ne pas sauvegarder l'historique de navigation et les données des sites webs (active le Mode de Navigation Privée)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage"> <!ENTITY torbutton.prefs.block_plugins "Désactiver les greffons du navigateur (tels que Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distinguent des autres utilisateurs du Navigateur Tor"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les fichiers de police de caractères fournis par des sites Web sont bloqués."> <!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisées"> <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site"> - diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/fur/torbutton.dtd +++ b/src/chrome/locale/fur/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/fy/torbutton.dtd +++ b/src/chrome/locale/fy/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ga/torbutton.dtd +++ b/src/chrome/locale/ga/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd index 8f22cc2..aeed940 100644 --- a/src/chrome/locale/gl/torbutton.dtd +++ b/src/chrome/locale/gl/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd index 8b95427..ae4d9b8 100644 --- a/src/chrome/locale/gu/torbutton.dtd +++ b/src/chrome/locale/gu/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/gun/torbutton.dtd +++ b/src/chrome/locale/gun/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ha/torbutton.dtd +++ b/src/chrome/locale/ha/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index e0fd7c8..a2b4ec7 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "מחק את כל הקוקיז הלא מוגנים"> <!ENTITY torbutton.cookiedialog.saveAllCookies "הגן על קוקיז חדשים"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "אל תגן על קוקיז חדשים"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "השבת תוספות דפדפן (כגון Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd index eb4fea9..faf0e15 100644 --- a/src/chrome/locale/hi/torbutton.dtd +++ b/src/chrome/locale/hi/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd index 1a47a21..eac5ca7 100644 --- a/src/chrome/locale/hr/torbutton.dtd +++ b/src/chrome/locale/hr/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ht/torbutton.dtd +++ b/src/chrome/locale/ht/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index a0ca551..e3a50f2 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "A védett kivételével az összes törlése"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Védje az új sütiket"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne védje az új sütiket"> -<!ENTITY torbutton.prefs.block_disk "Ne rögzítsen böngésző előzményeket, vagy weboldal adatot (engedélyezi a Privát böngésző módot)"> <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik féltől származó sütik és nyomkövetési adatok korlátozása"> <!ENTITY torbutton.prefs.block_plugins "Böngésző kiegészítők kikapcsolása (mint pl. a Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Változtassa meg a részleteket, amik megkülönböztetik a többi Tor böngésző felhasználótól"> diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/hy/torbutton.dtd +++ b/src/chrome/locale/hy/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd index 25ea8cc..52ac230 100644 --- a/src/chrome/locale/id/torbutton.dtd +++ b/src/chrome/locale/id/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index b830af0..e0d131c 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 423a9e3..a1e36bd 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "Non registrare la cronologia di navigazione o i dati dei siti (attiva la Navigazione Anonima)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> <!ENTITY torbutton.prefs.block_plugins "Disabilita i plugin del browser (come Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati."> <!ENTITY torbutton.prefs.sec_custom "Valori personalizzati"> <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito"> - diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 56e1fb2..5d16b6b 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -25,7 +25,6 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "新しいCookieを保護"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCookieを保護しない"> <!ENTITY torbutton.prefs.priv_caption "プライバシー設定"> -<!ENTITY torbutton.prefs.block_disk "ブラウジング履歴やウェブサイトのデータを記録しない (プライベートブラウジングモードを有効化)"> <!ENTITY torbutton.prefs.restrict_thirdparty "サードパーティーのCookieやその他のトラッキングデータを制限"> <!ENTITY torbutton.prefs.block_plugins "ブラウザのプラグイン(フラッシュなど)を無効化"> <!ENTITY torbutton.prefs.resist_fingerprinting "あなたとほかのTorブラウザのユーザーを区別する詳細を変更"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web サイトが提供するフォントはブロックされます。"> <!ENTITY torbutton.prefs.sec_custom "カスタム値"> <!ENTITY torbutton.circuit_display.title "このサイト用の Tor サーキット"> - diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/jv/torbutton.dtd +++ b/src/chrome/locale/jv/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/km/torbutton.dtd +++ b/src/chrome/locale/km/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/kn/torbutton.dtd +++ b/src/chrome/locale/kn/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 4a86795..f07eae6 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -25,7 +25,6 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "새로운 쿠키 보호"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "새로운 쿠키를 보호하지 않음"> <!ENTITY torbutton.prefs.priv_caption "개인 정보 설정"> -<!ENTITY torbutton.prefs.block_disk "브라우징 히스토리나 웹사이트 데이터를 기록하지 마십시오 (Private Browsing 모드 활성화)"> <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> <!ENTITY torbutton.prefs.block_plugins "브라우저 플러그인 비활성화 (예 : 플래시)"> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "사이트 내장 폰트가 차단되었습니다."> <!ENTITY torbutton.prefs.sec_custom "맞춤 값"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> - diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ku/torbutton.dtd +++ b/src/chrome/locale/ku/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/kw/torbutton.dtd +++ b/src/chrome/locale/kw/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd index cf8167b..cf55502 100644 --- a/src/chrome/locale/ky/torbutton.dtd +++ b/src/chrome/locale/ky/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/lb/torbutton.dtd +++ b/src/chrome/locale/lb/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ln/torbutton.dtd +++ b/src/chrome/locale/ln/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/lo/torbutton.dtd +++ b/src/chrome/locale/lo/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd index 5a78077..9eafa01 100644 --- a/src/chrome/locale/lt/torbutton.dtd +++ b/src/chrome/locale/lt/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd index 7192ef1..5424cd3 100644 --- a/src/chrome/locale/lv/torbutton.dtd +++ b/src/chrome/locale/lv/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Noņemt visas, izņemot aizsargātās"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Aizsargāt jaunās sīkdatnes"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neaizsargāt jaunās sīkdatnes"> -<!ENTITY torbutton.prefs.block_disk "Nereģistrēt pārlūkošanas vēsturi vai tīmekļa vietņu datus (iespējo Privātas pārlūkošanas režīmu)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ierobežot trešo personu sīkdatnes un citus izsekošanas datus"> <!ENTITY torbutton.prefs.block_plugins "Atspējot pārlūku spraudņus (tādus kā Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Mainīt informāciju, kura dara Jūs atšķirīgus no citiem Pārlūka Tor lietotājiem"> diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/mg/torbutton.dtd +++ b/src/chrome/locale/mg/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/mi/torbutton.dtd +++ b/src/chrome/locale/mi/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd index 2c89bd1..c365aaf 100644 --- a/src/chrome/locale/mk/torbutton.dtd +++ b/src/chrome/locale/mk/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ml/torbutton.dtd +++ b/src/chrome/locale/ml/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/mn/torbutton.dtd +++ b/src/chrome/locale/mn/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/mr/torbutton.dtd +++ b/src/chrome/locale/mr/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ms/torbutton.dtd +++ b/src/chrome/locale/ms/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/mt/torbutton.dtd +++ b/src/chrome/locale/mt/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd index 91225d4..ce34a21 100644 --- a/src/chrome/locale/my/torbutton.dtd +++ b/src/chrome/locale/my/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "အားလုံးကို ဖယ်ထုတ်ပါ။ သို့သော် အကာအကွယ် လုပ်ထားသည်"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ကွတ်ကီးသစ်များကို ကာကွယ်ရန်"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ကွတ်ကီးသစ်များကို ကာကွယ်ခြင်း မပြုရန်"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/nah/torbutton.dtd +++ b/src/chrome/locale/nah/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/nap/torbutton.dtd +++ b/src/chrome/locale/nap/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd index 8376d7d..e2e8305 100644 --- a/src/chrome/locale/nb/torbutton.dtd +++ b/src/chrome/locale/nb/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern Alle Bortsett Fra Beskyttede"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt Nye Informasjonskapsler"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke Beskytt Nye Informasjonskapsler"> -<!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleser økt)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata."> <!ENTITY torbutton.prefs.block_plugins "Deaktiver nettlesertillegg (som f.eks Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre Tor Browser brukere."> diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ne/torbutton.dtd +++ b/src/chrome/locale/ne/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 3c254a3..22fd46a 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -25,7 +25,6 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe Cookies niet"> <!ENTITY torbutton.prefs.priv_caption "Privacyinstellingen"> -<!ENTITY torbutton.prefs.block_disk "Bewaar geen surfgeschiedenis of websitegegevens. (Schakelt Privénavigatie in.)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden"> <!ENTITY torbutton.prefs.block_plugins "Schakel browserplug-ins uit (zoals Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypes worden geblokkeerd."> <!ENTITY torbutton.prefs.sec_custom "Aangepaste waarden"> <!ENTITY torbutton.circuit_display.title "Tor circuit voor deze website"> - diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/nn/torbutton.dtd +++ b/src/chrome/locale/nn/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/nso/torbutton.dtd +++ b/src/chrome/locale/nso/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/oc/torbutton.dtd +++ b/src/chrome/locale/oc/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/or/torbutton.dtd +++ b/src/chrome/locale/or/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd index 70622d3..c6430de 100644 --- a/src/chrome/locale/pa/torbutton.dtd +++ b/src/chrome/locale/pa/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/pap/torbutton.dtd +++ b/src/chrome/locale/pap/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 9a433c3..f2cd78e 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "Nie zapisuj historii przeglądania i danych o stronach (włącza Tryb Prywatny)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane służące do śledzenia"> <!ENTITY torbutton.prefs.block_plugins "Wyłącz wtyczki przeglądarki (takie jak Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Zmień szczegóły odróżniające Cię od innych użytkowników Przeglądarki Tora"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Pliki czcionek dostarczane przez strony internetowe są blokowane."> <!ENTITY torbutton.prefs.sec_custom "Wartości niestandardowe"> <!ENTITY torbutton.circuit_display.title "Obwód Tor dla tej strony"> - diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/pms/torbutton.dtd +++ b/src/chrome/locale/pms/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ps/torbutton.dtd +++ b/src/chrome/locale/ps/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index a95eb42..bfb2dc9 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Não Prototeger Novos COOKIES"> -<!ENTITY torbutton.prefs.block_disk "Não gravar o histórico de navegação ou dados do site (permite Navegação em modo privado)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle"> <!ENTITY torbutton.prefs.block_plugins "Desabilita plugins do browser (como o Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os dados que distinguem você de outros usuários do Tor Browser"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 921abb5..cd95c2a 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "Não gravar o histórico de navegação ou os dados do site da Web (ativa o Modo de Navegação Privado)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento"> <!ENTITY torbutton.prefs.block_plugins "Desativar extensões de navegador (tal como Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que o diferencia dos outros utilizadores do Navegador Tor"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Os ficheiros dos tipos de letra fornecidos pelo site da Web estão bloqueados."> <!ENTITY torbutton.prefs.sec_custom "Valores Personalizados"> <!ENTITY torbutton.circuit_display.title "Circuito Tor para este site"> - diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd index c1d2cc7..afe5570 100644 --- a/src/chrome/locale/ro/torbutton.dtd +++ b/src/chrome/locale/ro/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Indeparteaza tot, mai putin protejat"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 3f5d602..7e53f4b 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -25,7 +25,6 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Защищать новые куки-файлы"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> <!ENTITY torbutton.prefs.priv_caption "Настройки конфиденциальности"> -<!ENTITY torbutton.prefs.block_disk "Не сохранять историю журнала посещений и данные с посещаемых сайтов (активирует функцию конфиденциального просмотра)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки-файлы и другие данные слежения"> <!ENTITY torbutton.prefs.block_plugins "Отключить расширения браузера (такие как Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Файлы шрифтов, предоставленные сайтом, заблокированы"> <!ENTITY torbutton.prefs.sec_custom "Собственные значения"> <!ENTITY torbutton.circuit_display.title "Цепочка Tor для этого сайта"> - diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/sco/torbutton.dtd +++ b/src/chrome/locale/sco/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd index 77ce90a..9c50c09 100644 --- a/src/chrome/locale/sk/torbutton.dtd +++ b/src/chrome/locale/sk/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd index d18faf7..99be7c0 100644 --- a/src/chrome/locale/sl/torbutton.dtd +++ b/src/chrome/locale/sl/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ne zaščiti novih piškotkov"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/so/torbutton.dtd +++ b/src/chrome/locale/so/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/son/torbutton.dtd +++ b/src/chrome/locale/son/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd index c9f35bf..480ce05 100644 --- a/src/chrome/locale/sq/torbutton.dtd +++ b/src/chrome/locale/sq/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd index 6b62886..4a257da 100644 --- a/src/chrome/locale/sr/torbutton.dtd +++ b/src/chrome/locale/sr/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Уклони све осим заштићених"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Заштити нове колачиће"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не штити нове колачиће"> -<!ENTITY torbutton.prefs.block_disk "Ne pamti moji istoriju pretrazivanja ili podatke sa web sajtova(Omogucava Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju"> <!ENTITY torbutton.prefs.block_plugins "Onemogući dodatke pretrazivaca (kao što su Flash )"> <!ENTITY torbutton.prefs.resist_fingerprinting "Promenite detalje koji vas razlikuju od drugih korisnika Tor pretrazivaca."> diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/st/torbutton.dtd +++ b/src/chrome/locale/st/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/su/torbutton.dtd +++ b/src/chrome/locale/su/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index a2ca4c8..7f8c9af 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "Spara ingen historik eller webbplatsdata (aktiverar privat surfning)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data"> <!ENTITY torbutton.prefs.block_plugins "Inaktivera insticksmoduler (så som Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Ändra detailjer som utmärker dig ifrån andra Tor Browser användare"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbsidor är blockerade."> <!ENTITY torbutton.prefs.sec_custom "Anpassad nivå"> <!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbsidan"> - diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/sw/torbutton.dtd +++ b/src/chrome/locale/sw/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ta/torbutton.dtd +++ b/src/chrome/locale/ta/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/te/torbutton.dtd +++ b/src/chrome/locale/te/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/tg/torbutton.dtd +++ b/src/chrome/locale/tg/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd index 9525f2d..0a78cac 100644 --- a/src/chrome/locale/th/torbutton.dtd +++ b/src/chrome/locale/th/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ti/torbutton.dtd +++ b/src/chrome/locale/ti/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/tk/torbutton.dtd +++ b/src/chrome/locale/tk/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index b22c065..34986f9 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -25,7 +25,6 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Çerezleri Koru"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Çerezleri Koruma"> <!ENTITY torbutton.prefs.priv_caption "Gizlilik Ayarları"> -<!ENTITY torbutton.prefs.block_disk "Tarama geçmişini ve web sitesi bilgileri kaydedilmesin (Gizli Tarama Kipi kullanılır)"> <!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf çerez ve diğer iz sürücü bilgiler engellensin"> <!ENTITY torbutton.prefs.block_plugins "Tarayıcı eklentileri engellensin (Flash gibi)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor Browser kullanıcılarından sizi ayıran ayrıntılar değiştirilsin"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web sitesi tarafından sunulan yazı tipi dosyaları engellenir."> <!ENTITY torbutton.prefs.sec_custom "Özel Değerler"> <!ENTITY torbutton.circuit_display.title "Bu site için Tor devresi"> - diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd index 978b9b6..205be94 100644 --- a/src/chrome/locale/uk/torbutton.dtd +++ b/src/chrome/locale/uk/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Видалити Усі, Окрім Захищених"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Захищати Нові Куки"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не Захищати Нові Куки"> -<!ENTITY torbutton.prefs.block_disk "Не зберігати історію переглядів або дані з відвідуваних сайтів (активує функцію приватного перегляду)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокувати сторонні куки та інші дані відстеження"> <!ENTITY torbutton.prefs.block_plugins "Вимкнути розширення переглядача (такі як Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Змінити відомості, що відрізняють вас від інших користувачів переглядача Tor"> diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ur/torbutton.dtd +++ b/src/chrome/locale/ur/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/ve/torbutton.dtd +++ b/src/chrome/locale/ve/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index cca65c7..516306e 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -25,7 +25,6 @@ <!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.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.prefs.sec_custom "Custom Values"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> - diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/wa/torbutton.dtd +++ b/src/chrome/locale/wa/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/wo/torbutton.dtd +++ b/src/chrome/locale/wo/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 652c1c6..5b292a9 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -25,7 +25,6 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "保护新的 Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保护新的 Cookie"> <!ENTITY torbutton.prefs.priv_caption "隐私设置"> -<!ENTITY torbutton.prefs.block_disk "禁止记录浏览历史或网站数据（启用隐私浏览模式）"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> @@ -58,4 +57,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "禁用网站提供的字体文件。"> <!ENTITY torbutton.prefs.sec_custom "自定义"> <!ENTITY torbutton.circuit_display.title "为此站点使用的 Tor 线路"> - diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/zh-HK/torbutton.dtd +++ b/src/chrome/locale/zh-HK/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index 3e521cc..ab94893 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd index ee8f465..9f0f938 100644 --- a/src/chrome/locale/zu/torbutton.dtd +++ b/src/chrome/locale/zu/torbutton.dtd @@ -21,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index 33e5800..778118d 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -177,7 +177,7 @@ function CookieJarSelector() { cookies.push(cookie); this["protected-" + name] = cookies; - if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { + if (!this.prefs.getBoolPref("browser.privatebrowsing.autostart")) { // save protected cookies to file this._protectedCookiesToFile(name); } else { @@ -230,7 +230,7 @@ function CookieJarSelector() { this.protectCookies = function(cookies) { var name = "tor"; this._writeProtectCookies(cookies,name); - if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { + if (!this.prefs.getBoolPref("browser.privatebrowsing.autostart")) { // save protected cookies to file this._protectedCookiesToFile(name); } else { @@ -307,7 +307,7 @@ function CookieJarSelector() { this["session-cookiesobj-" + name] = this._cookiesToJS(true); this["cookiesobj-" + name] = this._cookiesToJS(false); - if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { + if (!this.prefs.getBoolPref("browser.privatebrowsing.autostart")) { // save cookies to file this._cookiesToFile(name); } else { @@ -379,7 +379,7 @@ function CookieJarSelector() { // remove cookies before loading old ones this.clearCookies(); - if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { + if (!this.prefs.getBoolPref("browser.privatebrowsing.autostart")) { // load cookies from file this["cookiesobj-" + name] = this._cookiesFromFile(name); } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index a3105da..cb9474f 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -45,7 +45,6 @@ pref("extensions.torbutton.launch_warning",true); // https://developer.mozilla.org/en/Addons/Working_with_AMO pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false); -pref("extensions.torbutton.block_disk", true); pref("extensions.torbutton.resist_fingerprinting", true); pref("extensions.torbutton.restrict_thirdparty", true);

1 0

[tor-browser-bundle/maint-6.0] Bug 20342: Add tor-gencert.exe to expert bundle
by gk＠torproject.org 13 Oct '16

13 Oct '16

commit 43cf1a1ce71a143a29819d149fa0da44cf7c8dc7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 13 07:35:59 2016 +0000 Bug 20342: Add tor-gencert.exe to expert bundle --- gitian/descriptors/windows/gitian-tor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 63b527a..49d86dd 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -75,6 +75,10 @@ script: | make install cd ../.. install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ + if [ "$BUILD" == "expert" ] + then + install -s $INSTDIR/bin/tor-gencert.exe $INSTDIR/Tor/ + fi cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/

1 0

[tor-browser-bundle/master] Bug 20342: Add tor-gencert.exe to expert bundle
by gk＠torproject.org 13 Oct '16

13 Oct '16

commit 9d1f518b29b254bbfcd15fc69f7d149687eb49c8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 13 07:35:59 2016 +0000 Bug 20342: Add tor-gencert.exe to expert bundle --- gitian/descriptors/windows/gitian-tor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 63b527a..49d86dd 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -75,6 +75,10 @@ script: | make install cd ../.. install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ + if [ "$BUILD" == "expert" ] + then + install -s $INSTDIR/bin/tor-gencert.exe $INSTDIR/Tor/ + fi cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/

1 0

[tor-browser-bundle/master] Bug 20217: check that OSX incremental MARs are made with code signing
by gk＠torproject.org 11 Oct '16

11 Oct '16

commit 9836227e4ae27123a3eb27167dc6dca13b5d1027 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 10 19:44:10 2016 +0200 Bug 20217: check that OSX incremental MARs are made with code signing When updating the OSX incremental MAR files after running dmg2mar, we check that both the old and the new mar files contain code signing. We don't check this while creating the incremental MAR files during the build. --- gitian/Makefile | 4 ++-- tools/update-responses/update_responses | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index f008834..a4a757f 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -48,12 +48,12 @@ signmars-nightly: dmg2mars: cd $(shell ../tools/update-responses/get_channel_version release) && ../../tools/dmg2mar $(TORSOCKS) ../tools/update-responses/download_missing_versions release - MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals release dmg2mars-alpha: cd $(shell ../tools/update-responses/get_channel_version alpha) && ../../tools/dmg2mar $(TORSOCKS) ../tools/update-responses/download_missing_versions alpha - MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals alpha + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals alpha update_responses: ../tools/update-responses/update_responses release diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 7962f69..ceba144 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -197,6 +197,12 @@ sub create_incremental_mar { my $tmpdir = File::Temp->newdir(); extract_mar(mar_filename($from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($new_version, $os, $lang), "$tmpdir/B"); + if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { + unless (-f "$tmpdir/A/TorBrowser.app/Contents/_CodeSignature/CodeResources" + && -f "$tmpdir/B/TorBrowser.app/Contents/_CodeSignature/CodeResources") { + exit_error "Missing code signature while creating $mar_file"; + } + } my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); if (!$success) {

1 0

[tor-browser-bundle/maint-6.0] Bump OpenSSL to 1.0.1u
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 531a442020e99d600386903aec0256e060842ace Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 6 08:59:39 2016 +0000 Bump OpenSSL to 1.0.1u --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 170e6df..85b2a7a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -44,7 +44,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.1t +OPENSSL_VER=1.0.1u GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -94,7 +94,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 +OPENSSL_HASH=4312b4ca1215b6f2c97007503d80db80d5157f76f8f7d3febbe6b4c56ff26739 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit ef6b1ceff3996006497ebbdbd02104031eaf64f5 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Thu Mar 10 16:54:05 2016 +0900 Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj Our STL wrappers do various different things, one of which is including mozalloc.h for infallible operator new. mozalloc.h includes stdlib.h, which, in libstdc++ >= 6 is now itself a wrapper around cstdlib, which circles back to our STL wrapper. But of the things our STL wrappers do, including mozalloc.h is not one that is necessary for cstdlib. So skip including mozalloc.h in our cstdlib wrapper. Additionally, some C++ sources (in media/mtransport) are including headers in an extern "C" block, which end up including stdlib.h, which ends up including cstdlib because really, this is all C++, and our wrapper pre-includes <new> for mozalloc.h, which fails because templates don't work inside extern "C". So, don't pre-include <new> when we're not including mozalloc.h. --- config/gcc-stl-wrapper.template.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h index 75bbe75..b5ebeec 100644 --- a/config/gcc-stl-wrapper.template.h +++ b/config/gcc-stl-wrapper.template.h @@ -17,6 +17,11 @@ // Silence "warning: #include_next is a GCC extension" #pragma GCC system_header +// Don't include mozalloc for cstdlib. See bug 1245076. +#ifndef moz_dont_include_mozalloc_for_cstdlib +# define moz_dont_include_mozalloc_for_cstdlib +#endif +#ifndef moz_dont_include_mozalloc_for_${HEADER} // mozalloc.h wants <new>; break the cycle by always explicitly // including <new> here. NB: this is a tad sneaky. Sez the gcc docs: // @@ -25,15 +30,17 @@ // same name as the current file. It simply looks for the file // named, starting with the directory in the search path after the // one where the current file was found. -#include_next <new> +# include_next <new> // See if we're in code that can use mozalloc. NB: this duplicates // code in nscore.h because nscore.h pulls in prtypes.h, and chromium // can't build with that being included before base/basictypes.h. -#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) -# include "mozilla/mozalloc.h" -#else -# error "STL code can only be used with infallible ::operator new()" +# if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC) +# include "mozilla/mozalloc.h" +# else +# error "STL code can only be used with infallible ::operator new()" +# endif + #endif #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Work around Mozilla's 1305396
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 08136fae2fb1fb6b6713b0821c8cf6ea5666d192 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 27 08:26:07 2016 +0000 Work around Mozilla's 1305396 --- security/pkix/lib/pkixnames.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/security/pkix/lib/pkixnames.cpp b/security/pkix/lib/pkixnames.cpp index 37c6c79..2cec4f0 100644 --- a/security/pkix/lib/pkixnames.cpp +++ b/security/pkix/lib/pkixnames.cpp @@ -37,6 +37,8 @@ #include "pkixcheck.h" #include "pkixutil.h" +#include <cstring> + namespace mozilla { namespace pkix { namespace {

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit e2e11538f13e7eb4aa8bd9daf8f3d89c1434c1ef Author: Jonathan Kew <jkew(a)mozilla.com> Date: Wed May 18 15:22:54 2016 +0100 Bug 1272647 - Exclude NameTable.cpp from unified compilation because #include <cmath> in other source files causes gcc6 compilation failure. r=bas --- gfx/graphite2/src/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index 4008b77..c18c6f4 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -45,7 +45,6 @@ UNIFIED_SOURCES += [ 'Intervals.cpp', 'json.cpp', 'Justifier.cpp', - 'NameTable.cpp', 'Pass.cpp', 'Position.cpp', 'SegCache.cpp', @@ -59,6 +58,12 @@ UNIFIED_SOURCES += [ 'UtfCodec.cpp', ] +# Excluded from UNIFIED_SOURCES because <cmath> from other files breaks it, +# see bug 1272647. +SOURCES += [ + 'NameTable.cpp', +] + # tell graphite2 not to export symbols, we'll be linking it directly with # thebes DEFINES['GRAPHITE2_STATIC'] = True

1 0

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

06 Oct '16

commit 0348263efd1cb8a9eca8737f3dc7734ef75e0966 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 29 09:31:55 2016 +0000 Bug 13893: Make Tor Browser compatible with EMET Bumping GCC to 6.2.0 is fixing our EMET incompatibilities. The exact change on GCC's side causing this remains unclear, though. We need to backout GCC changes that are causing a mingw-w64 build to fail. For details see the bug report in GCC's bugtracker: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77459 --- 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, 1234 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9c31834..d3598e2 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -35,6 +35,8 @@ 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 @@ -79,6 +81,11 @@ 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 new file mode 100644 index 0000000..7ca36d8 --- /dev/null +++ b/gitian/patches/gcc_62_1.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 0000000..7dbd826 --- /dev/null +++ b/gitian/patches/gcc_62_2.patch @@ -0,0 +1,1198 @@ +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 898e781..f0b32d9 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=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=4e270fefffda8f8123c0d64b77a6855dc3c732b1 # fix Fx compilation 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=5.1.0 +GCC_VER=6.2.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=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f6dbb68..20c4ae4 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=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=4e270fefffda8f8123c0d64b77a6855dc3c732b1 # fix Fx compilation 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=5.1.0 +GCC_VER=6.2.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=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da

1 0

[tor-browser-bundle/hardened-builds] Bug 20296: Rotate ports again for default obfs4 bridges
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 76ab07a1dbf78a1445d76bac4e1498136361641a Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Wed Oct 5 14:22:51 2016 -0700 Bug 20296: Rotate ports again for default obfs4 bridges LeifEricson (blocked): Port 50000 --> 50001 Greenbelt (unblocked): Port 5881 --> 7013 Mosaddegh (blocked): Port 2934 --> 9332 MaBishomarim (blocked): Port 2413 --> 7920 JonbesheSabz (blocked): Port 1894 --> 4148 Azadi (unblocked): Port 4319 --> 6041 --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 2537625..c4752c1 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,24 +15,24 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:2934 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50000 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:2413 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:5881 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:7013 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:1894 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:4319 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 445AAA9309486821673F1BAD2F5DA31D57BA14A1 cert=G2f9hXO446LRm6zZo6i5ayMwk7q9PzcGu5ZNCbx+rYsoyJvWLl/RenYJeOZfsNc4m+KcSw iat-mode=0"); // Not used yet // pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");

1 0

[tor-browser-bundle/maint-6.0] Bug 20296: Rotate ports again for default obfs4 bridges
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 7a8773ae2fb72801b716977e7db46b338f63563d Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Wed Oct 5 14:22:51 2016 -0700 Bug 20296: Rotate ports again for default obfs4 bridges LeifEricson (blocked): Port 50000 --> 50001 Greenbelt (unblocked): Port 5881 --> 7013 Mosaddegh (blocked): Port 2934 --> 9332 MaBishomarim (blocked): Port 2413 --> 7920 JonbesheSabz (blocked): Port 1894 --> 4148 Azadi (unblocked): Port 4319 --> 6041 --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 2537625..c4752c1 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,24 +15,24 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:2934 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50000 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:2413 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:5881 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:7013 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:1894 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:4319 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 445AAA9309486821673F1BAD2F5DA31D57BA14A1 cert=G2f9hXO446LRm6zZo6i5ayMwk7q9PzcGu5ZNCbx+rYsoyJvWLl/RenYJeOZfsNc4m+KcSw iat-mode=0"); // Not used yet // pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");

1 0

[tor-browser-bundle/master] Bug 20296: Rotate ports again for default obfs4 bridges
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 4ae6f9f49b686ccc204e143e9c97d870cee66e24 Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Wed Oct 5 14:22:51 2016 -0700 Bug 20296: Rotate ports again for default obfs4 bridges LeifEricson (blocked): Port 50000 --> 50001 Greenbelt (unblocked): Port 5881 --> 7013 Mosaddegh (blocked): Port 2934 --> 9332 MaBishomarim (blocked): Port 2413 --> 7920 JonbesheSabz (blocked): Port 1894 --> 4148 Azadi (unblocked): Port 4319 --> 6041 --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 2537625..c4752c1 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,24 +15,24 @@ pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:2934 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:9332 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50000 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50001 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:2413 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:7920 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:5881 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:7013 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:1894 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:4319 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 445AAA9309486821673F1BAD2F5DA31D57BA14A1 cert=G2f9hXO446LRm6zZo6i5ayMwk7q9PzcGu5ZNCbx+rYsoyJvWLl/RenYJeOZfsNc4m+KcSw iat-mode=0"); // Not used yet // pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 20043: Isolate SharedWorker script requests to first party
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit 22e6c335a74f08d37dd0e2daec9951dd4d0cc89d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 22 05:49:07 2016 +0000 Bug 20043: Isolate SharedWorker script requests to first party --- dom/workers/WorkerPrivate.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp index 830712e..2ac0c0f 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -4396,6 +4396,25 @@ WorkerPrivate::GetLoadInfo(JSContext* aCx, nsPIDOMWindow* aWindow, getter_AddRefs(loadInfo.mChannel)); NS_ENSURE_SUCCESS(rv, rv); + // If this is a SharedWorker and we have an isolation key, use it as the + // DocumentURI for this channel. Ensures we get the right first-party domain. + if ((aWorkerType == WorkerTypeShared || aWorkerType == WorkerTypeService) && + !loadInfo.mIsolationKey.IsEmpty()) { + nsCOMPtr<nsIHttpChannelInternal> channelInternal(do_QueryInterface(loadInfo.mChannel)); + if (channelInternal) { + nsCString documentURISpec("https://"); + documentURISpec.Append(loadInfo.mIsolationKey); + nsCOMPtr<nsIURI> documentURI; + nsresult rv = NS_NewURI(getter_AddRefs(documentURI), documentURISpec); + if (NS_SUCCEEDED(rv)) { + channelInternal->SetDocumentURI(documentURI); + } else { + NS_WARNING("Unable to set the documentURI for SharedWorker's " + "loading channel."); + } + } + } + rv = NS_GetFinalChannelURI(loadInfo.mChannel, getter_AddRefs(loadInfo.mResolvedScriptURI)); NS_ENSURE_SUCCESS(rv, rv);

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] squash! Bug #13749.2: Regression tests for first-party isolation of cache
by gk＠torproject.org 06 Oct '16

06 Oct '16

commit cb2bd1de68d3ad252c665958616a53cb5aa35e38 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 22 05:57:07 2016 +0000 squash! Bug #13749.2: Regression tests for first-party isolation of cache Also regression tests for Bug 20043: Isolate SharedWorker script requests to first party --- netwerk/test/browser/browser.ini | 1 + netwerk/test/browser/browser_cacheFirstParty.js | 2 +- netwerk/test/browser/thirdPartyChild.iframe.html | 1 + netwerk/test/browser/thirdPartyChild.sharedworker.js | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index a78557b..93f05ed 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -15,6 +15,7 @@ support-files = thirdPartyChild.script.js thirdPartyChild.track.vtt thirdPartyChild.video.ogv + thirdPartyChild.sharedworker.js thirdPartyChild.worker.fetch.html thirdPartyChild.worker.js thirdPartyChild.worker.request.html diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js index 7e66726..a5d7376 100644 --- a/netwerk/test/browser/browser_cacheFirstParty.js +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -116,7 +116,7 @@ let privacyPref = "privacy.thirdparty.isolate", "video.ogv", "track.vtt", "favicon.ico", "fetch.html", "worker.fetch.html", "request.html", "worker.request.html", - "import.js"]; + "import.js", "worker.js", "sharedworker.js"]; // __checkCachePopulation(isolate, numberOfDomains)__. // Check if the number of entries found in the cache for each diff --git a/netwerk/test/browser/thirdPartyChild.iframe.html b/netwerk/test/browser/thirdPartyChild.iframe.html index 56f6df2..7ff2be3 100644 --- a/netwerk/test/browser/thirdPartyChild.iframe.html +++ b/netwerk/test/browser/thirdPartyChild.iframe.html @@ -9,6 +9,7 @@ xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.xhr.html", true); xhr.send(); var worker = new Worker("http://example.net/browser/netwerk/test/browser/thirdPartyChild.worker.js"); + var sharedWorker = new SharedWorker("http://example.net/browser/netwerk/test/browser/thirdPartyChild.sharedworke…"); fetch("thirdPartyChild.fetch.html", {cache: "force-cache"} ); fetch(new Request("thirdPartyChild.request.html"), {cache: "force-cache"} ); diff --git a/netwerk/test/browser/thirdPartyChild.sharedworker.js b/netwerk/test/browser/thirdPartyChild.sharedworker.js new file mode 100644 index 0000000..b262fa1 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.sharedworker.js @@ -0,0 +1 @@ +// dummy file

1 0

[tor-browser-bundle/maint-6.0] Bug 20290: Upgrade meek to 0.24.
by gk＠torproject.org 05 Oct '16

05 Oct '16

commit c8e727d5b00af25194cde2577a45b68bcb31f7ca Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 3 19:26:11 2016 -0700 Bug 20290: Upgrade meek to 0.24. This version has a fix for https://bugs.torproject.org/20030. (meek-client-torbrowser failing to kill is subprocesses, which was a problem whenever meek-client-torbrowser was built with Go 1.6 or later.) --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 16d9553..170e6df 100755 --- a/gitian/versions +++ b/gitian/versions @@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.5 -MEEK_TAG=0.22-18371-3 +MEEK_TAG=0.24 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 7efe5d8..97cf78f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.5 -MEEK_TAG=0.22-18371-3 +MEEK_TAG=0.24 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 67c7d99..22e9742 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,7 +40,7 @@ FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=master -MEEK_TAG=0.22-18371-3 #master +MEEK_TAG=0.24 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

1 0

[tor-browser-bundle/hardened-builds] Bug 20290: Upgrade meek to 0.24.
by gk＠torproject.org 05 Oct '16

05 Oct '16

commit 40fd8cb1c914996adb817bf961ed23d1e5eb4856 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 3 19:26:11 2016 -0700 Bug 20290: Upgrade meek to 0.24. This version has a fix for https://bugs.torproject.org/20030. (meek-client-torbrowser failing to kill is subprocesses, which was a problem whenever meek-client-torbrowser was built with Go 1.6 or later.) --- gitian/versions | 4 ++-- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 6ab0f2d..d276d33 100755 --- a/gitian/versions +++ b/gitian/versions @@ -28,8 +28,8 @@ LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GOPTLIB_TAG=0.2 -MEEK_TAG=0.20 +GOPTLIB_TAG=0.5 +MEEK_TAG=0.24 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e12110e..295439e 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -37,7 +37,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.5 -MEEK_TAG=0.22-18371-3 +MEEK_TAG=0.24 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 99e476e..ab47af1 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,7 +40,7 @@ FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=master -MEEK_TAG=0.22-18371-3 #master +MEEK_TAG=0.24 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

1 0