- tbb-commits - lists.torproject.org

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

[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

[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

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

05 Oct '16

commit a933bb826a463fa8372fe1e5ed372a3390b1db31 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 4ee6f20..ef57d6a 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 464f917..898e781 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 3b90c88..f6dbb68 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/master] Bug 20182: Handle the special case of the ja locale in dmg2mar
by gk＠torproject.org 05 Oct '16

05 Oct '16

commit 3993fb0ee7624b8c0daaefcd9f08d1ccf0a048e1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 4 20:21:51 2016 +0200 Bug 20182: Handle the special case of the ja locale in dmg2mar --- tools/dmg2mar | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/dmg2mar b/tools/dmg2mar index 47a543a..010761e 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -98,7 +98,11 @@ sub convert_files { my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { print "Finished $_[2]\n" }); foreach my $file (get_dmg_files_from_sha256sums) { - my $output = "tor-browser-osx64-$file->{version}_$file->{lang}.mar"; + # The 'ja' locale is a special case: it is called 'ja-JP-mac' + # internally on OSX, but the dmg file still uses 'ja' to avoid + # confusing users. + my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; + my $output = "tor-browser-osx64-$file->{version}_$mar_lang.mar"; my $step_name = "$file->{filename} -> $output"; print "Starting $step_name\n"; $pm->start($step_name) and next;

1 0

[tor-browser/tor-browser-45.4.0esr-6.0-1] Bug 1070710 - Use ViewRegion for vibrant areas in VibrancyManager. r=spohl
by gk＠torproject.org 04 Oct '16

04 Oct '16

commit b3e5e45fc43646fa658cd8bbb43389a02e391150 Author: Markus Stange <mstange(a)themasta.com> Date: Mon Jul 11 14:47:05 2016 -0400 Bug 1070710 - Use ViewRegion for vibrant areas in VibrancyManager. r=spohl MozReview-Commit-ID: 5qVo59SV7QG --HG-- extra : histedit_source : 12980052172b2a858a52978fdd98dea28a9ea854 --- widget/cocoa/VibrancyManager.h | 14 +++------ widget/cocoa/VibrancyManager.mm | 70 +++++++++-------------------------------- 2 files changed, 18 insertions(+), 66 deletions(-) diff --git a/widget/cocoa/VibrancyManager.h b/widget/cocoa/VibrancyManager.h index 464a106..737fdc2 100644 --- a/widget/cocoa/VibrancyManager.h +++ b/widget/cocoa/VibrancyManager.h @@ -11,6 +11,7 @@ #include "nsClassHashtable.h" #include "nsRegion.h" #include "nsTArray.h" +#include "ViewRegion.h" #import <Foundation/NSGeometry.h> @@ -100,20 +101,13 @@ public: */ static bool SystemSupportsVibrancy(); - // The following are only public because otherwise ClearVibrantRegionFunc - // can't see them. - struct VibrantRegion { - LayoutDeviceIntRegion region; - nsTArray<NSView*> effectViews; - }; - void ClearVibrantRegion(const VibrantRegion& aVibrantRegion) const; - protected: - NSView* CreateEffectView(VibrancyType aType, NSRect aRect); + void ClearVibrantRegion(const LayoutDeviceIntRegion& aVibrantRegion) const; + NSView* CreateEffectView(VibrancyType aType); const nsChildView& mCoordinateConverter; NSView* mContainerView; - nsClassHashtable<nsUint32HashKey, VibrantRegion> mVibrantRegions; + nsClassHashtable<nsUint32HashKey, ViewRegion> mVibrantRegions; }; } // namespace mozilla diff --git a/widget/cocoa/VibrancyManager.mm b/widget/cocoa/VibrancyManager.mm index 26f9670..f12cac6 100644 --- a/widget/cocoa/VibrancyManager.mm +++ b/widget/cocoa/VibrancyManager.mm @@ -15,63 +15,25 @@ VibrancyManager::UpdateVibrantRegion(VibrancyType aType, const LayoutDeviceIntRegion& aRegion) { auto& vr = *mVibrantRegions.LookupOrAdd(uint32_t(aType)); - if (vr.region == aRegion) { - return; - } - - // We need to construct the required region using as many EffectViews - // as necessary. We try to update the geometry of existing views if - // possible, or create new ones or remove old ones if the number of - // rects in the region has changed. - - nsTArray<NSView*> viewsToRecycle; - vr.effectViews.SwapElements(viewsToRecycle); - // vr.effectViews is now empty. - - LayoutDeviceIntRegion::RectIterator iter(aRegion); - const LayoutDeviceIntRect* iterRect = nullptr; - for (size_t i = 0; (iterRect = iter.Next()) || i < viewsToRecycle.Length(); ++i) { - if (iterRect) { - NSView* view = nil; - NSRect rect = mCoordinateConverter.DevPixelsToCocoaPoints(*iterRect); - if (i < viewsToRecycle.Length()) { - view = viewsToRecycle[i]; - [view setFrame:rect]; - [view setNeedsDisplay:YES]; - } else { - view = CreateEffectView(aType, rect); - [mContainerView addSubview:view]; - - // Now that the view is in the view hierarchy, it'll be kept alive by - // its superview, so we can drop our reference. - [view release]; - } - vr.effectViews.AppendElement(view); - } else { - // Our new region is made of less rects than the old region, so we can - // remove this view. We only have a weak reference to it, so removing it - // from the view hierarchy will release it. - [viewsToRecycle[i] removeFromSuperview]; - } - } - - vr.region = aRegion; + vr.UpdateRegion(aRegion, mCoordinateConverter, mContainerView, ^() { + return this->CreateEffectView(aType); + }); } void VibrancyManager::ClearVibrantAreas() const { for (auto iter = mVibrantRegions.ConstIter(); !iter.Done(); iter.Next()) { - ClearVibrantRegion(*iter.UserData()); + ClearVibrantRegion(iter.UserData()->Region()); } } void -VibrancyManager::ClearVibrantRegion(const VibrantRegion& aVibrantRegion) const +VibrancyManager::ClearVibrantRegion(const LayoutDeviceIntRegion& aVibrantRegion) const { [[NSColor clearColor] set]; - LayoutDeviceIntRegion::RectIterator iter(aVibrantRegion.region); + LayoutDeviceIntRegion::RectIterator iter(aVibrantRegion); while (const LayoutDeviceIntRect* rect = iter.Next()) { NSRectFill(mCoordinateConverter.DevPixelsToCocoaPoints(*rect)); } @@ -97,15 +59,13 @@ AdjustedColor(NSColor* aFillColor, VibrancyType aType) NSColor* VibrancyManager::VibrancyFillColorForType(VibrancyType aType) { - const nsTArray<NSView*>& views = - mVibrantRegions.LookupOrAdd(uint32_t(aType))->effectViews; + NSView* view = mVibrantRegions.LookupOrAdd(uint32_t(aType))->GetAnyView(); - if (!views.IsEmpty() && - [views[0] respondsToSelector:@selector(_currentFillColor)]) { + if (view && [view respondsToSelector:@selector(_currentFillColor)]) { // -[NSVisualEffectView _currentFillColor] is the color that our view // would draw during its drawRect implementation, if we hadn't // disabled that. - return AdjustedColor([views[0] _currentFillColor], aType); + return AdjustedColor([view _currentFillColor], aType); } return [NSColor whiteColor]; } @@ -117,12 +77,10 @@ VibrancyManager::VibrancyFillColorForType(VibrancyType aType) NSColor* VibrancyManager::VibrancyFontSmoothingBackgroundColorForType(VibrancyType aType) { - const nsTArray<NSView*>& views = - mVibrantRegions.LookupOrAdd(uint32_t(aType))->effectViews; + NSView* view = mVibrantRegions.LookupOrAdd(uint32_t(aType))->GetAnyView(); - if (!views.IsEmpty() && - [views[0] respondsToSelector:@selector(fontSmoothingBackgroundColor)]) { - return [views[0] fontSmoothingBackgroundColor]; + if (view && [view respondsToSelector:@selector(fontSmoothingBackgroundColor)]) { + return [view fontSmoothingBackgroundColor]; } return [NSColor clearColor]; } @@ -250,14 +208,14 @@ enum { @end NSView* -VibrancyManager::CreateEffectView(VibrancyType aType, NSRect aRect) +VibrancyManager::CreateEffectView(VibrancyType aType) { static Class EffectViewClassWithoutForegroundVibrancy = CreateEffectViewClass(NO); static Class EffectViewClassWithForegroundVibrancy = CreateEffectViewClass(YES); Class EffectViewClass = HasVibrantForeground(aType) ? EffectViewClassWithForegroundVibrancy : EffectViewClassWithoutForegroundVibrancy; - NSView* effectView = [[EffectViewClass alloc] initWithFrame:aRect]; + NSView* effectView = [[EffectViewClass alloc] initWithFrame:NSZeroRect]; [effectView performSelector:@selector(setAppearance:) withObject:AppearanceForVibrancyType(aType)]; [effectView setState:VisualEffectStateForVibrancyType(aType)];

1 0

[tor-browser/tor-browser-45.4.0esr-6.0-1] Bug 1070710 - Use ViewRegion for window dragging. r=spohl
by gk＠torproject.org 04 Oct '16

04 Oct '16

commit 8b1f07f31cd04fb157bf99a9e2e600b4422f277f Author: Markus Stange <mstange(a)themasta.com> Date: Mon Jul 11 16:15:07 2016 -0400 Bug 1070710 - Use ViewRegion for window dragging. r=spohl MozReview-Commit-ID: 5x2XHl20P6a --HG-- extra : histedit_source : 56b671bffe9e6cd497ade61ff9beed2e3bf98e14 --- widget/cocoa/nsChildView.h | 5 +- widget/cocoa/nsChildView.mm | 117 ++++++++++++++------------------------------ 2 files changed, 40 insertions(+), 82 deletions(-) diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h index 8f07c70..e7bd6b0 100644 --- a/widget/cocoa/nsChildView.h +++ b/widget/cocoa/nsChildView.h @@ -28,6 +28,7 @@ #include "nsString.h" #include "nsIDragService.h" +#include "ViewRegion.h" #import <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> @@ -493,7 +494,7 @@ public: virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) override; virtual void UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion) override; - const LayoutDeviceIntRegion& GetDraggableRegion() { return mDraggableRegion; } + LayoutDeviceIntRegion GetNonDraggableRegion() { return mNonDraggableRegion.Region(); } virtual void ReportSwipeStarted(uint64_t aInputBlockId, bool aStartSwipe) override; @@ -659,7 +660,7 @@ protected: // uploaded to to mTitlebarImage. Main thread only. nsIntRegion mDirtyTitlebarRegion; - LayoutDeviceIntRegion mDraggableRegion; + mozilla::ViewRegion mNonDraggableRegion; // Cached value of [mView backingScaleFactor], to avoid sending two obj-c // messages (respondsToSelector, backingScaleFactor) every time we need to diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8dbeacc..1415664 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2720,12 +2720,41 @@ nsChildView::DoRemoteComposition(const LayoutDeviceIntRect& aRenderRect) [(ChildView*)mView postRender:mGLPresenter->GetNSOpenGLContext()]; } +@interface NonDraggableView : NSView +@end + +@implementation NonDraggableView +- (BOOL)mouseDownCanMoveWindow { return NO; } +- (NSView*)hitTest:(NSPoint)aPoint { return nil; } +@end + void nsChildView::UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion) { - if (mDraggableRegion != aRegion) { - mDraggableRegion = aRegion; - [(ChildView*)mView updateWindowDraggableState]; + // mView returns YES from mouseDownCanMoveWindow, so we need to put NSViews + // that return NO from mouseDownCanMoveWindow in the places that shouldn't + // be draggable. We can't do it the other way round because returning + // YES from mouseDownCanMoveWindow doesn't have any effect if there's a + // superview that returns NO. + LayoutDeviceIntRegion nonDraggable; + nonDraggable.Sub(LayoutDeviceIntRect(0, 0, mBounds.width, mBounds.height), aRegion); + + __block bool changed = false; + + // Suppress calls to setNeedsDisplay during NSView geometry changes. + ManipulateViewWithoutNeedingDisplay(mView, ^() { + changed = mNonDraggableRegion.UpdateRegion(nonDraggable, *this, mView, ^() { + return [[NonDraggableView alloc] initWithFrame:NSZeroRect]; + }); + }); + + if (changed) { + // Trigger an update to the window server. This will call + // mouseDownCanMoveWindow. + // Doing this manually is only necessary because we're suppressing + // setNeedsDisplay calls above. + [[mView window] setMovableByWindowBackground:NO]; + [[mView window] setMovableByWindowBackground:YES]; } } @@ -3566,8 +3595,10 @@ NSEvent* gLastDragMouseDownEvent = nil; - (BOOL)mouseDownCanMoveWindow { - // Return YES so that _regionForOpaqueDescendants gets called, where the - // actual draggable region will be assembled. + // Return YES so that parts of this view can be draggable. The non-draggable + // parts will be covered by NSViews that return NO from + // mouseDownCanMoveWindow and thus override draggability from the inside. + // These views are assembled in nsChildView::UpdateWindowDraggingRegion. return YES; } @@ -4572,7 +4603,7 @@ NSEvent* gLastDragMouseDownEvent = nil; CGFloat locationInTitlebar = [[self window] frame].size.height - [theEvent locationInWindow].y; LayoutDeviceIntPoint pos = geckoEvent.refPoint; if (!defaultPrevented && [theEvent clickCount] == 2 && - mGeckoChild->GetDraggableRegion().Contains(pos.x, pos.y) && + !mGeckoChild->GetNonDraggableRegion().Contains(pos.x, pos.y) && [[self window] isKindOfClass:[ToolbarWindow class]] && (locationInTitlebar < [(ToolbarWindow*)[self window] titlebarHeight] || locationInTitlebar < [(ToolbarWindow*)[self window] unifiedToolbarHeight])) { @@ -4607,80 +4638,6 @@ NSEvent* gLastDragMouseDownEvent = nil; mGeckoChild->DispatchEvent(&event, status); } -- (void)updateWindowDraggableState -{ - // Trigger update to the window server. - [[self window] setMovableByWindowBackground:NO]; - [[self window] setMovableByWindowBackground:YES]; -} - -// aRect is in view coordinates relative to this NSView. -- (CGRect)convertToFlippedWindowCoordinates:(NSRect)aRect -{ - // First, convert the rect to regular window coordinates... - NSRect inWindowCoords = [self convertRect:aRect toView:nil]; - // ... and then flip it again because window coordinates have their origin - // in the bottom left corner, and we need it to be in the top left corner. - inWindowCoords.origin.y = [[self window] frame].size.height - NSMaxY(inWindowCoords); - return NSRectToCGRect(inWindowCoords); -} - -static CGSRegionObj -NewCGSRegionFromRegion(const LayoutDeviceIntRegion& aRegion, - CGRect (^aRectConverter)(const LayoutDeviceIntRect&)) -{ - nsTArray<CGRect> rects; - LayoutDeviceIntRegion::RectIterator iter(aRegion); - for (;;) { - const LayoutDeviceIntRect* r = iter.Next(); - if (!r) { - break; - } - rects.AppendElement(aRectConverter(*r)); - } - - CGSRegionObj region; - CGSNewRegionWithRectList(rects.Elements(), rects.Length(), &region); - return region; -} - -// This function is called with forMove:YES to calculate the draggable region -// of the window which will be submitted to the window server. Window dragging -// is handled on the window server without calling back into our process, so it -// also works while our app is unresponsive. -- (CGSRegionObj)_regionForOpaqueDescendants:(NSRect)aRect forMove:(BOOL)aForMove -{ - if (!aForMove || !mGeckoChild) { - return [super _regionForOpaqueDescendants:aRect forMove:aForMove]; - } - - LayoutDeviceIntRect boundingRect = mGeckoChild->CocoaPointsToDevPixels(aRect); - - LayoutDeviceIntRegion opaqueRegion; - opaqueRegion.Sub(boundingRect, mGeckoChild->GetDraggableRegion()); - - return NewCGSRegionFromRegion(opaqueRegion, ^(const LayoutDeviceIntRect& r) { - return [self convertToFlippedWindowCoordinates:mGeckoChild->DevPixelsToCocoaPoints(r)]; - }); -} - -// Starting with 10.10, in addition to the traditional -// -[NSView _regionForOpaqueDescendants:forMove:] method, there's a new form with -// an additional forUnderTitlebar argument, which is sometimes called instead of -// the old form. We need to override the new variant as well. -- (CGSRegionObj)_regionForOpaqueDescendants:(NSRect)aRect - forMove:(BOOL)aForMove - forUnderTitlebar:(BOOL)aForUnderTitlebar -{ - if (!aForMove || !mGeckoChild) { - return [super _regionForOpaqueDescendants:aRect - forMove:aForMove - forUnderTitlebar:aForUnderTitlebar]; - } - - return [self _regionForOpaqueDescendants:aRect forMove:aForMove]; -} - - (void)handleMouseMoved:(NSEvent*)theEvent { NS_OBJC_BEGIN_TRY_ABORT_BLOCK;

1 0

[tor-browser/tor-browser-45.4.0esr-6.0-1] Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl
by gk＠torproject.org 04 Oct '16

04 Oct '16

commit 95b008b232fb75f09541ac43e3d1ef5482ad2590 Author: Markus Stange <mstange(a)themasta.com> Date: Sat Jul 16 17:07:45 2016 -0400 Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl MozReview-Commit-ID: RrVzLcv27T --HG-- extra : amend_source : d14dc262bf300a81feaf03954d5783ea1c7451cb extra : histedit_source : aa39b53c122a719a5181b5a41d5351bbdf04cbd8 --- widget/cocoa/ViewRegion.h | 53 ++++++++++++++++++++++++++++++++ widget/cocoa/ViewRegion.mm | 70 +++++++++++++++++++++++++++++++++++++++++++ widget/cocoa/moz.build | 1 + widget/cocoa/nsScreenCocoa.mm | 4 +-- 4 files changed, 126 insertions(+), 2 deletions(-) diff --git a/widget/cocoa/ViewRegion.h b/widget/cocoa/ViewRegion.h new file mode 100644 index 0000000..a8efcca --- /dev/null +++ b/widget/cocoa/ViewRegion.h @@ -0,0 +1,53 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef ViewRegion_h +#define ViewRegion_h + +#include "Units.h" +#include "nsTArray.h" + +@class NSView; + +namespace mozilla { + +/** + * Manages a set of NSViews to cover a LayoutDeviceIntRegion. + */ +class ViewRegion { +public: + ~ViewRegion(); + + mozilla::LayoutDeviceIntRegion Region() { return mRegion; } + + /** + * Update the region. + * @param aRegion The new region. + * @param aCoordinateConverter The nsChildView to use for converting + * LayoutDeviceIntRect device pixel coordinates into Cocoa NSRect coordinates. + * @param aContainerView The view that's going to be the superview of the + * NSViews which will be created for this region. + * @param aViewCreationCallback A block that instantiates new NSViews. + * @return Whether or not the region changed. + */ + bool UpdateRegion(const mozilla::LayoutDeviceIntRegion& aRegion, + const nsChildView& aCoordinateConverter, + NSView* aContainerView, + NSView* (^aViewCreationCallback)()); + + /** + * Return an NSView from the region, if there is any. + */ + NSView* GetAnyView() { return mViews.Length() > 0 ? mViews[0] : nil; } + +private: + mozilla::LayoutDeviceIntRegion mRegion; + nsTArray<NSView*> mViews; +}; + +} // namespace mozilla + +#endif // ViewRegion_h diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm new file mode 100644 index 0000000..3459849 --- /dev/null +++ b/widget/cocoa/ViewRegion.mm @@ -0,0 +1,70 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "ViewRegion.h" +#import <Cocoa/Cocoa.h> + +using namespace mozilla; + +ViewRegion::~ViewRegion() +{ + for (size_t i = 0; i < mViews.Length(); i++) { + [mViews[i] removeFromSuperview]; + } +} + +bool +ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion, + const nsChildView& aCoordinateConverter, + NSView* aContainerView, + NSView* (^aViewCreationCallback)()) +{ + if (mRegion == aRegion) { + return false; + } + + // We need to construct the required region using as many EffectViews + // as necessary. We try to update the geometry of existing views if + // possible, or create new ones or remove old ones if the number of + // rects in the region has changed. + + nsTArray<NSView*> viewsToRecycle; + mViews.SwapElements(viewsToRecycle); + // The mViews array is now empty. + + LayoutDeviceIntRegion::RectIterator iter(aRegion); + const LayoutDeviceIntRect* iterRect = nullptr; + for (size_t i = 0; (iterRect = iter.Next()) || i < viewsToRecycle.Length(); ++i) { + if (iterRect) { + NSView* view = nil; + NSRect rect = aCoordinateConverter.DevPixelsToCocoaPoints(*iterRect); + if (i < viewsToRecycle.Length()) { + view = viewsToRecycle[i]; + } else { + view = aViewCreationCallback(); + [aContainerView addSubview:view]; + + // Now that the view is in the view hierarchy, it'll be kept alive by + // its superview, so we can drop our reference. + [view release]; + } + if (!NSEqualRects(rect, [view frame])) { + [view setFrame:rect]; + } + [view setNeedsDisplay:YES]; + mViews.AppendElement(view); + iter.Next(); + } else { + // Our new region is made of fewer rects than the old region, so we can + // remove this view. We only have a weak reference to it, so removing it + // from the view hierarchy will release it. + [viewsToRecycle[i] removeFromSuperview]; + } + } + + mRegion = aRegion; + return true; +} diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build index aa8bfac..21b9369 100644 --- a/widget/cocoa/moz.build +++ b/widget/cocoa/moz.build @@ -58,6 +58,7 @@ UNIFIED_SOURCES += [ 'SwipeTracker.mm', 'TextInputHandler.mm', 'VibrancyManager.mm', + 'ViewRegion.mm', 'WidgetTraceEvent.mm', ] diff --git a/widget/cocoa/nsScreenCocoa.mm b/widget/cocoa/nsScreenCocoa.mm index 1b72bbf..bd3eef3 100644 --- a/widget/cocoa/nsScreenCocoa.mm +++ b/widget/cocoa/nsScreenCocoa.mm @@ -44,7 +44,7 @@ nsScreenCocoa::GetRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t { NSRect frame = [mScreen frame]; - LayoutDeviceIntRect r = + mozilla::LayoutDeviceIntRect r = nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor()); *outX = r.x; @@ -60,7 +60,7 @@ nsScreenCocoa::GetAvailRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int { NSRect frame = [mScreen visibleFrame]; - LayoutDeviceIntRect r = + mozilla::LayoutDeviceIntRect r = nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor()); *outX = r.x;

1 0

[tor-browser-bundle/master] Bug 20183: Only update OSX incremental mar files after adding code signing
by gk＠torproject.org 04 Oct '16

04 Oct '16

commit ac9c992cae2078c866b67341d929c61fe54f5437 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 4 01:51:30 2016 +0200 Bug 20183: Only update OSX incremental mar files after adding code signing Don't touch the incremental mar files for the other platforms when updating the OSX incremental mar files after adding code signing. We add a MAR_SKIP_EXISTING environment variable which indicates to the gen_incrementals script that existing incremental mar files should not be regenerated. The old incremental mar files for OSX are removed by the dmg2mar script. --- gitian/Makefile | 4 ++-- tools/update-responses/update_responses | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 59efd0e..f008834 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 - ../tools/update-responses/gen_incrementals release + 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 - ../tools/update-responses/gen_incrementals alpha + 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 b83ac29..7962f69 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -175,8 +175,12 @@ sub mar_filename { sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar"; - print "Starting $mar_file\n"; my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { + print "Skipping $mar_file\n"; + return; + } + print "Starting $mar_file\n"; my $download_url = "$config->{download}{mars_url}/$new_version"; my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0;

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl
by gk＠torproject.org 03 Oct '16

03 Oct '16

commit 4dc2922a3071f1789cb0078809e4b28c48fb3922 Author: Markus Stange <mstange(a)themasta.com> Date: Sat Jul 16 17:07:45 2016 -0400 Bug 1070710 - Add mozilla::ViewRegion which assembles a LayoutDeviceIntRegion as NSViews. r=spohl MozReview-Commit-ID: RrVzLcv27T --HG-- extra : amend_source : d14dc262bf300a81feaf03954d5783ea1c7451cb extra : histedit_source : aa39b53c122a719a5181b5a41d5351bbdf04cbd8 --- widget/cocoa/ViewRegion.h | 53 ++++++++++++++++++++++++++++++++ widget/cocoa/ViewRegion.mm | 70 +++++++++++++++++++++++++++++++++++++++++++ widget/cocoa/moz.build | 1 + widget/cocoa/nsScreenCocoa.mm | 4 +-- 4 files changed, 126 insertions(+), 2 deletions(-) diff --git a/widget/cocoa/ViewRegion.h b/widget/cocoa/ViewRegion.h new file mode 100644 index 0000000..a8efcca --- /dev/null +++ b/widget/cocoa/ViewRegion.h @@ -0,0 +1,53 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef ViewRegion_h +#define ViewRegion_h + +#include "Units.h" +#include "nsTArray.h" + +@class NSView; + +namespace mozilla { + +/** + * Manages a set of NSViews to cover a LayoutDeviceIntRegion. + */ +class ViewRegion { +public: + ~ViewRegion(); + + mozilla::LayoutDeviceIntRegion Region() { return mRegion; } + + /** + * Update the region. + * @param aRegion The new region. + * @param aCoordinateConverter The nsChildView to use for converting + * LayoutDeviceIntRect device pixel coordinates into Cocoa NSRect coordinates. + * @param aContainerView The view that's going to be the superview of the + * NSViews which will be created for this region. + * @param aViewCreationCallback A block that instantiates new NSViews. + * @return Whether or not the region changed. + */ + bool UpdateRegion(const mozilla::LayoutDeviceIntRegion& aRegion, + const nsChildView& aCoordinateConverter, + NSView* aContainerView, + NSView* (^aViewCreationCallback)()); + + /** + * Return an NSView from the region, if there is any. + */ + NSView* GetAnyView() { return mViews.Length() > 0 ? mViews[0] : nil; } + +private: + mozilla::LayoutDeviceIntRegion mRegion; + nsTArray<NSView*> mViews; +}; + +} // namespace mozilla + +#endif // ViewRegion_h diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm new file mode 100644 index 0000000..3459849 --- /dev/null +++ b/widget/cocoa/ViewRegion.mm @@ -0,0 +1,70 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "ViewRegion.h" +#import <Cocoa/Cocoa.h> + +using namespace mozilla; + +ViewRegion::~ViewRegion() +{ + for (size_t i = 0; i < mViews.Length(); i++) { + [mViews[i] removeFromSuperview]; + } +} + +bool +ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion, + const nsChildView& aCoordinateConverter, + NSView* aContainerView, + NSView* (^aViewCreationCallback)()) +{ + if (mRegion == aRegion) { + return false; + } + + // We need to construct the required region using as many EffectViews + // as necessary. We try to update the geometry of existing views if + // possible, or create new ones or remove old ones if the number of + // rects in the region has changed. + + nsTArray<NSView*> viewsToRecycle; + mViews.SwapElements(viewsToRecycle); + // The mViews array is now empty. + + LayoutDeviceIntRegion::RectIterator iter(aRegion); + const LayoutDeviceIntRect* iterRect = nullptr; + for (size_t i = 0; (iterRect = iter.Next()) || i < viewsToRecycle.Length(); ++i) { + if (iterRect) { + NSView* view = nil; + NSRect rect = aCoordinateConverter.DevPixelsToCocoaPoints(*iterRect); + if (i < viewsToRecycle.Length()) { + view = viewsToRecycle[i]; + } else { + view = aViewCreationCallback(); + [aContainerView addSubview:view]; + + // Now that the view is in the view hierarchy, it'll be kept alive by + // its superview, so we can drop our reference. + [view release]; + } + if (!NSEqualRects(rect, [view frame])) { + [view setFrame:rect]; + } + [view setNeedsDisplay:YES]; + mViews.AppendElement(view); + iter.Next(); + } else { + // Our new region is made of fewer rects than the old region, so we can + // remove this view. We only have a weak reference to it, so removing it + // from the view hierarchy will release it. + [viewsToRecycle[i] removeFromSuperview]; + } + } + + mRegion = aRegion; + return true; +} diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build index aa8bfac..21b9369 100644 --- a/widget/cocoa/moz.build +++ b/widget/cocoa/moz.build @@ -58,6 +58,7 @@ UNIFIED_SOURCES += [ 'SwipeTracker.mm', 'TextInputHandler.mm', 'VibrancyManager.mm', + 'ViewRegion.mm', 'WidgetTraceEvent.mm', ] diff --git a/widget/cocoa/nsScreenCocoa.mm b/widget/cocoa/nsScreenCocoa.mm index 1b72bbf..bd3eef3 100644 --- a/widget/cocoa/nsScreenCocoa.mm +++ b/widget/cocoa/nsScreenCocoa.mm @@ -44,7 +44,7 @@ nsScreenCocoa::GetRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int32_t { NSRect frame = [mScreen frame]; - LayoutDeviceIntRect r = + mozilla::LayoutDeviceIntRect r = nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor()); *outX = r.x; @@ -60,7 +60,7 @@ nsScreenCocoa::GetAvailRect(int32_t *outX, int32_t *outY, int32_t *outWidth, int { NSRect frame = [mScreen visibleFrame]; - LayoutDeviceIntRect r = + mozilla::LayoutDeviceIntRect r = nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor()); *outX = r.x;

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1070710 - Use ViewRegion for window dragging. r=spohl
by gk＠torproject.org 03 Oct '16

03 Oct '16

commit 7298e8412e723ff90d74dd06124f8b1ae7e12980 Author: Markus Stange <mstange(a)themasta.com> Date: Mon Jul 11 16:15:07 2016 -0400 Bug 1070710 - Use ViewRegion for window dragging. r=spohl MozReview-Commit-ID: 5x2XHl20P6a --HG-- extra : histedit_source : 56b671bffe9e6cd497ade61ff9beed2e3bf98e14 --- widget/cocoa/nsChildView.h | 5 +- widget/cocoa/nsChildView.mm | 117 ++++++++++++++------------------------------ 2 files changed, 40 insertions(+), 82 deletions(-) diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h index 8f07c70..e7bd6b0 100644 --- a/widget/cocoa/nsChildView.h +++ b/widget/cocoa/nsChildView.h @@ -28,6 +28,7 @@ #include "nsString.h" #include "nsIDragService.h" +#include "ViewRegion.h" #import <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> @@ -493,7 +494,7 @@ public: virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) override; virtual void UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion) override; - const LayoutDeviceIntRegion& GetDraggableRegion() { return mDraggableRegion; } + LayoutDeviceIntRegion GetNonDraggableRegion() { return mNonDraggableRegion.Region(); } virtual void ReportSwipeStarted(uint64_t aInputBlockId, bool aStartSwipe) override; @@ -659,7 +660,7 @@ protected: // uploaded to to mTitlebarImage. Main thread only. nsIntRegion mDirtyTitlebarRegion; - LayoutDeviceIntRegion mDraggableRegion; + mozilla::ViewRegion mNonDraggableRegion; // Cached value of [mView backingScaleFactor], to avoid sending two obj-c // messages (respondsToSelector, backingScaleFactor) every time we need to diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 8dbeacc..1415664 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2720,12 +2720,41 @@ nsChildView::DoRemoteComposition(const LayoutDeviceIntRect& aRenderRect) [(ChildView*)mView postRender:mGLPresenter->GetNSOpenGLContext()]; } +@interface NonDraggableView : NSView +@end + +@implementation NonDraggableView +- (BOOL)mouseDownCanMoveWindow { return NO; } +- (NSView*)hitTest:(NSPoint)aPoint { return nil; } +@end + void nsChildView::UpdateWindowDraggingRegion(const LayoutDeviceIntRegion& aRegion) { - if (mDraggableRegion != aRegion) { - mDraggableRegion = aRegion; - [(ChildView*)mView updateWindowDraggableState]; + // mView returns YES from mouseDownCanMoveWindow, so we need to put NSViews + // that return NO from mouseDownCanMoveWindow in the places that shouldn't + // be draggable. We can't do it the other way round because returning + // YES from mouseDownCanMoveWindow doesn't have any effect if there's a + // superview that returns NO. + LayoutDeviceIntRegion nonDraggable; + nonDraggable.Sub(LayoutDeviceIntRect(0, 0, mBounds.width, mBounds.height), aRegion); + + __block bool changed = false; + + // Suppress calls to setNeedsDisplay during NSView geometry changes. + ManipulateViewWithoutNeedingDisplay(mView, ^() { + changed = mNonDraggableRegion.UpdateRegion(nonDraggable, *this, mView, ^() { + return [[NonDraggableView alloc] initWithFrame:NSZeroRect]; + }); + }); + + if (changed) { + // Trigger an update to the window server. This will call + // mouseDownCanMoveWindow. + // Doing this manually is only necessary because we're suppressing + // setNeedsDisplay calls above. + [[mView window] setMovableByWindowBackground:NO]; + [[mView window] setMovableByWindowBackground:YES]; } } @@ -3566,8 +3595,10 @@ NSEvent* gLastDragMouseDownEvent = nil; - (BOOL)mouseDownCanMoveWindow { - // Return YES so that _regionForOpaqueDescendants gets called, where the - // actual draggable region will be assembled. + // Return YES so that parts of this view can be draggable. The non-draggable + // parts will be covered by NSViews that return NO from + // mouseDownCanMoveWindow and thus override draggability from the inside. + // These views are assembled in nsChildView::UpdateWindowDraggingRegion. return YES; } @@ -4572,7 +4603,7 @@ NSEvent* gLastDragMouseDownEvent = nil; CGFloat locationInTitlebar = [[self window] frame].size.height - [theEvent locationInWindow].y; LayoutDeviceIntPoint pos = geckoEvent.refPoint; if (!defaultPrevented && [theEvent clickCount] == 2 && - mGeckoChild->GetDraggableRegion().Contains(pos.x, pos.y) && + !mGeckoChild->GetNonDraggableRegion().Contains(pos.x, pos.y) && [[self window] isKindOfClass:[ToolbarWindow class]] && (locationInTitlebar < [(ToolbarWindow*)[self window] titlebarHeight] || locationInTitlebar < [(ToolbarWindow*)[self window] unifiedToolbarHeight])) { @@ -4607,80 +4638,6 @@ NSEvent* gLastDragMouseDownEvent = nil; mGeckoChild->DispatchEvent(&event, status); } -- (void)updateWindowDraggableState -{ - // Trigger update to the window server. - [[self window] setMovableByWindowBackground:NO]; - [[self window] setMovableByWindowBackground:YES]; -} - -// aRect is in view coordinates relative to this NSView. -- (CGRect)convertToFlippedWindowCoordinates:(NSRect)aRect -{ - // First, convert the rect to regular window coordinates... - NSRect inWindowCoords = [self convertRect:aRect toView:nil]; - // ... and then flip it again because window coordinates have their origin - // in the bottom left corner, and we need it to be in the top left corner. - inWindowCoords.origin.y = [[self window] frame].size.height - NSMaxY(inWindowCoords); - return NSRectToCGRect(inWindowCoords); -} - -static CGSRegionObj -NewCGSRegionFromRegion(const LayoutDeviceIntRegion& aRegion, - CGRect (^aRectConverter)(const LayoutDeviceIntRect&)) -{ - nsTArray<CGRect> rects; - LayoutDeviceIntRegion::RectIterator iter(aRegion); - for (;;) { - const LayoutDeviceIntRect* r = iter.Next(); - if (!r) { - break; - } - rects.AppendElement(aRectConverter(*r)); - } - - CGSRegionObj region; - CGSNewRegionWithRectList(rects.Elements(), rects.Length(), &region); - return region; -} - -// This function is called with forMove:YES to calculate the draggable region -// of the window which will be submitted to the window server. Window dragging -// is handled on the window server without calling back into our process, so it -// also works while our app is unresponsive. -- (CGSRegionObj)_regionForOpaqueDescendants:(NSRect)aRect forMove:(BOOL)aForMove -{ - if (!aForMove || !mGeckoChild) { - return [super _regionForOpaqueDescendants:aRect forMove:aForMove]; - } - - LayoutDeviceIntRect boundingRect = mGeckoChild->CocoaPointsToDevPixels(aRect); - - LayoutDeviceIntRegion opaqueRegion; - opaqueRegion.Sub(boundingRect, mGeckoChild->GetDraggableRegion()); - - return NewCGSRegionFromRegion(opaqueRegion, ^(const LayoutDeviceIntRect& r) { - return [self convertToFlippedWindowCoordinates:mGeckoChild->DevPixelsToCocoaPoints(r)]; - }); -} - -// Starting with 10.10, in addition to the traditional -// -[NSView _regionForOpaqueDescendants:forMove:] method, there's a new form with -// an additional forUnderTitlebar argument, which is sometimes called instead of -// the old form. We need to override the new variant as well. -- (CGSRegionObj)_regionForOpaqueDescendants:(NSRect)aRect - forMove:(BOOL)aForMove - forUnderTitlebar:(BOOL)aForUnderTitlebar -{ - if (!aForMove || !mGeckoChild) { - return [super _regionForOpaqueDescendants:aRect - forMove:aForMove - forUnderTitlebar:aForUnderTitlebar]; - } - - return [self _regionForOpaqueDescendants:aRect forMove:aForMove]; -} - - (void)handleMouseMoved:(NSEvent*)theEvent { NS_OBJC_BEGIN_TRY_ABORT_BLOCK;

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1070710 - Use ViewRegion for vibrant areas in VibrancyManager. r=spohl
by gk＠torproject.org 03 Oct '16

03 Oct '16

commit 037b95c9574e274274441a17d3f304d529417f7d Author: Markus Stange <mstange(a)themasta.com> Date: Mon Jul 11 14:47:05 2016 -0400 Bug 1070710 - Use ViewRegion for vibrant areas in VibrancyManager. r=spohl MozReview-Commit-ID: 5qVo59SV7QG --HG-- extra : histedit_source : 12980052172b2a858a52978fdd98dea28a9ea854 --- widget/cocoa/VibrancyManager.h | 14 +++------ widget/cocoa/VibrancyManager.mm | 70 +++++++++-------------------------------- 2 files changed, 18 insertions(+), 66 deletions(-) diff --git a/widget/cocoa/VibrancyManager.h b/widget/cocoa/VibrancyManager.h index 464a106..737fdc2 100644 --- a/widget/cocoa/VibrancyManager.h +++ b/widget/cocoa/VibrancyManager.h @@ -11,6 +11,7 @@ #include "nsClassHashtable.h" #include "nsRegion.h" #include "nsTArray.h" +#include "ViewRegion.h" #import <Foundation/NSGeometry.h> @@ -100,20 +101,13 @@ public: */ static bool SystemSupportsVibrancy(); - // The following are only public because otherwise ClearVibrantRegionFunc - // can't see them. - struct VibrantRegion { - LayoutDeviceIntRegion region; - nsTArray<NSView*> effectViews; - }; - void ClearVibrantRegion(const VibrantRegion& aVibrantRegion) const; - protected: - NSView* CreateEffectView(VibrancyType aType, NSRect aRect); + void ClearVibrantRegion(const LayoutDeviceIntRegion& aVibrantRegion) const; + NSView* CreateEffectView(VibrancyType aType); const nsChildView& mCoordinateConverter; NSView* mContainerView; - nsClassHashtable<nsUint32HashKey, VibrantRegion> mVibrantRegions; + nsClassHashtable<nsUint32HashKey, ViewRegion> mVibrantRegions; }; } // namespace mozilla diff --git a/widget/cocoa/VibrancyManager.mm b/widget/cocoa/VibrancyManager.mm index 26f9670..f12cac6 100644 --- a/widget/cocoa/VibrancyManager.mm +++ b/widget/cocoa/VibrancyManager.mm @@ -15,63 +15,25 @@ VibrancyManager::UpdateVibrantRegion(VibrancyType aType, const LayoutDeviceIntRegion& aRegion) { auto& vr = *mVibrantRegions.LookupOrAdd(uint32_t(aType)); - if (vr.region == aRegion) { - return; - } - - // We need to construct the required region using as many EffectViews - // as necessary. We try to update the geometry of existing views if - // possible, or create new ones or remove old ones if the number of - // rects in the region has changed. - - nsTArray<NSView*> viewsToRecycle; - vr.effectViews.SwapElements(viewsToRecycle); - // vr.effectViews is now empty. - - LayoutDeviceIntRegion::RectIterator iter(aRegion); - const LayoutDeviceIntRect* iterRect = nullptr; - for (size_t i = 0; (iterRect = iter.Next()) || i < viewsToRecycle.Length(); ++i) { - if (iterRect) { - NSView* view = nil; - NSRect rect = mCoordinateConverter.DevPixelsToCocoaPoints(*iterRect); - if (i < viewsToRecycle.Length()) { - view = viewsToRecycle[i]; - [view setFrame:rect]; - [view setNeedsDisplay:YES]; - } else { - view = CreateEffectView(aType, rect); - [mContainerView addSubview:view]; - - // Now that the view is in the view hierarchy, it'll be kept alive by - // its superview, so we can drop our reference. - [view release]; - } - vr.effectViews.AppendElement(view); - } else { - // Our new region is made of less rects than the old region, so we can - // remove this view. We only have a weak reference to it, so removing it - // from the view hierarchy will release it. - [viewsToRecycle[i] removeFromSuperview]; - } - } - - vr.region = aRegion; + vr.UpdateRegion(aRegion, mCoordinateConverter, mContainerView, ^() { + return this->CreateEffectView(aType); + }); } void VibrancyManager::ClearVibrantAreas() const { for (auto iter = mVibrantRegions.ConstIter(); !iter.Done(); iter.Next()) { - ClearVibrantRegion(*iter.UserData()); + ClearVibrantRegion(iter.UserData()->Region()); } } void -VibrancyManager::ClearVibrantRegion(const VibrantRegion& aVibrantRegion) const +VibrancyManager::ClearVibrantRegion(const LayoutDeviceIntRegion& aVibrantRegion) const { [[NSColor clearColor] set]; - LayoutDeviceIntRegion::RectIterator iter(aVibrantRegion.region); + LayoutDeviceIntRegion::RectIterator iter(aVibrantRegion); while (const LayoutDeviceIntRect* rect = iter.Next()) { NSRectFill(mCoordinateConverter.DevPixelsToCocoaPoints(*rect)); } @@ -97,15 +59,13 @@ AdjustedColor(NSColor* aFillColor, VibrancyType aType) NSColor* VibrancyManager::VibrancyFillColorForType(VibrancyType aType) { - const nsTArray<NSView*>& views = - mVibrantRegions.LookupOrAdd(uint32_t(aType))->effectViews; + NSView* view = mVibrantRegions.LookupOrAdd(uint32_t(aType))->GetAnyView(); - if (!views.IsEmpty() && - [views[0] respondsToSelector:@selector(_currentFillColor)]) { + if (view && [view respondsToSelector:@selector(_currentFillColor)]) { // -[NSVisualEffectView _currentFillColor] is the color that our view // would draw during its drawRect implementation, if we hadn't // disabled that. - return AdjustedColor([views[0] _currentFillColor], aType); + return AdjustedColor([view _currentFillColor], aType); } return [NSColor whiteColor]; } @@ -117,12 +77,10 @@ VibrancyManager::VibrancyFillColorForType(VibrancyType aType) NSColor* VibrancyManager::VibrancyFontSmoothingBackgroundColorForType(VibrancyType aType) { - const nsTArray<NSView*>& views = - mVibrantRegions.LookupOrAdd(uint32_t(aType))->effectViews; + NSView* view = mVibrantRegions.LookupOrAdd(uint32_t(aType))->GetAnyView(); - if (!views.IsEmpty() && - [views[0] respondsToSelector:@selector(fontSmoothingBackgroundColor)]) { - return [views[0] fontSmoothingBackgroundColor]; + if (view && [view respondsToSelector:@selector(fontSmoothingBackgroundColor)]) { + return [view fontSmoothingBackgroundColor]; } return [NSColor clearColor]; } @@ -250,14 +208,14 @@ enum { @end NSView* -VibrancyManager::CreateEffectView(VibrancyType aType, NSRect aRect) +VibrancyManager::CreateEffectView(VibrancyType aType) { static Class EffectViewClassWithoutForegroundVibrancy = CreateEffectViewClass(NO); static Class EffectViewClassWithForegroundVibrancy = CreateEffectViewClass(YES); Class EffectViewClass = HasVibrantForeground(aType) ? EffectViewClassWithForegroundVibrancy : EffectViewClassWithoutForegroundVibrancy; - NSView* effectView = [[EffectViewClass alloc] initWithFrame:aRect]; + NSView* effectView = [[EffectViewClass alloc] initWithFrame:NSZeroRect]; [effectView performSelector:@selector(setAppearance:) withObject:AppearanceForVibrancyType(aType)]; [effectView setState:VisualEffectStateForVibrancyType(aType)];

1 0

[tor-browser-bundle/master] Bug 20258: Make OS X Tor archive reproducible
by gk＠torproject.org 03 Oct '16

03 Oct '16

commit bfecaab2a6585e958bfbad9cd70fc9dfb5d2aad7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 29 12:34:53 2016 +0000 Bug 20258: Make OS X Tor archive reproducible --- gitian/descriptors/mac/gitian-tor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index fdc6afa..f2f4b01 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -33,6 +33,7 @@ script: | fi export TZ=UTC export LC_ALL=C + export REFERENCE_DATETIME umask 0022 # mkdir -p $INSTDIR/bin/

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1263334 - Check VBR header is valid before using it for duration calculations. r=esawin
by gk＠torproject.org 29 Sep '16

29 Sep '16

commit 2b459feaa5713f0b2c3d6595e677290cdcc8f9ca Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Sat Apr 9 20:38:45 2016 +0200 Bug 1263334 - Check VBR header is valid before using it for duration calculations. r=esawin MozReview-Commit-ID: KPrn5WeXUuF --HG-- extra : transplant_source : E%89%8Cs%1BG%28y%B82%3E%F8%CB%A8Q%B3%1F%EB%94%C2 This fixes our bug 20160. --- dom/media/MP3Demuxer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/media/MP3Demuxer.cpp b/dom/media/MP3Demuxer.cpp index 7780e57..88a20dcb 100644 --- a/dom/media/MP3Demuxer.cpp +++ b/dom/media/MP3Demuxer.cpp @@ -347,7 +347,7 @@ MP3TrackDemuxer::Duration() const { int64_t numFrames = 0; const auto numAudioFrames = mParser.VBRInfo().NumAudioFrames(); - if (numAudioFrames) { + if (mParser.VBRInfo().IsValid()) { // VBR headers don't include the VBR header frame. numFrames = numAudioFrames.value() + 1; } else {

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1291543 - [1.1] Accept partial information from VBR headers. r=jya
by gk＠torproject.org 29 Sep '16

29 Sep '16

commit 6715852d4487a4b3176c70f34358f5894954bbe2 Author: Eugen Sawin <esawin(a)mozilla.com> Date: Wed Aug 3 15:34:30 2016 +0200 Bug 1291543 - [1.1] Accept partial information from VBR headers. r=jya This fixes our bug 20160. --- dom/media/MP3Demuxer.cpp | 16 ++++++++++------ dom/media/MP3Demuxer.h | 5 ++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dom/media/MP3Demuxer.cpp b/dom/media/MP3Demuxer.cpp index 88a20dcb..773f996 100644 --- a/dom/media/MP3Demuxer.cpp +++ b/dom/media/MP3Demuxer.cpp @@ -347,7 +347,7 @@ MP3TrackDemuxer::Duration() const { int64_t numFrames = 0; const auto numAudioFrames = mParser.VBRInfo().NumAudioFrames(); - if (mParser.VBRInfo().IsValid()) { + if (mParser.VBRInfo().IsValid() && numAudioFrames.valueOr(0) + 1 > 1) { // VBR headers don't include the VBR header frame. numFrames = numAudioFrames.value() + 1; } else { @@ -513,7 +513,6 @@ MP3TrackDemuxer::GetNextFrame(const MediaByteRange& aRange) { if (mNumParsedFrames == 1) { // First frame parsed, let's read VBR info if available. - // TODO: read info that helps with seeking (bug 1163667). ByteReader reader(frame->Data(), frame->Size()); mParser.ParseVBRHeader(&reader); reader.DiscardRemaining(); @@ -534,7 +533,7 @@ MP3TrackDemuxer::OffsetFromFrameIndex(int64_t aFrameIndex) const { int64_t offset = 0; const auto& vbr = mParser.VBRInfo(); - if (vbr.IsValid()) { + if (vbr.IsComplete()) { offset = mFirstFrameOffset + aFrameIndex * vbr.NumBytes().value() / vbr.NumAudioFrames().value(); } else if (AverageFrameLength() > 0) { @@ -550,7 +549,7 @@ MP3TrackDemuxer::FrameIndexFromOffset(int64_t aOffset) const { int64_t frameIndex = 0; const auto& vbr = mParser.VBRInfo(); - if (vbr.IsValid()) { + if (vbr.IsComplete()) { frameIndex = static_cast<float>(aOffset - mFirstFrameOffset) / vbr.NumBytes().value() * vbr.NumAudioFrames().value(); frameIndex = std::min<int64_t>(vbr.NumAudioFrames().value(), frameIndex); @@ -626,7 +625,7 @@ MP3TrackDemuxer::AverageFrameLength() const { return static_cast<double>(mTotalFrameLen) / mNumParsedFrames; } const auto& vbr = mParser.VBRInfo(); - if (vbr.IsValid() && vbr.NumAudioFrames().value() + 1) { + if (vbr.IsComplete() && vbr.NumAudioFrames().value() + 1) { return static_cast<double>(vbr.NumBytes().value()) / (vbr.NumAudioFrames().value() + 1); } @@ -964,7 +963,12 @@ FrameParser::VBRHeader::IsTOCPresent() const { bool FrameParser::VBRHeader::IsValid() const { - return mType != NONE && + return mType != NONE; +} + +bool +FrameParser::VBRHeader::IsComplete() const { + return IsValid() && mNumAudioFrames.valueOr(0) > 0 && mNumBytes.valueOr(0) > 0 && // We don't care about the scale for any computations here. diff --git a/dom/media/MP3Demuxer.h b/dom/media/MP3Demuxer.h index d98cb73..54e380a 100644 --- a/dom/media/MP3Demuxer.h +++ b/dom/media/MP3Demuxer.h @@ -232,9 +232,12 @@ public: // Returns true iff Xing/Info TOC (table of contents) is present. bool IsTOCPresent() const; - // Returns whether the header is valid (containing reasonable field values). + // Returns whether the header is valid (type XING or VBRI). bool IsValid() const; + // Returns whether the header is valid and contains reasonable non-zero field values. + bool IsComplete() const; + // Returns the byte offset for the given duration percentage as a factor // (0: begin, 1.0: end). int64_t Offset(float aDurationFac) const;

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1236639 - [1.2] Avoid division by zero in MP3Demuxer. r=gerald
by gk＠torproject.org 29 Sep '16

29 Sep '16

commit 57bdfc8fded25c4d6952208e7e2561509d57f7c5 Author: Eugen Sawin <esawin(a)mozilla.com> Date: Thu Jan 7 22:45:11 2016 +0100 Bug 1236639 - [1.2] Avoid division by zero in MP3Demuxer. r=gerald This fixes our bug 20160. --- dom/media/MP3Demuxer.cpp | 22 +++++++++++++++++----- dom/media/MP3Demuxer.h | 3 +++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dom/media/MP3Demuxer.cpp b/dom/media/MP3Demuxer.cpp index 2ec5099..7780e57 100644 --- a/dom/media/MP3Demuxer.cpp +++ b/dom/media/MP3Demuxer.cpp @@ -204,7 +204,7 @@ MP3TrackDemuxer::FastSeek(const TimeUnit& aTime) { if (!aTime.ToMicroseconds()) { // Quick seek to the beginning of the stream. mFrameIndex = 0; - } else if (vbr.IsTOCPresent()) { + } else if (vbr.IsTOCPresent() && Duration().ToMicroseconds() > 0) { // Use TOC for more precise seeking. const float durationFrac = static_cast<float>(aTime.ToMicroseconds()) / Duration().ToMicroseconds(); @@ -356,7 +356,9 @@ MP3TrackDemuxer::Duration() const { // Unknown length, we can't estimate duration. return TimeUnit::FromMicroseconds(-1); } - numFrames = (streamLen - mFirstFrameOffset) / AverageFrameLength(); + if (AverageFrameLength() > 0) { + numFrames = (streamLen - mFirstFrameOffset) / AverageFrameLength(); + } } return Duration(numFrames); } @@ -532,7 +534,7 @@ MP3TrackDemuxer::OffsetFromFrameIndex(int64_t aFrameIndex) const { int64_t offset = 0; const auto& vbr = mParser.VBRInfo(); - if (vbr.NumBytes() && vbr.NumAudioFrames()) { + if (vbr.IsValid()) { offset = mFirstFrameOffset + aFrameIndex * vbr.NumBytes().value() / vbr.NumAudioFrames().value(); } else if (AverageFrameLength() > 0) { @@ -548,7 +550,7 @@ MP3TrackDemuxer::FrameIndexFromOffset(int64_t aOffset) const { int64_t frameIndex = 0; const auto& vbr = mParser.VBRInfo(); - if (vbr.NumBytes() && vbr.NumAudioFrames()) { + if (vbr.IsValid()) { frameIndex = static_cast<float>(aOffset - mFirstFrameOffset) / vbr.NumBytes().value() * vbr.NumAudioFrames().value(); frameIndex = std::min<int64_t>(vbr.NumAudioFrames().value(), frameIndex); @@ -624,7 +626,7 @@ MP3TrackDemuxer::AverageFrameLength() const { return static_cast<double>(mTotalFrameLen) / mNumParsedFrames; } const auto& vbr = mParser.VBRInfo(); - if (vbr.NumBytes() && vbr.NumAudioFrames()) { + if (vbr.IsValid() && vbr.NumAudioFrames().value() + 1) { return static_cast<double>(vbr.NumBytes().value()) / (vbr.NumAudioFrames().value() + 1); } @@ -960,6 +962,16 @@ FrameParser::VBRHeader::IsTOCPresent() const { return mTOC.size() == vbr_header::TOC_SIZE; } +bool +FrameParser::VBRHeader::IsValid() const { + return mType != NONE && + mNumAudioFrames.valueOr(0) > 0 && + mNumBytes.valueOr(0) > 0 && + // We don't care about the scale for any computations here. + // mScale < 101 && + true; +} + int64_t FrameParser::VBRHeader::Offset(float aDurationFac) const { if (!IsTOCPresent()) { diff --git a/dom/media/MP3Demuxer.h b/dom/media/MP3Demuxer.h index f42126d..d98cb73 100644 --- a/dom/media/MP3Demuxer.h +++ b/dom/media/MP3Demuxer.h @@ -232,6 +232,9 @@ public: // Returns true iff Xing/Info TOC (table of contents) is present. bool IsTOCPresent() const; + // Returns whether the header is valid (containing reasonable field values). + bool IsValid() const; + // Returns the byte offset for the given duration percentage as a factor // (0: begin, 1.0: end). int64_t Offset(float aDurationFac) const;

1 0

[tor-launcher/master] Tagging is not enough, we need version bumps as well
by gk＠torproject.org 28 Sep '16

28 Sep '16

commit 505321f54ced353ce3851baa2e65f81c6e9759a4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 28 08:36:03 2016 +0000 Tagging is not enough, we need version bumps as well --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 2eea493..48599a7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.8.5</em:version> + <em:version>0.2.11</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/hardened-builds] Don't hardcode mirror for py2exe
by gk＠torproject.org 27 Sep '16

27 Sep '16

commit 833ad0f63bfef186b12c1232328457e5d1b8017b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 27 08:49:20 2016 +0000 Don't hardcode mirror for py2exe --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 46aad1b..6ab0f2d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -140,7 +140,7 @@ ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 421dd28..e12110e 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -148,7 +148,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index a686402..2a78a8c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -127,7 +127,7 @@ ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… -PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1d598d4..99e476e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -151,7 +151,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE}

1 0

[tor-browser-bundle/maint-6.0] Don't hardcode mirror for py2exe
by gk＠torproject.org 27 Sep '16

27 Sep '16

commit cb3868eb1cc556bee8d0bf2d95d3ef3e9811b8a8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 27 08:49:20 2016 +0000 Don't hardcode mirror for py2exe --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 410b15b..16d9553 100755 --- a/gitian/versions +++ b/gitian/versions @@ -137,7 +137,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fe1eb9b..7efe5d8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -137,7 +137,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 87680b7..8452954 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -115,7 +115,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4db79f7..67c7d99 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -144,7 +144,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE}

1 0

[tor-browser-bundle/master] Don't hardcode mirror for py2exe
by gk＠torproject.org 27 Sep '16

27 Sep '16

commit 0c2bff224ef17491f465d502578bc91b43689d6f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 27 08:49:20 2016 +0000 Don't hardcode mirror for py2exe --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index febeb06..4ee6f20 100755 --- a/gitian/versions +++ b/gitian/versions @@ -141,7 +141,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6e92fcb..464f917 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -141,7 +141,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 6e5485e..8ac35ae 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -119,7 +119,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 295d507..3b90c88 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -148,7 +148,7 @@ PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAG… ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} -PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} +PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_PACKAGE} SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE}

1 0

[torbutton/master] Bug 20123: Remove code to enable remote jars at low security
by gk＠torproject.org 27 Sep '16

27 Sep '16

commit 958d858f568a39fac1e1769745ffad402ee87c84 Author: arthuredelstein(a)gmail.com <arthuredelstein(a)gmail.com> Date: Sun Sep 25 11:55:17 2016 -0700 Bug 20123: Remove code to enable remote jars at low security We'll also use add a patch to disable remote jars in tor-browser.git --- src/chrome/content/preferences.xul | 15 --------------- src/chrome/content/torbutton.js | 4 ---- src/chrome/locale/ar/torbutton.dtd | 2 -- src/chrome/locale/de/torbutton.dtd | 2 -- src/chrome/locale/en/torbutton.dtd | 2 -- src/chrome/locale/es/torbutton.dtd | 2 -- src/chrome/locale/eu/torbutton.dtd | 2 -- src/chrome/locale/fa/torbutton.dtd | 2 -- src/chrome/locale/fr/torbutton.dtd | 2 -- src/chrome/locale/it/torbutton.dtd | 2 -- src/chrome/locale/ja/torbutton.dtd | 2 -- src/chrome/locale/ko/torbutton.dtd | 2 -- src/chrome/locale/nl/torbutton.dtd | 2 -- src/chrome/locale/pl/torbutton.dtd | 2 -- src/chrome/locale/pt/torbutton.dtd | 2 -- src/chrome/locale/ru/torbutton.dtd | 2 -- src/chrome/locale/sv/torbutton.dtd | 2 -- src/chrome/locale/tr/torbutton.dtd | 2 -- src/chrome/locale/vi/torbutton.dtd | 2 -- src/chrome/locale/zh-CN/torbutton.dtd | 2 -- 20 files changed, 55 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 8474871..205c187 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -107,10 +107,6 @@ &torbutton.prefs.sec_html5_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> - &torbutton.prefs.sec_jar_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> &torbutton.prefs.sec_mathml_desc; </description> @@ -145,10 +141,6 @@ &torbutton.prefs.sec_html5_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> - &torbutton.prefs.sec_jar_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> &torbutton.prefs.sec_mathml_desc; </description> @@ -171,10 +163,6 @@ &torbutton.prefs.sec_html5_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> - &torbutton.prefs.sec_jar_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> &torbutton.prefs.sec_mathml_desc; </description> @@ -200,7 +188,6 @@ <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> <html:div>&torbutton.prefs.sec_svg_desc;</html:div> @@ -213,7 +200,6 @@ <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> </tooltip> @@ -223,7 +209,6 @@ <html:br></html:br> <html:div>&torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> </tooltip> <tooltip id="low_preview"> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bdcbc4d..e18c4e6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -88,7 +88,6 @@ var torbutton_unique_pref_observer = this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); this._branch.addObserver("extensions.torbutton", this, false); this._branch.addObserver("network.cookie", this, false); - this._branch.addObserver("network.jar", this, false); this._branch.addObserver("browser.privatebrowsing.autostart", this, false); this._branch.addObserver("javascript", this, false); this._branch.addObserver("gfx", this, false); @@ -108,7 +107,6 @@ var torbutton_unique_pref_observer = if (!this._branch) return; this._branch.removeObserver("extensions.torbutton", this); this._branch.removeObserver("network.cookie", this); - this._branch.removeObserver("network.jar", this); this._branch.removeObserver("browser.privatebrowsing.autostart", this); this._branch.removeObserver("javascript", this); this._branch.removeObserver("gfx", this); @@ -195,7 +193,6 @@ var torbutton_unique_pref_observer = case "javascript.options.typeinference": case "noscript.forbidMedia": case "media.webaudio.enabled": - case "network.jar.block-remote-files": case "mathml.disabled": case "javascript.options.baselinejit.content": case "noscript.forbidFonts": @@ -1835,7 +1832,6 @@ var torbutton_sec_ml_bool_prefs = { "javascript.options.typeinference" : false, "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, - "network.jar.block-remote-files" : true, "mathml.disabled" : true }; diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 0da10fd..b12013b 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "سكربت في بعض المواقع قد تعمل بشكل بطيئ"> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> <!ENTITY torbutton.prefs.sec_med_high "شبه عالٍ"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index c711ed2..670a33e 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Typinferenz, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT-Basis."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts können auf manchen Seiten langsamer laufen."> -<!ENTITY torbutton.prefs.sec_jar_desc "JAR-Dateien sind im Web extrem selten, können aber eine Quelle von XSS und anderen Attacken sein."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-Dateien sind sehr selten im Internet, aber sie können eine Quelle von XSS (Webseitenübergreifendes Skripting) und anderer Angriffe sein."> <!ENTITY torbutton.prefs.sec_mathml_desc "Manche Vorgänge zur Anzeige von mathematischen Gleichungen sind deaktiviert."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ist blockiert."> <!ENTITY torbutton.prefs.sec_med_high "oberes Mittel"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 81ca8f4..92b6eed 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -48,8 +48,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> <!ENTITY torbutton.prefs.sec_med_high "Medium-High"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 57f4be5..570abae 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantáneo optimizado), Type Inference (deducción del tipo de datos por el compilador), ASM.JS (JS intermedio para alto rendimiento de otros lenguajes)"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT (compilador JS instantáneo)"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Los scripts en algunos sitios puede que se ejecuten más lentamente."> -<!ENTITY torbutton.prefs.sec_jar_desc "Los ficheros JAR remotos están bloqueados."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "Los ficheros JAR son extremadamente raros en la web, pero pueden ser una fuente de ataques XSS y de otros tipos."> <!ENTITY torbutton.prefs.sec_mathml_desc "Algunos mecanismos de representación de ecuaciones matemáticas están deshabilitados."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML está deshabilitado."> <!ENTITY torbutton.prefs.sec_med_high "Medio-Alto"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index c92b7f5..5275cdd 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Urruneko JAR fitxategiak blokeatuta daude."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR fitxategiak oso bitxiak dira webean, baina XSS eta beste eraso batzuen jatorria izan daitezke."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ezgaituta dago."> <!ENTITY torbutton.prefs.sec_med_high "Ertaina-altua"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index a60c04d..f1413bb 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT در شروع مطالعه."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "اسکریپت هل در برخی از سایت ها ممکن است آهسته تر اجرا شود."> -<!ENTITY torbutton.prefs.sec_jar_desc "فایل های JAR از راه دور مسدود."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "فایل ها با پسوند JAR به ندرت در وب استفاده می شوند ، ولی می توانند مبدایی برای هک به روش XSS و دیگر حملات هکری شوند."> <!ENTITY torbutton.prefs.sec_mathml_desc "برخی مکانیسم ها نمایش معادلات ریاضی غیر فعال می باشد."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML غیر فعال است."> <!ENTITY torbutton.prefs.sec_med_high "متوسط - بالا"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 53bfb12..a6b0c1a 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "JIT ION, inférence de types, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT Baseline."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts sur certains sites peuvent être ralentis."> -<!ENTITY torbutton.prefs.sec_jar_desc "Les fichiers distants JAR sont bloqués."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "Les fichiers JAR sont extrêmement rares sur le Web, mais peuvent être une source d'attaques XSS et autres."> <!ENTITY torbutton.prefs.sec_mathml_desc "Quelques mécanismes d'affichage d'équations mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est désactivé."> <!ENTITY torbutton.prefs.sec_med_high "Moyennement haut"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 2ebeeff..423a9e3 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Gli scripts su alcuni siti possono girare più lenti."> -<!ENTITY torbutton.prefs.sec_jar_desc "I file JAR remoti sono bloccati."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "I file JAR sono molto rari nel web, ma possono essere fonte di XSS o altri attacchi."> <!ENTITY torbutton.prefs.sec_mathml_desc "Alcuni meccanismi di visualizzazione di equazioni matematiche sono disabilitati."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML è disabilitato."> <!ENTITY torbutton.prefs.sec_med_high "Medio-Alto"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index ad2d2ea..56e1fb2 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、型インターフェイス、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "基本的なJIT。"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "サイトによってはスクリプトの動作が遅くなります。"> -<!ENTITY torbutton.prefs.sec_jar_desc "リモートの JAR ファイルがブロックされます。"> -<!ENTITY torbutton.prefs.sec_jar_tooltip "Web 上で JAR ファイルが利用されることは稀ですが、 XSS などに使われることがあります。"> <!ENTITY torbutton.prefs.sec_mathml_desc "数式を表示するためのいくつかの機能が無効化されます。"> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML が無効化されます。"> <!ENTITY torbutton.prefs.sec_med_high "高中"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 0d19bd0..4a86795 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline (베이스라인) JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "일부 사이트의 스크립트 동작이 느려질 수 있습니다."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML가 비활성화 되었습니다."> <!ENTITY torbutton.prefs.sec_med_high "중간 높음"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 66ae979..3c254a3 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts kunnen op sommige websites trager zijn."> -<!ENTITY torbutton.prefs.sec_jar_desc "Externe JAR bestanden worden geblokkeerd."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-bestanden zijn uiterst zeldzaam op het web, maar kan een bron van XSS en andere attacks"> <!ENTITY torbutton.prefs.sec_mathml_desc "Sommige mechanismen van het weergeven van wiskundige vergelijkingen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is uitgeschakeld."> <!ENTITY torbutton.prefs.sec_med_high "Medium-Hoog"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 0006944..9a433c3 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skrypty na niektórych stronach mogą działać wolniej."> -<!ENTITY torbutton.prefs.sec_jar_desc "Zdalne pliki JAR są blokowane."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "Pliki JAR są bardzo rzadkim typem plików w internecie. Mogą być one źródłem ataków XSS i innych."> <!ENTITY torbutton.prefs.sec_mathml_desc "Niektóre mechanizmy wyświetlania równań matematycznych są wyłączone."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML jest wyłączony."> <!ENTITY torbutton.prefs.sec_med_high "Średni-Wysoki"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 9e4dcf7..921abb5 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de base JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sites poderão funcionar muito lentamente."> -<!ENTITY torbutton.prefs.sec_jar_desc "Os ficheiros JAR remotos estão bloqueados."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "Os ficheiros JAR são extremamente raros na Web, mas podem ser uma fonte de XSS e outros ataques."> <!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos de visualização de equações matemáticas estão desativados."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML está desativado."> <!ENTITY torbutton.prefs.sec_med_high "Médio-Alto"> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 49b9d98..3f5d602 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Базовый JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Сценарии на некоторых сайтах могут работать медленнее."> -<!ENTITY torbutton.prefs.sec_jar_desc "Сторонние JAR файлы заблокированы."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR файлы крайне редки в Интернете, но могут быть источником XSS и других атак."> <!ENTITY torbutton.prefs.sec_mathml_desc "Некоторые механизмы отображения математических уравнений отключены."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML отключен."> <!ENTITY torbutton.prefs.sec_med_high "Умеренно высокий"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index f65b669..a2ca4c8 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbsidor kan gå långsammare."> -<!ENTITY torbutton.prefs.sec_jar_desc "JAR-filer blockeras."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-filer är extremt ovanliga på webben men kan innehålla XSS och andra typer av attacker."> <!ENTITY torbutton.prefs.sec_mathml_desc "Vissa funktioner för att visa matematiska formler är avaktiverade."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML är inaktiverat."> <!ENTITY torbutton.prefs.sec_med_high "Medium-hög"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index f0ed069..b22c065 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Sınır Çizgi JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> -<!ENTITY torbutton.prefs.sec_jar_desc "Uzak JAR dosyaları engellenir."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR dosyalarına ağda oldukça ender rastlanır, ancak XSS ve diğer saldırıların kaynağı olabilir."> <!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_med_high "Orta-Yüksek"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index d4157be..cca65c7 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> <!ENTITY torbutton.prefs.sec_med_high "Medium-High"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 3146ce3..652c1c6 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -42,8 +42,6 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会暂缓执行。"> -<!ENTITY torbutton.prefs.sec_jar_desc "禁用远程 JAR 文件。"> -<!ENTITY torbutton.prefs.sec_jar_tooltip "网站上很少出现 JAR 文件，但可能成为 XSS 及其他攻击的源头。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "禁用 MathML。"> <!ENTITY torbutton.prefs.sec_med_high "中高">

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 20123: Always block remote jar files
by gk＠torproject.org 27 Sep '16

27 Sep '16

commit 01d246a535b34248b06e03c4f475387e75a172c3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 26 16:15:00 2016 +0000 Bug 20123: Always block remote jar files --- browser/app/profile/000-tor-browser.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a5c0e7f..13af485 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -289,9 +289,8 @@ pref("layers.acceleration.disabled", true); pref("media.audio_data.enabled", false); // If true, remote JAR files will not be opened, regardless of content type -// Patch done by Jeff Gibat (iSEC). We bind it to the security slider but allow -// jar: in default mode. -pref("network.jar.block-remote-files", false); +// Patch written by Jeff Gibat (iSEC). +pref("network.jar.block-remote-files", true); // Enable TLS 1.1 and 1.2: // https://trac.torproject.org/projects/tor/ticket/11253

1 0

[tor-browser-bundle/hardened-builds] Bug 19838: Adding new default obfs4 bridge Lisbeth.
by gk＠torproject.org 27 Sep '16

27 Sep '16

commit 84cf9fff2adaf61e94c6f90e7e0c2ff3b04f7279 Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Tue Sep 20 15:39:11 2016 -0700 Bug 19838: Adding new default obfs4 bridge Lisbeth. Another new bridge NX01 is present but commented out. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f3b9d9f..2537625 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73 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.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"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-6.0] Bug 19838: Adding new default obfs4 bridge Lisbeth.
by gk＠torproject.org 27 Sep '16

27 Sep '16

commit 585e546d589a89366a41ea54f268e703cdf89481 Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Tue Sep 20 15:39:11 2016 -0700 Bug 19838: Adding new default obfs4 bridge Lisbeth. Another new bridge NX01 is present but commented out. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f3b9d9f..2537625 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73 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.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"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 19838: Adding new default obfs4 bridge Lisbeth.
by gk＠torproject.org 27 Sep '16

27 Sep '16

commit 7e0acfc779d22d5e4a1c5efdca9c75f082021f67 Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Tue Sep 20 15:39:11 2016 -0700 Bug 19838: Adding new default obfs4 bridge Lisbeth. Another new bridge NX01 is present but commented out. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f3b9d9f..2537625 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,9 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73 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.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"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/hardened-builds] Bumping OpenSSL for nightlies again
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 5f850eb9ff3334a75efe83904ecd307798b41ad3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 12:13:22 2016 +0000 Bumping OpenSSL for nightlies again --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d99711c..1d598d4 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -52,7 +52,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2i +OPENSSL_VER=1.0.2j GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -107,7 +107,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f +OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser-bundle/master] Bumping OpenSSL for nightlies again
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 143d1c0bbda2408993790e160975eaf95d7ad145 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 12:13:22 2016 +0000 Bumping OpenSSL for nightlies again --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c435a47..295d507 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -51,7 +51,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2i +OPENSSL_VER=1.0.2j GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f +OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[torbutton/master] Bug 17904: Allow P&S Settings dialog to resize
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit b1adcba17a96a925345001d4da69cb71b469e3ed Author: arthuredelstein(a)gmail.com <arthuredelstein(a)gmail.com> Date: Thu Sep 15 16:23:58 2016 -0700 Bug 17904: Allow P&S Settings dialog to resize If the dialog is too small to show all descriptions, then the descriptions text area will show a scrollbar. --- src/chrome/content/preferences.js | 4 -- src/chrome/content/preferences.xul | 99 ++++++++++++++++++++------------------ 2 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index fb5aafd..ee81568 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -9,7 +9,6 @@ const Cc = Components.classes, Ci = Components.interfaces; function torbutton_prefs_init(doc) { torbutton_log(2, "called prefs_init()"); - sizeToContent(); var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); @@ -184,9 +183,6 @@ function torbutton_set_slider_text(doc, custom) { doc.getElementById("desc_high").collapsed = true; break; } - // It can happen that the descriptions of the slider settings consume more - // space than originally allocated. Adapt the dialog size accordingly. - sizeToContent(); } function torbutton_prefs_check_disk() { diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index baa6093..8474871 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -11,13 +11,15 @@ buttons="accept,cancel,extra1" buttonlabelextra1="&torbutton.prefs.restore_defaults;" ondialogextra1="torbutton_prefs_reset_defaults();" - persist="screenX screenY" + persist="screenX screenY width height" onload="torbutton_prefs_init(document)" + align="stretch" + pack="center" ondialogaccept="torbutton_prefs_save(document)" > <script type="application/x-javascript" src="torbutton_util.js"/> <script type="application/x-javascript" src="preferences.js"/> - <vbox> + <vbox flex="1" align="stretch"> <groupbox> <caption label="&torbutton.prefs.priv_caption;" tooltiptext="&torbutton.prefs.priv_caption_tooltip;"/> @@ -35,49 +37,58 @@ label="&torbutton.prefs.resist_fingerprinting;" tooltiptext="&torbutton.prefs.resist_fingerprinting_tooltip;"/> </groupbox> - <spacer flex="1"/> - <groupbox> - <caption label="&torbutton.prefs.sec_caption;" - tooltiptext="&torbutton.prefs.sec_caption_tooltip;"/> - <hbox> - <vbox height="200"> - <scale id="torbutton_sec_slider" flex="1" min="1" max="4" - movetoclick="true" orient="vertical"/> - </vbox> - <vbox height="200"> - <hbox flex="1" align="start"> - <description id="torbutton_sec_high" - tooltip="high_preview" - onclick="torbutton_toggle_slider(document, 1);"> - &torbutton.prefs.sec_high; - </description> + <groupbox align="stretch" flex="1">  + <caption label="&torbutton.prefs.sec_caption;"/> + <hbox flex="1" align="stretch"> + <vbox> + <hbox height="200"> + <vbox> + <scale id="torbutton_sec_slider" flex="1" min="1" max="4" + movetoclick="true" orient="vertical"/> + </vbox> + <vbox> + <hbox flex="1" align="start"> + <description id="torbutton_sec_high" + tooltip="high_preview" + onclick="torbutton_toggle_slider(document, 1);"> + &torbutton.prefs.sec_high; + </description> + </hbox> + <hbox flex="1" align="center"> + <description id="torbutton_sec_med_high" + tooltip="mh_preview" + onclick="torbutton_toggle_slider(document, 2);"> + &torbutton.prefs.sec_med_high; + </description> + </hbox> + <hbox flex="1" align="center"> + <description id="torbutton_sec_med_low" + tooltip="ml_preview" + onclick="torbutton_toggle_slider(document, 3);"> + &torbutton.prefs.sec_med_low; + </description> + </hbox> + <hbox flex="1" align="end"> + <description id="torbutton_sec_low" + tooltip="low_preview" + onclick="torbutton_toggle_slider(document, 4);"> + &torbutton.prefs.sec_low; + </description> + </hbox> + </vbox> </hbox> - <hbox flex="1" align="center"> - <description id="torbutton_sec_med_high" - tooltip="mh_preview" - onclick="torbutton_toggle_slider(document, 2);"> - &torbutton.prefs.sec_med_high; - </description> - </hbox> - <hbox flex="1" align="center"> - <description id="torbutton_sec_med_low" - tooltip="ml_preview" - onclick="torbutton_toggle_slider(document, 3);"> - &torbutton.prefs.sec_med_low; - </description> - </hbox> - <hbox flex="1" align="end"> - <description id="torbutton_sec_low" - tooltip="low_preview" - onclick="torbutton_toggle_slider(document, 4);"> - &torbutton.prefs.sec_low; - </description> + <hbox> +  + <checkbox id="torbutton_sec_custom" flex="1" + oncommand="torbutton_set_slider_text(document, event.target.checked);" + label="&torbutton.prefs.sec_custom;"/> </hbox> </vbox> - <spacer flex="1"/>  - <vbox flex="1" width="300"> + <vbox flex="1" width="300" style="overflow: auto;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight"> @@ -179,14 +190,6 @@ </vbox> </vbox> </hbox> - <hbox> -  - <checkbox id="torbutton_sec_custom" flex="1" - oncommand="torbutton_set_slider_text(document, event.target.checked);" - label="&torbutton.prefs.sec_custom;"/> - </hbox> </groupbox> </vbox>

1 0

[torbutton/master] Bug 17546: Tooltips for Privacy Settings checkboxes
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit c8a04a79d7371b30622c727366ba5584569d4ffb Author: arthuredelstein(a)gmail.com <arthuredelstein(a)gmail.com> Date: Thu Sep 22 17:00:40 2016 -0700 Bug 17546: Tooltips for Privacy Settings checkboxes --- src/chrome/content/preferences.xul | 20 +++++++++++++------- src/chrome/locale/en/torbutton.dtd | 6 ++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 8ea448c..baa6093 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -19,20 +19,26 @@ <script type="application/x-javascript" src="preferences.js"/> <vbox> <groupbox> - <caption label="&torbutton.prefs.priv_caption;"/> + <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();"/> + oncommand="torbutton_prefs_check_disk();" + tooltiptext="&torbutton.prefs.block_disk_tooltip;"/> <checkbox id="torbutton_blockPlugins" - label="&torbutton.prefs.block_plugins;"/> + label="&torbutton.prefs.block_plugins;" + tooltiptext="&torbutton.prefs.block_plugins_tooltip;"/> <checkbox id="torbutton_restrictThirdParty" - label="&torbutton.prefs.restrict_thirdparty;"/> + label="&torbutton.prefs.restrict_thirdparty;" + tooltiptext="&torbutton.prefs.restrict_thirdparty_tooltip;"/> <checkbox id="torbutton_resistFingerprinting" - label="&torbutton.prefs.resist_fingerprinting;"/> + label="&torbutton.prefs.resist_fingerprinting;" + tooltiptext="&torbutton.prefs.resist_fingerprinting_tooltip;"/> </groupbox> <spacer flex="1"/> <groupbox> - <caption label="&torbutton.prefs.sec_caption;"/> + <caption label="&torbutton.prefs.sec_caption;" + tooltiptext="&torbutton.prefs.sec_caption_tooltip;"/> <hbox> <vbox height="200"> <scale id="torbutton_sec_slider" flex="1" min="1" max="4" @@ -168,7 +174,7 @@ &torbutton.prefs.sec_low_desc; </description> <description class="slider-text-size"> - &torbutton.prefs.sec_low_usable_desc; + &torbutton.prefs.sec_low_usable_desc; </description> </vbox> </vbox> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 4bca4c7..81ca8f4 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -25,11 +25,17 @@ <!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.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)"> +<!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"> +<!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."> <!ENTITY torbutton.prefs.sec_low "Low (default)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled.">

1 0

[tor-browser-bundle/hardened-builds] Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 36842fddafcf79bab6911def2ec4133826bc28f9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Sep 19 12:02:21 2016 -0400 Bug 15852: Remove/synchronize Torbutton SOCKS pref logic Remove from extension-overrides.js the Torbutton preferences that are no longer used. --- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- 3 files changed, 27 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true);

1 0

[tor-browser-bundle/master] Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 0a5e21b00533960317352ac27db996258544eac6 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Sep 19 12:02:21 2016 -0400 Bug 15852: Remove/synchronize Torbutton SOCKS pref logic Remove from extension-overrides.js the Torbutton preferences that are no longer used. --- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- .../Browser/profile.default/preferences/extension-overrides.js | 9 --------- 3 files changed, 27 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 865398e..3ccab99 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -2,15 +2,6 @@ # Tor Browser Bundle # Do not edit this file. -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); pref("extensions.https_everywhere.toolbar_hint_shown", true);

1 0

[tor-browser-bundle/hardened-builds] Nightly version bumps
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit ef8d6d484d0bbd4692e882cd1f2eeda1efe437d0 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 07:52:19 2016 +0000 Nightly version bumps Tor Browser 45.4.0 and OpenSSL 1.0.2i --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 99d7d7e..d99711c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.3.0esr +FIREFOX_VERSION=45.4.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -52,7 +52,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2h +OPENSSL_VER=1.0.2i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -107,7 +107,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 +OPENSSL_HASH=9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser-bundle/master] Nightly version bumps
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 97aa7318fce7df592d2c25955f2e76cff6f3480c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 07:52:19 2016 +0000 Nightly version bumps Tor Browser 45.4.0 and OpenSSL 1.0.2i --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index fe6c738..c435a47 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.3.0esr +FIREFOX_VERSION=45.4.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -51,7 +51,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.2h +OPENSSL_VER=1.0.2i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 +OPENSSL_HASH=9287487d11c9545b6efb287cdb70535d4e9b284dd10d51441d9b9963d000de6f GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser-bundle/master] Fold in 6.5a3-hardened changelog
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit 71a5fe16d317c26b2391739b56afb6e99063d304 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 07:39:40 2016 +0000 Fold in 6.5a3-hardened changelog --- Bundle-Data/Docs/ChangeLog.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 881f25f..100ac48 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,39 @@ +Tor Browser 6.5a3-hardened -- September 20 2016 + * All Platforms + * Update Firefox to 45.4.0esr + * Update Tor to 0.2.9.2-alpha + * Update OpenSSL to 1.0.2h (bug 20095) + * Update Torbutton to 1.9.6.4 + * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git + * Bug 17767: Make "JavaScript disabled" more visible in Security Slider + * Bug 19995: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 14271: Make Torbutton work with Unix Domain Socket option + * Translation updates + * Update Tor Launcher to 0.2.11 + * Bug 14272: Make Tor Launcher work with Unix Domain Socket option + * Bug 19568: Set CurProcD for Thunderbird/Instantbird + * Bug 19432: Remove special handling for Instantbird/Thunderbird + * Translation updates + * Update HTTPS-Everywhere to 5.2.4 + * Update NoScript to 2.9.0.14 + * Bug 19851: Fix ASan error by upgrading GCC to 5.4.0 + * Bug 17858: Fix creation of incremental MARs for hardened builds + * Bug 14273: Backport patches for Unix Domain Socket support + * Bug 19890: Disable installation of system addons + * Bug 17334: Spoof referrer when leaving a .onion domain + * Bug 20092: Rotate ports for default obfs4 bridges + * Bug 20040: Add update support for unpacked HTTPS Everywhere + * Bug 20118: Don't unpack HTTPS Everywhere anymore + * Bug 19336+19835: Enhance about:tbupdate page + * Build system + * All platforms + * Bug 20133: Don't apply OpenSSL patch anymore + * Bug 19528: Set MOZ_BUILD_DATE based on Firefox version + Tor Browser 6.5a3 -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr

1 0

[tor-browser-bundle/hardened-builds] We are on the hardened track
by gk＠torproject.org 26 Sep '16

26 Sep '16

commit c72cb6b6cd1371969a614061aa7a8bcb7bf822d5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 26 07:38:19 2016 +0000 We are on the hardened track --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ff3164f..68a9d43 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.5a3 -- September 20 2016 +Tor Browser 6.5a3-hardened -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr * Update Tor to 0.2.9.2-alpha

1 0

[tor-browser-bundle/maint-6.0] Fix bug in changelog
by gk＠torproject.org 20 Sep '16

20 Sep '16

commit ae4e1c26e4dd6ba37fa7b930c28b6a2c9db4d5ca Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 20 14:23:01 2016 +0000 Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a8f341b..ecb6572 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.0.5 -- September 16 * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7 * Update Torbutton to 1.9.5.7 - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Update HTTPS-Everywhere to 5.2.4 * Bug 20092: Rotate ports for default obfs4 bridges

1 0

[tor-browser-bundle/hardened-builds] Fix bug in changelog
by gk＠torproject.org 20 Sep '16

20 Sep '16

commit 369588783e9ffb3b2441e226696798df395382f4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 20 14:22:22 2016 +0000 Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 20f120b..ff3164f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Update Torbutton to 1.9.6.4 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Bug 19837: Whitelist internal URLs that Firefox requires for media * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic

1 0

[tor-browser-bundle/master] Fix bug in changelog
by gk＠torproject.org 20 Sep '16

20 Sep '16

commit 7014b0ff1e63b01353801c40d2db9a7c54970182 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 20 14:17:01 2016 +0000 Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 302f5d5..881f25f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Update Torbutton to 1.9.6.4 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Bug 19837: Whitelist internal URLs that Firefox requires for media * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic @@ -42,7 +42,7 @@ Tor Browser 6.0.5 -- September 16 * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7 * Update Torbutton to 1.9.5.7 - * Bug 18589: Clear site security settings during New Identity + * Bug 19995: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times * Update HTTPS-Everywhere to 5.2.4 * Bug 20092: Rotate ports for default obfs4 bridges

1 0

[tor-browser-bundle/hardened-builds] Fix selfrandro install path
by gk＠torproject.org 19 Sep '16

19 Sep '16

commit 8039dd7759df72fc2cb316004718daa03a665aee Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 19 08:24:23 2016 +0000 Fix selfrandro install path --- gitian/descriptors/linux/gitian-utils.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 4bbb8a4..2d095d0 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -104,7 +104,7 @@ script: | cd selfrando scons -Q arch=x86_64 ADDN_CCFLAGS="-include $(ls $HOME/build/elfutils-*/libelf/elf.h) -I $INSTDIR/elfutils/include -fno-reorder-functions" ADDN_LINKFLAGS="-L $INSTDIR/elfutils/lib" mkdir -p $INSTDIR/self-rando - cp sconsRelease/x86_64/bin/* $INSTDIR/self-rando/ + cp sconsRelease/x86_64/gcc/bin/* $INSTDIR/self-rando/ cd .. PATH="$OPATH"

1 0

[tor-browser-bundle/hardened-builds] Bug 20095: Move OpenSSL to 1.0.2 in Tor Browser
by gk＠torproject.org 19 Sep '16

19 Sep '16

commit 2a7be0f64a6d7d46b29ecd8c2ad25f72450d3ce1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 7 09:09:12 2016 +0000 Bug 20095: Move OpenSSL to 1.0.2 in Tor Browser --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fbb6a29..421dd28 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -49,7 +49,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.1t +OPENSSL_VER=1.0.2h GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 +OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc diff --git a/gitian/versions.nightly b/gitian/versions.nightly index ae2a959..99d7d7e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -52,7 +52,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.1t +OPENSSL_VER=1.0.2h GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -107,7 +107,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 +OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.5a3-hardened
by gk＠torproject.org 19 Sep '16

19 Sep '16

commit 8c2784c6b486bbe6f4abf81278dee9e892dcb382 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 19 07:19:58 2016 +0000 Release preparations for 6.5a3-hardened --- Bundle-Data/Docs/ChangeLog.txt | 36 ++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 16 ++++++++-------- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2cdc4b7..20f120b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,39 @@ +Tor Browser 6.5a3 -- September 20 2016 + * All Platforms + * Update Firefox to 45.4.0esr + * Update Tor to 0.2.9.2-alpha + * Update OpenSSL to 1.0.2h (bug 20095) + * Update Torbutton to 1.9.6.4 + * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git + * Bug 17767: Make "JavaScript disabled" more visible in Security Slider + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 14271: Make Torbutton work with Unix Domain Socket option + * Translation updates + * Update Tor Launcher to 0.2.11 + * Bug 14272: Make Tor Launcher work with Unix Domain Socket option + * Bug 19568: Set CurProcD for Thunderbird/Instantbird + * Bug 19432: Remove special handling for Instantbird/Thunderbird + * Translation updates + * Update HTTPS-Everywhere to 5.2.4 + * Update NoScript to 2.9.0.14 + * Bug 19851: Fix ASan error by upgrading GCC to 5.4.0 + * Bug 17858: Fix creation of incremental MARs for hardened builds + * Bug 14273: Backport patches for Unix Domain Socket support + * Bug 19890: Disable installation of system addons + * Bug 17334: Spoof referrer when leaving a .onion domain + * Bug 20092: Rotate ports for default obfs4 bridges + * Bug 20040: Add update support for unpacked HTTPS Everywhere + * Bug 20118: Don't unpack HTTPS Everywhere anymore + * Bug 19336+19835: Enhance about:tbupdate page + * Build system + * All platforms + * Bug 20133: Don't apply OpenSSL patch anymore + * Bug 19528: Set MOZ_BUILD_DATE based on Firefox version + Tor Browser 6.5a2-hardened -- August 3 * All Platforms * Update Firefox to 45.3.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 538ad0e..fbb6a29 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,15 +14,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.3.0esr +FIREFOX_VERSION=45.4.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 -TOR_TAG=tor-0.2.8.5-rc -TORLAUNCHER_TAG=0.2.8.5 -TORBUTTON_TAG=1.9.6.1 -HTTPSE_TAG=5.2.1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 +TOR_TAG=tor-0.2.9.2-alpha +TORLAUNCHER_TAG=0.2.11 +TORBUTTON_TAG=1.9.6.4 +HTTPSE_TAG=5.2.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -74,7 +74,7 @@ ELFUTILS_VER=0.160 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -109,7 +109,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 77c8b46..f7edb24 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -15,7 +15,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.5a2-hardened + hardened: 6.5a3-hardened release: 6.0.1 versions: 6.0.1: @@ -28,11 +28,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a2-hardened: - platformVersion: 45.3.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-hardened-released + 6.5a3-hardened: + platformVersion: 45.4.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a3-hardened-released incremental_from: - - 6.5a1-hardened + - 6.5a2-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Changelog fixup
by gk＠torproject.org 19 Sep '16

19 Sep '16

commit d804c1bb404ef53e426286f2139ce32ea2fbfc2a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 19 07:03:28 2016 +0000 Changelog fixup --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a9c6d18..302f5d5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -35,6 +35,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Bug 19528: Set MOZ_BUILD_DATE based on Firefox version * OS X * Bug 19856: Make OS X builds reproducible again + * Bug 19410: Fix incremental updates by taking signatures into account Tor Browser 6.0.5 -- September 16 * All Platforms

1 0

[tor-browser-bundle/hardened-builds] Bug 19851: Fix ASan error by upgrading GCC to 5.4.0
by gk＠torproject.org 19 Sep '16

19 Sep '16

commit 971399e21ee26922defb9893f188d435ebf62a0c Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 21 11:45:16 2016 +0000 Bug 19851: Fix ASan error by upgrading GCC to 5.4.0 We need to update the selfrando commit we use as well to pick up a GCC 5.4.0 related fixup. --- gitian/versions.alpha | 6 +++--- gitian/versions.nightly | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 964e529..538ad0e 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -45,7 +45,7 @@ GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -SELFRANDO_TAG=8e49e7aa664625d8e4793579864231b151589d0f +SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4-1 @@ -54,7 +54,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=5.2.0 +GCC_VER=5.4.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=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad +GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 27059d7..ae2a959 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -48,7 +48,7 @@ GO_X_CRYPTO_TAG=master GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -SELFRANDO_TAG=8e49e7aa664625d8e4793579864231b151589d0f +SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4 @@ -57,7 +57,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=5.2.0 +GCC_VER=5.4.0 CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -127,7 +127,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad +GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da

1 0

[tor-browser-bundle/hardened-builds] Bug 19528: fix permissions on get-moz-build-date (fixup)
by gk＠torproject.org 19 Sep '16

19 Sep '16

commit eb6d8398127f82b3dccb3c192333a98de0881405 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 16 17:09:22 2016 +0200 Bug 19528: fix permissions on get-moz-build-date (fixup) --- gitian/descriptors/linux/gitian-firefox.yml | 1 + gitian/descriptors/mac/gitian-firefox.yml | 1 + gitian/descriptors/windows/gitian-firefox.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index dc02cba..002005f 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -86,6 +86,7 @@ script: | cd tor-browser mv .mozconfig-asan .mozconfig # run get-moz-build-date before removing .git, which is used to get the year + chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 7a852c4..49b659a 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -61,6 +61,7 @@ script: | COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig # run get-moz-build-date before removing .git, which is used to get the year + chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index cc7fdeb..8b68925 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -69,6 +69,7 @@ script: | # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" # run get-moz-build-date before removing .git, which is used to get the year + chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src

1 0

[tor-browser-bundle/hardened-builds] Pass recipient addresses to mailx directly.
by gk＠torproject.org 19 Sep '16

19 Sep '16

commit 077b3928379745ababb9bf25ed084a771f42948f Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Sep 15 20:22:20 2016 +0200 Pass recipient addresses to mailx directly. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 7a7e812..1c1118d 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -74,6 +74,6 @@ else [ -r ../../gitian-builder/var/build.log ] && FILES="$FILES ../../gitian-builder/var/build.log" [ -r ../../gitian-builder/var/target.log ] && FILES="$FILES ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date -u +%F)" \ - $LOGSENDER -- $LOGRECIPIENTS + $LOGSENDER $LOGRECIPIENTS fi fi

1 0

[tor-browser-bundle/master] Folding in stable changelog
by gk＠torproject.org 18 Sep '16

18 Sep '16

commit c070c5188644023851aa1b71df1367672213e0e4 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 18 05:35:32 2016 +0000 Folding in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 25e563b..a9c6d18 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -36,6 +36,26 @@ Tor Browser 6.5a3 -- September 20 2016 * OS X * Bug 19856: Make OS X builds reproducible again +Tor Browser 6.0.5 -- September 16 + * All Platforms + * Update Firefox to 45.4.0esr + * Update Tor to 0.2.8.7 + * Update Torbutton to 1.9.5.7 + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Update HTTPS-Everywhere to 5.2.4 + * Bug 20092: Rotate ports for default obfs4 bridges + * Bug 20040: Add update support for unpacked HTTPS Everywhere + * Windows + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x + * Linux + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x + * Android + * Bug 19706: Store browser data in the app home directory + * Build system + * All platforms + * Upgrade Go to 1.4.3 + Tor Browser 6.0.4 -- August 16 2016 * All Platforms * Update Tor to 0.2.8.6

1 0

[tor-browser-bundle/maint-6.0] Correcting 6.0.5 release date
by gk＠torproject.org 18 Sep '16

18 Sep '16

commit c477bb587f9f385820e0c454cea17aec47ecd390 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 18 05:32:13 2016 +0000 Correcting 6.0.5 release date --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6a4e4d6..a8f341b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.0.5 -- September 20 +Tor Browser 6.0.5 -- September 16 * All Platforms * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7

1 0

[tor-browser-bundle/master] Bug 19528: fix permissions on get-moz-build-date (fixup)
by gk＠torproject.org 16 Sep '16

16 Sep '16

commit 6a0a82dd8a9e1d882e780b9a0783e91c1c0d69af Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 16 17:09:22 2016 +0200 Bug 19528: fix permissions on get-moz-build-date (fixup) --- gitian/descriptors/linux/gitian-firefox.yml | 1 + gitian/descriptors/mac/gitian-firefox.yml | 1 + gitian/descriptors/windows/gitian-firefox.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 79356a9..6f3d3ad 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -89,6 +89,7 @@ script: | cd tor-browser # run get-moz-build-date before removing .git, which is used to get the year + chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 607a04c..7461031 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -44,6 +44,7 @@ script: | COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig # run get-moz-build-date before removing .git, which is used to get the year + chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index cc7fdeb..8b68925 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -69,6 +69,7 @@ script: | # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" # run get-moz-build-date before removing .git, which is used to get the year + chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src

1 0

[tor-browser-bundle/master] Pass recipient addresses to mailx directly.
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit 0dec3b0bb897a4e804880f45bd630bfa19b1acd9 Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Sep 15 20:22:20 2016 +0200 Pass recipient addresses to mailx directly. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 7a7e812..1c1118d 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -74,6 +74,6 @@ else [ -r ../../gitian-builder/var/build.log ] && FILES="$FILES ../../gitian-builder/var/build.log" [ -r ../../gitian-builder/var/target.log ] && FILES="$FILES ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date -u +%F)" \ - $LOGSENDER -- $LOGRECIPIENTS + $LOGSENDER $LOGRECIPIENTS fi fi

1 0

[tor-browser-bundle/master] Update gk's key in torbutton.gpg
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit d3e096531fba44c67c19f195302897a2d31fc900 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 12 08:03:58 2016 +0000 Update gk's key in torbutton.gpg --- gitian/gpg/torbutton.gpg | Bin 94114 -> 135369 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index da40f76..17b6c70 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/master] Version bumps due to new tags
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit 9959fe004fce97e740c48dde079b3082eaaa0031 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 13:42:04 2016 +0000 Version bumps due to new tags --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- gitian/versions.alpha | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a7fb928..25e563b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Update Firefox to 45.4.0esr * Update Tor to 0.2.9.2-alpha * Update OpenSSL to 1.0.2h (bug 20095) - * Update Torbutton to 1.9.6.3 + * Update Torbutton to 1.9.6.4 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider * Bug 18589: Clear site security settings during New Identity @@ -13,7 +13,7 @@ Tor Browser 6.5a3 -- September 20 2016 * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 * Bug 14271: Make Torbutton work with Unix Domain Socket option * Translation updates - * Update Tor Launcher to 0.2.10 + * Update Tor Launcher to 0.2.10.1 * Bug 14272: Make Tor Launcher work with Unix Domain Socket option * Bug 19568: Set CurProcD for Thunderbird/Instantbird * Bug 19432: Remove special handling for Instantbird/Thunderbird diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c87def8..6e92fcb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,10 +14,10 @@ FIREFOX_VERSION=45.4.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 TOR_TAG=tor-0.2.9.2-alpha -TORLAUNCHER_TAG=0.2.10 -TORBUTTON_TAG=1.9.6.3 +TORLAUNCHER_TAG=0.2.10.1 +TORBUTTON_TAG=1.9.6.4 HTTPSE_TAG=5.2.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Version bump for new tag
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit 1db6465b140fa61092dddee2c60ec5297045a72f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 13:39:03 2016 +0000 Version bump for new tag --- src/CHANGELOG | 1 + src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 56a40f3..6d68055 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,4 @@ +1.9.6.4 1.9.6.3 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider diff --git a/src/install.rdf b/src/install.rdf index 3d0ee37..7243571 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.6.3</em:version> + <em:version>1.9.6.4</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Release preparations for 6.5a3
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit c1fee0d5f7e27de3636998dda7c7f0a644b710b7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 12:49:01 2016 +0000 Release preparations for 6.5a3 Versions bumps, changelog update, and updating config.yml --- Bundle-Data/Docs/ChangeLog.txt | 38 ++++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 16 ++++++++-------- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 51 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 60a60cf..a7fb928 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,41 @@ +Tor Browser 6.5a3 -- September 20 2016 + * All Platforms + * Update Firefox to 45.4.0esr + * Update Tor to 0.2.9.2-alpha + * Update OpenSSL to 1.0.2h (bug 20095) + * Update Torbutton to 1.9.6.3 + * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git + * Bug 17767: Make "JavaScript disabled" more visible in Security Slider + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 14271: Make Torbutton work with Unix Domain Socket option + * Translation updates + * Update Tor Launcher to 0.2.10 + * Bug 14272: Make Tor Launcher work with Unix Domain Socket option + * Bug 19568: Set CurProcD for Thunderbird/Instantbird + * Bug 19432: Remove special handling for Instantbird/Thunderbird + * Translation updates + * Update HTTPS-Everywhere to 5.2.4 + * Update NoScript to 2.9.0.14 + * Bug 14273: Backport patches for Unix Domain Socket support + * Bug 19890: Disable installation of system addons + * Bug 17334: Spoof referrer when leaving a .onion domain + * Bug 20092: Rotate ports for default obfs4 bridges + * Bug 20040: Add update support for unpacked HTTPS Everywhere + * Bug 20118: Don't unpack HTTPS Everywhere anymore + * Bug 19336+19835: Enhance about:tbupdate page + * Android + * Bug 19706: Store browser data in the app home directory + * Build system + * All platforms + * Bug 20133: Don't apply OpenSSL patch anymore + * Bug 19528: Set MOZ_BUILD_DATE based on Firefox version + * OS X + * Bug 19856: Make OS X builds reproducible again + Tor Browser 6.0.4 -- August 16 2016 * All Platforms * Update Tor to 0.2.8.6 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ee8a197..c87def8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.3.0esr +FIREFOX_VERSION=45.4.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 -TOR_TAG=tor-0.2.8.5-rc -TORLAUNCHER_TAG=0.2.9.3 -TORBUTTON_TAG=1.9.6.1 -HTTPSE_TAG=5.2.1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 +TOR_TAG=tor-0.2.9.2-alpha +TORLAUNCHER_TAG=0.2.10 +TORBUTTON_TAG=1.9.6.3 +HTTPSE_TAG=5.2.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -68,7 +68,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -102,7 +102,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 050328e..8c047b5 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -15,7 +15,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.5a2 + alpha: 6.5a3 release: 6.0.1 versions: 6.0.1: @@ -29,11 +29,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a2: - platformVersion: 45.3.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-released + 6.5a3: + platformVersion: 45.4.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a3-released incremental_from: - - 6.5a1 + - 6.5a2 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/master] Release preparations for 1.9.6.3
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit d3541bff2c22f30fe9f127cf3f4b005790ec253c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 09:40:42 2016 +0000 Release preparations for 1.9.6.3 --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 599645c..56a40f3 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.6.3 + * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git + * Bug 17767: Make "JavaScript disabled" more visible in Security Slider + 1.9.6.2 * Bug 18589: Clear site security settings during New Identity * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times diff --git a/src/install.rdf b/src/install.rdf index 5936299..3d0ee37 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.6.2</em:version> + <em:version>1.9.6.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 17334: Spoof referrer when leaving a .onion domain
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit 5837ac47afae9ca736ec4c4fedf0d83d6a601bc9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 9 22:50:47 2016 -0700 Bug 17334: Spoof referrer when leaving a .onion domain Note I also remove a superfluous and confusing line, `currentHost = referrerHost;` --- netwerk/protocol/http/HttpBaseChannel.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 76c4a9a..8d9a408 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -14,6 +14,7 @@ #include "nsMimeTypes.h" #include "nsNetCID.h" #include "nsNetUtil.h" +#include "nsReadableUtils.h" #include "nsICachingChannel.h" #include "nsIDOMDocument.h" @@ -1389,13 +1390,15 @@ HttpBaseChannel::SetReferrerWithPolicy(nsIURI *referrer, return NS_OK; } - // send spoofed referrer if desired - if (userSpoofReferrerSource) { + bool leavingOnion = !currentHost.Equals(referrerHost) && + StringEndsWith(referrerHost, NS_LITERAL_CSTRING(".onion")); + + // send spoofed referrer if desired by user, or if we are leaving a .onion + if (userSpoofReferrerSource || leavingOnion) { nsCOMPtr<nsIURI> mURIclone; rv = mURI->CloneIgnoringRef(getter_AddRefs(mURIclone)); if (NS_FAILED(rv)) return rv; clone = mURIclone; - currentHost = referrerHost; } // strip away any userpass; we don't want to be giving out passwords ;-)

1 0

[torbutton/master] Bug 17334: Move referrer spoof for .onion domains to tor-browser.git
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit 7f7129eb1eac515ca77d9f4b06bbf4b150fcffbe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 9 23:10:48 2016 -0700 Bug 17334: Move referrer spoof for .onion domains to tor-browser.git --- src/chrome.manifest | 4 -- src/components/torRefSpoofer.js | 90 ----------------------------------------- 2 files changed, 94 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 7ca2a75..78da042 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -165,14 +165,10 @@ contract @torproject.org/domain-isolator;1 {e33fd6d4-270f-475f-a96f-ff3140279f68 category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1 -component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js -contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf} - component {4c03be7d-492f-990e-f0da-f3689e564898} components/content-policy.js contract @torproject.org/content-policy;1 {4c03be7d-492f-990e-f0da-f3689e564898} category content-policy ContentPolicy @torproject.org/content-policy;1 -category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1 category profile-after-change StartupObserver @torproject.org/startup-observer;1 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 category profile-after-change ExtAppBlockerService @torproject.org/torbutton-extAppBlockerService;1 diff --git a/src/components/torRefSpoofer.js b/src/components/torRefSpoofer.js deleted file mode 100644 index b69f8e0..0000000 --- a/src/components/torRefSpoofer.js +++ /dev/null @@ -1,90 +0,0 @@ -// Clear referer on cross-domain requests to/from Tor Hidden Services: #9623 -// ("Smart referer" previously spoofed referer on all cross-domain requests.) - -const kMODULE_CID = Components.ID("65be2be0-ceb4-44c2-91a5-9c75c53430bf"); -const kMODULE_CONTRACTID = "@torproject.org/torRefSpoofer;1"; - -function RefSpoofer() { - this.logger = Components.classes["@torproject.org/torbutton-logger;1"]. - getService(Components.interfaces.nsISupports).wrappedJSObject; - this.logger.log(3, "RefSpoof component created"); - this.onionDomainRegex = new RegExp("\\.onion$", "i"); // THS hosts - this.thirdPartyUtil = Components.classes["@mozilla.org/thirdpartyutil;1"]. - getService(Components.interfaces.mozIThirdPartyUtil); - this.ios = Components.classes["@mozilla.org/network/io-service;1"]. - getService(Components.interfaces.nsIIOService); -} - - -RefSpoofer.prototype = { - observe: function(subject, topic, data) - { - if (topic == "http-on-modify-request") { - subject.QueryInterface(Components.interfaces.nsIHttpChannel); - this.onModifyRequest(subject); - return; - } - if (topic == "profile-after-change") { - this.logger.log(3, "RefSpoof got profile-after-change"); - var os = Components.classes["@mozilla.org/observer-service;1"]. - getService(Components.interfaces.nsIObserverService); - os.addObserver(this, "http-on-modify-request", false); - return; - } - }, - onModifyRequest: function(oHttpChannel) - { - var referer; - - try { - oHttpChannel.QueryInterface(Components.interfaces.nsIChannel); - try { - referer = oHttpChannel.getRequestHeader("Referer"); - referer = this.ios.newURI(referer, null, null); //make a nsIURI object for referer - } catch (referr) { - return; //no referer available or invalid uri - } - // Only spoof referer for cross-domain requests from .onions - if (this.onionDomainRegex.test(referer.host) && - this.thirdPartyUtil.isThirdPartyURI(referer, oHttpChannel.URI)) { - // Set the referer to the domain being requested. This makes it harder - // to tell that we are referer-spoofing. - this.adjustRef(oHttpChannel, - [oHttpChannel.URI.scheme, oHttpChannel.URI.host].join("://")); - } - } catch (ex) { - this.logger.log(5, "RefSpoof onModifyRequest: " + ex); - } - }, - adjustRef: function(oChannel, sRef) - { - try { - if (oChannel.referrer) - { - oChannel.referrer.spec = sRef; - oChannel.setRequestHeader("Referer", sRef, false); - } - return true; - } - catch (ex) { - this.logger.log(5, "RefSpoof adjustRef: " +ex); - } - return false; - }, - QueryInterface: function(iid) - { - if (!iid.equals(Components.interfaces.nsISupports) && - !iid.equals(Components.interfaces.nsIObserver) && - !iid.equals(Components.interfaces.nsISupportsWeakReference)) { - throw Components.results.NS_ERROR_NO_INTERFACE; - } - return this; - }, - _xpcom_categories: [{category:"profile-after-change"}], - classID: kMODULE_CID, - contractID: kMODULE_CONTRACTID, - classDescription: "Tor Ref Spoofer" -}; - -Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); -var NSGetFactory = XPCOMUtils.generateNSGetFactory([RefSpoofer]);

1 0

[tor-launcher/maint-0.2.10] Version bump
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit 42ee1aa7706f4aa1a8ce58c9b7af61701259ab02 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 08:29:57 2016 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 7598b60..96f9a66 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.9.3</em:version> + <em:version>0.2.10</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-launcher/master] Translation updates
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit cecde937c20801a1f92d2a33b5cfee8a2880d064 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 08:22:57 2016 +0000 Translation updates --- src/chrome/locale/ar/torlauncher.properties | 6 ++-- src/chrome/locale/bg/torlauncher.properties | 2 +- src/chrome/locale/ca/progress.dtd | 4 +-- src/chrome/locale/cs/network-settings.dtd | 20 +++++------ src/chrome/locale/da/torlauncher.properties | 8 ++--- src/chrome/locale/de/network-settings.dtd | 2 +- src/chrome/locale/de/torlauncher.properties | 2 +- src/chrome/locale/el/network-settings.dtd | 2 +- src/chrome/locale/eu/network-settings.dtd | 14 ++++---- src/chrome/locale/eu/progress.dtd | 2 +- src/chrome/locale/eu/torlauncher.properties | 8 ++--- src/chrome/locale/fi/network-settings.dtd | 16 ++++----- src/chrome/locale/fi/torlauncher.properties | 8 ++--- src/chrome/locale/hi/progress.dtd | 8 ++--- src/chrome/locale/hr-HR/network-settings.dtd | 28 +++++++-------- src/chrome/locale/hr-HR/progress.dtd | 2 +- src/chrome/locale/hr-HR/torlauncher.properties | 20 +++++------ src/chrome/locale/id/torlauncher.properties | 2 +- src/chrome/locale/ja/network-settings.dtd | 18 +++++----- src/chrome/locale/ja/progress.dtd | 2 +- src/chrome/locale/ja/torlauncher.properties | 8 ++--- src/chrome/locale/ka/network-settings.dtd | 24 ++++++------- src/chrome/locale/ka/torlauncher.properties | 2 +- src/chrome/locale/ko-KR/network-settings.dtd | 20 +++++------ src/chrome/locale/ko-KR/torlauncher.properties | 14 ++++---- src/chrome/locale/lb/torlauncher.properties | 2 +- src/chrome/locale/lt/network-settings.dtd | 18 +++++----- src/chrome/locale/lt/torlauncher.properties | 2 +- src/chrome/locale/lv/network-settings.dtd | 22 ++++++------ src/chrome/locale/lv/progress.dtd | 2 +- src/chrome/locale/lv/torlauncher.properties | 8 ++--- src/chrome/locale/nb/torlauncher.properties | 4 +-- src/chrome/locale/pa/network-settings.dtd | 2 +- src/chrome/locale/pa/torlauncher.properties | 28 +++++++-------- src/chrome/locale/pt/progress.dtd | 2 +- src/chrome/locale/pt/torlauncher.properties | 4 +-- src/chrome/locale/ro/torlauncher.properties | 2 +- src/chrome/locale/sk-SK/network-settings.dtd | 48 +++++++++++++------------- src/chrome/locale/sk-SK/progress.dtd | 2 +- src/chrome/locale/sk-SK/torlauncher.properties | 32 ++++++++--------- src/chrome/locale/sr/network-settings.dtd | 4 +-- src/chrome/locale/tr/network-settings.dtd | 2 +- src/chrome/locale/tr/progress.dtd | 2 +- src/chrome/locale/uk/network-settings.dtd | 2 +- src/chrome/locale/uk/torlauncher.properties | 4 +-- src/chrome/locale/ur/network-settings.dtd | 4 +-- src/chrome/locale/vi/progress.dtd | 4 +-- src/chrome/locale/vi/torlauncher.properties | 2 +- src/chrome/locale/zh-CN/network-settings.dtd | 10 +++--- 49 files changed, 227 insertions(+), 227 deletions(-) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index e5a4aae..27ae3e6 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=مُشغل تور -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=تم إغلاق تور بشكل مفاجئ. قد يكون هذا بسبب مشكلة في تور نفسه أو بسبب برنامج آخر على نظامك أو بسبب مشكلة في عتاد جهازك. إلى أن تقوم بإعادة تشغيل تور، فإن متصفح تور لن يستطيع الوصول إلى أي موقع. إذا استمرت المشكلة، يرجى إرسال نسخة من سجل تور إلى فريق الدعم. torlauncher.tor_exited=تم إغلاق تور بشكل مفاجئ. قد يكون هذا بسبب مشكلة في تور نفسه أو بسبب برنامج آخر على نظامك أو بسبب مشكلة في عتاد جهازك. إلى أن تقوم بإعادة تشغيل تور، فإن متصفح تور لن يستطيع الوصول إلى أي موقع. إذا استمرت المشكلة، يرجى إرسال نسخة من سجل تور إلى فريق الدعم. torlauncher.tor_exited2=اعادة تشغيل تور لا يغلق الصفحات. torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور. @@ -37,7 +37,7 @@ torlauncher.quit_win=خروج torlauncher.done=تم torlauncher.forAssistance=للمساعدة, اتصل بـ %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=للمُساعدة, قُم بزيارة S% torlauncher.copiedNLogMessages=تم إكمال النسخ. %S من رسائل سجل تور جاهزة لنسخها في محرر نصوص أو رسالة بريد إلكتروني. @@ -54,7 +54,7 @@ torlauncher.bootstrapStatus.done=تم الاتصال بشبكة تور torlauncher.bootstrapWarning.done=تم torlauncher.bootstrapWarning.connectrefused=تم رفض الاتصال -torlauncher.bootstrapWarning.misc=متفرقات +torlauncher.bootstrapWarning.misc=متفرّقات torlauncher.bootstrapWarning.resourcelimit=الموارد غير كافية torlauncher.bootstrapWarning.identity=لم تتطابق الهوية torlauncher.bootstrapWarning.timeout=الاتصال عاطل diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index 2a82c8c..2ffafa2 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Тор лънчер -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor спря неочаквано по време на стартиране. Това може да е поради грешка в torrc файла, бъг в самият Tor или друга програма от вашата система или повреден хардуер. Докато не разрешите основният проблем и не рестартирате Tor, Tor браузърът няма да може да се стартира. torlauncher.tor_exited=Тор се изключи неочаквано.Това може да е поради бъг в самият Тор,друга програма в системата ви или повреден хардуер.Докато не рестартирате Тор браузърът няма да може да отваря никакви сайтове.Ако проблемът продължава моля изпратете вашият Тор Log към нашия екип по поддръжката. torlauncher.tor_exited2=Рестартирането на Тор няма да затвори вашите прозорци в браузъра. torlauncher.tor_controlconn_failed=Тор няма връзка с контролния порт diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd index 06eba3a..cb1bd5d 100644 --- a/src/chrome/locale/ca/progress.dtd +++ b/src/chrome/locale/ca/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estat de Tor"> -<!ENTITY torprogress.openSettings "Obrir preferències."> +<!ENTITY torprogress.openSettings "Obrie les preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> -<!ENTITY torprogress.pleaseWait "Per favor, esperi mentre establim la connexió amb la red de Tor.  L'acció pot durar varis minuts."> +<!ENTITY torprogress.pleaseWait "Espereu mentre establim la connexió amb la xarxa Tor.  Això pot tardar uns minuts."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index de87e8f..d231510 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Která možnost nejlépe popisuje Vaši situaci?"> <!ENTITY torSettings.configurePrompt1 "Připojení k internetu u tohoto pořítače je cenzorováno nebo proxováno."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Potřebuji nastavit most, nebo lokální proxy, než se k síti Tor&#160 připojím."> <!ENTITY torSettings.configure "Konfigurovat"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Rád bych se k síti Tor připojil přímo."> <!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve většině případů."> <!ENTITY torSettings.connect "Připojit"> <!ENTITY torSettings.proxyPageTitle "Konfigurace místní proxy"> <!ENTITY torSettings.proxyQuestion "Potřebuje tento počítač zapnutí lokální proxy, aby se připojil k internetu?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Ve většině případů lokální proxy není potřeba, ale může být nutná při připojování z firemní, nebo školní sítě."> +<!ENTITY torSettings.proxyExplanation2 "Pokud nevíte, jak na tuto otázku odpovědět, podívejte se na nastavení internetu v jiném prohlížeči, nebo na síťové nastavení na Vašem počítači, aby jste určili, zda je potřeba lokální proxy."> <!ENTITY torSettings.enterProxy "Zadejte nastavení serveru proxy."> <!ENTITY torSettings.bridgePageTitle "Konfigurace Tor přemostění"> <!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí TORu?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Pokud si nejste jisti, jak na tuto otázku odpovědět, tak zvolte NE (v případě, že se k síti Tor bez mostu nebudete moct připojit, tak most můžete přidat později)."> +<!ENTITY torSettings.bridgeExplanation2 "Pokud zvolíte ANO, budete muset nastavit mosty Toru, což jsou nezveřejněné přenašeče, které zabraňují blokaci připojení k síti Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Můžete použít poskytnutou sadu síťových mostů nebo můžete získat a zadat vlastní sadu.">  <!ENTITY torsettings.startingTor "Čekání na start TORu"> <!ENTITY torsettings.restartTor "Restartovat Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Přenastavit"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Nastavil jste síťový most nebo zadal lokální proxy.  Aby jste se mohl připojit k síti Tor přímo, musíte tato nastavení odstranit."> +<!ENTITY torsettings.discardSettings.proceed "Odstranit nastavení a připojit se"> <!ENTITY torsettings.optional "Volitelný"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> <!ENTITY torsettings.useBridges.checkbox "Můj internetový poskytovatel (ISP) blokuje připojení k Tor síti"> <!ENTITY torsettings.useBridges.default "Připojit pomocí poskytnuté sady mostů"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Každý druh mostu používá jiný způsob obcházení cenzury.  Pokud vám nefunguje, zkuste to s jiným."> <!ENTITY torsettings.useBridges.type "Typ přenosu:"> <!ENTITY torsettings.useBridges.custom "Zadejete vlastní mosty"> <!ENTITY torsettings.useBridges.label "Zadejte jedno nebo více mostních relé (jedno na řádek)."> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 960ab0e..2ca0df2 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor starter -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor lukkede under opstart. Det kan skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program på dit system, eller hardwarefejl. Tor Browser vil ikke starte, før du løser det underliggende problem og genstarter Tor. torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor-browseren vil ikke være i stand til at forbinde til noget som helst website før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter. torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket ved af at du genstarter Tor. torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S). torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S torlauncher.tor_missing=Kunne ikke finde Tor programmet. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=torrc-filen mangler og kunne ikke dannes. +torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke dannes. torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af kodeordet. torlauncher.failed_to_get_settings=Kunne ikke læse Tor indstillingerne..⏎\n⏎\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=Afslut torlauncher.done=Færdig torlauncher.forAssistance=For hjælp, kontakt %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=For hjælp, gå til %S torlauncher.copiedNLogMessages=Kopieringen er gennemført. %S logbeskeder fra Tor er klar til at blive sat ind i et tekstdokument eller en e-mail. diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 60d9edb..493f40d 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -69,7 +69,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet"> <!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Schicken Sie eine E-Mail mit dem Text 'get bridges' an bridges(a)torproject.org. Um Missbrauch durch das Auslesen großer Mengen an Brücken zu erschweren, muss Ihre Anfrage jedoch von einer der folgenden E-Mail Anbieter kommen:"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Schicken Sie eine E-Mail mit dem Text 'get bridges' an bridges(a)torproject.org. Um Missbrauch durch das Auslesen großer Mengen an Brücken zu erschweren, muss Ihre Anfrage jedoch von einem der folgenden E-Mail-Anbieter kommen:"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, oder https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle"> <!ENTITY torsettings.bridgeHelp4 "Brückenadressen können auch mit Hilfe einer höflichen E-Mail an help(a)rt.torproject.org angefordert werden.  Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss."> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index bbf1be6..8406776 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -49,7 +49,7 @@ torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden gelade torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbunden -torlauncher.bootstrapStatus.handshake_or=Tor-Verbindung wird hergestellt +torlauncher.bootstrapStatus.handshake_or=Tor-Kanal wird hergestellt torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wurde verbunden! torlauncher.bootstrapWarning.done=abgeschlossen diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 210a82e..aa2b6f4 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -66,7 +66,7 @@ <!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο"> <!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια"> <!ENTITY torsettings.bridgeHelp1 "Αν δε μπορείτε να συνδεθείτε στο δίκτυο Tor, ίσως ο πάροχός (ISP) σας ή κάποιος τρίτος μπλοκάρει το Tor .  Αυτό το πρόβλημα συνήθως λύνεται με τη χρήση Tor Bridges (γέφυρες), που είναι μη δημοσιευμένες διευθύνσεις από τις οποίες μπορείτε να μπείτε στο δίκτυο Tor, συνεπώς πιο δύσκολο να μπλοκαριστούν."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Μπορείτε να χρησιμοποιήσετε το προδιαμορφωμένο παρεχόμενο σετ διευθύνσεων γ'έφυρων ή να με την προϋπόθεση σύνολο των διευθύνσεων γέφυρας ή να αποκτήσετε ένα προσαρμοσμένο σύνολο διευθύνσεων, χρησιμοποιώντας μία από αυτές τις μεθόδους:"> <!ENTITY torsettings.bridgeHelp2Heading "Μέσω του Διαδικτύου"> <!ENTITY torsettings.bridgeHelp2 "Χρησιμοποιήστε έναν φυλλομετρητή για να επισκεφτείτε το https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Μέσω της Αυτοματοποιημένης Απάντησης Email"> diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index b311fdc..0efb96c 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Tor sare ezarpenak">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Tor nabigatzailearen hizkuntza"> +<!ENTITY torlauncher.localePicker.prompt "Mesedez hautatu ezazu hizkuntz bat.">  @@ -13,13 +13,13 @@ <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> <!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy lokalaren ezarpenak konfiguratu behar ditut Tor sarera konektatu baino lehen."> <!ENTITY torSettings.configure "Konfiguratu"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> <!ENTITY torSettings.connect "Konektatu"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Proxy lokalaren konfigurazioa"> <!ENTITY torSettings.proxyQuestion "Ordenagailu honek Internetera sartzeko proxy lokalen bat erabili behar al du?">  <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> @@ -35,10 +35,10 @@ <!ENTITY torsettings.startingTor "Tor abiarazi dadin itxaroten..."> <!ENTITY torsettings.restartTor "Tor berrabiarazi"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Birkonfiguratu"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Ezarpenak ezabatu eta konektatu"> <!ENTITY torsettings.optional "Hautazkoa"> diff --git a/src/chrome/locale/eu/progress.dtd b/src/chrome/locale/eu/progress.dtd index caa9a98..55bb4c0 100644 --- a/src/chrome/locale/eu/progress.dtd +++ b/src/chrome/locale/eu/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor egoera"> <!ENTITY torprogress.openSettings "Ezarpenak ireki"> <!ENTITY torprogress.heading "Tor sarera konektatzen"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.  Honek minutu batzuk har litzake."> diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 5e30e37..8c49224 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor abiarazlea -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor irten egin da abiarazterkoan. Hau zure torrc fitxategiko akats bategatik, Tor edo zure sistemaren beste programaren akats bategatik edo hardware akastunaren erruagatik izan daiteke. Arazo hau konpontzen ez duzun bitartean eta Tor berrabiarazten ez duzun bitartean, Tor Browser ez da abiaraziko. torlauncher.tor_exited=Tor ustekabean irten da. Hau Toren akats bategatik, zure sistemako beste programa bategatik, edo hardware akastunaren erruagatik izan daiteke. Tor berrabiarazten duzun bitartean, Tor Browserek ezingo du webguneak ireki. Arazoak jarraitzen badu, mesedez bidali Tor erregistroaren kopia bat laguntza taldeari. torlauncher.tor_exited2=Tor berrabiarazteak ez ditu zure nabigatzatilearen fitxak itxiko. torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu. @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S). torlauncher.unable_to_start_tor=Ezin izan da Tor hasi.\n\n%S torlauncher.tor_missing=Tor exekutagarria falta da. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=torrc fitxategia falta da eta ezin izan da sortu. +torlauncher.datadir_missing=Tor datu direktorioa ez da existitzen eta ezin izan da sortu. torlauncher.password_hash_missing=Huts egin du hash-eatutako pasahitza eskuratzen. torlauncher.failed_to_get_settings=Ezin izan dira Tor ezarpenak berreskuratu.\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=Irten torlauncher.done=Eginda torlauncher.forAssistance=Laguntza lortzeko, %S(r)ekin harremanetan jarri -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Laguntzako lortzeko, bisita ezazu %S torlauncher.copiedNLogMessages=Kopia burutu da. %S Tor erregistro mezuak prest daude testu editore edo email mezu batean itsasteko. diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 31dae56..f0ddb4c 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Mikä seuraavista kuvailee parhaiten tilannettasi?"> <!ENTITY torSettings.configurePrompt1 "Tämän tietokoneen internet-yhteys on sensuroitu tai kulkee välityspalvelimen kautta."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Minun täytyy configuroida joko silta- tai paikallinen välityspalvelimen asetukset ennen kuin yhdistän Tor verkkoon."> <!ENTITY torSettings.configure "Määritä"> <!ENTITY torSettings.connectPrompt2 "Haluan tehdä suoran yhteyden Tor-verkkoon."> <!ENTITY torSettings.connectPrompt3 "Tämä toimii useimmissa tilanteissa."> @@ -22,13 +22,13 @@ <!ENTITY torSettings.proxyPageTitle "Paikallisen välityspalvelimen määritys"> <!ENTITY torSettings.proxyQuestion "Tarvitseeko tämän tietokoneen käyttää paikallista välityspalvelinta Internet-pääsyyn?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Yleensä paikallista välityspalvelinta ei tarvita mutta se voidaan tarvia jos yhdistetään yrityksen, koulun tai yliopistpjen verkon kautta."> +<!ENTITY torSettings.proxyExplanation2 "Jos et ole varma, kuinka vastata tähän kysymykseen, katso toisen selaimen Internet-asetuksista tai järjestelmäsi verkkoasetuksista, tarvitaanko paikallista välityspalvelinta."> <!ENTITY torSettings.enterProxy "Kirjoita välityspalvelinasetukset."> <!ENTITY torSettings.bridgePageTitle "Tor-siltojen määritys"> <!ENTITY torSettings.bridgeQuestion "Sensuroiko tai estääkö sinun operaattorisi (ISP) yhteydet Tor-verkkoon?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Jos et ole varma, kuinka vastata tähän kysymykseen, valitse Ei (jos et voi yhdistää Tor-verkkoon ilman siltaa, voit lisätä sellaisen myöhemmin)."> +<!ENTITY torSettings.bridgeExplanation2 "Jos valitset Kyllä, sinua pyydetään määrittämään Tor-sillat, jotka ovat listaamattomia välityspalvelimia, jotta yhteyksiä olisi vaikeampi estää Tor-verkkoon yhdistettäessä."> <!ENTITY torSettings.bridgeSettingsPrompt "Voit käyttää tarjottua siltajoukkoa tai voit hankkia ja kirjoittaa oman siltojen joukon.">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Käynnistä Tor uudelleen"> <!ENTITY torsettings.reconfigTor "Uudelleenmääritä"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Olet määrittänyt Tor-siltoja tai olet asettanut paikallisen välityspalvelimen asetukset.  Muodostaaksesi suoran yhteyden Tor-verkkoon sinun tulee poistaa nämä asetukset."> <!ENTITY torsettings.discardSettings.proceed "Poista asetukset ja yhdistä"> <!ENTITY torsettings.optional "Vaihtoehtoinen"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:"> <!ENTITY torsettings.useBridges.checkbox "Minun internet-yhteyden tarjoajani (ISP) estää yhteydet Tor-verkkoon"> <!ENTITY torsettings.useBridges.default "Yhdistä tarjotuilla silloilla"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Jokainen siltatyyppi käyttää eri tapaa sensuurin välttämiseksi.  Jos yksi silta ei toimi, kokeile uudelleen käyttäen toista siltaa."> <!ENTITY torsettings.useBridges.type "Siirtotyyppi:"> <!ENTITY torsettings.useBridges.custom "Kirjoita omat sillat"> <!ENTITY torsettings.useBridges.label "Kirjoita yksi tai useampi siltavälityspalvelin (yksi per rivi)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopioi Tor-loki leikepöydälle"> <!ENTITY torsettings.bridgeHelpTitle "Siltavälityspalvelinopaste"> <!ENTITY torsettings.bridgeHelp1 "Jos et pysty yhdistämään Tor-verkkoon, syy voi olla, että Internet palveluntarjoajasi (ISP) tai muu taho estää Tor-sovelluksen.  Usein voit kiertää tämän ongelman käyttämällä Tor-siltoja, jotka ovat listaamattomia välityspalvelimia, joita on vaikeampi estää."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Voit käyttää ennalta määritettyä, tarjottua siltajoukkoa tai voit hankkia oman osoitejoukon jollakin näistä tavoista:"> <!ENTITY torsettings.bridgeHelp2Heading "Verkon yli"> <!ENTITY torsettings.bridgeHelp2 "Käytä internet-selainta vieraillaksesi osoitteessa: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Sähköpostin automaattivastaajan läpi"> diff --git a/src/chrome/locale/fi/torlauncher.properties b/src/chrome/locale/fi/torlauncher.properties index 7ba7b44..ebe5251 100644 --- a/src/chrome/locale/fi/torlauncher.properties +++ b/src/chrome/locale/fi/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor-käynnistin -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor sulkeutui avaamisen yhdeydessä. Tämä saattaa johtua virheestä torrc tiedostossa, virheestä Tor:issa, muussa ohjelmassa tai viallisessa ohjelmistossa. Kunnes saat virheen korjattua ja käynnistät Tor:in uudelleen, Tor selain ei käynnisty. torlauncher.tor_exited=Tor sammui odottamatta. Tämä voi olla virhe Tor-sovelluksessa itsessään, tai toisen ohjelman järjestelmässäsi aiheuttama, tai laitteistovirhe. Tor ei kykene tavoittamaan yhtään verkkosivua, jos et käynnistä Tor-sovellusta uudelleen. Jos tämä ongelma jatkuu, lähetä kopio Tor-lokitiedostosta tukiryhmälle. torlauncher.tor_exited2=Tor-sovelluksen käynnistäminen uudestaan ei sulje selaimesi välilehtiä. torlauncher.tor_controlconn_failed=Yhteydenotto Tor-sovelluksen hallintaporttiin epäonnistui. @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S epäonnistui (%2$S). torlauncher.unable_to_start_tor=Tor-sovelluksen käynnistys epäonnistui.\n\n%S torlauncher.tor_missing=Suoritettava Tor-tiedosto puuttuu. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=Torrc tiedostoa ei löydetty ja sitä ei voitu luoda uudelleen. +torlauncher.datadir_missing=Tor tietohakemistoa ei ole olemassa, ja sitä ei voida luoda uudellen. torlauncher.password_hash_missing=Tiivistettyä salasanaa ei löytynyt. torlauncher.failed_to_get_settings=Tor-asetusten noutaminen epäonnistui.\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=Lopeta torlauncher.done=Valmis torlauncher.forAssistance=Tukea saat ottamalla yhteyttä osoitteeseen %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Tukea saat sivustolta %S torlauncher.copiedNLogMessages=Kopionti suoritettu. %S Tor-lokiviestiä on valmiina kopiotavaksi tekstimuokkaimeen tai sähköpostiviestiin. diff --git a/src/chrome/locale/hi/progress.dtd b/src/chrome/locale/hi/progress.dtd index 14111f6..03eacb2 100644 --- a/src/chrome/locale/hi/progress.dtd +++ b/src/chrome/locale/hi/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "टोर स्थिति"> -<!ENTITY torprogress.openSettings "व्यवस्था खोलें"> -<!ENTITY torprogress.heading "टोर संजाल से जुड़ रहा है"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.dialog.title "टोर का अवस्था। "> +<!ENTITY torprogress.openSettings "सेटिंग्स खोलें। "> +<!ENTITY torprogress.heading "टोर संजाल से जुड़ है। "> +<!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।"> diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 8eb9b7c..902c4f0 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor mrežne postavke">  -<!ENTITY torlauncher.localePicker.title "Jezik Tor Preglednika"> +<!ENTITY torlauncher.localePicker.title "Jezik Tor Browsera"> <!ENTITY torlauncher.localePicker.prompt "Molimo odaberite jezik.">  @@ -14,18 +14,18 @@ internetskoj vezi ovog računala."> <!ENTITY torSettings.firstQuestion "Koje od sljedećeg najbolje opisuje Vašu situaciju?"> <!ENTITY torSettings.configurePrompt1 "Veza ovog računal s Internetom je cenzurirana ili iza proxy-a."> -<!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati postavke mosta ili lokalnog proxy-a prije nego se spojim na Tor mrežu."> +<!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati postavke mosta ili lokalnog proxya prije nego se spojim na Tor mrežu."> <!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connectPrompt2 "Želim direktnu vezu s Tor mrežom."> -<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> +<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini slučajeva."> <!ENTITY torSettings.connect "Spoji"> -<!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proxy-a"> +<!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proxya"> <!ENTITY torSettings.proxyQuestion "Treba li ovo računalo koristiti lokalni proxy da pristupi Internetu?">  -<!ENTITY torSettings.proxyExplanation1 "U većini slučaja lokalni proxy nije potreban, ali može biti kad se spajate kroz mržu tvrtke, škole ili fakulteta."> +<!ENTITY torSettings.proxyExplanation1 "U većini slučaja lokalni proxy nije potreban, ali može biti kad se spajate kroz mrežu tvrtke, škole ili fakulteta."> <!ENTITY torSettings.proxyExplanation2 "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku ili provjerite mrežne postavke Vašeg sustava kako bi vidjeli da li je potreban lokalni proxy."> -<!ENTITY torSettings.enterProxy "Unesite postavke proxyj-a."> +<!ENTITY torSettings.enterProxy "Unesite postavke proxya."> <!ENTITY torSettings.bridgePageTitle "Konfiguracija Tor mostova"> <!ENTITY torSettings.bridgeQuestion "Blokira li Vaš davetelj Internet usluge (ISP) ili drugačije cenzurira veze s Tor mrežom?"> @@ -39,13 +39,13 @@ s Tor mrežom?"> <!ENTITY torsettings.restartTor "Ponovno pokreni Tor"> <!ENTITY torsettings.reconfigTor "Rekonfiguriraj"> -<!ENTITY torsettings.discardSettings.prompt "Konfigurirali ste Tor mostove ili ste unijeli postavke lokalnog proxy-a.  Kako bi ostvarili direktnu vezu s Tor mrežom, ove postavke moraju biti uklonjene."> +<!ENTITY torsettings.discardSettings.prompt "Konfigurirali ste Tor mostove ili ste unijeli postavke lokalnog proxya.  Kako bi ostvarili direktnu vezu s Tor mrežom, ove postavke moraju biti uklonjene."> <!ENTITY torsettings.discardSettings.proceed "Ukloni postavke i poveži"> <!ENTITY torsettings.optional "Opcionalno"> <!ENTITY torsettings.useProxy.checkbox "Ovo računalo treba koristiti lokalni proxy za pristup Internetu."> -<!ENTITY torsettings.useProxy.type "Tip proxyj-a:"> +<!ENTITY torsettings.useProxy.type "Tip proxya:"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -65,13 +65,13 @@ s Tor mrežom?"> <!ENTITY torsettings.useBridges.placeholder "unesite adresa:port"> <!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> -<!ENTITY torsettings.bridgeHelpTitle "Pomoć za relej-mostove"> -<!ENTITY torsettings.bridgeHelp1 "Ako se ne možete spojiti na Tor mrežu, to može biti zato što Vaš pružatelj Internet usluge (ISP) ili druga agencija blokira Tor.  Najčešće možete zaobići ovaj problem koristeći Tor Mostove, koji su neizlistani releji koje je teže blokirati."> +<!ENTITY torsettings.bridgeHelpTitle "Pomoć za releje mostove"> +<!ENTITY torsettings.bridgeHelp1 "Ako se ne možete spojiti na Tor mrežu, to može biti zato što Vaš pružatelj Internet usluge (ISP) ili druga agencija blokira Tor.  Najčešće možete zaobići ovaj problem koristeći Tor mostove, koji su neizlistani releji koje je teže blokirati."> <!ENTITY torsettings.bridgeHelp1B "Možete koristiti unaprijed konfigurirane setove adresa mostova ili možete dobiti prilagođene setove korištenjem jedne od ovih metoda:"> -<!ENTITY torsettings.bridgeHelp2Heading "Kroz Web"> +<!ENTITY torsettings.bridgeHelp2Heading "Kroz web"> <!ENTITY torsettings.bridgeHelp2 "Koristite web preglednik kako bi posjetili https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Kroz Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3Heading "Kroz email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Pošaljite email na bridges(a)torproject.org tako što će te u poruku napisati samo 'get bridges'.  Kako bilo, da bi otežali napadaču da nauči puno adresa mostova, morate poslati taj zahtjev koristeći jednog od sljedećih davatelja email usluge (poredano po preferabilnosti):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, ili https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Pomoću Help Desk-a"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ili https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "Pomoću Help Deska"> <!ENTITY torsettings.bridgeHelp4 "Na kraju, možete zatražiti adrese mostova tako što će te poslati pristojan email na help(a)rt.torproject.org.  Imajte na umu da će na svaki zahtjev morati odgovoriti osoba."> diff --git a/src/chrome/locale/hr-HR/progress.dtd b/src/chrome/locale/hr-HR/progress.dtd index da9a846..20fa443 100644 --- a/src/chrome/locale/hr-HR/progress.dtd +++ b/src/chrome/locale/hr-HR/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Otvori Postavke"> +<!ENTITY torprogress.openSettings "Otvori postavke"> <!ENTITY torprogress.heading "Spajanje na Tor mrežu"> <!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties index e080459..175e7b4 100644 --- a/src/chrome/locale/hr-HR/torlauncher.properties +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -1,14 +1,14 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Pokretač Tor-a +torlauncher.error_title=Pokretač Tora torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u Vašoj torrc datoteci, greške u Tor-u ili drugom programu u Vašem sustavu ili zbog neispravnog hardware-a. Dok ne popravite inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti. -torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog greške u samom Tor-u, drugog programa na Vašem sustavu ili neispravnog hardware-a. Dok ne pokrenete Tor ponovno, Tor Preglednik neće biti u mogućnosti pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju Vašeg Tor zapisa timu za podršku. -torlauncher.tor_exited2=Ponovno pokretanje Tor-a neće zatvoriti Vaše kartice u pregledniku. -torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Tor-ov upravljački port. +torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog greške u samom Toru, drugog programa na Vašem sustavu ili neispravnog hardwarea. Dok ne pokrenete Tor ponovno, Tor Browser neće biti u mogućnosti pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju Vašeg Tor zapisa timu za podršku. +torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti Vaše kartice u pregledniku. +torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port. torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti. -torlauncher.tor_control_failed=Preuzimanje kontrole nad Tor-om nije uspjelo. +torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo. torlauncher.tor_bootstrap_failed=Tor nije uspio uspostaviti Tor mrežnu vezu. torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S). @@ -22,8 +22,8 @@ torlauncher.failed_to_get_settings=Nije moguće dobaviti Tor postavke.\n\n%S torlauncher.failed_to_save_settings=Nije moguće spremiti Tor postavke.\n\n%S torlauncher.ensure_tor_is_running=Molimo osigurajte da je Tor pokrenut. -torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime računala i broj porta da biste konfigurirali Tor za korištenje proxyj-a za pristup Internetu. -torlauncher.error_proxy_type_missing=Morate odabrati tip proxy-a. +torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime računala i broj porta da biste konfigurirali Tor za korištenje proxya za pristup Internetu. +torlauncher.error_proxy_type_missing=Morate odabrati tip proxya. torlauncher.error_bridges_missing=Morate odrediti jedan ili više mostova. torlauncher.error_default_bridges_type_missing=Morate odabrati vrstu transporta za pružene mostove. torlauncher.error_bridge_bad_default_type=Nema dostupnih pruženih mostova koji imaju %S vrstu transporta. Molimo, prilagodite svoje postavke. @@ -41,11 +41,11 @@ torlauncher.forAssistance2=Za pomoć posjetite %S torlauncher.copiedNLogMessages=Kopiranje završeno. %S Tor zapisi su spremni za lijepljenje u uređivač teksta ili email poruku. -torlauncher.bootstrapStatus.conn_dir=Spajanje na mapu releja -torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje šifrirane veze na mapu +torlauncher.bootstrapStatus.conn_dir=Spajanje na direktorij releja +torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje enkriptirane veze na direktorij torlauncher.bootstrapStatus.requesting_status=Dohvaćanje statusa mreže torlauncher.bootstrapStatus.loading_status=Učitavanje statusa mreže -torlauncher.bootstrapStatus.loading_keys=Učitavanje autoriteta certifikata +torlauncher.bootstrapStatus.loading_keys=Učitavanje certifikata autoriteta torlauncher.bootstrapStatus.requesting_descriptors=Zahtjevanje informacija o releju torlauncher.bootstrapStatus.loading_descriptors=Učitavanje informacija o releju torlauncher.bootstrapStatus.conn_or=Spajanje na Tor mrežu diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index d0195e0..f18c2dd 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.quit_win=Keluar torlauncher.done=Selesai. torlauncher.forAssistance=Untuk bantuan, hubungi $S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Untuk bantuan, kunjungi %S torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap untuk ditempelkan ke dalam editor text atau pesan email. diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index fa3049c..724a4ee 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -13,22 +13,22 @@ <!ENTITY torSettings.firstQuestion "以下のうちあなたの状態に最も適しているのはどれですか？"> <!ENTITY torSettings.configurePrompt1 "このコンピュータのインターネット接続は、検閲されているかプロキシを通します。"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Torネットワークに接続する前にブリッジやローカルプロキシを設定する必要があります。 "> <!ENTITY torSettings.configure "構成"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Torネットワークに直接接続します。"> <!ENTITY torSettings.connectPrompt3 "これはほとんどの状況で動作します。"> <!ENTITY torSettings.connect "接続"> <!ENTITY torSettings.proxyPageTitle "ローカルプロキシの設定"> <!ENTITY torSettings.proxyQuestion "インターネットに接続するためにローカルプロキシを通す必要がありますか？">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "ほとんどの場合ローカルプロキシは必要ありません。ただし、会社、学校、大学などのネットワークを通して接続する場合に必要となることがあるかもしれません。"> +<!ENTITY torSettings.proxyExplanation2 "もし分からなければ、他のブラウザーのインターネット設定やシステムのネットワーク設定を確認して、ローカルプロキシが必要かどうか確認してください。"> <!ENTITY torSettings.enterProxy "プロキシ設定を入力"> <!ENTITY torSettings.bridgePageTitle "Torブリッジの設定"> <!ENTITY torSettings.bridgeQuestion "あなたのインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックしているか、あるいは別のやり方で検閲していますか？"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "もし分からなければ「いいえ」を選択してください。(ブリッジなしでTorネットワークに接続することができなかった場合、後で追加できます)"> +<!ENTITY torSettings.bridgeExplanation2 "「はい」を選択した場合、TorブリッジすなわちTorネットワークへの接続をブロックすることを難しくするリストされていないリレーを設定するよう求められます。"> <!ENTITY torSettings.bridgeSettingsPrompt "提供されたブリッジのセットを使用するか、あるいはカスタムのブリッジのセットを取得して入力することができます。">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Torを再起動する"> <!ENTITY torsettings.reconfigTor "再設定"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> +<!ENTITY torsettings.discardSettings.prompt "Torブリッジが設定されるか、ローカルプロキシ設定が入力されるかしました。  Torネットワークに直接接続するためには、これらの設定は削除する必要があります。"> <!ENTITY torsettings.discardSettings.proceed "設定と接続を削除"> <!ENTITY torsettings.optional "オプション"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "許可されたポート:"> <!ENTITY torsettings.useBridges.checkbox "私のインターネットサービスプロバイダ(ISP)はTorネットワークへの接続をブロックします"> <!ENTITY torsettings.useBridges.default "提供されたブリッジで接続"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "それぞれの種類のブリッジは検閲を避けるために異なった方法を使用します。 もしひとつのブリッジが機能しなければ、別のもので再度試してみてください。"> <!ENTITY torsettings.useBridges.type "トランスポートタイプ:"> <!ENTITY torsettings.useBridges.custom "カスタムブリッジを入力"> <!ENTITY torsettings.useBridges.label "1つ以上のブリッジリレーを入力してください(行あたり1つ)。"> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> <!ENTITY torsettings.bridgeHelp1 "Tor ネットワークに接続できないなら、あなたのインターネットサービスプロバイダー(ISP)や別の機関が Tor をブロックしている可能性があります。  ブロックが比較的困難なリストされていないリレーである Tor ブリッジを使用することでこの問題を回避できることもあります。"> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "設定済みのデフォルトの設定を利用するか、以下のうちのいずれかの方法によってカスタムのアドレスセットを取得することができます。"> <!ENTITY torsettings.bridgeHelp2Heading "ウェブ経由"> <!ENTITY torsettings.bridgeHelp2 "ウェブを使用して、https://bridges.torproject.orgを開く"> <!ENTITY torsettings.bridgeHelp3Heading "メール自動応答システム経由"> diff --git a/src/chrome/locale/ja/progress.dtd b/src/chrome/locale/ja/progress.dtd index 31c0943..db3ec29 100644 --- a/src/chrome/locale/ja/progress.dtd +++ b/src/chrome/locale/ja/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Torの状態"> <!ENTITY torprogress.openSettings "設定を開く"> <!ENTITY torprogress.heading "Torネットワークに接続しています"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Torネットワークへの接続が確立されるまでお待ちください。  これには数分間かかることがあります。"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index bad6925..a5e2d49 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Torが起動中に終了しました。これは、torrcファイルの誤りや、Torまたは他のプログラムのバグ、もしくはハードウェアの故障に起因しているかもしれません。問題を解決してTorを再起動するまで、Tor Browserは起動されません。 torlauncher.tor_exited=Torが突然終了しました。原因はおそらくTor自体のバグか、他の常駐プログラムか、あるいはハードウェアーが問題です。Torを再起動するまで、Torブラウザーはウェブサイトに一切接続できません。再起動しても解決されない場合、Torログファイルをサポートチームに送信してください torlauncher.tor_exited2=Torを再起動しても、あなたのブラウザータブはそのまま残ります。 torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=torrcファイルが見つからず、作成もできませんでした。 +torlauncher.datadir_missing=Torのデータディレクトリが存在せず、作成もできませんでした。 torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました torlauncher.failed_to_get_settings=Torの設定を回復出来ません。\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=終了 torlauncher.done=完了 torlauncher.forAssistance=サポートについては、%Sにお問い合わせください -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=サポートについては、%Sをご覧ください。 torlauncher.copiedNLogMessages=コピー成功。 %S個のTorログファイルがテキストエディターやEメールにペーストする準備ができました。 diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index d66d355..d75f96d 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -1,25 +1,25 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor-ის ქსელის პარამეტრები">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Tor-ის ბრაუზერის ენა"> +<!ENTITY torlauncher.localePicker.prompt "გთხოვთ, აირჩიოთ ენა.">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Tor-ის ქსელთან შეერთებამდე, თქვენ უნდა წარადგინოთ ინფორმაცია ამ კომპიუტერის ინტერნეტ კავშირის შესახებ."> <!ENTITY torSettings.yes "დიახ"> <!ENTITY torSettings.no "არა"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.firstQuestion "შემდეგიდან რომელი უკეთესად აღწერს თქვენს სიტუაციას?"> +<!ENTITY torSettings.configurePrompt1 "ამ კომპიუტერის ინტერნეტ კავშირი არის ცენზურის ქვეშ ან პროქსის უკან."> +<!ENTITY torSettings.configurePrompt2 "უნდა დავაკონფიგურირო ბრიჯი ან ადგილობრივი პროქსის პარამეტრები Tor ქსელთან შეერთებამდე."> +<!ENTITY torSettings.configure "კონფიგურირება"> +<!ENTITY torSettings.connectPrompt2 "მსურს Tor-ის ქსელთან პირდაპირი კავშირის გამოყენება."> +<!ENTITY torSettings.connectPrompt3 "ეს იმუშავებს უმეტეს სიტუაციაში."> +<!ENTITY torSettings.connect "დაკავშირება"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "ადგილობრივი პროქსის კონფიგურაცია"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?">  <!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index e0941ff..976c18c 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect +torlauncher.connect=დაკავშირება torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index df3b833..1fdc20b 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -1,23 +1,23 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor 네트워크 설정">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Tor 사용 언어"> +<!ENTITY torlauncher.localePicker.prompt "사용할 언어를 설정해주세요.">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Tor 네트워크에 접속하기 전, 이 컴퓨터의 인터넷 접속 정보를 제공해 주셔야 합니다."> <!ENTITY torSettings.yes "네"> <!ENTITY torSettings.no "아니오"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> +<!ENTITY torSettings.firstQuestion "무엇이 당신의 상황과 가장 가까운가요?"> +<!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열 또는 프록시에 연결되어 있습니다."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connectPrompt2 "나는 Tor 네트워크와 직접적인 연결을 하고 싶습니다."> +<!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작할 것입니다."> +<!ENTITY torSettings.connect "연결"> <!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> @@ -34,7 +34,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Tor 재시작"> <!ENTITY torsettings.reconfigTor "Reconfigure"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> diff --git a/src/chrome/locale/ko-KR/torlauncher.properties b/src/chrome/locale/ko-KR/torlauncher.properties index ebce309..ba0e7bf 100644 --- a/src/chrome/locale/ko-KR/torlauncher.properties +++ b/src/chrome/locale/ko-KR/torlauncher.properties @@ -1,12 +1,12 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor 런처 torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_controlconn_failed=Tor 제어 포트에 접속할 수 없습니다. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. @@ -28,13 +28,13 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(추천) -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.connect=연결 +torlauncher.restart_tor=Tor 재시작 +torlauncher.quit=연결 끝내기 torlauncher.quit_win=나가기 -torlauncher.done=Done +torlauncher.done=완료 torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/lb/torlauncher.properties b/src/chrome/locale/lb/torlauncher.properties index 2248a69..08f57f5 100644 --- a/src/chrome/locale/lb/torlauncher.properties +++ b/src/chrome/locale/lb/torlauncher.properties @@ -33,7 +33,7 @@ torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=Ausgang torlauncher.done=Fäerdeg torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index 587ad7f..ad55643 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -20,14 +20,14 @@ <!ENTITY torSettings.connect "Prisijungti"> <!ENTITY torSettings.proxyPageTitle "Vietinio įgaliotojo serverio konfigūracija"> -<!ENTITY torSettings.proxyQuestion "Ar šis kompiuteris naudoja vietinį proxy prisijungimui prie interneto?"> +<!ENTITY torSettings.proxyQuestion "Ar šis kompiuteris prisijungimui prie interneto naudoja vietinį įgaliotąjį serverį?">  -<!ENTITY torSettings.proxyExplanation1 "Daugelyje atveju, vietinis įgaliotasis serveris yra nereikalingas, tačiau jo gali prireikti, jungiantis per kompanijos, mokyklos ar universiteto tinklą."> +<!ENTITY torSettings.proxyExplanation1 "Daugeliu atveju, vietinis įgaliotasis serveris yra nereikalingas, tačiau jo gali prireikti, jungiantis per kompanijos, mokyklos ar universiteto tinklą."> <!ENTITY torSettings.proxyExplanation2 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pažiūrėkite interneto nustatymus kitoje naršyklėje arba patikrinkite savo sistemos tinklo nustatymus, kad pamatytumėte ar vietinis įgaliotasis serveris yra reikalingas."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.enterProxy "Įrašykite įgaliotojo serverio nustatymus."> +<!ENTITY torSettings.bridgePageTitle "Tor tiltų konfigūracija"> <!ENTITY torSettings.bridgeQuestion "Ar jūsų interneto paslaugų tiekėjas (ISP) blokuoja ar kitaip cenzūruoja prisijungimus prie Tor tinklo?"> -<!ENTITY torSettings.bridgeExplanation1 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pasirinkite Ne (jeigu negalite prisijungti prie Tor tinklo be tinklų tilto, jūs galėsite jį pridėti vėliau)."> +<!ENTITY torSettings.bridgeExplanation1 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pasirinkite Ne (jeigu negalėsite prisijungti prie Tor tinklo be tinklų tilto, tuomet galėsite jį pridėti vėliau)."> <!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -37,15 +37,15 @@ <!ENTITY torsettings.restartTor "Pakartotinai paleisti Tor"> <!ENTITY torsettings.reconfigTor "Reconfigure"> -<!ENTITY torsettings.discardSettings.prompt "Jūs esate sukofigūravę Tor tinklų tiltus arba esate įvedę vietinio įgaliotojo serverio nustatymus.  Tam, kad galėtumėte tiesiogiai prisijungti prie Tor tinklo, šie nustatymai privalo būti pašalinti."> +<!ENTITY torsettings.discardSettings.prompt "Jūs esate sukofigūravę Tor tinklų tiltus arba esate įrašę vietinio įgaliotojo serverio nustatymus.  Tam, kad galėtumėte tiesiogiai prisijungti prie Tor tinklo, šie nustatymai privalo būti pašalinti."> <!ENTITY torsettings.discardSettings.proceed "Šalinti nustatymus ir prisijungti"> <!ENTITY torsettings.optional "Nebūtina"> <!ENTITY torsettings.useProxy.checkbox "Šis kompiuteris turi naudoti vietinį įgaliotąjį serverį, kad gautų prieigą prie internetą."> -<!ENTITY torsettings.useProxy.type "Proxy tipas:"> +<!ENTITY torsettings.useProxy.type "Įgaliotojo serverio tipas:"> <!ENTITY torsettings.useProxy.address "Adresas:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresas arba serverio vardas"> <!ENTITY torsettings.useProxy.port "Prievadas:"> <!ENTITY torsettings.useProxy.username "Vartotojo vardas:"> <!ENTITY torsettings.useProxy.password "Slaptažodis:"> @@ -60,7 +60,7 @@ <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "įrašykite adresą:prievadą"> <!ENTITY torsettings.copyLog "Kopijuoti Tor žurnalą į iškarpinę"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index 0441b95..7d85680 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.quit_win=Išeiti torlauncher.done=Atlikta torlauncher.forAssistance=Jei Jums reikia pagalbos, susisiekti galite su %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Norėdami gauti pagalbos, apsilankykite %S torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą. diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index c63091e..aeb6381 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> <!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzēts vai starpniekots."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Man jānokonfigurē tiltu vai vietējo starpniekserveru iestatījumi pirms es izveidoju savienojumu ar tīklu Tor ."> <!ENTITY torSettings.configure "Konfigurēt"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Es vēlos izveidot tiešu savienojumu ar tīklu Tor."> <!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> <!ENTITY torSettings.connect "Veidot savienojumu"> <!ENTITY torSettings.proxyPageTitle "Lokālā starpniekservera konfigurēšana"> <!ENTITY torSettings.proxyQuestion "Vai šim datoram jāizmanto lokālais starpniekserveris, lai piekļūtu internetam?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Vairumā gadījumu nav nepieciešams vietējais starpniekserveris, bet tas var būt nepieciešams, ja savienojumu veido caur uzņēmuma, skolas vai universitātes tīklu."> +<!ENTITY torSettings.proxyExplanation2 "Ja īsti nezināt kā atbildēt uz šo jautājumu, ieskatieties cita pārlūka interneta iestatījumos vai pārbaudiet Jūsu sistēmas tīkla iestatījumus, lai redzētu vai ir nepieciešams vietējais starpniekserveris. "> <!ENTITY torSettings.enterProxy "Ievadiet starpnieka iestatījumus."> <!ENTITY torSettings.bridgePageTitle "Tor tiltu konfigurēšana"> <!ENTITY torSettings.bridgeQuestion "Vai Jūsu interneta pakalpojumu sniedzējs (ISP) bloķē vai savādāk cenzē savienojumus ar tīklu Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ja īsti nezināt kā atbildēt uz šo jautājumu, izvēlieties Nē (ja bez tilta nevarat izveidot savienojumu ar tīklu Tor, varēsit tiltu pievienot vēlāk)."> +<!ENTITY torSettings.bridgeExplanation2 "Ja izvēlēsities Jā, Jums lūgs konfigurēt Tor tiltus, kas ir sarakstos neiekļauti retranslatori, kas padara grūtāku savienojumu bloķēšanu ar tīklu Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Jūs varat izmantot piedāvāto tiltu kopumu vai varat ievadīt tiltu pielāgotu sarakstu. ">  <!ENTITY torsettings.startingTor "Gaida, kamēr Tor startēs..."> <!ENTITY torsettings.restartTor "Restartēt Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Pārkonfigurēt"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Jūs nokonfigurējāt Tor tiltus vai ievadījāt vietējā starpniekservera iestatījumus.  lai izveidot tiešu savienojumu ar tīklu Tor, šie iestatījumi ir jānoņem."> +<!ENTITY torsettings.discardSettings.proceed "Noņemt Iestatījumus un Izveidot savienojumu "> <!ENTITY torsettings.optional "Neobligāts"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Atļautie porti:"> <!ENTITY torsettings.useBridges.checkbox "Mans interneta pakalpojumu sniedzējs (IPS) bloķē savienojumu izveidošanu ar tīklu Tor"> <!ENTITY torsettings.useBridges.default "Veidot savienojumu ar piedāvātajiem tiltiem"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Katrs tilta veids lieto citu cenzūras apiešanas metodi.  ja kāds tilts nestrādā, mēģiniet vēlreiz ar citu."> <!ENTITY torsettings.useBridges.type "Transporta veids:"> <!ENTITY torsettings.useBridges.custom "Ievadiet pielāgotus tiltus"> <!ENTITY torsettings.useBridges.label "Ievadiet vienu vai vairākus tilta retranslatorus (vienu rindā)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Kopēt Tor žurnālu starpliktuvē"> <!ENTITY torsettings.bridgeHelpTitle "Palīdzība par tiltu retranslatoriem"> <!ENTITY torsettings.bridgeHelp1 "Ja nevarat izveidot savienojumu ar tīklu Tor, tad, iespējams, ka Jūsu interneta pakalpojumu sniedzējs (ISP) vai cita iestāde bloķē Tor.  Bieži, šo problemu var apiet izmantojot Tor tiltus jeb Tor Bridges, proti, neuzskaitītus retranslatorus, kurus grūtāk bloķēt."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Jūs varat izmantot piedāvāto, iepriekš nokonfigurēto tiltu adrešu kopumu vai varat saņemt pielāgotu adrešu kopumu, lietojot kādu no šīm metodēm:"> <!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli"> <!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu, lai apmeklētu https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju"> diff --git a/src/chrome/locale/lv/progress.dtd b/src/chrome/locale/lv/progress.dtd index 2e1be38..98f8be5 100644 --- a/src/chrome/locale/lv/progress.dtd +++ b/src/chrome/locale/lv/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor'a statuss"> <!ENTITY torprogress.openSettings "Atvērt iestatījumus"> <!ENTITY torprogress.heading "Veido savienojumu ar Tor'a tīklu"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Lūdzu pagaidiet kamēr mēs izveidojam savienojumu ar tīklu Tor.  tam var būt nepieciešamas vairākas minūtes."> diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index 6670ada..72389df 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor palaidējs -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Startēšanas laikā Tor beidza darbu. Tas varēja noteikt dēļ kļūdas torrc datnē vai Tor, vai citā Jūsu sistēmas programmā, vai kļūdaini strādājošā tehniskajā nodrošinājumā. Pārlūks Tor nesāks darbu līdz Jūs novērsīsit pamatā esošo problēmu un pārstartēsit Tor. torlauncher.tor_exited=Tor negaidīti beidza darbu. Tas varēja noteikt dēļ kļūdas pašā Tor, vai citas programmas Jūsu sistēmā, vai kļūmes datorā. Līdz brīdim kad Jūs restartēsiet Tor, Tor nevarēs sasniegt nevienu mājaslapu. Ja problēma nepazūd, lūdzu nosūtiet Jūsu Tor Log atblasta komandai. torlauncher.tor_exited2=Tor restartēšana neaizvērs jūsu pārlūka lapas. torlauncher.tor_controlconn_failed=Nevarēja veikt savienojumu ar Tor kontrolportu. @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S neizdevas (%2$S). torlauncher.unable_to_start_tor=Nespēj startēt Tor:\n⏎\n%S torlauncher.tor_missing=Trūkst Tor'a izpildāmā moduļa. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=Trūkst torrc datnes, un to nevarēja izveidot. +torlauncher.datadir_missing=Tor datu direktorija nepastāv, un to nevarēja izveidot. torlauncher.password_hash_missing=Neizdevās saņemt jaukto paroli. torlauncher.failed_to_get_settings=Neizdevās izgūt Tor'a iestatījumus.\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=Iziet torlauncher.done=Gatavs torlauncher.forAssistance=Lai saņemtu palīdzību, sazinieties ar %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Lai saņemtu palīdzību, apmeklējiet %S torlauncher.copiedNLogMessages=Kopēšana paveikta. %S Tor žurnāla ziņojumi sagatavoti ielīmēšanai teksta redaktorā vai e-pasta ziņojumā. diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index a5e08bd..b064dbd 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -45,11 +45,11 @@ torlauncher.bootstrapStatus.conn_dir=Kobler til en rutingsstafettoppsetts-katalo torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse torlauncher.bootstrapStatus.requesting_status=Mottar nettverkstatus torlauncher.bootstrapStatus.loading_status=Laster nettverkstatus -torlauncher.bootstrapStatus.loading_keys=Laster serfikater for autoritet +torlauncher.bootstrapStatus.loading_keys=Laster identitetsbekreftende sertifikater torlauncher.bootstrapStatus.requesting_descriptors=Sender forespørsel om rutingsstafettoppsettsinformasjon torlauncher.bootstrapStatus.loading_descriptors=Laster inn rutingsstafettoppsetts-informasjon torlauncher.bootstrapStatus.conn_or=Kobler til Tor-nettverket -torlauncher.bootstrapStatus.handshake_or=Etablerer en Tor-rute +torlauncher.bootstrapStatus.handshake_or=Etablerer en Tor-krets torlauncher.bootstrapStatus.done=Koblet til Tor-nettverket! torlauncher.bootstrapWarning.done=ferdig diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index f749ef0..b02946f 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -34,7 +34,7 @@  <!ENTITY torsettings.startingTor "...ਟੋਰ ਸ਼ੁਰੂ ਹੋਣ ਤੱਕ ਉਡੀਕੋ"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "ਟੋਰ ਮੁੜ-ਚਾਲੂ ਕਰੋ"> <!ENTITY torsettings.reconfigTor "Reconfigure"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties index f8b90fd..43da2bd 100644 --- a/src/chrome/locale/pa/torlauncher.properties +++ b/src/chrome/locale/pa/torlauncher.properties @@ -6,24 +6,24 @@ torlauncher.error_title=ਟੋਰ ਲਾਂਚਰ torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_controlconn_failed=ਟੋਰ ਕੰਟਰੋਲ ਪੋਰਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ। torlauncher.tor_failed_to_start=ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. +torlauncher.unable_to_start_tor=ਟੋਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।\n\n%S +torlauncher.tor_missing=ਟੋਰ ਚੱਲਣਯੋਗ ਗੁੰਮ ਹੈ। torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.ensure_tor_is_running=ਕਿਰਪਾ ਕਰਕੇ ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਟੋਰ ਚਾਲੂ ਹੈ। torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. +torlauncher.error_proxy_type_missing=ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਦੀ ਕਿਸਮ ਦੀ ਚੋਣ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. @@ -31,13 +31,13 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=ਕੁਨੈਕਟ ਕਰੋ -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.restart_tor=ਟੋਰ ਮੁੜ-ਚਾਲੂ ਕਰੋ +torlauncher.quit=ਬੰਦ torlauncher.quit_win=ਬੰਦ ਕਰੋ torlauncher.done=ਮੁਕੰਮਲ -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=ਸਹਾਇਤਾ ਲਈ %S ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਜੀ +torlauncher.forAssistance2=ਸਹਾਇਤਾ ਲਈ ਜਾਓ %S ਉੱਪਰ torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. @@ -53,11 +53,11 @@ torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! torlauncher.bootstrapWarning.done=ਮੁਕੰਮਲ -torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.connectrefused=ਕੁਨੈਕਸ਼ਨ ਇਨਕਾਰ torlauncher.bootstrapWarning.misc=ਫੁਟਕਲ torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error +torlauncher.bootstrapWarning.identity=ਪਛਾਣ ਮਿਸਮੈਚ +torlauncher.bootstrapWarning.timeout=ਕੁਨੈਕਸ਼ਨ ਅੰਤਰਾਲ +torlauncher.bootstrapWarning.noroute=ਮੇਜ਼ਬਾਨ ਨੂੰ ਕੋਈ ਰਸਤਾ ਨਹੀਂ +torlauncher.bootstrapWarning.ioerror=ਪੜ੍ਹਨ/ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ torlauncher.bootstrapWarning.pt_missing=missing pluggable transport diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd index 85cf672..6ed4a63 100644 --- a/src/chrome/locale/pt/progress.dtd +++ b/src/chrome/locale/pt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações"> <!ENTITY torprogress.heading "A conetar à rede Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Por favor aguarde enquanto estabelecemos a ligação à rede Tor.  Isto pode levar alguns minutos."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 54601a6..41a235a 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=O ficheiro torc não existe e não pode ser criado. +torlauncher.datadir_missing=O diretório de dados Tor não existe e não pode ser criado. torlauncher.password_hash_missing=Não foi possível obter a senha "hashed". torlauncher.failed_to_get_settings=Não é possível obter as configurações do Tor\n\n %S diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 8571ca6..a02bfd5 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Lansator Tor -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor s-a închis în mod neașteptat. Acest lucru se datorează fie unei erori în Tor, în alt program de pe sistemul dvs., sau a unei defecțiuni de hardware. Până nu vei fixa problema şi restartezi Tor,\nBrowserul Tor nu va porni. torlauncher.tor_exited=Tor s-a închis în mod neașteptat. Acest lucru se datorează fie unei erori în Tor, în alt program de pe sistemul dvs., sau a unei defecțiuni în hardware. Browserul Tor nu va putea accesa nici un site decât dacă reporniți Tor. Dacă problema persistă, vă rugăm să trimiteți o copie a Tor Log către echipa de suport. torlauncher.tor_exited2=Restartând Tor nu se vor închide ferestrele browserului dvs. torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor. diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index 8de7563..1831549 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Nastavenia Tor Network">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Jazyk Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Prosím zvoľte jazyk.">  @@ -12,37 +12,37 @@ <!ENTITY torSettings.no "Nie"> <!ENTITY torSettings.firstQuestion "Ktorá z nasledujúcich situácií najlepšie popisuje vašu?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt1 "Pripojenie tohto počítača je cenzurované, filtrované alebo vedené cez proxy."> +<!ENTITY torSettings.configurePrompt2 "Musím nastaviť premostenie alebo miestne proxy nastavenie pred pripojením do Tor siete."> <!ENTITY torSettings.configure "Konfigurovať"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Rád by som sa pripojil priamo do siete Tor."> <!ENTITY torSettings.connectPrompt3 "Toto by vo väčšine prípadov malo fungovať."> <!ENTITY torSettings.connect "Pripojiť"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "Miestne proxy nastavenia"> +<!ENTITY torSettings.proxyQuestion "Potrebuje tento počítač použiť proxy pre prístup na internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Vo väčšine prípadov nie je lokálne proxy potrebné, ale môže byť vyžadované pri pripájaní sa cez firemnú, školskú alebo univerzitnú sieť."> +<!ENTITY torSettings.proxyExplanation2 "Ak si nie ste istý ako zodpovedať túto otázky, pozrite si nastavenia internetu v inom prehliadači, alebo skontrolujte Vaše systémové sieťové nastavenia, či je miestne proxy potrebné."> <!ENTITY torSettings.enterProxy "Zadajte nastavenia proxy."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Konfigurácia premostenia Tor"> <!ENTITY torSettings.bridgeQuestion "Blokuje váš poskytovateľ internetového pripojenia (ISP) alebo inak cenzuruje pripojenia do siete Tor Network?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Ak si nie ste istý ako zodpovedať túto otázku, zvoľte Nie (ak sa nedokážete pripojiť k sieti Tor bez premostenia, môžete ho pridať neskôr)."> +<!ENTITY torSettings.bridgeExplanation2 "Ak zvolíte Áno, budete vyzvaný na nastavenie Tor premostení. Premostenia sú v zozname neuvedené prenosy, ktoré sťažujú blokovanie pripojení do siete Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Môžete použiť dodanú sadu premostení alebo si môžete zaobstarať a zadať vlastnú sadu premostení.">  <!ENTITY torsettings.startingTor "Čakanie na štart Toru..."> <!ENTITY torsettings.restartTor "Reštartovať Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Rekonfigurovať"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Nakonfigurovali ste Tor premostenia alebo ste uviedli miestne nastavenia proxy.  Pre vytvorenie priameho spojenia so sieťou Tor, musia byť tieto nastavenia odstránené."> +<!ENTITY torsettings.discardSettings.proceed "Odstrániť nastavenia a spojenia"> <!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje pre prístup na Internet použiť proxy"> <!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa"> @@ -52,24 +52,24 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Tento počítač prechádza cez firewall, ktorý povoľuje spojenie len k určitým portom."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> <!ENTITY torsettings.useBridges.checkbox "Môj poskytovateľ internetového pripojenia blokuje spojenie do siete Tor"> <!ENTITY torsettings.useBridges.default "Pripojiť sa cez dodané premostenia"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Každý typ premostení používa inú metódu na vyhýbanie sa cenzúre.  Ak jedno premostenie nefunguje, skúste iné."> <!ENTITY torsettings.useBridges.type "Typ transportu:"> <!ENTITY torsettings.useBridges.custom "Zadajte vlastné premostenia"> <!ENTITY torsettings.useBridges.label "Zadaj jedno alebo viac premostení relé (jedno na riadok)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "Typ adresy:port"> <!ENTITY torsettings.copyLog "Kopírovať log Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle "Pomocník pre premostenia relé"> <!ENTITY torsettings.bridgeHelp1 "Ak nie ste schopní sa pripojiť do siete Tor, je možné, že váš poskytovateľ internetového pripojenia (ISP) alebo iný správny orgán blokuje Tor.  Väčšinou je možné tento problém obísť použitím Tor Bridges, čo sú nikde nezapísané relé, ktoré je obtiažne blokovať."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp1B "Môžete použiť prednastavené, vopred poskytnuté adresy premostení alebo môžete získať vlastný set adries použitím jednej z nasledujúcich metód:"> +<!ENTITY torsettings.bridgeHelp2Heading "Prostredníctvom internetu"> <!ENTITY torsettings.bridgeHelp2 "Navštívte https://bridges.torproject.org pomocou webového prehliadača"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3Heading "Cez automatickú emailovú odpoveď"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Pošlite email na bridges(a)torproject.org len s textom 'get bridges' v tele správy.  Bohužiaľ, aby sa zabránilo útočníkom získať množstvo adries premostení, musíte požiadavku poslať z emailu nasledovných poskytovateľov (zoradené podľa preferencií): "> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "Prostredníctvom Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ako posledné východisko, môžete poslať milý e-mail na help(a)rt.torproject.org a požiadať o adresy premostenia.  Berte, prosím, na vedomie, že niekto bude musieť na každú požiadavku samostatne reagovať."> diff --git a/src/chrome/locale/sk-SK/progress.dtd b/src/chrome/locale/sk-SK/progress.dtd index 58926c8..272fc72 100644 --- a/src/chrome/locale/sk-SK/progress.dtd +++ b/src/chrome/locale/sk-SK/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Otvoriť nastavenia"> <!ENTITY torprogress.heading "Pripájanie do siete Tor "> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. "> diff --git a/src/chrome/locale/sk-SK/torlauncher.properties b/src/chrome/locale/sk-SK/torlauncher.properties index 8f479ab..f0e48e5 100644 --- a/src/chrome/locale/sk-SK/torlauncher.properties +++ b/src/chrome/locale/sk-SK/torlauncher.properties @@ -3,19 +3,19 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited_during_startup=Tor bol ukončený počas spúšťania. Mohla to spôsibiť chyba vo Vašom torrc súbore, chyba v Tor alebo inom programe vo Vašom systéme, alebo chybný hardvér. Kým nevyriešite tento problém a nereštartujete Tor, nebude možné spustiť prehliadač Tor. +torlauncher.tor_exited=Tor bol nečakane ukončený. Mohla nastať chyba v prehliadači Tor, alebo to mohlo byť spôsobené iným programom vo Vašom systéme alebo chybným hardvérom. Kým nereštartujete Tor, prehliadač Tor nebude schopný načítať žiadne webové stránky. Ak sa tým problém nevyrieši, pošlite kópiu záznamu Tor Log tímu technickej podpory. torlauncher.tor_exited2=Reštartovanie Tor spojenia nezavrie záložky -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_controlconn_failed=Pripojenie ku kontrolnému portu Tor bolo neúspešné. torlauncher.tor_failed_to_start=Nepodarilo sa spustiť Tor. torlauncher.tor_control_failed=Nepodarilo sa získať kontrolu nad Tor-om torlauncher.tor_bootstrap_failed=Tor nedokázal nadviazať spojenie do siete Tor. torlauncher.tor_bootstrap_failed_details=%1$S zlyhaných (%2$S). torlauncher.unable_to_start_tor=Nie je možné spustiť Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.tor_missing=Chýbjú dáta pre spustenie Tor. +torlauncher.torrc_missing=Chýba súbor torrc a nemohol byť vytvorený. +torlauncher.datadir_missing=Priečinok pre dáta Tor neexistuje a nemohol byť vytvorený. torlauncher.password_hash_missing=Nebolo možné prevziať zašifrované heslo. torlauncher.failed_to_get_settings=Nepodarilo sa získať Tor nastavenia.\n\n%S @@ -25,8 +25,8 @@ torlauncher.ensure_tor_is_running=Prosím, uistite sa že Tor beží. torlauncher.error_proxy_addr_missing=Musíte špecifikovať tak IP adresu alebo host, ako aj port, aby Tor používal proxy na pripájanie sa do internetu. torlauncher.error_proxy_type_missing=Musíte si vybrať proxy typ. torlauncher.error_bridges_missing=Musíte špecifikovať jedno alebo viac premostení -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Musíte vybrať typ transportu pre získanie premostení. +torlauncher.error_bridge_bad_default_type=Nie sú k dispozícii žiadne premostenia s typom transportu %S. Prosím upravte nastavenia. torlauncher.recommended_bridge=(odporúčané) @@ -37,19 +37,19 @@ torlauncher.quit_win=Ukončiť torlauncher.done=Hotovo torlauncher.forAssistance=Pre pomoc konaktujte %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Pre pomoc navštívte %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopírovanie kompletné. %S záznamov je pripravených na vloženie do textového editora alebo emailu. -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.conn_dir=Pripájam sa do priečinka relé torlauncher.bootstrapStatus.handshake_dir=Vytváram spojenie so zašifrovaným priečinkom torlauncher.bootstrapStatus.requesting_status=Získavam stav siete torlauncher.bootstrapStatus.loading_status=Načítavam stav siete torlauncher.bootstrapStatus.loading_keys=Načítavam certifikáty autority -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.requesting_descriptors=Vyžiadavam informácie o relé +torlauncher.bootstrapStatus.loading_descriptors=Načítavam informácie o relé torlauncher.bootstrapStatus.conn_or=Pripájanie do siete Tor -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit +torlauncher.bootstrapStatus.handshake_or=Vytváram obvod Tor torlauncher.bootstrapStatus.done=Pripojené do siete Tor! torlauncher.bootstrapWarning.done=hotovo @@ -58,6 +58,6 @@ torlauncher.bootstrapWarning.misc=rôzne torlauncher.bootstrapWarning.resourcelimit=nedostatočné zdroje torlauncher.bootstrapWarning.identity=nezhoda v identite torlauncher.bootstrapWarning.timeout=timeout spojenia -torlauncher.bootstrapWarning.noroute=no route to host +torlauncher.bootstrapWarning.noroute=Žiadna cesta ku hostiteľovi torlauncher.bootstrapWarning.ioerror=chyba čítania, alebo zápisu -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=chýba zásuvný - pluggable transport diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 6b2cd2c..be5b44b 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Подешавања Тор мреже">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Тор језик"> +<!ENTITY torlauncher.localePicker.prompt "Молимо вас одаберите језик.">  diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index a0881ff..48ead46 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> <!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü ya da vekil sunucu arkasında."> -<!ENTITY torSettings.configurePrompt2 "Tor ağına bağlanmadan önce köprü ya da yerel vekil sunucu ayarlarını yapmalıyım"> +<!ENTITY torSettings.configurePrompt2 "Tor ağına bağlanmadan önce köprü ya da yerel vekil sunucu ayarlarını yapılandırmalıyım."> <!ENTITY torSettings.configure "Yapılandır"> <!ENTITY torSettings.connectPrompt2 "Tor ağı ile doğrudan bir bağlantı kurmak istiyorum."> <!ENTITY torSettings.connectPrompt3 "Bu çoğu durumda çalışır."> diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd index 2b9b2b9..76930b0 100644 --- a/src/chrome/locale/tr/progress.dtd +++ b/src/chrome/locale/tr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Durumu"> <!ENTITY torprogress.openSettings "Ayarları Aç"> <!ENTITY torprogress.heading "Tor ağına bağlanılıyor"> -<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem bir kaç dakika sürebilir."> +<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir."> diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index 3848423..5df3df6 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Скопіювати журнал Tor до буферу обміну"> <!ENTITY torsettings.bridgeHelpTitle "Допомога по ретрансляторам типу міст"> <!ENTITY torsettings.bridgeHelp1 "Якщо Ви не можете підключитися до мережі Tor, може бути, що Ваш інтернет-провайдер (ISP) або інша організація блокує Tor.  Часто можна обійти цю проблему за допомогою Tor мостів, що є приватними трансляторами, які важче заблокувати."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Ви можете використати заздалегідь визначений перелік адрес мостів або можете отримати і ввести набір мостів вручну."> <!ENTITY torsettings.bridgeHelp2Heading "Через Веб"> <!ENTITY torsettings.bridgeHelp2 "Відвідайте сторінку https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Через автовідповідач електронної пошти"> diff --git a/src/chrome/locale/uk/torlauncher.properties b/src/chrome/locale/uk/torlauncher.properties index cee6280..5ddfb29 100644 --- a/src/chrome/locale/uk/torlauncher.properties +++ b/src/chrome/locale/uk/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Завантажувач Tor -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor завершив роботу під час запуску. Це може бути викликано помилкою у Вашому torrc файлі, недоробкою в Tor або іншій програмі на Вашій системі, або несправним обладнанням. Доки Ви не усунете первісну проблему і не перезапустите Tor, Tor Browser не працюватиме. torlauncher.tor_exited=Tor несподівано завершив роботу. Це може бути пов'язано з помилкою в Torі, іншою програмою на вашій системі, або несправним обладнанням. Поки ви не перевантажите Tor, браузер Tor буде не в змозі досягти будь-яких веб-сайтів. Якщо проблема не усувається, то, будь ласка, відправте копію журналу Tor у службу підтримки. torlauncher.tor_exited2=Перезапуск Tor не буде закривати вкладки вашого браузера. torlauncher.tor_controlconn_failed=Неможливо з'єднатися з портом управління Tor. @@ -37,7 +37,7 @@ torlauncher.quit_win=Вихід torlauncher.done=Готово torlauncher.forAssistance=Для допомоги зв'яжіться з %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Для отримання допомоги, будь ласка звертайтеся %S torlauncher.copiedNLogMessages=Копіювання завершено. %S повідомлень журналу tor готові до вставки у текстовий редактор або повідомлення електронної пошти. diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index 174f353..de0c4e6 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "جی ہاں"> +<!ENTITY torSettings.no "نہیں"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> diff --git a/src/chrome/locale/vi/progress.dtd b/src/chrome/locale/vi/progress.dtd index 305cba3..15cd66b 100644 --- a/src/chrome/locale/vi/progress.dtd +++ b/src/chrome/locale/vi/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Trạng thái Tor"> -<!ENTITY torprogress.openSettings "Cài đặt Mở"> +<!ENTITY torprogress.openSettings "Những cài đặt mở"> <!ENTITY torprogress.heading "Kết nối với mạng Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Vui lòng chờ trong khi chúng tôi thiết lập kết nối tới mạng lưới Tor.  Việc này có thể tốn một vài phút."> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index f066531..12de864 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor đã thoát trong khi khởi động. Điều này có lẽ là do một lỗi trong tệp tin torrc của bạn, một khiếm khuyết của Tor hay của một chương trình khác trong hệ thống của bạn, hoặc lỗi phần cứng. Cho đến khi bạn sửa chữa lại vấn đề bên dưới đó và khởi động lại Tor, trình duyệt Tor sẽ không khởi động. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 35343c2..5997966 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -2,7 +2,7 @@  <!ENTITY torlauncher.localePicker.title "Tor Browser 语言"> -<!ENTITY torlauncher.localePicker.prompt "请选择一个语言。"> +<!ENTITY torlauncher.localePicker.prompt "请选择一种语言。">  @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "以下哪个描述与你的情况最为匹配？"> <!ENTITY torSettings.configurePrompt1 "网络连接受到审查或需要代理。"> -<!ENTITY torSettings.configurePrompt2 "我需要配置网桥或本地代理设置才能连接到 Tor 网络。"> +<!ENTITY torSettings.configurePrompt2 "我需要配置网桥或设置本地代理才能连接到 Tor 网络。"> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connectPrompt2 "我想直接连接 Tor 网络。"> <!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> @@ -22,12 +22,12 @@ <!ENTITY torSettings.proxyPageTitle "本地代理配置"> <!ENTITY torSettings.proxyQuestion "是否需要本地代理访问互联网？">  -<!ENTITY torSettings.proxyExplanation1 "大多数情况下不需要使用本地代理，但在使用公司、校园等网络时这可能必需。"> -<!ENTITY torSettings.proxyExplanation2 "如果您不确定此问题的答案，请查看其他网络浏览器或者您的系统中的网络设置，检查其是否使用了一个本地代理。"> +<!ENTITY torSettings.proxyExplanation1 "大多数情况下并不需要使用本地代理，但在公司、学校等网络时这可能需要。"> +<!ENTITY torSettings.proxyExplanation2 "如果你不确定此问题的答案，请查看此计算机中的其他浏览器的因特网设置或者是你系统中的网络设置，查看是否需要本地代理设置。"> <!ENTITY torSettings.enterProxy "输入代理设置。"> <!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> -<!ENTITY torSettings.bridgeExplanation1 "如果您不确定此问题的答案，请选择否（如果您在不使用网桥时无法连接到 Tor 网络，您可以在稍后回来添加一个）"> +<!ENTITY torSettings.bridgeExplanation1 "如果你不确定此问题的答案，请选择否，（如果你在不使用网桥时无法连接到 Tor 网络，你可以稍后添加）。"> <!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">

1 0

[tor-browser-bundle/maint-6.0] Changelog update
by gk＠torproject.org 15 Sep '16

15 Sep '16

commit f4d04fd57c9c1b43b8ca3550a051ff19b8eeee8b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 15 07:02:43 2016 +0000 Changelog update --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4000a57..6a4e4d6 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 6.0.5 -- September 13 +Tor Browser 6.0.5 -- September 20 * All Platforms * Update Firefox to 45.4.0esr * Update Tor to 0.2.8.7

1 0

[tor-browser-bundle/hardened-builds] Bug 19528: run get-moz-build-date before removing .git (fixup)
by gk＠torproject.org 14 Sep '16

14 Sep '16

commit b79f5d274b2093758af6cf9a2076224c40295b1d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 14 17:11:38 2016 +0200 Bug 19528: run get-moz-build-date before removing .git (fixup) Additionally, we make get-moz-build-date fail with an error if it was not possible to get the year from git. --- gitian/build-helpers/get-moz-build-date | 5 +++++ gitian/descriptors/linux/gitian-firefox.yml | 3 ++- gitian/descriptors/mac/gitian-firefox.yml | 3 ++- gitian/descriptors/windows/gitian-firefox.yml | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/get-moz-build-date b/gitian/build-helpers/get-moz-build-date index 168a8c7..3dae232 100755 --- a/gitian/build-helpers/get-moz-build-date +++ b/gitian/build-helpers/get-moz-build-date @@ -4,6 +4,11 @@ use strict; my ($year) = split('-', `git show -s --format='%ci'`); +if ($? != 0) { + print STDERR "Failed to get year from the git commit\n"; + print "exit 1\n"; + exit 1; +} die "missing argument" unless @ARGV; my $version = $ARGV[0]; diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 89f68fa..dc02cba 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -85,6 +85,8 @@ script: | cd tor-browser mv .mozconfig-asan .mozconfig + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" @@ -93,7 +95,6 @@ script: | # Self-Rando wrapper export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" export SELFRANDO_skip_shuffle= - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Without disabling LSan our build is blowing up: diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index fea3139..7a852c4 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -60,13 +60,14 @@ script: | TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 788b053..cc7fdeb 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -68,13 +68,14 @@ script: | # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" #

1 0

[tor-browser-bundle/master] Bug 19528: run get-moz-build-date before removing .git (fixup)
by gk＠torproject.org 14 Sep '16

14 Sep '16

commit 02ff59eaeb1bea0ce00ee0223da9eab0ff69834d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 14 17:11:38 2016 +0200 Bug 19528: run get-moz-build-date before removing .git (fixup) Additionally, we make get-moz-build-date fail with an error if it was not possible to get the year from git. --- gitian/build-helpers/get-moz-build-date | 5 +++++ gitian/descriptors/linux/gitian-firefox.yml | 3 ++- gitian/descriptors/mac/gitian-firefox.yml | 3 ++- gitian/descriptors/windows/gitian-firefox.yml | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/get-moz-build-date b/gitian/build-helpers/get-moz-build-date index 168a8c7..3dae232 100755 --- a/gitian/build-helpers/get-moz-build-date +++ b/gitian/build-helpers/get-moz-build-date @@ -4,6 +4,11 @@ use strict; my ($year) = split('-', `git show -s --format='%ci'`); +if ($? != 0) { + print STDERR "Failed to get year from the git commit\n"; + print "exit 1\n"; + exit 1; +} die "missing argument" unless @ARGV; my $version = $ARGV[0]; diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 14799d6..79356a9 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -88,12 +88,13 @@ script: | mkdir -p $INSTDIR/Debug/Browser/browser/components cd tor-browser + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index bd7d7f7..607a04c 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -43,13 +43,14 @@ script: | TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 788b053..cc7fdeb 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -68,13 +68,14 @@ script: | # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" #

1 0

[torbutton/master] Bug 17767: Move 'JavaScript disabled' to top of Security Slider list
by gk＠torproject.org 13 Sep '16

13 Sep '16

commit fe6c10c893f3aed2d58e5b0c1b703543d7286f96 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 9 11:28:41 2016 -0700 Bug 17767: Move 'JavaScript disabled' to top of Security Slider list --- src/chrome/content/preferences.xul | 42 +++++++++++++++++++------------------- src/chrome/locale/en/torbutton.dtd | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 507efd0..8ea448c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -78,14 +78,18 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; + tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> + &torbutton.prefs.sec_all_js_desc; </description> <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -98,10 +102,6 @@ &torbutton.prefs.sec_font_rend_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> - &torbutton.prefs.sec_all_js_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_svg_desc_tooltip;"> &torbutton.prefs.sec_svg_desc; </description> @@ -116,14 +116,18 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; + tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> + &torbutton.prefs.sec_js_https_desc; </description> <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -135,10 +139,6 @@ tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> &torbutton.prefs.sec_font_rend_desc; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> - &torbutton.prefs.sec_js_https_desc; - </description> </vbox> <vbox id="desc_medium_low" collapsed="true"> <description @@ -146,14 +146,14 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip;"> &torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -188,12 +188,12 @@ <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> + <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> - <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> <html:div>&torbutton.prefs.sec_svg_desc;</html:div> <html:div>&torbutton.prefs.sec_webfonts_desc;</html:div> </tooltip> @@ -201,19 +201,19 @@ <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> + <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> - <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> </tooltip> <tooltip id="ml_preview"> <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> </tooltip> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 0720208..4bca4c7 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -47,7 +47,7 @@ <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> <!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> <!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled.">

1 0

[tor-browser-bundle/hardened-builds] Bug 20133: Don't apply OpenSSL patch anymore
by gk＠torproject.org 12 Sep '16

12 Sep '16

commit 4023bc26f3a371dbdadc7659eb511c6d2a5b4d5c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 12 12:31:26 2016 +0000 Bug 20133: Don't apply OpenSSL patch anymore The patch we applied for building OpenSSL reproducible got upstreamed into 1.0.2. Thus, we don't need to apply it anymore after switching to the new OpenSSL series. --- gitian/descriptors/linux/gitian-utils.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 2 -- .../patches/openssl-Make-build-reproducible.patch | 28 ---------------------- 3 files changed, 32 deletions(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 2db8739..4bbb8a4 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -35,7 +35,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -125,7 +124,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 # Using $MAKEOPTS breaks the build. Might be the issue mentioned on diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9296724..0286f58 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -24,7 +24,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -131,7 +130,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch deleted file mode 100644 index d86f5ba..0000000 --- a/gitian/patches/openssl-Make-build-reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt(a)roeckx.be> -Date: Fri, 2 Jan 2015 12:27:57 +0100 -Subject: [PATCH] Make build reproducible - -It contained a date on when it was build. - -Reviewed-by: Rich Salz <rsalz(a)openssl.org> ---- - crypto/cversion.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/cversion.c b/crypto/cversion.c -index 9e6f50d78182..c417d1d1121f 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) - return OPENSSL_VERSION_TEXT; - if (t == SSLEAY_BUILT_ON) { - #ifdef DATE -+# ifdef OPENSSL_USE_BUILD_DATE - return (DATE); -+# else -+ return("built on: reproducible build, date unspecified"); -+# endif - #else - return ("built on: date not available"); - #endif

1 0

[tor-browser-bundle/master] Bug 20133: Don't apply OpenSSL patch anymore
by gk＠torproject.org 12 Sep '16

12 Sep '16

commit 4e2d9e7d4a0e0485ee5a5654e98c7262b9e6c03c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 12 12:31:26 2016 +0000 Bug 20133: Don't apply OpenSSL patch anymore The patch we applied for building OpenSSL reproducible got upstreamed into 1.0.2. Thus, we don't need to apply it anymore after switching to the new OpenSSL series. --- gitian/descriptors/linux/gitian-utils.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 2 -- .../patches/openssl-Make-build-reproducible.patch | 28 ---------------------- 3 files changed, 32 deletions(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 0adcf5d..7093a0d 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -32,7 +32,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -97,7 +96,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" if [ $GBUILD_BITS == "64" ]; then diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 0876bff..9c31834 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -27,7 +27,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -137,7 +136,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch deleted file mode 100644 index d86f5ba..0000000 --- a/gitian/patches/openssl-Make-build-reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt(a)roeckx.be> -Date: Fri, 2 Jan 2015 12:27:57 +0100 -Subject: [PATCH] Make build reproducible - -It contained a date on when it was build. - -Reviewed-by: Rich Salz <rsalz(a)openssl.org> ---- - crypto/cversion.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/cversion.c b/crypto/cversion.c -index 9e6f50d78182..c417d1d1121f 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) - return OPENSSL_VERSION_TEXT; - if (t == SSLEAY_BUILT_ON) { - #ifdef DATE -+# ifdef OPENSSL_USE_BUILD_DATE - return (DATE); -+# else -+ return("built on: reproducible build, date unspecified"); -+# endif - #else - return ("built on: date not available"); - #endif

1 0

[tor-browser-bundle/master] We have 2016 already
by gk＠torproject.org 10 Sep '16

10 Sep '16

commit 587aa59bbb39529cc69df18c2615cc6963df0aad Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 10 12:22:06 2016 +0000 We have 2016 already --- Bundle-Data/Docs/ChangeLog.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4506e37..60a60cf 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,10 @@ -Tor Browser 6.0.4 -- August 16 +Tor Browser 6.0.4 -- August 16 2016 * All Platforms * Update Tor to 0.2.8.6 * Update NoScript to 2.9.0.14 * Bug 19890: Disable installation of system addons -Tor Browser 6.5a2-hardened -- August 3 +Tor Browser 6.5a2-hardened -- August 3 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Tor to tor-0.2.8.5-rc @@ -37,7 +37,7 @@ Tor Browser 6.5a2-hardened -- August 3 * All Platforms * Bug 19703: Upgrade Go to 1.6.3 -Tor Browser 6.5a2 -- August 3 +Tor Browser 6.5a2 -- August 3 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Tor to tor-0.2.8.5-rc @@ -77,7 +77,7 @@ Tor Browser 6.5a2 -- August 3 * All Platforms * Bug 19703: Upgrade Go to 1.6.3 -Tor Browser 6.0.3 -- August 2 +Tor Browser 6.0.3 -- August 2 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Torbutton to 1.9.5.6 @@ -96,7 +96,7 @@ Tor Browser 6.0.3 -- August 2 * Android * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined -Tor Browser 6.0.2 -- June 21 +Tor Browser 6.0.2 -- June 21 2016 * All Platforms * Update Torbutton to 1.9.5.5 * Bug 19417: Clear asmjscache @@ -108,7 +108,7 @@ Tor Browser 6.0.2 -- June 21 * Linux * Bug 19276: Disable Xrender due to possible performance regressions -Tor Browser 6.5a1-hardened -- June 8 +Tor Browser 6.5a1-hardened -- June 8 2016 * All Platforms * Update Firefox to 45.2.0esr * Update Tor to 0.2.8.3-alpha @@ -162,7 +162,7 @@ Tor Browser 6.5a1-hardened -- June 8 * Bug 18291: Remove some uses of libfaketime * Bug 18845: Make zip and tar helpers generate reproducible archives -Tor Browser 6.5a1 -- June 8 +Tor Browser 6.5a1 -- June 8 2016 * All Platforms * Update Firefox to 45.2.0esr * Update Tor to 0.2.8.3-alpha @@ -221,7 +221,7 @@ Tor Browser 6.5a1 -- June 8 * Bug 18291: Remove some uses of libfaketime * Bug 18845: Make zip and tar helpers generate reproducible archives -Tor Browser 6.0.1 -- June 7 +Tor Browser 6.0.1 -- June 7 2016 * All Platforms * Update Firefox to 45.2.0esr * Bug 18884: Don't build the loop extension @@ -230,7 +230,7 @@ Tor Browser 6.0.1 -- June 7 * Linux * Bug 19189: Backport for working around a linker (gold) bug -Tor Browser 6.0 -- May 30 +Tor Browser 6.0 -- May 30 2016 * All Platforms * Update Firefox to 45.1.1esr * Update OpenSSL to 1.0.1t

1 0

[tor-browser-bundle/master] Bug 20118: Don't unpack HTTPS Everywhere anymore
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit ae5f3f9f9bb12a0e07d268262c6e5b8e3b0baf88 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:30:44 2016 +0000 Bug 20118: Don't unpack HTTPS Everywhere anymore Starting with version 5.2.2 HTTPS Everywhere is not unpacked anymore. We should keep it unpacked as well, especially as that fixes usability issues like #20033. --- gitian/descriptors/linux/gitian-bundle.yml | 9 +++------ gitian/descriptors/mac/gitian-bundle.yml | 9 +++------ gitian/descriptors/windows/gitian-bundle.yml | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 105cab7..b08fbcc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -71,7 +71,7 @@ script: | # directory named tor-browser (instead of tor-browser_en-US). Therefore we # stage everything under tor-browser-stage to avoid a conflict. TB_STAGE_DIR=tor-browser-stage - mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/ @@ -109,16 +109,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/ cd ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org/ - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build # cd meek/firefox diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index d644a56..4f12174 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -104,7 +104,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p $TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-eff(a)eff.org + mkdir -p $TORBROWSER_NAME.app/$EXTSPATH mkdir -p $TORBROWSER_NAME.app/$MEEKPROFILEPATH/extensions mkdir -p $TORBROWSER_NAME.app/$DOCSPATH/sources mkdir -p $TORBROWSER_NAME.app/Contents/MacOS @@ -139,16 +139,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi ./$TORBROWSER_NAME.app/$EXTSPATH/ cd $TORBROWSER_NAME.app/$EXTSPATH/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # cd meek/firefox diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index d065f60..e563308 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -76,7 +76,7 @@ script: | export PATH=$INSTDIR/nsis/bin:$PATH # mkdir -p $OUTDIR/ - mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources @@ -109,16 +109,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # cd meek/firefox

1 0

[torbutton/master] Adding translation update to CHANGELOG
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 57002e877310f8c1e136f733f946dee6677958d3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:46:21 2016 +0000 Adding translation update to CHANGELOG --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 25c4c95..599645c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -5,6 +5,7 @@ * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 * Bug 14271: Make Torbutton work with Unix Domain Socket option + * Translation updates 1.9.6.1 * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client

1 0

[torbutton/master] Release preparations for 1.9.6.2
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 0520c426f6a6b7997962ca53b4ca154ce5285dc0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:45:29 2016 +0000 Release preparations for 1.9.6.2 --- src/CHANGELOG | 8 ++++++++ src/install.rdf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index cd5ce27..25c4c95 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,11 @@ +1.9.6.2 + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 14271: Make Torbutton work with Unix Domain Socket option + 1.9.6.1 * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) diff --git a/src/install.rdf b/src/install.rdf index e33fdb9..5936299 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.6.1</em:version> + <em:version>1.9.6.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit a84c726d08e9661a860eb3e8288f3acb1cc23f58 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:41:53 2016 +0000 Translation updates --- src/chrome/locale/ar/aboutTor.dtd | 4 ++-- src/chrome/locale/es/torbutton.dtd | 6 +++--- src/chrome/locale/eu/aboutDialog.dtd | 12 ++++++------ src/chrome/locale/eu/aboutTBUpdate.dtd | 10 +++++----- src/chrome/locale/eu/torbutton.dtd | 12 ++++++------ src/chrome/locale/eu/torbutton.properties | 20 ++++++++++---------- src/chrome/locale/fa/torbutton.properties | 2 +- src/chrome/locale/nl/aboutDialog.dtd | 2 +- src/chrome/locale/nl/torbutton.dtd | 2 +- src/chrome/locale/pt/torbutton.properties | 4 ++-- src/chrome/locale/ru/aboutDialog.dtd | 2 +- src/chrome/locale/ru/aboutTBUpdate.dtd | 6 +++--- src/chrome/locale/ru/aboutTor.dtd | 2 +- src/chrome/locale/ru/brand.dtd | 2 +- src/chrome/locale/vi/aboutTBUpdate.dtd | 2 +- src/chrome/locale/vi/aboutTor.dtd | 2 +- src/chrome/locale/vi/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/aboutDialog.dtd | 2 +- src/chrome/locale/zh-CN/aboutTBUpdate.dtd | 8 ++++---- src/chrome/locale/zh-CN/aboutTor.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 6 +++--- 21 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 8945674..bf90b4f 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -6,13 +6,13 @@ <!ENTITY aboutTor.title "عن تور"> -<!ENTITY aboutTor.outOfDateTorOn.label "هذا المتصفح خارج التحديث"> +<!ENTITY aboutTor.outOfDateTorOn.label "تحذير: هذه نسخة قديمة من المتصفح."> <!ENTITY aboutTor.outOfDateTorOff.label "أيضاً، هذه نسخة قديمة من المتصفح."> <!ENTITY aboutTor.outOfDate2.label "اضغط على رمز البصلة ثم اختر "تحقق من تحديثات متصفح تور""> <!ENTITY aboutTor.check.label "اختبر إعدادات شبكة تور."> -<!ENTITY aboutTor.success.label "مرحبا بك في متصفح تور"> +<!ENTITY aboutTor.success.label "أهلاً بك في متصفح تور"> <!ENTITY aboutTor.success2.label "تم الإتصال بشبكة تور"> <!ENTITY aboutTor.success3.label "يمكنك الآن تصفح الانترنت بشكل يحمي هويتك."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 40c1270..57f4be5 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -18,7 +18,7 @@ <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)"> <!ENTITY torbutton.cookiedialog.nameCol "Nombre"> <!ENTITY torbutton.cookiedialog.pathCol "Ruta"> -<!ENTITY torbutton.cookiedialog.protectCookie "Proteger cookie"> +<!ENTITY torbutton.cookiedialog.protectCookie "Cookie protegida"> <!ENTITY torbutton.cookiedialog.removeCookie "Eliminar cookie"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger cookie"> <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas"> @@ -28,7 +28,7 @@ <!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 de Navegador Tor"> +<!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)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "Esto proporciona la mejor experiencia de usabilidad."> @@ -37,7 +37,7 @@ <!ENTITY torbutton.prefs.sec_med_low "Medio-Bajo"> <!ENTITY torbutton.prefs.sec_gen_desc "En este nivel de seguridad, se aplican los siguientes cambios (ratón encima para detalles):"> <!ENTITY torbutton.prefs.sec_html5_desc "Los medios de vídeo y audio HTML5 se vuelven tipo clic-para-reproducir mediante NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, podría necesitar usar el botón de barra de herramientas de NoScript para habilitar estos objetos de medios."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, podría necesitar usar el botón NoScript de barra de herramientas para habilitar estos objetos de medios."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Algunas optimizaciones de rendimiento de JavaScript están deshabilitadas."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantáneo optimizado), Type Inference (deducción del tipo de datos por el compilador), ASM.JS (JS intermedio para alto rendimiento de otros lenguajes)"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT (compilador JS instantáneo)"> diff --git a/src/chrome/locale/eu/aboutDialog.dtd b/src/chrome/locale/eu/aboutDialog.dtd index 93819b7..08f9426 100644 --- a/src/chrome/locale/eu/aboutDialog.dtd +++ b/src/chrome/locale/eu/aboutDialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; garatzen du ">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", irabazi asmorik gabeko eta zure sareko askatasun eta pribatutasuna defendatzen duen erakunde bat."> <!ENTITY help.start "Lagundu nahi duzu?">  <!ENTITY help.donateLink "Egizu dohaintza"> -<!ENTITY help.or " or "> +<!ENTITY help.or "edo">  <!ENTITY help.getInvolvedLink "egizu bat"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Galderarik?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Lagundu Tor sarea hazten!">  <!ENTITY bottomLinks.license "Lizentziei Buruzko Informazioa"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY tor.TrademarkStatement "'Tor' eta 'Onion Logo' Tor Project, Inc.ren marka erregistratuak dira."> diff --git a/src/chrome/locale/eu/aboutTBUpdate.dtd b/src/chrome/locale/eu/aboutTBUpdate.dtd index 37567bd..5f2178b 100644 --- a/src/chrome/locale/eu/aboutTBUpdate.dtd +++ b/src/chrome/locale/eu/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.title "Tor nabigatzailearen eguneraketa"> +<!ENTITY aboutTBUpdate.updated "Tor nabigatzailea eguneratu egin da."> +<!ENTITY aboutTBUpdate.linkPrefix "Eguneraketa honen inguruko azken informazioa lortzeko,"> +<!ENTITY aboutTBUpdate.linkLabel "ikusi ezazu gure webgunea"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Aldaketen zerrenda:"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 6ee2509..c92b7f5 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -42,22 +42,22 @@ <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> +<!ENTITY torbutton.prefs.sec_jar_desc "Urruneko JAR fitxategiak blokeatuta daude."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR fitxategiak oso bitxiak dira webean, baina XSS eta beste eraso batzuen jatorria izan daitezke."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ezgaituta dago."> <!ENTITY torbutton.prefs.sec_med_high "Ertaina-altua"> <!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> <!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG irudiak ezgaituta daude."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "Altua"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!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 "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "Gune honetako Tor zirkuitua"> diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index fcc3b15..0799da2 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -2,10 +2,10 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP ezezaguna torbutton.circuit_display.onion_site = Onion webgunea torbutton.circuit_display.this_browser = Nagibatzaile hau -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = errele torbutton.circuit_display.tor_bridge = Zubia torbutton.circuit_display.unknown_country = Herrialde ezezaguna -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor nabigatzaileak marjin hau gehitzen du zure lehioaren zabalera eta altuera ez hain bereizgarria egiteko, horrela norbaitek zure jarraipena egiteko gaitasuna murriztuz. torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko torbutton.panel.label.disabled = Tor Ezgaitua @@ -26,12 +26,12 @@ torbutton.popup.short_torbrowser = Torbutton informazio garrantzitsua!\n\nTorbut torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna eta anonimotasuna kaltetu dezakete.\n\nTor saltatu dezakete zure uneko kokalekua eta IP helbidea erakusteko.\n\nPluginak gaitu nahi dituzulaz ziur al zaude?\n\n torbutton.popup.never_ask_again = Ez nazazu galdetu berriz -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor nabigatzaileak lehio eta fitxa guztiak itxiko ditu. Webguneen saio guztiak galdutko dira.\n\nTor nabigatzailea orain berrabiarazi zure nortasuna berrezartzeko?\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Tipula berdearen menua orain zure segurtasun maila egokitzen uzten dizun barra bat du. Proba ezazu! +torbutton.slider_notification_button = Segurtasun aukerak ireki -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Tor nabigatzailea maximizatzeak webguneek zure pantailaren neurria zehaztea baimendu dezake, eta zure jarraipena egiteko erabili daiteke. Tor nabigatzailearen lehioa neurri lehenetsian uztea gomendatzen dugu. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Webgune hau (% S) HTML5 canvas irudi datuak ateratzen saiatu da, eta zure ordenagailua identifikatzeko erabil daitezke.\n\nTor Nabigatzailea baimendu nahi duzu webgune honetan HTML5 canvas irudiaren datuak ateratzeko? @@ -45,7 +45,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=%S Profilarekin Arazoa -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileReadOnly=Ezin duzu %S exekutatu irakurtzeko soilik den fitxategi sistema batetik. Mesedez kopiatu ezazu %S beste leku batean erabiltzen saiatu baino lehenago. +profileReadOnlyMac=Ezin duzu %S exekutatu irakurtzeko soilik den fitxategi sistema batetik. Mesedez kopiatu %S zure mahaigain edo aplikazioen karpetara erabiltzen saiatu baino lehenago. +profileAccessDenied=%S ez du profilera sartzeko baimenik. Mesedez egokitu itzazu zure fitxategi sistemaren baimenak eta berriz saiatu. +profileMigrationFailed=Zure %S profilaren migrazioak huts egin du.\nEzarpen berriak erabiliko dira. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 9f77531..d809651 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -48,4 +48,4 @@ profileProblemTitle=%S مشکل پروفایل profileReadOnly=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به محل دیگری قبل از تلاش برای استفاده از آن. profileReadOnlyMac=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به دسکتاپ خودتان یا پوشه برنامه قبل از تلاش برای استفاده از آن. profileAccessDenied=٪ S اجازه دسترسی به مشخصات ندارد. لطفا مجوزهای سیستم فایل خود را تنظیم و دوباره سعی کنید. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=مهاجرت ناموفق از پروفایل %S.\nتنظیمات جدید استفاده خواهد شد. diff --git a/src/chrome/locale/nl/aboutDialog.dtd b/src/chrome/locale/nl/aboutDialog.dtd index 028e122..33e7e78 100644 --- a/src/chrome/locale/nl/aboutDialog.dtd +++ b/src/chrome/locale/nl/aboutDialog.dtd @@ -3,7 +3,7 @@ <!ENTITY project.tpoLink "het &vendorShortName;"> <!ENTITY project.end ", een non-profit die zich inzet om uw privacy en vrijheid online te verdedigen."> -<!ENTITY help.start "Wilt u meehelpen?"> +<!ENTITY help.start "Wil je meehelpen?">  <!ENTITY help.donateLink "Doneer"> <!ENTITY help.or "of"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index e5c2b3a..66ae979 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -37,7 +37,7 @@ <!ENTITY torbutton.prefs.sec_med_low "Medium-Laag"> <!ENTITY torbutton.prefs.sec_gen_desc "Op dit beveiligingsniveau gelden de volgende wijzigingen (beweeg de muis over de items voor meer informatie)"> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video en audio media geworden click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites , zou je de NoScript werkbalk knop moeten gebruiken om deze media -objecten mogelijk te maken."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites zou je de NoScript werkbalk knop moeten gebruiken om deze media -objecten mogelijk te maken."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Sommige JavaScript-prestatieverbeteringen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 2c1e704..658c96e 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -21,10 +21,10 @@ torbutton.popup.dontask = A partir de agora, transferir automaticamente os fiche torbutton.popup.prompted_language = Para lhe fornecer maior privacidade, o Torbutton pode requerer o uso da versão em inglês em páginas da Internet. Isto pode causar a visualização em inglês das páginas que prefere ler em português.\n\nPretende visualizar páginas em inglês, para melhor privacidade? torbutton.popup.no_newnym = O Torbutton não pode, em segurança, fornecer-lhe uma nova identidade. Não tem acesso à porta de controle Tor.\n\nEstá a usar o Tor Browser Bundle? torbutton.title.prompt_torbrowser = Informação Importante do Torbutton -torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma diferente: já não pode desligá-lo.\n\nProcedemos a esta alteração porque não é seguro usar o Torbutton num explorador também usado para buscas fora do Tor. Havia demasiados erros que não conseguimos corrigir de outra forma.\n\nSe pretende continuar a usar o Firefox normalmente, deve desinstalar o Torbutton e carregar o Tor Browser Bundle para o seu computador. As políticas de privacidade do Explorador do Tor também são superiores às normais no Firefox, mesmo quando este é usado com o Torbutton.\n\nPara remover o Torbutton abra Ferramentas->Acessórios->Extensões e clique no botão Remover junto ao Torbutton. +torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma diferente: já não o poderá desligar.\n\nEfetuámos alteração porque não é seguro usar o Torbutton num navegador também usado para navegação não Tor. Havia demasiados erros que não conseguiríamos corrigir de outra forma.\n\nSe pretende continuar a usar o Firefox, deve desinstalar o Torbutton e descarregar o Tor Browser Bundle para o seu computador. As políticas de privacidade do Navegador Tor também são superiores às normais no Firefox, mesmo quando este é usado com o Torbutton.\n\nPara remover o Torbutton, aceda a Ferramentas->Acessórios->Extensões e clique no botão Remover junto ao Torbutton. torbutton.popup.short_torbrowser = Informação importante do Torbutton!\nO Torbutton não está sempre activo.\nClique no Torbutton para mais informação. -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n +torbutton.popup.confirm_plugins = Os plugins tais como o Flash podem invadir a sua privacidade.\n\nTambém podem originar que o Tor revele a sua localização e o seu endereço IP.\n\nTem a certeza de que deseja ativar os plugins?\n\n torbutton.popup.never_ask_again = Não voltar a perguntar-me torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e separadores. Estarão perdidas todas sessões do sítio da Web.\n\nReiniciar o Navegador Tor para repor a sua identidade?\n\n diff --git a/src/chrome/locale/ru/aboutDialog.dtd b/src/chrome/locale/ru/aboutDialog.dtd index 19b96a0..2ea0395 100644 --- a/src/chrome/locale/ru/aboutDialog.dtd +++ b/src/chrome/locale/ru/aboutDialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; разработано"> +<!ENTITY project.start "&brandShortName; разработки">  <!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end ", проект, созданный, чтобы защитить вашу конфиденциальность и свободу в сети."> diff --git a/src/chrome/locale/ru/aboutTBUpdate.dtd b/src/chrome/locale/ru/aboutTBUpdate.dtd index da0a7c3..21221ac 100644 --- a/src/chrome/locale/ru/aboutTBUpdate.dtd +++ b/src/chrome/locale/ru/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "Обновление браузера Tor"> -<!ENTITY aboutTBUpdate.updated "Браузер Tor был обновлен."> -<!ENTITY aboutTBUpdate.linkPrefix "Для наиболее актуальной информации об этом выпуске,"> +<!ENTITY aboutTBUpdate.updated "Браузер Tor обновлён."> +<!ENTITY aboutTBUpdate.linkPrefix "Чтобы получить наиболее свежую информацию об этом выпуске,"> <!ENTITY aboutTBUpdate.linkLabel "посетите наш вебсайт"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Список изменений:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Журнал изменений:"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index f2ea375..bcc257a 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -13,7 +13,7 @@ <!ENTITY aboutTor.check.label "Проверить настройки сети Tor"> <!ENTITY aboutTor.success.label "Добро пожаловать в обозреватель Tor"> -<!ENTITY aboutTor.success2.label "Соединены с сетью Tor"> +<!ENTITY aboutTor.success2.label "Вы подключены к сети Tor."> <!ENTITY aboutTor.success3.label "Теперь Вы можете просматривать интернет-сайты в анонимном режиме."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> diff --git a/src/chrome/locale/ru/brand.dtd b/src/chrome/locale/ru/brand.dtd index 416dcd8..e7e0a5e 100644 --- a/src/chrome/locale/ru/brand.dtd +++ b/src/chrome/locale/ru/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShorterName "Браузер Tor"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Проект Tor"> diff --git a/src/chrome/locale/vi/aboutTBUpdate.dtd b/src/chrome/locale/vi/aboutTBUpdate.dtd index 37567bd..4f0a9d4 100644 --- a/src/chrome/locale/vi/aboutTBUpdate.dtd +++ b/src/chrome/locale/vi/aboutTBUpdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.title "Cập nhật về Trình duyệt Tor"> <!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> <!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> <!ENTITY aboutTBUpdate.linkLabel "visit our website"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 3ab6a1b..8a349b5 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Thông tin về Tor"> <!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "Ngoài ra, trình duyệt này đã lỗi thời."> +<!ENTITY aboutTor.outOfDateTorOff.label "Thêm nữa, trình duyệt này đã lỗi thời."> <!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Network Settings"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 92c1120..d4157be 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -1,4 +1,4 @@ -<!ENTITY torbutton.context_menu.new_identity "Giám định Mới"> +<!ENTITY torbutton.context_menu.new_identity "Định danh mới"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Vòng Tor mới cho trang này"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> diff --git a/src/chrome/locale/zh-CN/aboutDialog.dtd b/src/chrome/locale/zh-CN/aboutDialog.dtd index 2b2bbf7..0f6da79 100644 --- a/src/chrome/locale/zh-CN/aboutDialog.dtd +++ b/src/chrome/locale/zh-CN/aboutDialog.dtd @@ -3,7 +3,7 @@ <!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end "，一个捍卫您的隐私和自由上网权的非营利组织。"> -<!ENTITY help.start "想要提供帮助？"> +<!ENTITY help.start "需要得到帮助？">  <!ENTITY help.donateLink "捐款"> <!ENTITY help.or "或者"> diff --git a/src/chrome/locale/zh-CN/aboutTBUpdate.dtd b/src/chrome/locale/zh-CN/aboutTBUpdate.dtd index d5caea9..416ddae 100644 --- a/src/chrome/locale/zh-CN/aboutTBUpdate.dtd +++ b/src/chrome/locale/zh-CN/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser 更新"> -<!ENTITY aboutTBUpdate.updated "Tor Browser 已更新。"> +<!ENTITY aboutTBUpdate.title "更新 Tor Browser"> +<!ENTITY aboutTBUpdate.updated "Tor Browser 更新完成。"> <!ENTITY aboutTBUpdate.linkPrefix "有关此版本的最新信息，"> -<!ENTITY aboutTBUpdate.linkLabel "请访问我们的网站"> +<!ENTITY aboutTBUpdate.linkLabel "访问我们的网站"> <!ENTITY aboutTBUpdate.linkSuffix "。"> -<!ENTITY aboutTBUpdate.changeLogHeading "变更日志："> +<!ENTITY aboutTBUpdate.changeLogHeading "更新日志："> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 4d02c9b..426ec5e 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "关于 Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "警告：此浏览器版本较旧。"> +<!ENTITY aboutTor.outOfDateTorOn.label "警告：此浏览器版本过旧。"> <!ENTITY aboutTor.outOfDateTorOff.label "另外，该浏览器并非最新版本。"> <!ENTITY aboutTor.outOfDate2.label "点击洋葱图标，然后选择“Tor Browser 检查更新”。"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 58f72fb..3146ce3 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -15,7 +15,7 @@ <!ENTITY torbutton.prefs.restore_defaults "恢复默认设置"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> -<!ENTITY torbutton.cookiedialog.domainCol "服务器"> +<!ENTITY torbutton.cookiedialog.domainCol "主机"> <!ENTITY torbutton.cookiedialog.nameCol "名称"> <!ENTITY torbutton.cookiedialog.pathCol "路径"> <!ENTITY torbutton.cookiedialog.protectCookie "保护 Cookie"> @@ -35,13 +35,13 @@ <!ENTITY torbutton.prefs.sec_low_desc "该安全级别将启用所有浏览器功能。"> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "禁用 SVG OpenType 字体渲染功能。"> <!ENTITY torbutton.prefs.sec_med_low "中低"> -<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别设置如下（光标悬停查看更多信息）："> +<!ENTITY torbutton.prefs.sec_gen_desc "在这个安全级别，下列更改将会生效（鼠标悬停查看细节）："> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> <!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本执行变慢。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会暂缓执行。"> <!ENTITY torbutton.prefs.sec_jar_desc "禁用远程 JAR 文件。"> <!ENTITY torbutton.prefs.sec_jar_tooltip "网站上很少出现 JAR 文件，但可能成为 XSS 及其他攻击的源头。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。">

1 0

[torbutton/master] Bug 14271: Make Torbutton work with Unix Domain Socket option
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 28a55f5bf324f43373006328c5b03793096f71c4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 9 11:53:23 2016 -0400 Bug 14271: Make Torbutton work with Unix Domain Socket option Call Tor Launcher's new TorGetControlSocketFile() function to determine if a Unix domain socket is being used for Tor control port communication and, if it is, use it instead of a TCP connection. --- src/chrome/content/tor-circuit-display.js | 20 +++--- src/chrome/content/torbutton.js | 101 +++++++++++++++++++----------- src/modules/tor-control-port.js | 82 +++++++++++++----------- 3 files changed, 124 insertions(+), 79 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index c99d25d..f1cf2aa 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -5,9 +5,10 @@ // call earlier functions). The file can be processed // with docco.js to produce pretty documentation. // -// This script is to be embedded in torbutton.xul. It defines a single global function, -// runTorCircuitDisplay(host, port, password), which activates the automatic Tor -// circuit display for the current tab and any future tabs. +// This script is to be embedded in torbutton.xul. It defines a single global +// function, createTorCircuitDisplay(socketFile, host, port, password), which +// activates the automatic Tor circuit display for the current tab and any +// future tabs. // // See https://trac.torproject.org/8641 @@ -15,10 +16,10 @@ /* global document, gBrowser, Components */ // ### Main function -// __createTorCircuitDisplay(host, port, password, enablePrefName)__. +// __createTorCircuitDisplay(socketFile, host, port, password, enablePrefName)__. // The single function that prepares tor circuit display. Connects to a tor -// control port with the given host, port, and password, and binds to -// a named bool pref whose value determines whether the circuit display +// control port with the given socketFile or host plus port, and password, and +// binds to a named bool pref whose value determines whether the circuit display // is enabled or disabled. let createTorCircuitDisplay = (function () { @@ -311,11 +312,11 @@ let syncDisplayWithSelectedTab = (function() { // ## Main function -// __setupDisplay(host, port, password, enablePrefName)__. +// __setupDisplay(socketFile, host, port, password, enablePrefName)__. // Once called, the Tor circuit display will be started whenever // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. -let setupDisplay = function (host, port, password, enablePrefName) { +let setupDisplay = function (socketFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, stop = function() { @@ -329,7 +330,8 @@ let setupDisplay = function (host, port, password, enablePrefName) { }, start = function () { if (!myController) { - myController = controller(host, port || 9151, password, function (err) { + myController = controller(socketFile, host, port || 9151, password, + function (err) { // An error has occurred. logger.eclog(5, err); logger.eclog(5, "Disabling tor display circuit because of an error."); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index acb4b4b..bdcbc4d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -31,9 +31,11 @@ var m_tb_window_width = window.outerWidth; var m_tb_tbb = false; -var m_tb_control_port = null; -var m_tb_control_host = null; +var m_tb_control_socket_file = null; // Set if using a UNIX domain socket. +var m_tb_control_port = null; // Set if not using a socket. +var m_tb_control_host = null; // Set if not using a socket. var m_tb_control_pass = null; +var m_tb_control_desc = null; // For logging. var m_tb_orig_BrowserOnAboutPageLoad = null; @@ -314,6 +316,12 @@ function torbutton_init() { m_tb_prefs.setCharPref(k_tb_last_browser_version_pref, cur_version); } + let tlps; + try { + tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] + .getService(Ci.nsISupports).wrappedJSObject; + } catch(e) {} + // Bug 1506 P4: These vars are very important for New Identity var environ = Components.classes["@mozilla.org/process/environment;1"] .getService(Components.interfaces.nsIEnvironment); @@ -329,33 +337,48 @@ function torbutton_init() { } catch(e) { torbutton_log(4, 'unable to read authentication cookie'); } - } else { + } else try { // Try to get password from Tor Launcher. - try { - let tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] - .getService(Ci.nsISupports).wrappedJSObject; - m_tb_control_pass = tlps.TorGetPassword(false); - } catch(e) {} - } + m_tb_control_pass = tlps.TorGetPassword(false); + } catch(e) {} - if (environ.exists("TOR_CONTROL_PORT")) { - m_tb_control_port = environ.get("TOR_CONTROL_PORT"); - } else { - try { - const kTLControlPortPref = "extensions.torlauncher.control_port"; - m_tb_control_port = m_tb_prefs.getIntPref(kTLControlPortPref); - } catch(e) {} - } + // Try to get control port socket (an nsIFile) from Tor Launcher, since + // Tor Launcher knows how to handle its own preferences and how to + // resolve relative paths. + try { + m_tb_control_socket_file = tlps.TorGetControlSocketFile(); + } catch(e) {} - if (environ.exists("TOR_CONTROL_HOST")) { - m_tb_control_host = environ.get("TOR_CONTROL_HOST"); + if (m_tb_control_socket_file) { + m_tb_control_desc = m_tb_control_socket_file.path; } else { - try { - const kTLControlHostPref = "extensions.torlauncher.control_host"; - m_tb_control_host = m_tb_prefs.getCharPref(kTLControlHostPref); - } catch(e) { - m_tb_control_host = "127.0.0.1"; - } + if (environ.exists("TOR_CONTROL_PORT")) { + m_tb_control_port = environ.get("TOR_CONTROL_PORT"); + } else { + try { + const kTLControlPortPref = "extensions.torlauncher.control_port"; + m_tb_control_port = m_tb_prefs.getIntPref(kTLControlPortPref); + } catch(e) { + // Since we want to disable some features when Tor Launcher is + // not installed (e.g., New Identity), we do not set a default + // port value here. + } + } + + if (m_tb_control_port) { + m_tb_control_desc = "" + m_tb_control_port; + } + + if (environ.exists("TOR_CONTROL_HOST")) { + m_tb_control_host = environ.get("TOR_CONTROL_HOST"); + } else { + try { + const kTLControlHostPref = "extensions.torlauncher.control_host"; + m_tb_control_host = m_tb_prefs.getCharPref(kTLControlHostPref); + } catch(e) { + m_tb_control_host = "127.0.0.1"; + } + } } // Add event listener for about:tor page loads. @@ -430,7 +453,8 @@ function torbutton_init() { torbutton_notify_if_update_needed(); torbutton_update_sync_ui(); - createTorCircuitDisplay(m_tb_control_host, m_tb_control_port, m_tb_control_pass, + createTorCircuitDisplay(m_tb_control_socket_file, m_tb_control_host, + m_tb_control_port, m_tb_control_pass, "extensions.torbutton.display_circuit"); torbutton_log(3, 'init completed'); @@ -999,9 +1023,15 @@ function torbutton_send_ctrl_cmd(command) { m_tb_domWindowUtils.suppressEventHandling(false); try { - var socketTransportService = Components.classes["@mozilla.org/network/socket-transport-service;1"] - .getService(Components.interfaces.nsISocketTransportService); - var socket = socketTransportService.createTransport(null, 0, m_tb_control_host, m_tb_control_port, null); + let sts = Cc["@mozilla.org/network/socket-transport-service;1"] + .getService(Ci.nsISocketTransportService); + let socket; + if (m_tb_control_socket_file) { + socket = sts.createUnixDomainTransport(m_tb_control_socket_file); + } else { + socket = sts.createTransport(null, 0, m_tb_control_host, + m_tb_control_port, null); + } // If we don't get a response from the control port in 2 seconds, someting is wrong.. socket.setTimeout(Ci.nsISocketTransport.TIMEOUT_READ_WRITE, 2); @@ -1021,21 +1051,21 @@ function torbutton_send_ctrl_cmd(command) { var bytes = torbutton_socket_readline(inputStream); if (bytes.indexOf("250") != 0) { - torbutton_safelog(4, "Unexpected auth response on control port "+m_tb_control_port+":", bytes); + torbutton_safelog(4, "Unexpected auth response on control port "+m_tb_control_desc+":", bytes); return null; } outputStream.writeBytes(command, command.length); bytes = torbutton_socket_readline(inputStream); if(bytes.indexOf("250") != 0) { - torbutton_safelog(4, "Unexpected command response on control port "+m_tb_control_port+":", bytes); + torbutton_safelog(4, "Unexpected command response on control port "+m_tb_control_desc+":", bytes); return null; } // Closing these streams prevents a shutdown hang on Mac OS. See bug 10201. inputStream.close(); outputStream.close(); - socket.close(Components.results.NS_OK); + socket.close(Cr.NS_OK); return bytes.substr(4); } catch(e) { torbutton_log(4, "Exception on control port "+e); @@ -1339,7 +1369,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym. - if (!m_tb_control_pass || !m_tb_control_port) { + if (!m_tb_control_pass || (!m_tb_control_socket_file && !m_tb_control_port)) { var warning = torbutton_get_property_string("torbutton.popup.no_newnym"); torbutton_log(5, "Torbutton cannot safely newnym. It does not have access to the Tor Control Port."); window.alert(warning); @@ -1497,7 +1527,7 @@ function torbutton_do_tor_check() const kEnvUseTransparentProxy = "TOR_TRANSPROXY"; var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); - if (m_tb_control_port && + if ((m_tb_control_socket_file || m_tb_control_port) && !env.exists(kEnvUseTransparentProxy) && !env.exists(kEnvSkipControlPortTest) && m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { @@ -2096,8 +2126,9 @@ function torbutton_check_protections() // 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"); - if (!m_tb_control_pass || !m_tb_control_port) + if (!m_tb_control_pass || (!m_tb_control_socket_file && !m_tb_control_port)) { document.getElementById("torbutton-new-identity").disabled = true; + } if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { torbutton_inform_about_tbb(); diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 63c2cd9..f23daed 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -7,9 +7,10 @@ // // To import the module, use // -// let { controller } = Components.utils.import("path/to/controlPort.jsm"); +// let { controller } = Components.utils.import("path/to/tor-control-port.js"); // -// See the last function defined in this file, controller(host, port, password, onError) +// See the last function defined in this file: +// controller(socketFile, host, port, password, onError) // for usage of the controller function. /* jshint esnext: true */ @@ -41,17 +42,24 @@ log("Loading tor-control-port.js\n"); // I/O utilities namespace let io = {}; -// __io.asyncSocketStreams(host, port)__. +// __io.asyncSocketStreams(socketFile, host, port)__. // Creates a pair of asynchronous input and output streams for a socket at the -// given host and port. -io.asyncSocketStreams = function (host, port) { - let socketTransportService = Cc["@mozilla.org/network/socket-transport-service;1"] - .getService(Components.interfaces.nsISocketTransportService), - UNBUFFERED = Ci.nsITransport.OPEN_UNBUFFERED, - // Create an instance of a socket transport. - socketTransport = socketTransportService.createTransport(null, 0, host, port, null), - // Open unbuffered asynchronous outputStream. - outputStream = socketTransport.openOutputStream(UNBUFFERED, 1, 1) +// given socketFile or host and port. +io.asyncSocketStreams = function (socketFile, host, port) { + let sts = Cc["@mozilla.org/network/socket-transport-service;1"] + .getService(Components.interfaces.nsISocketTransportService), + UNBUFFERED = Ci.nsITransport.OPEN_UNBUFFERED; + + // Create an instance of a socket transport. + let socketTransport; + if (socketFile) { + socketTransport = sts.createUnixDomainTransport(socketFile); + } else { + socketTransport = sts.createTransport(null, 0, host, port, null); + } + + // Open unbuffered asynchronous outputStream. + let outputStream = socketTransport.openOutputStream(UNBUFFERED, 1, 1) .QueryInterface(Ci.nsIAsyncOutputStream), // Open unbuffered asynchronous inputStream. inputStream = socketTransport.openInputStream(UNBUFFERED, 1, 1) @@ -91,14 +99,16 @@ io.pumpInputStream = function (inputStream, onInputData, onError) { } }, null); }; -// __io.asyncSocket(host, port, onInputData, onError)__. -// Creates an asynchronous, text-oriented TCP socket at host:port. +// __io.asyncSocket(socketFile, host, port, onInputData, onError)__. +// Creates an asynchronous, text-oriented UNIX domain socket (if socketFile +// is defined) or TCP socket at host:port. // The onInputData callback should accept a single argument, which will be called // repeatedly, whenever incoming text arrives. Returns a socket object with two methods: // socket.write(text) and socket.close(). onError will be passed the error object // whenever a write fails. -io.asyncSocket = function (host, port, onInputData, onError) { - let [inputStream, outputStream] = io.asyncSocketStreams(host, port), +io.asyncSocket = function (socketFile, host, port, onInputData, onError) { + let [inputStream, outputStream] = io.asyncSocketStreams(socketFile, host, + port), pendingWrites = []; // Run an input stream pump to send incoming data to the onInputData callback. io.pumpInputStream(inputStream, onInputData, onError); @@ -243,13 +253,13 @@ io.matchRepliesToCommands = function (asyncSend, dispatcher) { }); }; -// __io.controlSocket(host, port, password, onError)__. -// Instantiates and returns a socket to a tor ControlPort at host:port, -// authenticating with the given password. onError is called with an +// __io.controlSocket(socketFile, host, port, password, onError)__. +// Instantiates and returns a socket to a tor ControlPort at socketFile or +// host:port, authenticating with the given password. onError is called with an // error object as its single argument whenever an error occurs. Example: // // // Open the socket -// let socket = controlSocket("127.0.0.1", 9151, "MyPassw0rd", +// let socket = controlSocket(undefined, "127.0.0.1", 9151, "MyPassw0rd", // function (error) { console.log(error.message || error); }); // // Send command and receive "250" reply or error message // socket.sendCommand(commandText, replyCallback, errorCallback); @@ -259,11 +269,11 @@ io.matchRepliesToCommands = function (asyncSend, dispatcher) { // socket.removeNotificationCallback(callback); // // Close the socket permanently // socket.close(); -io.controlSocket = function (host, port, password, onError) { +io.controlSocket = function (socketFile, host, port, password, onError) { // Produce a callback dispatcher for Tor messages. let mainDispatcher = io.callbackDispatcher(), // Open the socket and convert format to Tor messages. - socket = io.asyncSocket(host, port, + socket = io.asyncSocket(socketFile, host, port, io.onDataFromOnLine( io.onLineFromOnMessage(mainDispatcher.pushMessage)), onError), @@ -606,15 +616,16 @@ event.watchEvent = function (controlSocket, type, filter, onData) { let tor = {}; // __tor.controllerCache__. -// A map from "host:port" to controller objects. Prevents redundant instantiation -// of control sockets. +// A map from "unix:socketpath" or "host:port" to controller objects. Prevents +// redundant instantiation of control sockets. tor.controllerCache = {}; -// __tor.controller(host, port, password, onError)__. -// Creates a tor controller at the given host and port, with the given password. +// __tor.controller(socketFile, host, port, password, onError)__. +// Creates a tor controller at the given socketFile or host and port, with the +// given password. // onError returns asynchronously whenever a connection error occurs. -tor.controller = function (host, port, password, onError) { - let socket = io.controlSocket(host, port, password, onError), +tor.controller = function (socketFile, host, port, password, onError) { + let socket = io.controlSocket(socketFile, host, port, password, onError), isOpen = true; return { getInfo : key => info.getInfo(socket, key), getConf : key => info.getConf(socket, key), @@ -627,27 +638,28 @@ tor.controller = function (host, port, password, onError) { // ## Export -// __controller(host, port, password, onError)__. +// __controller(socketFile, host, port, password, onError)__. // Instantiates and returns a controller object connected to a tor ControlPort -// at host:port, authenticating with the given password, if the controller doesn't yet -// exist. Otherwise returns the existing controller to the given host:port. +// on socketFile or at host:port, authenticating with the given password, if +// the controller doesn't yet exist. Otherwise returns the existing controller +// to the given socketFile or host:port. // onError is called with an error object as its single argument whenever // an error occurs. Example: // // // Get the controller -// let c = controller("127.0.0.1", 9151, "MyPassw0rd", +// let c = controller(undefined, "127.0.0.1", 9151, "MyPassw0rd", // function (error) { console.log(error.message || error); }); // // Send command and receive `250` reply or error message in a promise: // let replyPromise = c.getInfo("ip-to-country/16.16.16.16"); // // Close the controller permanently // c.close(); -var controller = function (host, port, password, onError) { - let dest = host + ":" + port, +var controller = function (socketFile, host, port, password, onError) { + let dest = (socketFile) ? "unix:" + socketFile.path : host + ":" + port, maybeController = tor.controllerCache[dest]; return (tor.controllerCache[dest] = (maybeController && maybeController.isOpen()) ? maybeController : - tor.controller(host, port, password, onError)); + tor.controller(socketFile, host, port, password, onError)); }; // Export the controller function for external use.

1 0

[tor-browser-bundle/hardened-builds] Bug 19528: set MOZ_BUILD_DATE based on firefox version
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit ac62d42011e18a5cf124d3265b3b62a931c17e9a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 9 14:07:39 2016 +0200 Bug 19528: set MOZ_BUILD_DATE based on firefox version The MOZ_BUILD_DATE environment variable is used as the build id. --- gitian/build-helpers/get-moz-build-date | 18 ++++++++++++++++++ gitian/descriptors/linux/gitian-firefox.yml | 3 ++- gitian/descriptors/mac/gitian-firefox.yml | 3 ++- gitian/descriptors/windows/gitian-firefox.yml | 3 ++- tools/update-responses/update_responses | 27 ++++++++++++++++++++++++++- 5 files changed, 50 insertions(+), 4 deletions(-) diff --git a/gitian/build-helpers/get-moz-build-date b/gitian/build-helpers/get-moz-build-date new file mode 100755 index 0000000..168a8c7 --- /dev/null +++ b/gitian/build-helpers/get-moz-build-date @@ -0,0 +1,18 @@ +#!/usr/bin/perl -w +# Generate a MOZ_BUILD_DATE based on firefox version number + +use strict; + +my ($year) = split('-', `git show -s --format='%ci'`); + +die "missing argument" unless @ARGV; +my $version = $ARGV[0]; +$version =~ s/\D+$//; +my @v = split(/[\.ab]/, $version); +push @v, '0' if @v < 4; +push @v, '0' if @v < 4; +my $day_of_month = int(($v[0] - 45) / 5); +my $date = 101010101 + $year * 10000000000 + $day_of_month * 1000000 + + $v[1] * 10000 + $v[2] * 100 + $v[3]; +$date += 100000000 unless $version =~ m/[ab]/; +print "export MOZ_BUILD_DATE=$date\n"; diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index f32ee40..89f68fa 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -32,6 +32,7 @@ remotes: files: - "binutils-linux64-utils.zip" - "gcc-linux64-utils.zip" +- "get-moz-build-date" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -92,7 +93,7 @@ script: | # Self-Rando wrapper export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" export SELFRANDO_skip_shuffle= - export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Without disabling LSan our build is blowing up: diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 302f2a4..fea3139 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -17,6 +17,7 @@ files: - "gcc-linux64-precise-utils.zip" - "MacOSX10.7.sdk.tar.gz" - "x86_64-apple-darwin10.tar.xz" +- "get-moz-build-date" - "re-dzip.sh" - "dzip.sh" - "fix-info-plist.py" @@ -65,7 +66,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 3261199..788b053 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -15,6 +15,7 @@ remotes: files: - "gcc-linux32-precise-utils.zip" - "mingw-w64-win32-utils.zip" +- "get-moz-build-date" - "re-dzip.sh" - "dzip.sh" - "gcclibs-win32-utils.zip" @@ -73,7 +74,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index faa1037..498132e 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -238,6 +238,30 @@ sub channel_to_version { return map { $config->{channels}{$_} } @channels; } +sub get_buildinfos { + my ($config, $version) = @_; + return if exists $config->{versions}{$version}{buildID}; + my $files = $config->{versions}{$version}{files}; + foreach my $os (keys %$files) { + foreach my $lang (keys %{$files->{$os}}) { + next unless $files->{$os}{$lang}{complete}; + my $tmpdir = File::Temp->newdir(); + extract_mar(mar_filename($version, $os, $lang), "$tmpdir"); + my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; + $appfile = "$tmpdir/Contents/Resources/application.ini" + if -f "$tmpdir/Contents/Resources/application.ini"; + exit_error "Could not find application.ini" unless $appfile; + foreach my $line (read_file("$tmpdir/application.ini")) { + if ($line =~ m/^BuildID=(.*)$/) { + $config->{versions}{$version}{buildID} = $1; + return; + } + } + exit_error "Could not extract buildID from application.ini"; + } + } +} + sub get_response { my ($config, $version, $os, @patches) = @_; my $res; @@ -257,7 +281,7 @@ sub get_response { displayVersion => $version, appVersion => $version, platformVersion => get_config($config, $version, $os, 'platformVersion'), - buildID => '20000101000000', + buildID => get_config($config, $version, $os, 'buildID'), detailsURL => get_config($config, $version, $os, 'detailsURL'), actions => 'showURL', openURL => get_config($config, $version, $os, 'detailsURL'), @@ -281,6 +305,7 @@ sub write_responses { foreach my $channel (@channels) { my $version = $config->{channels}{$channel}; get_version_files($config, $version); + get_buildinfos($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) {

1 0

[tor-browser-bundle/master] Bug 19410: Add script to convert dmg files to mar files
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 23bea36eb8d8d27ca00b2394757be08530cb7f19 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 9 13:46:49 2016 +0200 Bug 19410: Add script to convert dmg files to mar files We are also adding the dmg2mars and dmg2mars-alpha makefile rules to run the script and regenerate the incremental mars. --- gitian/Makefile | 10 +++ tools/dmg2mar | 136 +++++++++++++++++++++++++++++ tools/update-responses/get_channel_version | 1 + tools/update-responses/update_responses | 6 ++ 4 files changed, 153 insertions(+) diff --git a/gitian/Makefile b/gitian/Makefile index 50d4328..59efd0e 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -45,6 +45,16 @@ signmars-alpha: signmars-nightly: ./signmars.sh versions.nightly +dmg2mars: + cd $(shell ../tools/update-responses/get_channel_version release) && ../../tools/dmg2mar + $(TORSOCKS) ../tools/update-responses/download_missing_versions release + ../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 + ../tools/update-responses/gen_incrementals alpha + update_responses: ../tools/update-responses/update_responses release diff --git a/tools/dmg2mar b/tools/dmg2mar new file mode 100755 index 0000000..47a543a --- /dev/null +++ b/tools/dmg2mar @@ -0,0 +1,136 @@ +#!/usr/bin/perl -w +# +# This script converts all dmg files from the current directory and +# listed in the sha256sums-unsigned-build.txt file to full update +# mar files. After code signing the dmg files, this script can be used +# to update the mar files. +# +# A recent version of p7zip is required to extract the dmg files, such +# as 15.14. The version in Debian Jessie (9.20) is not recent enough. +# It is possible to install the p7zip-full package from Debian testing, +# or build p7zip from sources: +# $ p7zipdir=/some_directory/p7zip +# $ mkdir $p7zipdir +# $ cd $p7zipdir +# $ wget http://snapshot.debian.org/archive/debian/20160417T044336Z/pool/main/p/p7zi… +# $ echo 'e9e696e2fa77b00445a4d85fa07506debeae01943fdc1bee1472152d7d1386af p7zip_15.14.1+dfsg.orig.tar.xz' | sha256sum -c +# $ wget http://snapshot.debian.org/archive/debian/20160515T161830Z/pool/main/p/p7zi… +# $ echo 'f4db6803535fc30b6ae9db5aabfd9f57a851c6773d72073847ec5e3731b7af37 p7zip_15.14.1+dfsg-2.debian.tar.xz' | sha256sum -c +# $ tar xvf p7zip_15.14.1+dfsg-2.debian.tar.xz +# $ tar xvf p7zip_15.14.1+dfsg.orig.tar.xz +# $ cd p7zip_15.14.1/ +# $ for patch in $(cat ../debian/patches/series ); do patch -p1 < ../debian/patches/$patch; done +# $ make 7z +# $ mkdir $p7zipdir/bin +# $ echo '#!/bin/sh' > $p7zipdir/bin/7z +# $ echo "export LD_LIBRARY_PATH=$PWD/bin" >> $p7zipdir/bin/7z +# $ echo "exec $PWD/bin/7z "'"$@"' >> $p7zipdir/bin/7z +# $ chmod +x $p7zipdir/bin/7z +# $ export "PATH=$p7zipdir/bin:$PATH" + +use strict; +use IO::CaptureOutput qw(capture_exec); +use File::Slurp; +use Parallel::ForkManager; +use Cwd; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + chdir '/'; + exit (exists $_[1] ? $_[1] : 1); +} + +sub osname { + my ($osname) = capture_exec('uname', '-s'); + my ($arch) = capture_exec('uname', '-m'); + chomp($osname, $arch); + if ($osname eq 'Linux' && $arch eq 'x86_64') { + return 'linux64'; + } + if ($osname eq 'Linux' && $arch =~ m/^i.86$/) { + return 'linux32'; + } + exit_error 'Unknown OS'; +} + +my $martools_tmpdir; +sub extract_martools { + my $osname = osname; + my $marzip = getcwd . "/mar-tools-$osname.zip"; + $martools_tmpdir = File::Temp->newdir(); + my $old_cwd = getcwd; + chdir $martools_tmpdir; + my (undef, undef, $success) = capture_exec('unzip', $marzip); + chdir $old_cwd; + exit_error "Error extracting $marzip" unless $success; + $ENV{PATH} = "$martools_tmpdir/mar-tools:$ENV{PATH}"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } + $ENV{MAR} = "$martools_tmpdir/mar-tools/mar"; + $ENV{MSBDIFF} = "$martools_tmpdir/mar-tools/mbsdiff"; +} + +sub get_nbprocs { + return $ENV{NUM_PROCS} if defined $ENV{NUM_PROCS}; + if (-f '/proc/cpuinfo') { + return scalar grep { m/^processor\s+:\s/ } read_file '/proc/cpuinfo'; + } + return 4; +} + +sub get_dmg_files_from_sha256sums { + exit_error "Missing sha256sums-unsigned-build.txt file" + unless -f 'sha256sums-unsigned-build.txt'; + my @files; + foreach my $line (read_file('sha256sums-unsigned-build.txt')) { + my (undef, $filename) = split ' ', $line; + chomp $filename; + next unless $filename =~ m/^TorBrowser-(.+)-osx64_(.+)\.dmg$/; + push @files, { filename => $filename, version => $1, lang => $2 }; + } + return @files; +} + +sub convert_files { + my $pm = Parallel::ForkManager->new(get_nbprocs); + $pm->run_on_finish(sub { print "Finished $_[2]\n" }); + foreach my $file (get_dmg_files_from_sha256sums) { + my $output = "tor-browser-osx64-$file->{version}_$file->{lang}.mar"; + my $step_name = "$file->{filename} -> $output"; + print "Starting $step_name\n"; + $pm->start($step_name) and next; + my $tmpdir = File::Temp->newdir(); + my (undef, $err, $success) = capture_exec('7z', 'x', "-o$tmpdir", + $file->{filename}); + exit_error "Error extracting $file->{filename}: $err" unless $success; + unlink $output; + (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', + $output, "$tmpdir/TorBrowser.app"); + exit_error "Error updating $output: $err" unless $success; + $pm->finish; + } + $pm->wait_all_children; +} + +sub remove_incremental_mars { + exit_error "Missing sha256sums-unsigned-build.incrementals.txt file" + unless -f 'sha256sums-unsigned-build.incrementals.txt'; + foreach my $line (read_file('sha256sums-unsigned-build.incrementals.txt')) { + my (undef, $filename) = split ' ', $line; + chomp $filename; + next unless $filename =~ m/^tor-browser-osx64.+\.incremental\.mar$/; + next unless -f $filename; + print "Removing $filename\n"; + unlink $filename; + } +} + +# Set LC_ALL=C to avoid reproducibility issues when creating mar files +$ENV{LC_ALL} = 'C'; + +extract_martools; +convert_files; +remove_incremental_mars; diff --git a/tools/update-responses/get_channel_version b/tools/update-responses/get_channel_version new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/get_channel_version @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 498132e..b83ac29 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -596,6 +596,12 @@ my %actions = ( download_missing_versions($config, @channels); }, check_update_responses_deployement => \&check_update_responses, + get_channel_version => sub { + my ($config) = @_; + exit_error "Wrong arguments" unless @ARGV == 1; + exit_error "Unknown channel" unless $config->{channels}{$ARGV[0]}; + print $config->{channels}{$ARGV[0]}, "\n"; + }, ); my $action = fileparse($PROGRAM_NAME);

1 0

[tor-browser-bundle/master] Bug 19528: set MOZ_BUILD_DATE based on firefox version
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit ba7f0fcf914e889f78c0562a46e6026462f10ac8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 9 14:07:39 2016 +0200 Bug 19528: set MOZ_BUILD_DATE based on firefox version The MOZ_BUILD_DATE environment variable is used as the build id. --- gitian/build-helpers/get-moz-build-date | 18 ++++++++++++++++++ gitian/descriptors/linux/gitian-firefox.yml | 3 ++- gitian/descriptors/mac/gitian-firefox.yml | 3 ++- gitian/descriptors/windows/gitian-firefox.yml | 3 ++- tools/update-responses/update_responses | 27 ++++++++++++++++++++++++++- 5 files changed, 50 insertions(+), 4 deletions(-) diff --git a/gitian/build-helpers/get-moz-build-date b/gitian/build-helpers/get-moz-build-date new file mode 100755 index 0000000..168a8c7 --- /dev/null +++ b/gitian/build-helpers/get-moz-build-date @@ -0,0 +1,18 @@ +#!/usr/bin/perl -w +# Generate a MOZ_BUILD_DATE based on firefox version number + +use strict; + +my ($year) = split('-', `git show -s --format='%ci'`); + +die "missing argument" unless @ARGV; +my $version = $ARGV[0]; +$version =~ s/\D+$//; +my @v = split(/[\.ab]/, $version); +push @v, '0' if @v < 4; +push @v, '0' if @v < 4; +my $day_of_month = int(($v[0] - 45) / 5); +my $date = 101010101 + $year * 10000000000 + $day_of_month * 1000000 + + $v[1] * 10000 + $v[2] * 100 + $v[3]; +$date += 100000000 unless $version =~ m/[ab]/; +print "export MOZ_BUILD_DATE=$date\n"; diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 1316ed8..14799d6 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -33,6 +33,7 @@ files: - "binutils-linux64-utils.zip" - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" +- "get-moz-build-date" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -92,7 +93,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index fdec679..bd7d7f7 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -19,6 +19,7 @@ files: - "clang-linux64-wheezy-utils.zip" - "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" +- "get-moz-build-date" - "re-dzip.sh" - "dzip.sh" - "fix-info-plist.py" @@ -48,7 +49,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 3261199..788b053 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -15,6 +15,7 @@ remotes: files: - "gcc-linux32-precise-utils.zip" - "mingw-w64-win32-utils.zip" +- "get-moz-build-date" - "re-dzip.sh" - "dzip.sh" - "gcclibs-win32-utils.zip" @@ -73,7 +74,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - export MOZ_BUILD_DATE=$(date -d "$REFERENCE_DATETIME" +%Y%m%d%H%M%S) + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index faa1037..498132e 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -238,6 +238,30 @@ sub channel_to_version { return map { $config->{channels}{$_} } @channels; } +sub get_buildinfos { + my ($config, $version) = @_; + return if exists $config->{versions}{$version}{buildID}; + my $files = $config->{versions}{$version}{files}; + foreach my $os (keys %$files) { + foreach my $lang (keys %{$files->{$os}}) { + next unless $files->{$os}{$lang}{complete}; + my $tmpdir = File::Temp->newdir(); + extract_mar(mar_filename($version, $os, $lang), "$tmpdir"); + my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; + $appfile = "$tmpdir/Contents/Resources/application.ini" + if -f "$tmpdir/Contents/Resources/application.ini"; + exit_error "Could not find application.ini" unless $appfile; + foreach my $line (read_file("$tmpdir/application.ini")) { + if ($line =~ m/^BuildID=(.*)$/) { + $config->{versions}{$version}{buildID} = $1; + return; + } + } + exit_error "Could not extract buildID from application.ini"; + } + } +} + sub get_response { my ($config, $version, $os, @patches) = @_; my $res; @@ -257,7 +281,7 @@ sub get_response { displayVersion => $version, appVersion => $version, platformVersion => get_config($config, $version, $os, 'platformVersion'), - buildID => '20000101000000', + buildID => get_config($config, $version, $os, 'buildID'), detailsURL => get_config($config, $version, $os, 'detailsURL'), actions => 'showURL', openURL => get_config($config, $version, $os, 'detailsURL'), @@ -281,6 +305,7 @@ sub write_responses { foreach my $channel (@channels) { my $version = $config->{channels}{$channel}; get_version_files($config, $version); + get_buildinfos($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) {

1 0

[torbutton/master] Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries.
by gk＠torproject.org 08 Sep '16

08 Sep '16

commit 5ea022aadf6416a1f046eac47a3ec28ea2a5dd7d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 8 10:50:49 2016 -0400 Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries. When performing the local Tor check (which compares the configured Firefox SOCKS proxy to the one reported by GETINFO net/listeners/socks), correctly handle UNIX domain sockets as well as IPv6 addresses. --- src/chrome/content/torbutton.js | 78 ++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index e0fc931..acb4b4b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1534,48 +1534,86 @@ function torbutton_local_tor_check() { if (!didLogError) { didLogError = true; - torbutton_log(5, "unexpected tor response: " + resp); + torbutton_log(5, "Local Tor check: unexpected GETINFO response: " + resp); } } + function removeBrackets(aStr) + { + // Remove enclosing square brackets if present. + if (aStr.startsWith('[') && aStr.endsWith(']')) + return aStr.substr(1, aStr.length - 2); + + return aStr; + } + // Sample response: net/listeners/socks="127.0.0.1:9149" "127.0.0.1:9150" // First, check for command argument prefix. - resp = resp.toLowerCase(); if (0 != resp.indexOf(kCmdArg + '=')) { logUnexpectedResponse(); return false; } // Retrieve configured proxy settings and check each listener against them. + // When a Unix domain socket is configured, a file URL should be present in + // network.proxy.socks. + // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1211567 let socksAddr = m_tb_prefs.getCharPref("network.proxy.socks"); let socksPort = m_tb_prefs.getIntPref("network.proxy.socks_port"); + let socketPath; + if (socksAddr && socksAddr.startsWith("file:")) { + // Convert the file URL to a file path. + try { + let ioService = Cc["@mozilla.org/network/io-service;1"] + .getService(Ci.nsIIOService); + let fph = ioService.getProtocolHandler("file") + .QueryInterface(Ci.nsIFileProtocolHandler); + socketPath = fph.getFileFromURLSpec(socksAddr).path; + } catch (e) { + torbutton_log(5, "Local Tor check: Unix domain socket error: " + e); + return false; + } + } else { + socksAddr = removeBrackets(socksAddr); + } + let addrArray = resp.substr(kCmdArg.length + 1).split(' '); let foundSocksListener = false; - for (let i = 0; !foundSocksListener && (i < addrArray.length); ++i) - { - var addr = addrArray[i]; + for (let i = 0; !foundSocksListener && (i < addrArray.length); ++i) { + let addr = addrArray[i]; // Remove double quotes if present. let len = addr.length; if ((len > 2) && ('"' == addr.charAt(0)) && ('"' == addr.charAt(len - 1))) addr = addr.substring(1, len - 1); - // Check against the configured proxy. - let tokens = addr.split(':'); - if (tokens.length < 2) - logUnexpectedResponse(); - else - { - let torSocksAddr = tokens[0]; - let torSocksPort = parseInt(tokens[1], 10); - if ((torSocksAddr.length < 1) || isNaN(torSocksPort)) + if (addr.startsWith("unix:")) { + if (!socketPath) + continue; + + // Check against the configured UNIX domain socket proxy. + let path = addr.substring(5); + torbutton_log(2, "Tor socks listener (socket): " + path); + foundSocksListener = (socketPath === path); + } else if (!socketPath) { + // Check against the configured TCP proxy. We expect addr:port where addr + // may be an IPv6 address; that is, it may contain colon characters. + // Also, we remove enclosing square brackets before comparing addresses + // because tor requires them but Firefox does not. + let idx = addr.lastIndexOf(':'); + if (idx < 0) { logUnexpectedResponse(); - else - { - torbutton_log(2, "Tor socks listener: " + torSocksAddr + ':' - + torSocksPort); - foundSocksListener = ((socksAddr == torSocksAddr) && - (socksPort == torSocksPort)); + } else { + let torSocksAddr = removeBrackets(addr.substring(0, idx)); + let torSocksPort = parseInt(addr.substring(idx + 1), 10); + if ((torSocksAddr.length < 1) || isNaN(torSocksPort)) { + logUnexpectedResponse(); + } else { + torbutton_log(2, "Tor socks listener: " + torSocksAddr + ':' + + torSocksPort); + foundSocksListener = ((socksAddr === torSocksAddr) && + (socksPort === torSocksPort)); + } } } }

1 0

[tor-browser-bundle/master] Bug 19856: Make OS X builds reproducible again
by gk＠torproject.org 08 Sep '16

08 Sep '16

commit 73a698d2e1875763c153282a0eb19c259bd3788b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 15 12:10:19 2016 +0000 Bug 19856: Make OS X builds reproducible again We recently found a machine that includes actual timestamps into OpenSSL libraries we need for tor. The reason for this is unknown as other KVM and LXC machines are generating matching builds. Resorting to libfaketime again solves this issue. --- gitian/descriptors/mac/gitian-utils.yml | 34 ++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 33db2e8..f54d5cb 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -7,6 +7,7 @@ architectures: - "i386" - "amd64" packages: +- "faketime" - "automake" - "libtool" - "zip" @@ -14,6 +15,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" - "url": "https://github.com/llvm-mirror/llvm" "dir": "llvm" - "url": "https://github.com/llvm-mirror/clang" @@ -24,14 +27,13 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" +- "libfaketime.patch" script: | INSTDIR="$HOME/install" source versions - export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 @@ -54,13 +56,21 @@ script: | make $MAKEOPTS make install cd $INSTDIR - # Since we stopped using libfaketime, the clang archive is no longer - # reproducible. The reason is that it includes some .a archives and - # other files which include timestamps. - # Those files are however not part of the files we ship. ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang cp *utils.zip $OUTDIR/ else + # Building libfaketime. + cd faketime + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" + git am ~/build/libfaketime.patch + make + DESTDIR="$INSTDIR/faketime" make install + export FAKETIME_SKIP_CMDS="make" + export FAKETIME=$REFERENCE_DATETIME + cd .. + # dpkg requires sbin directories in the PATH export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb @@ -81,14 +91,15 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make $MAKEOPTS make install cd .. # Building OpenSSL + # We still need libfaketime here it seems, see #19856 for details. tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 @@ -101,19 +112,20 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make make install cd .. # Grabbing the results - # Since we stopped using libfaketime, the openssl archive is no - # longer reproducible. The main reason is that it includes some .a - # archives which include timestamps. - # Those files are however not part of the files we ship. cd $INSTDIR ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent

1 0

[tor-browser-bundle/maint-6.0] Release preparations for 6.0.5
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit b071421fa87b8f75bd6447b5cadf3288918c1fbd Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 7 09:01:19 2016 +0000 Release preparations for 6.0.5 Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 20 ++++++++++++++++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 11 +++++------ 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2bdf3e2..4000a57 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,23 @@ +Tor Browser 6.0.5 -- September 13 + * All Platforms + * Update Firefox to 45.4.0esr + * Update Tor to 0.2.8.7 + * Update Torbutton to 1.9.5.7 + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Update HTTPS-Everywhere to 5.2.4 + * Bug 20092: Rotate ports for default obfs4 bridges + * Bug 20040: Add update support for unpacked HTTPS Everywhere + * Windows + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x + * Linux + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x + * Android + * Bug 19706: Store browser data in the app home directory + * Build system + * All platforms + * Upgrade Go to 1.4.3 + Tor Browser 6.0.4 -- August 16 * All Platforms * Update Tor to 0.2.8.6 diff --git a/gitian/versions b/gitian/versions index cb482cc..410b15b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.3.0esr +FIREFOX_VERSION=45.4.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 -TOR_TAG=tor-0.2.8.6 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 +TOR_TAG=tor-0.2.8.7 TORLAUNCHER_TAG=0.2.9.3 -TORBUTTON_TAG=1.9.5.6 -HTTPSE_TAG=5.2.1 +TORBUTTON_TAG=1.9.5.7 +HTTPSE_TAG=5.2.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index f20e9b1..d81d102 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -16,14 +16,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.5a2 - release: 6.0.4 + release: 6.0.5 versions: - 6.0.4: - platformVersion: 45.3.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-604-released + 6.0.5: + platformVersion: 45.4.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-605-released incremental_from: - - 6.0.2 - - 6.0.3 + - 6.0.4 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-6.0] Bug 20092: Change ports for 6 default obfs4 bridges.
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 8ca70d898ca83618915289af226fd6f82ff58f85 Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Tue Sep 6 16:06:17 2016 -0700 Bug 20092: Change ports for 6 default obfs4 bridges. 83.212.101.3 - LeifEricson 154.35.22.9 - GreenBelt 154.35.22.10 - Mosaddegh 154.35.22.11 - MaBishomarim 154.35.22.12 - JonbesheSabz 154.35.22.13 - Azadi The previous ports will remain open for users of older versions. Link of plan to make previously blocked bridges unblocked: https://lists.torproject.org/pipermail/tor-project/2016-August/000664.html Update: Place ports 154.35.22.12:80 and 154.35.22.13:443 back in order since some users need those specific ports. --- Bundle-Data/PTConfigs/bridge_prefs.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 0b33d8c..f3b9d9f 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,22 +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:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +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.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:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw 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.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:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw 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.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:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA 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.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.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/hardened-builds] Bug 20092: Change ports for 6 default obfs4 bridges.
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 2c2b24a2cf30808b33c7e45fb0c441852470f68e Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Tue Sep 6 16:06:17 2016 -0700 Bug 20092: Change ports for 6 default obfs4 bridges. 83.212.101.3 - LeifEricson 154.35.22.9 - GreenBelt 154.35.22.10 - Mosaddegh 154.35.22.11 - MaBishomarim 154.35.22.12 - JonbesheSabz 154.35.22.13 - Azadi The previous ports will remain open for users of older versions. Link of plan to make previously blocked bridges unblocked: https://lists.torproject.org/pipermail/tor-project/2016-August/000664.html Update: Place ports 154.35.22.12:80 and 154.35.22.13:443 back in order since some users need those specific ports. --- Bundle-Data/PTConfigs/bridge_prefs.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 0b33d8c..f3b9d9f 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,22 +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:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +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.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:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw 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.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:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw 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.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:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA 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.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.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 20092: Change ports for 6 default obfs4 bridges.
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 73c28d82238b97c93b4a6b44c92d0b232c4b91da Author: Lynn Tsai <lynntsai(a)gmail.com> Date: Tue Sep 6 16:06:17 2016 -0700 Bug 20092: Change ports for 6 default obfs4 bridges. 83.212.101.3 - LeifEricson 154.35.22.9 - GreenBelt 154.35.22.10 - Mosaddegh 154.35.22.11 - MaBishomarim 154.35.22.12 - JonbesheSabz 154.35.22.13 - Azadi The previous ports will remain open for users of older versions. Link of plan to make previously blocked bridges unblocked: https://lists.torproject.org/pipermail/tor-project/2016-August/000664.html Update: Place ports 154.35.22.12:80 and 154.35.22.13:443 back in order since some users need those specific ports. --- Bundle-Data/PTConfigs/bridge_prefs.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 0b33d8c..f3b9d9f 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,22 +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:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +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.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:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw 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.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:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw 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.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:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA 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.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.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 20095: Move OpenSSL to 1.0.2 in Tor Browser
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit e9c9b4012a235d1c7fe1e9f1542a12081c70667e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 7 09:09:12 2016 +0000 Bug 20095: Move OpenSSL to 1.0.2 in Tor Browser --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index acd15b3..ee8a197 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -44,7 +44,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.1t +OPENSSL_VER=1.0.2h GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -97,7 +97,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=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 86f8b06..fe6c738 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -51,7 +51,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-4 -OPENSSL_VER=1.0.1t +OPENSSL_VER=1.0.2h GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,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=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc

1 0