- tbb-commits - lists.torproject.org

[torbutton/master] Bug 13650: Clip window height to 1000px (configurable)
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit 1f4436524793eb7321ac2cfafacb5c2ea8485790 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 19 18:54:26 2015 -0700 Bug 13650: Clip window height to 1000px (configurable) 1000px was chosen based on the cutoff for vertical display users from the data in: https://trac.torproject.org/projects/tor/ticket/13025#comment:17 --- src/chrome/content/torbutton.js | 12 ++++++++---- src/defaults/preferences/preferences.js | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 09d6080..7084584 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3452,16 +3452,20 @@ var torbutton_resizelistener = try { width = m_tb_prefs.getIntPref("extensions.torbutton.window.innerWidth"); } catch(e) { - if (maxWidth > 1000) { - width = 1000; - } else { - width = Math.floor(maxWidth/200.0)*200; + let cappedWidth = m_tb_prefs.getIntPref("extensions.torbutton.window.maxWidth"); + if (maxWidth > cappedWidth) { + maxWidth = cappedWidth; } + width = Math.floor(maxWidth/200.0)*200; } try { height = m_tb_prefs.getIntPref("extensions.torbutton.window.innerHeight"); } catch(e) { + let cappedHeight = m_tb_prefs.getIntPref("extensions.torbutton.window.maxHeight"); + if (maxHeight > cappedHeight) { + maxHeight = cappedHeight; + } height = Math.floor(maxHeight/100.0)*100; } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index fb1a702..e1686c4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -227,3 +227,6 @@ pref("extensions.torbutton.confirm_newnym", true); // Browser home page, and spell checker dictionary: pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties"); pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); + +pref("extensions.torbutton.window.maxHeight", 1000); +pref("extensions.torbutton.window.maxWidth", 1000);

1 0

[torbutton/master] Merge remote-tracking branch 'mikeperry/bug13650'
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit 55d3976e8dbfe7e0d969faf50722e6b0e5f869ac Merge: 430ccaa 1f44365 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 20 14:21:54 2015 -0700 Merge remote-tracking branch 'mikeperry/bug13650' src/chrome/content/torbutton.js | 12 ++++++++---- src/defaults/preferences/preferences.js | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-)

1 0

[torbutton/master] Bug 9387: Version 0.9 of the Security Slider
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit 430ccaa1596e03e3ea0a36c51c4623fe8ff67d52 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 20 14:54:09 2015 +0000 Bug 9387: Version 0.9 of the Security Slider Showing a notification to the user hinting at our new security slider to adjust the security settings. --- src/chrome/content/torbutton.js | 28 ++++++++++++++++++++++++++++ src/chrome/locale/en/torbutton.properties | 3 +++ src/defaults/preferences/preferences.js | 1 + 3 files changed, 32 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d3afef8..77dc871 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1044,6 +1044,34 @@ function torbutton_on_abouttor_load(aDoc) { if (m_tb_orig_BrowserOnAboutPageLoad) m_tb_orig_BrowserOnAboutPageLoad(aDoc); + + // Show the notification about the new security slider. + if (m_tb_prefs. + getBoolPref("extensions.torbutton.show_slider_notification")) { + let sb = torbutton_get_stringbundle(); + let button_label = + torbutton_get_property_string("torbutton.slider_notification_button"); + let box = gBrowser.getNotificationBox(); + + let buttons = [{ + label: button_label, + accessKey: 'S', + popup: null, + callback: function() { + window.openDialog("chrome://torbutton/content/preferences.xul", + "torbutton-preferences","chrome");} + }]; + + let priority = box.PRIORITY_INFO_LOW; + let message = + torbutton_get_property_string("torbutton.slider_notification"); + + box.appendNotification(message, 'new-menu-notification', + "chrome://torbutton/skin/tor-enabled-16.png", + priority, buttons); + m_tb_prefs. + setBoolPref("extensions.torbutton.show_slider_notification", false); + } } function torbutton_is_abouttor_doc(aDoc) { diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 7998437..8fc4600 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -55,6 +55,9 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again 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.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification_button = Open security settings + # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? canvas.notNow=Not Now diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 677447b..9a5df09 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -178,6 +178,7 @@ pref("extensions.torbutton.restrict_thirdparty", true); // Security Slider pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false); +pref("extensions.torbutton.show_slider_notification", true); // Google Captcha prefs // FIXME: NID cookie?

1 0

[torbutton/master] Bug 9387: Version 0.8 of the Security Slider
by gk＠torproject.org 20 Mar '15

20 Mar '15

commit 35970c68d6af10fdec19189aae64d76e048acc4e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 20 08:13:41 2015 +0000 Bug 9387: Version 0.8 of the Security Slider This is the first version of the slider that contains explanatory strings to make it more clear to the user what is changed and why. Special thanks to Mike Perry for helping out getting this part of the UI in good shape. --- src/chrome/content/preferences.js | 48 ++++++++ src/chrome/content/preferences.xul | 172 ++++++++++++++++++++++++++-- src/chrome/content/torbutton.js | 185 ++++++++----------------------- src/chrome/locale/en/torbutton.dtd | 27 +++++ src/chrome/skin/preferences.css | 7 ++ src/defaults/preferences/preferences.js | 2 +- 6 files changed, 292 insertions(+), 149 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index eaaa059..be77793 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -192,13 +192,18 @@ function torbutton_prefs_init(doc) { sec_slider.value = o_torprefs.getIntPref('security_slider'); sec_custom.checked = custom_values; sec_custom.disabled = !custom_values; + torbutton_set_slider_text(doc, sec_custom.checked); // If the custom checkbox is checked and the user is done with dragging // uncheck the checkbox to allow setting the (newly) chosen security level. sec_slider.dragStateChanged = function(isDragging) { if (!isDragging && sec_custom.checked) { sec_custom.checked = false; + sec_custom.disabled = true; } } + sec_slider.valueChanged = function(which, newValue, userChanged) { + torbutton_set_slider_text(doc, false); + } torbutton_prefs_set_field_attributes(doc); } @@ -473,6 +478,49 @@ function torbutton_toggle_slider(doc, pos) { if (sec_custom.checked) { sec_custom.checked = false; } + torbutton_set_slider_text(doc, false); +} + +function torbutton_set_slider_text(doc, custom) { + let level = doc.getElementById("torbutton_sec_slider").value; + if (custom) { + level = 5; + } + switch (level) { + case (1): + doc.getElementById("desc_low").collapsed = true; + doc.getElementById("desc_medium_low").collapsed = true; + doc.getElementById("desc_medium_high").collapsed = true; + doc.getElementById("desc_high").collapsed = false; + break; + case (2): + doc.getElementById("desc_low").collapsed = true; + doc.getElementById("desc_medium_low").collapsed = true; + doc.getElementById("desc_medium_high").collapsed = false; + doc.getElementById("desc_high").collapsed = true; + break; + case (3): + doc.getElementById("desc_low").collapsed = true; + doc.getElementById("desc_medium_low").collapsed = false; + doc.getElementById("desc_medium_high").collapsed = true; + doc.getElementById("desc_high").collapsed = true; + break; + case (4): + doc.getElementById("desc_low").collapsed = false; + doc.getElementById("desc_medium_low").collapsed = true; + doc.getElementById("desc_medium_high").collapsed = true; + doc.getElementById("desc_high").collapsed = true; + break; + case (5): + doc.getElementById("desc_low").collapsed = true; + doc.getElementById("desc_medium_low").collapsed = true; + doc.getElementById("desc_medium_high").collapsed = true; + 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 0a90f0f..d25fba4 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://torbutton/skin/preferences.css" type="text/css"?> <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> @@ -156,36 +157,144 @@ <groupbox> <caption label="&torbutton.prefs.sec_caption;"/> <hbox> - <vbox> - <scale id="torbutton_sec_slider" height="200" min="1" max="4" + <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="center"> - <description id="torbutton_sec_low" + <hbox flex="1" align="start"> + <description id="torbutton_sec_high" + tooltip="high_preview" onclick="torbutton_toggle_slider(document, 1);"> - &torbutton.prefs.sec_low; + &torbutton.prefs.sec_high; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_low" + <description id="torbutton_sec_med_high" + tooltip="mh_preview" onclick="torbutton_toggle_slider(document, 2);"> - &torbutton.prefs.sec_med_low; + &torbutton.prefs.sec_med_high; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_high" + <description id="torbutton_sec_med_low" + tooltip="ml_preview" onclick="torbutton_toggle_slider(document, 3);"> - &torbutton.prefs.sec_med_high; + &torbutton.prefs.sec_med_low; </description> </hbox> - <hbox flex="1" align="center"> - <description id="torbutton_sec_high" + <hbox flex="1" align="end"> + <description id="torbutton_sec_low" + tooltip="low_preview" onclick="torbutton_toggle_slider(document, 4);"> - &torbutton.prefs.sec_high; + &torbutton.prefs.sec_low; </description> </hbox> </vbox> + <spacer flex="1"/> +  + <vbox flex="1" width="300"> + <vbox id="desc_high" collapsed="true"> + <description + class="slider-text-size, slider-text-weight"> + &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_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_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> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip; &torbutton.prefs.sec_font_rend_graphite_tooltip;"> + &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> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_webfonts_desc_tooltip;"> + &torbutton.prefs.sec_webfonts_desc; + </description> + </vbox> + <vbox id="desc_medium_high" collapsed="true"> + <description + class="slider-text-size, slider-text-weight"> + &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_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_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> + <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip; &torbutton.prefs.sec_font_rend_graphite_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 + class="slider-text-size, slider-text-weight"> + &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_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> + </vbox> + <vbox id="desc_low" collapsed="false"> + <description + class="slider-text-size, slider-text-weight"> + &torbutton.prefs.sec_low_desc; + </description> + <description class="slider-text-size"> + &torbutton.prefs.sec_low_usable_desc; + </description> + </vbox> + </vbox> </hbox> <hbox> <checkbox id="torbutton_sec_custom" flex="1" @@ -198,4 +307,43 @@ </tabpanels> </tabbox> + <tooltip id="high_preview"> + <html:b>&torbutton.prefs.sec_gen_desc;</html:b> + <html:br></html:br> + <html:br></html:br> + <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> + <tooltip id="mh_preview"> + <html:b>&torbutton.prefs.sec_gen_desc;</html:b> + <html:br></html:br> + <html:br></html:br> + <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_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> + <tooltip id="low_preview"> + <html:b>&torbutton.prefs.sec_low_desc;</html:b> + <html:br></html:br> + <html:br></html:br> + <html:div>&torbutton.prefs.sec_low_usable_desc;</html:div> + </tooltip> </dialog> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f7e99a0..d3afef8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -235,15 +235,12 @@ var torbutton_unique_pref_observer = case "noscript.forbidMedia": case "media.webaudio.enabled": case "network.jar.block-remote-files": + case "mathml.disabled": case "javascript.options.baselinejit.content": case "noscript.forbidFonts": case "gfx.font_rendering.graphite.enabled": case "noscript.globalHttpsWhitelist": case "noscript.global": - case "media.ogg.enabled": - case "media.opus.enabled": - case "media.wave.enabled": - case "media.apple.mp3.enabled": // |m_tb_slider_update| is only set if the user updated a // preference under control of the security slider via the // slider on the Torbutton dialog. This in turn means we can @@ -2197,10 +2194,6 @@ function torbutton_update_thirdparty_prefs() { prefService.savePrefFile(null); } -var torbutton_sec_l_bool_prefs = { - "gfx.font_rendering.opentype_svg.enabled" : false, -}; - var torbutton_sec_ml_bool_prefs = { "javascript.options.ion.content" : false, "javascript.options.typeinference" : false, @@ -2208,23 +2201,21 @@ var torbutton_sec_ml_bool_prefs = { "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, "network.jar.block-remote-files" : true, - // XXX: pref for disabling MathML is missing + "mathml.disabled" : true }; var torbutton_sec_mh_bool_prefs = { "javascript.options.baselinejit.content" : false, + "gfx.font_rendering.graphite.enabled" : false, + "gfx.font_rendering.opentype_svg.enabled" : false, "noscript.global" : false, - "noscript.globalHttpsWhitelist" : true, - // XXX: pref for disableing SVG is missing + "noscript.globalHttpsWhitelist" : true }; var torbutton_sec_h_bool_prefs = { "noscript.forbidFonts" : true, "noscript.global" : false, - "media.ogg.enabled" : false, - "media.opus.enabled" : false, - "media.wave.enabled" : false, - "media.apple.mp3.enabled" : false + // XXX: pref for disabling SVG is missing }; function torbutton_update_security_slider() { @@ -2233,18 +2224,20 @@ function torbutton_update_security_slider() { let mode = m_tb_prefs.getIntPref("extensions.torbutton.security_slider"); let capValue = m_tb_prefs.getCharPref("capability.policy.maonoscript.sites"); switch (mode) { - case 1: - for (p in torbutton_sec_l_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_l_bool_prefs[p]); - } + case 1: for (p in torbutton_sec_ml_bool_prefs) { - m_tb_prefs.setBoolPref(p, !torbutton_sec_ml_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) } for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) + // noscript.globalHttpsWhitelist is special: We don't want it in this + // mode. + if (p === "noscript.globalHttpsWhitelist") { + m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) + } } for (p in torbutton_sec_h_bool_prefs) { - m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, torbutton_sec_h_bool_prefs[p]) } // Removing "https:" is needed due to a bug in older Noscript versions. // We leave that in for a while as there may be users that were affected @@ -2254,18 +2247,22 @@ function torbutton_update_security_slider() { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); } - if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); - } else { - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", true); - } break; case 2: - for (p in torbutton_sec_l_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_l_bool_prefs[p]); + for (p in torbutton_sec_ml_bool_prefs) { + m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) + } + // Order matters here as both the high mode and the medium-high mode + // share some preferences/values. So, let's revert the high mode + // preferences first and set the medium-high mode ones afterwards. + for (p in torbutton_sec_h_bool_prefs) { + m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) + } + for (p in torbutton_sec_mh_bool_prefs) { + m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) } + break; + case 3: for (p in torbutton_sec_ml_bool_prefs) { m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) } @@ -2283,49 +2280,16 @@ function torbutton_update_security_slider() { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); } - if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); - } else { - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", true); - } - break; - case 3: - for (p in torbutton_sec_l_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_l_bool_prefs[p]); - } - for (p in torbutton_sec_ml_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) - } - // Order matters here as both the high mode and the medium-high mode - // share some preferences/values. So, let's revert the high mode - // preferences first and set the medium-high mode ones afterwards. - for (p in torbutton_sec_h_bool_prefs) { - m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) - } - for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) - } - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); break; case 4: - for (p in torbutton_sec_l_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_l_bool_prefs[p]); - } for (p in torbutton_sec_ml_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, !torbutton_sec_ml_bool_prefs[p]) } for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) - // noscript.globalHttpsWhitelist is special: We don't want it in this - // mode. - if (p === "noscript.globalHttpsWhitelist") { - m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) - } + m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) } for (p in torbutton_sec_h_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_h_bool_prefs[p]) + m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } // Removing "https:" is needed due to a bug in older Noscript versions. // We leave that in for a while as there may be users that were affected @@ -2335,7 +2299,6 @@ function torbutton_update_security_slider() { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); } - m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", true); break; } m_tb_sliderUpdate = false; @@ -2348,35 +2311,23 @@ function torbutton_security_slider_custom_check(mode) { let capValue = m_tb_prefs.getCharPref("capability.policy.maonoscript.sites"); switch (mode) { case 1: - for (p in torbutton_sec_l_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { - return; - } - } for (p in torbutton_sec_ml_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) === torbutton_sec_ml_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { return; } } for (p in torbutton_sec_mh_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + // We don't want to have the whitelist in high mode. JavaScript is + // disabled globally. + if (p === "noscript.globalHttpsWhitelist") { + continue; + } return; } } for (p in torbutton_sec_h_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { - return; - } - } - if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { - - if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { - return; - } - } else { - if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_h_bool_prefs[p]) { return; } } @@ -2385,35 +2336,23 @@ function torbutton_security_slider_custom_check(mode) { m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); break; case 2: - for (p in torbutton_sec_l_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { - return; - } - } for (p in torbutton_sec_ml_bool_prefs) { if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { return; } } for (p in torbutton_sec_mh_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { return; } } for (p in torbutton_sec_h_bool_prefs) { if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { - return; - } - } - if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || - m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { - - if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { - return; - } - } else { - if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + // We have the whitelist and JavaScript is disabled in medium-high + // mode as well. + if (p === "noscript.global") { + continue; + } return; } } @@ -2422,67 +2361,41 @@ function torbutton_security_slider_custom_check(mode) { m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); break; case 3: - for (p in torbutton_sec_l_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { - return; - } - } for (p in torbutton_sec_ml_bool_prefs) { if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { return; } } for (p in torbutton_sec_mh_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { return; } } for (p in torbutton_sec_h_bool_prefs) { if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { - // We have the whitelist and JavaScript is disabled in medium-high - // mode as well. - if (p === "noscript.global") { - continue; - } return; } } - if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { - return; - } // We are still here which means all preferences are properly reset. Leave // custom mode. m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); break; case 4: - for (p in torbutton_sec_l_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { - return; - } - } for (p in torbutton_sec_ml_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_ml_bool_prefs[p]) { return; } } for (p in torbutton_sec_mh_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { - // We don't want to have the whitelist in high mode. JavaScript is - // disabled globally. - if (p === "noscript.globalHttpsWhitelist") { - continue; - } + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { return; } } for (p in torbutton_sec_h_bool_prefs) { - if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_h_bool_prefs[p]) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { return; } } - if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { - return; - } // We are still here which means all preferences are properly reset. Leave // custom mode. m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 15ae1e6..4a7bf7e 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -153,8 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.sec_caption "Security Level"> <!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."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> <!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> +<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!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"> +<!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_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 "High"> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> +<!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_custom "Custom Values"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> + diff --git a/src/chrome/skin/preferences.css b/src/chrome/skin/preferences.css new file mode 100644 index 0000000..013b367 --- /dev/null +++ b/src/chrome/skin/preferences.css @@ -0,0 +1,7 @@ +.slider-text-weight { + font-weight: bold; +} + +.slider-text-size { + font-size: 95%; +} diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index fb1a702..677447b 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -176,7 +176,7 @@ pref("extensions.torbutton.block_disk", true); pref("extensions.torbutton.resist_fingerprinting", true); pref("extensions.torbutton.restrict_thirdparty", true); // Security Slider -pref("extensions.torbutton.security_slider", 1); +pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false); // Google Captcha prefs

1 0

[tor-browser-bundle/master] Bug 14688: Create Desktop and Start Menu shortcuts for Windows
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit dad9a582b97d8720f788881461ead2284281eea8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 19 17:54:09 2015 -0700 Bug 14688: Create Desktop and Start Menu shortcuts for Windows This is on by default, but can be turned of in a checkbox on the installer. We also switch back to Moritz's NSIS repo and gpg key with this. Unfortunately, he tagged the same version as mcs did, but that's not a big deal. --- gitian/fetch-inputs.sh | 2 +- gitian/gpg/tbb-windows-installer.gpg | Bin 1213 -> 15689 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index e58c4d3..3b3c43a 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -247,7 +247,7 @@ cd inputs while read dir url tag; do update_git "$dir" "$url" "$tag" done << EOF -tbb-windows-installer https://github.com/MarkCSmith/tbb-windows-installer.git $NSIS_TAG +tbb-windows-installer https://github.com/moba/tbb-windows-installer.git $NSIS_TAG zlib https://github.com/madler/zlib.git $ZLIB_TAG libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG tor https://git.torproject.org/tor.git $TOR_TAG diff --git a/gitian/gpg/tbb-windows-installer.gpg b/gitian/gpg/tbb-windows-installer.gpg index e753e57..fab3a99 100644 Binary files a/gitian/gpg/tbb-windows-installer.gpg and b/gitian/gpg/tbb-windows-installer.gpg differ

1 0

[tor-browser-bundle/master] Bug 14959: Download missing MAR files for incrementals
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit 803049749f966e63e7c4f86dd556c49fa0fdd48d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 16 18:49:43 2015 +0100 Bug 14959: Download missing MAR files for incrementals --- gitian/Makefile | 6 ++- gitian/gpg/torbrowser.gpg | Bin 0 -> 6015 bytes tools/update-responses/config.yml | 3 ++ tools/update-responses/download_missing_versions | 1 + tools/update-responses/update_responses | 58 +++++++++++++++++++++- 5 files changed, 65 insertions(+), 3 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index ea82151..8f89bca 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -29,10 +29,12 @@ build-alpha: ./mkbundle-mac.sh versions.alpha incrementals: - ../tools/update-responses/gen_incrementals release || echo 'Warning: could not generate incremental MARs.' >&2 + $(TORSOCKS) ../tools/update-responses/download_missing_versions release + ../tools/update-responses/gen_incrementals release incrementals-alpha: - ../tools/update-responses/gen_incrementals alpha || echo 'Warning: could not generate incremental MARs.' >&2 + $(TORSOCKS) ../tools/update-responses/download_missing_versions alpha + ../tools/update-responses/gen_incrementals alpha signmars: ./signmars.sh versions diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg new file mode 100644 index 0000000..7267d4d Binary files /dev/null and b/gitian/gpg/torbrowser.gpg differ diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index a338745..403be5c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -1,4 +1,7 @@ --- +download: + archive_url: https://archive.torproject.org/tor-package-archive/torbrowser + gpg_keyring: ../../gitian/gpg/torbrowser.gpg build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 diff --git a/tools/update-responses/download_missing_versions b/tools/update-responses/download_missing_versions new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/download_missing_versions @@ -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 8b8c217..07efc7c 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -6,9 +6,10 @@ use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; -use Digest::SHA; +use Digest::SHA qw(sha256_hex); use XML::Writer; use Cwd; +use File::Copy; use File::Temp; use File::Find; use File::Which; @@ -408,6 +409,55 @@ sub check_update_responses_channel { } } +sub download_version { + my ($config, $version) = @_; + my $tmpdir = File::Temp->newdir(); + my $destdir = "$releases_dir/$version"; + my $urldir = "$config->{download}{archive_url}/$version"; + print "Downloading version $version\n"; + foreach my $file (qw(sha256sums.txt sha256sums.txt.asc)) { + if (getstore("$urldir/$file", "$tmpdir/$file") != 200) { + exit_error "Error downloading $urldir/$file"; + } + } + if (system('gpg', '--no-default-keyring', '--keyring', + $config->{download}{gpg_keyring}, '--verify', + "$tmpdir/sha256sums.txt.asc", "$tmpdir/sha256sums.txt")) { + exit_error "Error checking gpg signature for version $version"; + } + mkdir $destdir; + move "$tmpdir/sha256sums.txt.asc", "$destdir/sha256sums.txt.asc"; + move "$tmpdir/sha256sums.txt", "$destdir/sha256sums.txt"; + my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums.txt"; + foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { + print "Downloading $file\n"; + exit_error "Error downloading $urldir/$file\n" + unless getstore("$urldir/$file", "$tmpdir/$file") == 200; + if ($sums{$file} ne sha256_hex(read_file("$tmpdir/$file"))) { + exit_error "Error unsigning $file" + if system('signmar', '-r', "$tmpdir/$file", "$tmpdir/$file.u"); + exit_error "Wrong checksum for $file" + unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file.u")); + move "$tmpdir/$file.u", "$tmpdir/$file"; + } + move "$tmpdir/$file", "$destdir/$file"; + } +} + +sub download_missing_versions { + my ($config, @channels) = @_; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + my $cversion = $config->{channels}{$channel}; + next unless $config->{versions}{$cversion}{incremental_from}; + foreach my $version (@{$config->{versions}{$cversion}{incremental_from}}) { + next if -d "$releases_dir/$version"; + download_version($config, $version); + } + } +} + sub check_update_responses { my ($config) = @_; exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; @@ -453,6 +503,12 @@ my %actions = ( create_incremental_mars_for_version($config, $version); } }, + download_missing_versions => sub { + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + extract_martools; + download_missing_versions($config, @channels); + }, check_update_responses_deployement => \&check_update_responses, );

1 0

[tor-launcher/master] Bug 13983: Use CurProcD for Thunderbird/Instantbird
by brade＠torproject.org 19 Mar '15

19 Mar '15

commit c052b54b2d14032fac0c9b23a9ad9cc06d792a5a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Dec 18 10:33:29 2014 +0530 Bug 13983: Use CurProcD for Thunderbird/Instantbird To accommodate Tor Messenger/Tor Mail bundle packaging, use a path relative to the current working directory when locating Tor files (instead of relative to the profile directory). --- src/components/tl-process.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index cc5d654..b6dc98f 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -692,9 +692,8 @@ TorProcessService.prototype = .getService(Ci.nsIXULAppInfo); if (appInfo.ID == this.kThunderbirdID || appInfo.ID == this.kInstantbirdID) { - // For Thunderbird and Instantbird, paths are relative to this extension's folder. topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile); + .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); topDir.append("extensions"); topDir.append(this.kTorLauncherExtPath); }

1 0

[torbutton/master] Fixup for bug 10216
by gk＠torproject.org 19 Mar '15

19 Mar '15

commit 54d02f3c1c97c2dcef2c8c03bc00580592a6cf38 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 19 09:36:15 2015 +0000 Fixup for bug 10216 --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 09d6080..f7e99a0 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1913,7 +1913,7 @@ function torbutton_do_tor_check() let checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"] .getService(Ci.nsISupports).wrappedJSObject; if (checkSvc.kCheckNotInitiated != checkSvc.statusOfTorCheck || - !m.tb_prefs.getBoolPref("extensions.torbutton.test_enabled")) + !m_tb_prefs.getBoolPref("extensions.torbutton.test_enabled")) return; // Only do the check once. // If we have a tor control port and transparent torification is off,

1 0

[torbutton/master] Bug 14631: Improve profile access error msgs (strings).
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit fd2be43f999da3babdc0276ae2d2769938fe56c8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Feb 27 10:40:47 2015 -0500 Bug 14631: Improve profile access error msgs (strings). To allow for localization, get profile-related error strings from Torbutton. --- src/chrome/locale/en/torbutton.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 505f31b..50985a4 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -61,3 +61,10 @@ canvas.allow=Allow in the future canvas.allowAccessKey=A canvas.never=Never for this site (recommended) canvas.neverAccessKey=e + +# Profile/startup error messages. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S Profile Problem +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.

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug14631-01'
by mikeperry＠torproject.org 18 Mar '15

18 Mar '15

commit dc2fae0f80f156a2f0d80004b3a631687e4c7128 Merge: 4394ffb fd2be43 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 17 21:01:02 2015 -0700 Merge remote-tracking branch 'brade/bug14631-01' src/chrome/locale/en/torbutton.properties | 7 +++++++ 1 file changed, 7 insertions(+)

1 0