- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.5.1esr-8.5-1] squash! Bug 26961: New user onboarding.
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit ea65909a1c1060e544ea56a110f948994e2a3df9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 12 17:03:10 2019 -0400 squash! Bug 26961: New user onboarding. Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. --- browser/components/uitour/UITour-lib.js | 6 +++--- browser/components/uitour/UITour.jsm | 11 ++++++----- .../extensions/onboarding/content/onboarding-tour-agent.js | 2 +- browser/extensions/onboarding/content/onboarding.js | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/browser/components/uitour/UITour-lib.js b/browser/components/uitour/UITour-lib.js index 279b2e48bc85..31a43e39bbff 100644 --- a/browser/components/uitour/UITour-lib.js +++ b/browser/components/uitour/UITour-lib.js @@ -791,10 +791,10 @@ if (typeof Mozilla == "undefined") { }; /** - * @summary Opens Torbutton's Security Settings (aka the Security Slider). + * @summary Opens the Security Level Panel. */ - Mozilla.UITour.torBrowserOpenSecuritySettings = function() { - _sendEvent("torBrowserOpenSecuritySettings"); + Mozilla.UITour.torBrowserOpenSecurityLevelPanel = function() { + _sendEvent("torBrowserOpenSecurityLevelPanel"); }; })(); diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index ce3e20fda662..fd8491eae839 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -46,7 +46,7 @@ const TOR_BROWSER_PAGE_ACTIONS_ALLOWED = new Set([ "showMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED "hideMenu", // restricted to TOR_BROWSER_MENUS_ALLOWED "closeTab", - "torBrowserOpenSecuritySettings", + "torBrowserOpenSecurityLevelPanel", ]); const TOR_BROWSER_TARGETS_ALLOWED = new Set([ @@ -717,10 +717,11 @@ var UITour = { break; } - case "torBrowserOpenSecuritySettings": - // Ask Torbutton to open the Tor Browser Security Settings. - Services.obs.notifyObservers(undefined, "TorOpenSecuritySettings", - undefined); + case "torBrowserOpenSecurityLevelPanel": + let securityLevelButton = + window.document.getElementById("security-level-button"); + if (securityLevelButton) + securityLevelButton.doCommand(); break; } diff --git a/browser/extensions/onboarding/content/onboarding-tour-agent.js b/browser/extensions/onboarding/content/onboarding-tour-agent.js index b373c5e0ef01..a08320d0535a 100644 --- a/browser/extensions/onboarding/content/onboarding-tour-agent.js +++ b/browser/extensions/onboarding/content/onboarding-tour-agent.js @@ -19,7 +19,7 @@ let onCanSetDefaultBrowserInBackground = () => { let onClick = evt => { switch (evt.target.id) { case "onboarding-tour-tor-security-button": - Mozilla.UITour.torBrowserOpenSecuritySettings(); + Mozilla.UITour.torBrowserOpenSecurityLevelPanel(); break; #if 0 // Firefox onboarding actions. To reduce conflicts when rebasing against diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 5cb81852bb73..8f62e4f3b9d8 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -181,7 +181,7 @@ var onboardingTourset = { "onboarding.tour-tor-security.title", "onboarding.tour-tor-security.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security.png"); createOnboardingTourButton(div, - "onboarding-tour-tor-security-button", "onboarding.tour-tor-security.button"); + "onboarding-tour-tor-security-button", "onboarding.tour-tor-security-level.button"); return div; },

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit a7ba005d5398a29d95320a5e8c02bf050e58f08b Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Mar 4 16:09:51 2019 -0800 Bug 25658: Replace security slider with security level UI This patch adds a new 'securitylevel' component to Tor Browser intended to replace the torbutton 'Security Slider'. This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Strings used by this patch are pulled from the torbutton extension, but en-US defaults are provided if there is an error loading from the extension. With this patch applied, the usual work-flow of "./mach build && ./mach run" work as expected, even if the torbutton extension is disabled. --- browser/app/profile/000-tor-browser.js | 2 +- browser/base/content/browser.js | 7 + browser/base/content/browser.xul | 5 + browser/components/moz.build | 1 + .../preferences/in-content/preferences.js | 18 +- .../preferences/in-content/preferences.xul | 1 + .../components/preferences/in-content/privacy.js | 15 + .../components/preferences/in-content/privacy.xul | 2 + .../securitylevel/content/securityLevel.js | 528 +++++++++++++++++++++ .../securitylevel/content/securityLevelButton.css | 9 + .../content/securityLevelButton.inc.xul | 5 + .../securitylevel/content/securityLevelButton.svg | 21 + .../securitylevel/content/securityLevelPanel.css | 82 ++++ .../content/securityLevelPanel.inc.xul | 33 ++ .../content/securityLevelPreferences.css | 26 + .../content/securityLevelPreferences.inc.xul | 66 +++ browser/components/securitylevel/jar.mn | 6 + browser/components/securitylevel/moz.build | 1 + 18 files changed, 823 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a0b370c73279..df4d58e1009a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -271,7 +271,7 @@ pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},tor pref("extensions.webextensions.restrictedDomains", ""); // Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"to olbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); +pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"torbutton-button\",\"urlbar-container\",\"downloads-button\",\"security-level-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere-eff_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount \":1}"); // Putting the search engine prefs into this file to fix #11236. // Default search engine diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 4d15249afa97..16e712be0ba3 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -116,6 +116,8 @@ XPCOMUtils.defineLazyScriptGetter(this, ["DownloadsPanel", XPCOMUtils.defineLazyScriptGetter(this, ["DownloadsButton", "DownloadsIndicatorView"], "chrome://browser/content/downloads/indicator.js"); +XPCOMUtils.defineLazyScriptGetter(this, ["SecurityLevelButton"], + "chrome://browser/content/securitylevel/securityLevel.js"); XPCOMUtils.defineLazyScriptGetter(this, "gEditItemOverlay", "chrome://browser/content/places/editBookmarkOverlay.js"); if (AppConstants.NIGHTLY_BUILD) { @@ -1328,6 +1330,9 @@ var gBrowserInit = { // doesn't flicker as the window is being shown. DownloadsButton.init(); + // Init the SecuritySettingsButton + SecurityLevelButton.init(); + // Certain kinds of automigration rely on this notification to complete // their tasks BEFORE the browser window is shown. SessionStore uses it to // restore tabs into windows AFTER important parts like gMultiProcessBrowser @@ -1899,6 +1904,8 @@ var gBrowserInit = { DownloadsButton.uninit(); + SecurityLevelButton.uninit(); + gAccessibilityServiceIndicator.uninit(); LanguagePrompt.uninit(); diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 4d8496bbcf24..dac6fcbddf05 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -8,6 +8,8 @@ <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?> +<?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPanel.css"?> +<?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelButton.css"?> <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> @@ -500,6 +502,7 @@ #include ../../components/customizableui/content/panelUI.inc.xul #include ../../components/controlcenter/content/panel.inc.xul #include ../../components/downloads/content/downloadsPanel.inc.xul +#include ../../components/securitylevel/content/securityLevelPanel.inc.xul <hbox id="downloads-animation-container" mousethrough="always"> <vbox id="downloads-notification-anchor" hidden="true"> @@ -954,6 +957,8 @@ </stack> </toolbarbutton> +#include ../../components/securitylevel/content/securityLevelButton.inc.xul + <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav" removable="true" onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);" diff --git a/browser/components/moz.build b/browser/components/moz.build index 587d433eee4d..1ce83d3afb8b 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -49,6 +49,7 @@ DIRS += [ 'privatebrowsing', 'resistfingerprinting', 'search', + 'securitylevel', 'sessionstore', 'shell', 'syncedtabs', diff --git a/browser/components/preferences/in-content/preferences.js b/browser/components/preferences/in-content/preferences.js index 3da7d9f26403..e195d30061bc 100644 --- a/browser/components/preferences/in-content/preferences.js +++ b/browser/components/preferences/in-content/preferences.js @@ -224,10 +224,20 @@ async function spotlight(subcategory) { } if (subcategory) { if (!gSearchResultsPane.categoriesInitialized) { - await waitForSystemAddonInjectionsFinished([{ - isGoingToInject: formAutofillParent.initialized, - elementId: "formAutofillGroup", - }]); + // fix for tor #29554 + // for some reason this code throws an exception when called and + // prevents the scrollAndHighlight code from running so we + // swallow the exception here + // + // This entire block has been removed and/or refactored as part of + // mozilla #1520350 (commit d524c53377c22913cac387ad77b803aaf4fb754e) + // on 2019/01/28 + try { + await waitForSystemAddonInjectionsFinished([{ + isGoingToInject: formAutofillParent.initialized, + elementId: "formAutofillGroup", + }]); + } catch (e) { } } scrollAndHighlight(subcategory); } diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index 91e1cf94ebb4..7a606d76a42a 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -15,6 +15,7 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?> <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?> +<?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> <!DOCTYPE page [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js index e22624c82e0b..d2229d136261 100644 --- a/browser/components/preferences/in-content/privacy.js +++ b/browser/components/preferences/in-content/privacy.js @@ -21,6 +21,9 @@ ChromeUtils.defineModuleGetter(this, "SiteDataManager", XPCOMUtils.defineLazyPreferenceGetter(this, "trackingprotectionUiEnabled", "privacy.trackingprotection.ui.enabled"); +XPCOMUtils.defineLazyScriptGetter(this, ["SecurityLevelPreferences"], + "chrome://browser/content/securitylevel/securityLevel.js"); + ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm"); const PREF_UPLOAD_ENABLED = "datareporting.healthreport.uploadEnabled"; @@ -150,6 +153,17 @@ var gPrivacyPane = { }, /** + * Show the Security Level UI + */ + _initSecurityLevel() { + SecurityLevelPreferences.init(); + let unload = () => { + window.removeEventListener("unload", unload); + SecurityLevelPreferences.uninit(); + }; + }, + + /** * Linkify the Learn More link of the Private Browsing Mode Tracking * Protection UI. */ @@ -245,6 +259,7 @@ var gPrivacyPane = { this.updatePrivacyMicroControls(); this.initAutoStartPrivateBrowsingReverter(); this._initTrackingProtection(); + this._initSecurityLevel(); this._initTrackingProtectionPBM(); this._initTrackingProtectionExtensionControl(); this._initAutocomplete(); diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul index a5f3d25193c5..81e5d5b5079c 100644 --- a/browser/components/preferences/in-content/privacy.xul +++ b/browser/components/preferences/in-content/privacy.xul @@ -583,6 +583,8 @@ <label class="header-name" flex="1">&security.label;</label> </hbox> +#include ../../securitylevel/content/securityLevelPreferences.inc.xul +  <groupbox id="browsingProtectionGroup" data-category="panePrivacy" hidden="true"> <caption><label>&browsingProtection.label;</label></caption> diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js new file mode 100644 index 000000000000..405d38839da0 --- /dev/null +++ b/browser/components/securitylevel/content/securityLevel.js @@ -0,0 +1,528 @@ +"use strict"; + +ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +ChromeUtils.import("resource://gre/modules/Services.jsm"); + +XPCOMUtils.defineLazyModuleGetters(this, { + CustomizableUI: "resource:///modules/CustomizableUI.jsm", + PanelMultiView: "resource:///modules/PanelMultiView.jsm", +}); + +/* + Security Level Strings + + Strings loaded from torbutton, but en-US defaults provided in case torbutton addon not enabled +*/ +XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", function() { + let sls = null; + try { + sls = Services.strings.createBundle("chrome://torbutton/locale/securityLevel.properties"); + } catch(e) { } + + // tries to get the given key from the string bundle, return fallback on failure + let getString = function(key, fallback) { + let retval = ""; + if (sls) { + try { + retval = sls.GetStringFromName(key); + } catch(e) { } + } + if (retval == "") { + retval = fallback; + } + return retval; + }; + + // read localized strings from torbutton; but use hard-coded en-US strings as fallbacks in case of error + let retval = { + securityLevel : getString("securityLevel.securityLevel", "Security Level"), + customWarning : getString("securityLevel.customWarning", "Custom"), + overview : getString("securityLevel.overview", "Disable certain web features that can be used to attack your security and anonymity."), + standard : { + level : getString("securityLevel.standard.level", "Standard"), + tooltip : getString("securityLevel.standard.tooltip", "Security Level : Standard"), + summary : getString("securityLevel.standard.summary", "All Tor Browser and website features are enabled."), + }, + safer : { + level : getString("securityLevel.safer.level", "Safer"), + tooltip : getString("securityLevel.safer.tooltip", "Security Level : Safer"), + summary : getString("securityLevel.safer.summary", "Disables website features that are often dangerous, causing some sites to lose functionality."), + description1 : getString("securityLevel.safer.description1", "JavaScript is disabled on non-HTTPS sites."), + description2 : getString("securityLevel.safer.description2", "Some fonts and math symbols are disabled."), + description3 : getString("securityLevel.safer.description3", "Audio and video (HTML5 media) are click-to-play."), + }, + safest : { + level : getString("securityLevel.safest.level", "Safest"), + tooltip : getString("securityLevel.safest.tooltip", "Security Level : Safest"), + summary : getString("securityLevel.safest.summary", "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."), + description1 : getString("securityLevel.safest.description1", "JavaScript is disabled by default on all sites."), + description2 : getString("securityLevel.safest.description2", "Some fonts, icons, math symbols, and images are disabled."), + description3 : getString("securityLevel.safest.description3", "Audio and video (HTML5 media) are click-to-play."), + }, + custom : { + summary : getString("securityLevel.custom.summary", "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."), + }, + learnMore : getString("securityLevel.learnMore", "Learn more"), + learnMoreURL : function() { + let locale = ""; + try { + let { getLocale } = + Cu.import("resource://torbutton/modules/utils.js", {}); + locale = getLocale(); + } catch(e) {} + + if (locale == "") { + locale = "en-US"; + } + + return "https://tb-manual.torproject.org/" + locale + "/security-settings.html"; + }(), + restoreDefaults : getString("securityLevel.restoreDefaults", "Restore Defaults"), + advancedSecuritySettings : getString("securityLevel.advancedSecuritySettings", "Advanced Security Settings\u2026"), + }; + + + return retval; +}); + + +/* + Security Level Prefs + + Getters and Setters for relevant torbutton prefs +*/ +const SecurityLevelPrefs = { + security_slider_pref : "extensions.torbutton.security_slider", + security_custom_pref : "extensions.torbutton.security_custom", + + get securitySlider() { + try { + return Services.prefs.getIntPref(this.security_slider_pref); + } catch(e) { + // init pref to 4 (standard) + const val = 4; + Services.prefs.setIntPref(this.security_slider_pref, val); + return val; + } + }, + + set securitySlider(val) { + Services.prefs.setIntPref(this.security_slider_pref, val); + }, + + get securityCustom() { + try { + return Services.prefs.getBoolPref(this.security_custom_pref); + } catch(e) { + // init custom to false + const val = false; + Services.prefs.setBoolPref(this.security_custom_pref, val); + return val; + } + }, + + set securityCustom(val) { + Services.prefs.setBoolPref(this.security_custom_pref, val); + }, +}; + +/* + Security Level Button Code + + Controls init and update of the security level toolbar button +*/ + +const SecurityLevelButton = { + _securityPrefsBranch : null, + + _populateXUL : function(securityLevelButton) { + if (securityLevelButton != null) { + securityLevelButton.setAttribute("tooltiptext", SecurityLevelStrings.securityLevel); + securityLevelButton.setAttribute("label", SecurityLevelStrings.securityLevel); + } + }, + + _configUIFromPrefs : function(securityLevelButton) { + if (securityLevelButton != null) { + let securitySlider = SecurityLevelPrefs.securitySlider; + let classList = securityLevelButton.classList; + classList.remove("standard", "safer", "safest"); + switch(securitySlider) { + case 4: + classList.add("standard"); + securityLevelButton.setAttribute("tooltiptext", SecurityLevelStrings.standard.tooltip); + break; + case 2: + classList.add("safer"); + securityLevelButton.setAttribute("tooltiptext", SecurityLevelStrings.safer.tooltip); + break; + case 1: + classList.add("safest"); + securityLevelButton.setAttribute("tooltiptext", SecurityLevelStrings.safest.tooltip); + break; + } + } + }, + + init : function() { + // set the initial class based off of the current pref + let button = document.getElementById("security-level-button"); + this._populateXUL(button); + this._configUIFromPrefs(button); + + this._securityPrefsBranch = Services.prefs.getBranch("extensions.torbutton."); + this._securityPrefsBranch.addObserver("", this, false); + + CustomizableUI.addListener(this); + + SecurityLevelPanel.init(); + }, + + uninit : function() { + CustomizableUI.removeListener(this); + + this._securityPrefsBranch.removeObserver("", this); + this._securityPrefsBranch = null; + + SecurityLevelPanel.uninit(); + }, + + observe : function(subject, topic, data) { + switch(topic) { + case "nsPref:changed": + if (data == "security_slider") { + this._configUIFromPrefs(document.getElementById("security-level-button")); + } + break; + } + }, + + // callbacks for entering the 'Customize Firefox' screen to set icon + onCustomizeStart : function(window) { + let navigatorToolbox = document.getElementById("navigator-toolbox"); + let button = navigatorToolbox.palette.querySelector("#security-level-button"); + this._populateXUL(button); + this._configUIFromPrefs(button); + }, + + // callback when CustomizableUI modifies DOM + onWidgetAfterDOMChange : function(aNode, aNextNode, aContainer, aWasRemoval) { + if (aNode.id == "security-level-button" && !aWasRemoval) { + this._populateXUL(aNode); + this._configUIFromPrefs(aNode); + } + }, + + // when toolbar button is pressed + onCommand : function(anchor, event) { + SecurityLevelPanel.show(anchor); + }, +}; + +/* + Security Level Panel Code + + Controls init and update of the panel in the security level hanger +*/ + +const SecurityLevelPanel = { + _securityPrefsBranch : null, + _panel : null, + _anchor : null, + _populated : false, + + _populateXUL : function() { + // get the panel elements we need to populate + let panelview = document.getElementById("securityLevel-panelview"); + let labelHeader = panelview.querySelector("#securityLevel-header"); + let labelCustomWarning = panelview.querySelector("#securityLevel-customWarning") + let labelLearnMore = panelview.querySelector("#securityLevel-learnMore"); + let buttonRestoreDefaults = panelview.querySelector("#securityLevel-restoreDefaults"); + let buttonAdvancedSecuritySettings = panelview.querySelector("#securityLevel-advancedSecuritySettings"); + + labelHeader.setAttribute("value", SecurityLevelStrings.securityLevel); + labelCustomWarning.setAttribute("value", SecurityLevelStrings.customWarning); + labelLearnMore.setAttribute("value", SecurityLevelStrings.learnMore); + labelLearnMore.setAttribute("href", SecurityLevelStrings.learnMoreURL); + buttonRestoreDefaults.setAttribute("label", SecurityLevelStrings.restoreDefaults); + buttonAdvancedSecuritySettings.setAttribute("label", SecurityLevelStrings.advancedSecuritySettings); + + // rest of the XUL is set based on security prefs + this._configUIFromPrefs(); + + this._populated = true; + }, + + _configUIFromPrefs : function() { + // get security prefs + let securitySlider = SecurityLevelPrefs.securitySlider; + let securityCustom = SecurityLevelPrefs.securityCustom; + + // get the panel elements we need to populate + let panelview = document.getElementById("securityLevel-panelview"); + let labelLevel = panelview.querySelector("#securityLevel-level"); + let labelCustomWarning = panelview.querySelector("#securityLevel-customWarning") + let summary = panelview.querySelector("#securityLevel-summary"); + let buttonRestoreDefaults = panelview.querySelector("#securityLevel-restoreDefaults"); + let buttonAdvancedSecuritySettings = panelview.querySelector("#securityLevel-advancedSecuritySettings"); + + // only visible when user is using custom settings + labelCustomWarning.hidden = !securityCustom; + buttonRestoreDefaults.hidden = !securityCustom; + + // Descriptions change based on security level + switch(securitySlider) { + // standard + case 4: + labelLevel.setAttribute("value", SecurityLevelStrings.standard.level); + summary.textContent = SecurityLevelStrings.standard.summary; + break; + // safer + case 2: + labelLevel.setAttribute("value", SecurityLevelStrings.safer.level); + summary.textContent = SecurityLevelStrings.safer.summary; + break; + // safest + case 1: + labelLevel.setAttribute("value", SecurityLevelStrings.safest.level); + summary.textContent = SecurityLevelStrings.safest.summary; + break; + } + + // override the summary text with custom warning + if (securityCustom) { + summary.textContent = SecurityLevelStrings.custom.summary; + } + }, + + init : function() { + this._securityPrefsBranch = Services.prefs.getBranch("extensions.torbutton."); + this._securityPrefsBranch.addObserver("", this, false); + }, + + uninit : function() { + this._securityPrefsBranch.removeObserver("", this); + this._securityPrefsBranch = null; + }, + + show : function(anchor) { + // we have to defer this until after the browser has finished init'ing before + // we can populate the panel + if (!this._populated) { + this._populateXUL(); + } + + // save off anchor in case we want to show from our own code + this._anchor = anchor; + + let panel = document.getElementById("securityLevel-panel"); + panel.hidden = false; + PanelMultiView.openPopup(panel, anchor, "bottomcenter topright", + 0, 0, false, null).catch(Cu.reportError); + }, + + hide : function() { + let panel = document.getElementById("securityLevel-panel"); + PanelMultiView.hidePopup(panel); + }, + + // when prefs change + observe : function(subject, topic, data) { + switch(topic) { + case "nsPref:changed": + if (data == "security_slider" || data == "security_custom") { + this._configUIFromPrefs(); + } + break; + } + }, + + restoreDefaults : function() { + SecurityLevelPrefs.securityCustom = false; + // hide and reshow so that layout re-renders properly + this.hide(); + this.show(this._anchor); + }, + + openAdvancedSecuritySettings : async function() { + openPreferences("privacy-securitylevel"); + this.hide(); + } +}; + +/* + Security Level Preferences Code + + Code to handle init and update of security level section in about:preferences#privacy +*/ + +const SecurityLevelPreferences = +{ + _securityPrefsBranch : null, + + _populateXUL : function() { + let groupbox = document.getElementById("securityLevel-groupbox"); + + let labelHeader = groupbox.querySelector("#securityLevel-header"); + labelHeader.setAttribute("value", SecurityLevelStrings.securityLevel); + + let spanOverview = groupbox.querySelector("#securityLevel-overview"); + spanOverview.textContent = SecurityLevelStrings.overview; + + let labelLearnMore = groupbox.querySelector("#securityLevel-learnMore"); + labelLearnMore.setAttribute("value", SecurityLevelStrings.learnMore); + labelLearnMore.setAttribute("href", SecurityLevelStrings.learnMoreURL); + + let populateRadioElements = function(vboxQuery, stringStruct) { + let vbox = groupbox.querySelector(vboxQuery); + + let radio = vbox.querySelector("radio"); + radio.setAttribute("label", stringStruct.level); + + let customWarning = vbox.querySelector("#securityLevel-customWarning"); + customWarning.setAttribute("value", SecurityLevelStrings.customWarning); + + let labelSummary = vbox.querySelector("#securityLevel-summary"); + labelSummary.textContent = stringStruct.summary; + + let labelRestoreDefaults = vbox.querySelector("#securityLevel-restoreDefaults"); + labelRestoreDefaults.setAttribute("value", SecurityLevelStrings.restoreDefaults); + + let description1 = vbox.querySelector("#securityLevel-description1"); + if (description1) { + description1.textContent = stringStruct.description1; + } + let description2 = vbox.querySelector("#securityLevel-description2"); + if (description2) { + description2.textContent = stringStruct.description2; + } + let description3 = vbox.querySelector("#securityLevel-description3"); + if (description3) { + description3.textContent = stringStruct.description3; + } + }; + + populateRadioElements("#securityLevel-vbox-standard", SecurityLevelStrings.standard); + populateRadioElements("#securityLevel-vbox-safer", SecurityLevelStrings.safer); + populateRadioElements("#securityLevel-vbox-safest", SecurityLevelStrings.safest); + }, + + _configUIFromPrefs : function() { + // read our prefs + let securitySlider = SecurityLevelPrefs.securitySlider; + let securityCustom = SecurityLevelPrefs.securityCustom; + + // get our elements + let groupbox = document.getElementById("securityLevel-groupbox"); + + let radiogroup = groupbox.querySelector("#securityLevel-radiogroup"); + let labelStandardCustom = groupbox.querySelector("#securityLevel-vbox-standard label#securityLevel-customWarning"); + let labelSaferCustom = groupbox.querySelector("#securityLevel-vbox-safer label#securityLevel-customWarning"); + let labelSafestCustom = groupbox.querySelector("#securityLevel-vbox-safest label#securityLevel-customWarning"); + let labelStandardRestoreDefaults = groupbox.querySelector("#securityLevel-vbox-standard label#securityLevel-restoreDefaults"); + let labelSaferRestoreDefaults = groupbox.querySelector("#securityLevel-vbox-safer label#securityLevel-restoreDefaults"); + let labelSafestRestoreDefaults = groupbox.querySelector("#securityLevel-vbox-safest label#securityLevel-restoreDefaults"); + + // hide custom label by default until we know which level we're at + labelStandardCustom.hidden = true; + labelSaferCustom.hidden = true; + labelSafestCustom.hidden = true; + + labelStandardRestoreDefaults.hidden = true; + labelSaferRestoreDefaults.hidden = true; + labelSafestRestoreDefaults.hidden = true; + + switch(securitySlider) { + // standard + case 4: + radiogroup.value = "standard"; + labelStandardCustom.hidden = !securityCustom; + labelStandardRestoreDefaults.hidden = !securityCustom; + break; + // safer + case 2: + radiogroup.value = "safer"; + labelSaferCustom.hidden = !securityCustom; + labelSaferRestoreDefaults.hidden = !securityCustom; + break; + // safest + case 1: + radiogroup.value = "safest"; + labelSafestCustom.hidden = !securityCustom; + labelSafestRestoreDefaults.hidden = !securityCustom; + break; + } + }, + + init : function() { + // populate XUL with localized strings + this._populateXUL(); + + // read prefs and populate UI + this._configUIFromPrefs(); + + // register for pref chagnes + this._securityPrefsBranch = Services.prefs.getBranch("extensions.torbutton."); + this._securityPrefsBranch.addObserver("", this, false); + }, + + uninit : function() { + // unregister for pref change events + this._securityPrefsBranch.removeObserver("", this); + this._securityPrefsBranch = null; + }, + + // callback for when prefs change + observe : function(subject, topic, data) { + switch(topic) { + case "nsPref:changed": + if (data == "security_slider" || + data == "security_custom") { + this._configUIFromPrefs(); + } + break; + } + }, + + selectSecurityLevel : function() { + // radio group elements + let radiogroup = document.getElementById("securityLevel-radiogroup"); + + // update pref based on selected radio option + switch (radiogroup.value) { + case "standard": + SecurityLevelPrefs.securitySlider = 4; + break; + case "safer": + SecurityLevelPrefs.securitySlider = 2; + break; + case "safest": + SecurityLevelPrefs.securitySlider = 1; + break; + } + + this.restoreDefaults(); + }, + + restoreDefaults : function() { + SecurityLevelPrefs.securityCustom = false; + }, +}; + +Object.defineProperty(this, "SecurityLevelButton", { + value: SecurityLevelButton, + enumerable: true, + writable: false +}); + +Object.defineProperty(this, "SecurityLevelPanel", { + value: SecurityLevelPanel, + enumerable: true, + writable: false +}); + +Object.defineProperty(this, "SecurityLevelPreferences", { + value: SecurityLevelPreferences, + enumerable: true, + writable: false +}); diff --git a/browser/components/securitylevel/content/securityLevelButton.css b/browser/components/securitylevel/content/securityLevelButton.css new file mode 100644 index 000000000000..81f2365bae28 --- /dev/null +++ b/browser/components/securitylevel/content/securityLevelButton.css @@ -0,0 +1,9 @@ +toolbarbutton#security-level-button.standard { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelButton.svg#standard"); +} +toolbarbutton#security-level-button.safer { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelButton.svg#safer"); +} +toolbarbutton#security-level-button.safest { + list-style-image: url("chrome://browser/content/securitylevel/securityLevelButton.svg#safest"); +} diff --git a/browser/components/securitylevel/content/securityLevelButton.inc.xul b/browser/components/securitylevel/content/securityLevelButton.inc.xul new file mode 100644 index 000000000000..4ad26f4142bd --- /dev/null +++ b/browser/components/securitylevel/content/securityLevelButton.inc.xul @@ -0,0 +1,5 @@ +<toolbarbutton id="security-level-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + removable="true" + oncommand="SecurityLevelButton.onCommand(this, event);" + closemenu="none" + cui-areatype="toolbar"/> diff --git a/browser/components/securitylevel/content/securityLevelButton.svg b/browser/components/securitylevel/content/securityLevelButton.svg new file mode 100644 index 000000000000..8535cdcc531e --- /dev/null +++ b/browser/components/securitylevel/content/securityLevelButton.svg @@ -0,0 +1,21 @@ +<svg width="14px" height="16px" viewBox="0 0 14 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <style> + use:not(:target) { + display: none; + } + </style> + <defs> + <g id="standard_icon" stroke="none" stroke-width="1"> + <path d="M7.0 2.16583509C7.0 2.16583509 2.0 4.24375717 2.0 4.24375717C2.0 4.24375717 2.0 7.27272727 2.0 7.27272727C2.0 10.2413541 4.13435329 13.0576771 7.0 13.9315843C9.8656467 13.0576771 12.0 10.2413541 12.0 7.27272727C12.0 7.27272727 12.0 4.24375717 12.0 4.24375717C12.0 4.24375717 7.0 2.16583509 7.0 2.16583509C7.0 2.16583509 7.0 2.16583509 7.0 2.16583509M7.0 0.0C7.0 0.0 14.0 2.90909091 14.0 2.90909091C14.0 2.90909091 14.0 7.27272727 14.0 7.27272727C14.0 11.3090909 11.0133333 15.0836364 7.0 16.0C2.98666667 15.0836364 0.0 11.3090909 0.0 7.27272727C0.0 7.27272727 0.0 2.90909091 0.0 2.90909091C0.0 2.90909091 7.0 0.0 7.0 0.0C7.0 0.0 7.0 0.0 7.0 0.0" /> + </g> + <g id="safer_icon" stroke="none" stroke-width="1"> + <path fill-rule="nonzero" d="M7.0 2.1658351C7.0 13.931584 7.0 2.1658351 7.0 13.931584C9.8656467 13.057677 12.0 10.241354 12.0 7.2727273C12.0 7.2727273 12.0 4.2437572 12.0 4.2437572C12.0 4.2437572 7.0 2.1658351 7.0 2.1658351C7.0 2.1658351 7.0 2.1658351 7.0 2.1658351M7.0 0.0C7.0 0.0 14.0 2.9090909 14.0 2.9090909C14.0 2.9090909 14.0 7.2727273 14.0 7.2727273C14.0 11.309091 11.013333 15.083636 7.0 16.0C2.9866667 15.083636 0.0 11.309091 0.0 7.2727273C0.0 7.2727273 0.0 2.9090909 0.0 2.9090909C0.0 2.9090909 7.0 0.0 7.0 0.0"/> + </g> + <g id="safest_icon" stroke="none" stroke-width="1"> + <path d="M7.0 0.0C7.0 0.0 14.0 2.90909091 14.0 2.90909091C14.0 2.90909091 14.0 7.27272727 14.0 7.27272727C14.0 11.3090909 11.0133333 15.0836364 7.0 16.0C2.98666667 15.0836364 0.0 11.3090909 0.0 7.27272727C0.0 7.27272727 0.0 2.90909091 0.0 2.90909091C0.0 2.90909091 7.0 0.0 7.0 0.0C7.0 0.0 7.0 0.0 7.0 0.0" /> + </g> + </defs> + <use id="standard" fill="context-fill" fill-opacity="context-fill-opacity" href="#standard_icon" /> + <use id="safer" fill="context-fill" fill-opacity="context-fill-opacity" href="#safer_icon" /> + <use id="safest" fill="context-fill" fill-opacity="context-fill-opacity" href="#safest_icon" /> +</svg> diff --git a/browser/components/securitylevel/content/securityLevelPanel.css b/browser/components/securitylevel/content/securityLevelPanel.css new file mode 100644 index 000000000000..170bf625ea1d --- /dev/null +++ b/browser/components/securitylevel/content/securityLevelPanel.css @@ -0,0 +1,82 @@ +/* Security Level CSS */ + +panel#securityLevel-panel > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; +} + +panelview#securityLevel-panelview { + width: 20em; +} + +panelview#securityLevel-panelview>vbox.panel-subview-body { + padding: 1em; +} + +label#securityLevel-header { + text-transform: uppercase; + color: GrayText; + font-size: 0.85em; + margin: 0 0 0.4em 0; + padding: 0; +} + +hbox#securityLevel-levelHbox { + margin-bottom: 1em; +} + +label#securityLevel-level { + font-size: 1.5em; + margin: 0 0.5em 0 0; + padding: 0; +} + +label#securityLevel-customWarning { + border-radius: 2px; + background-color: #ffe845; + text-transform: uppercase; + font-weight: bolder; + font-size: 0.8em; + height: 1em; + line-height: 1em; + vertical-align: middle; + margin: auto; + padding: 0.4em; +} + +panelview#securityLevel-panelview description { + margin: 0 -0.5em 0.5em 0; + padding: 0 !important; +} + +label#securityLevel-learnMore { + margin: 0 0 1.0em 0; + padding: 0; +} + +panelview#securityLevel-panelview button { + -moz-appearance: none; + background-color: var(--arrowpanel-dimmed); +} + +panelview#securityLevel-panelview button:hover { + background-color: var(--arrowpanel-dimmed-further); +} + +panelview#securityLevel-panelview button:active { + background-color: var(--arrowpanel-dimmed-even-further); +} + +button#securityLevel-restoreDefaults { + margin: 0 0 1.0em 0; + padding: 0.45em; + color: inherit !important; +} + +button#securityLevel-advancedSecuritySettings { + margin: 0 -1.0em -1.0em -1.0em; + border-radius: 0; + border-top: 1px solid var(--panel-separator-color); + padding: 0; + height: 3.0em; + color: inherit !important; +} diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xul b/browser/components/securitylevel/content/securityLevelPanel.inc.xul new file mode 100644 index 000000000000..532e8dd98b32 --- /dev/null +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xul @@ -0,0 +1,33 @@ +<panel id="securityLevel-panel" + role="group" + type="arrow" + orient="vertical" + level="top" + hidden="true"> + <panelmultiview mainViewId="securityLevel-panelview"> + <panelview id="securityLevel-panelview" descriptionheightworkaround="true"> + <vbox class="panel-subview-body"> + <label id="securityLevel-header"/> + <hbox id="securityLevel-levelHbox"> + <label id="securityLevel-level"/> + <vbox> + <spacer flex="1"/> + <label id="securityLevel-customWarning"/> + <spacer flex="1"/> + </vbox> + </hbox> + <description id="securityLevel-summary"/> + <label + id="securityLevel-learnMore" + class="learnMore text-link" + onclick="SecurityLevelPanel.hide();"/> + <button + id="securityLevel-restoreDefaults" + oncommand="SecurityLevelPanel.restoreDefaults();"/> + <button + id="securityLevel-advancedSecuritySettings" + oncommand="SecurityLevelPanel.openAdvancedSecuritySettings();"/> + </vbox> + </panelview> + </panelmultiview> +</panel> diff --git a/browser/components/securitylevel/content/securityLevelPreferences.css b/browser/components/securitylevel/content/securityLevelPreferences.css new file mode 100644 index 000000000000..0d1040d177d8 --- /dev/null +++ b/browser/components/securitylevel/content/securityLevelPreferences.css @@ -0,0 +1,26 @@ +label#securityLevel-customWarning { + border-radius: 2px; + background-color: #ffe845; + text-transform: uppercase; + font-weight: bolder; + font-size: 0.7em; + height: 1em; + line-height: 1em; + padding: 0.35em; +} + +radiogroup#securityLevel-radiogroup radio { + font-weight: bold; +} + +vbox#securityLevel-vbox-standard, +vbox#securityLevel-vbox-safer, +vbox#securityLevel-vbox-safest { + margin-top: 0.4em; +} + +vbox#securityLevel-vbox-standard description.indent, +vbox#securityLevel-vbox-safer description.indent, +vbox#securityLevel-vbox-safest description.indent { + margin-inline-start: 0 !important; +} diff --git a/browser/components/securitylevel/content/securityLevelPreferences.inc.xul b/browser/components/securitylevel/content/securityLevelPreferences.inc.xul new file mode 100644 index 000000000000..0cf05a5f3c9b --- /dev/null +++ b/browser/components/securitylevel/content/securityLevelPreferences.inc.xul @@ -0,0 +1,66 @@ +<groupbox id="securityLevel-groupbox" data-category="panePrivacy" hidden="true"> + <caption><label id="securityLevel-header"/></caption> + <vbox data-subcategory="securitylevel" flex="1"> + <description flex="1"> + <html:span id="securityLevel-overview" class="tail-with-learn-more"/> + <label id="securityLevel-learnMore" class="learnMore text-link"/> + </description> + <radiogroup id="securityLevel-radiogroup" + oncommand="SecurityLevelPreferences.selectSecurityLevel();"> + <vbox id="securityLevel-vbox-standard"> + <hbox> + <radio value="standard"/> + <vbox> + <spacer flex="1"/> + <label id="securityLevel-customWarning"/> + <spacer flex="1"/> + </vbox> + </hbox> + <description flex="1"> + <html:span id="securityLevel-summary" class="tail-with-learn-more"/> + <label id="securityLevel-restoreDefaults" + class="learnMore text-link" + onclick="SecurityLevelPreferences.restoreDefaults();"/> + </description> + </vbox> + <vbox id="securityLevel-vbox-safer"> + <hbox> + <radio value="safer"/> + <vbox> + <spacer flex="1"/> + <label id="securityLevel-customWarning"/> + <spacer flex="1"/> + </vbox> + </hbox> + <description flex="1"> + <html:span id="securityLevel-summary" class="tail-with-learn-more"/> + <label id="securityLevel-restoreDefaults" + class="learnMore text-link" + onclick="SecurityLevelPreferences.restoreDefaults();"/> + </description> + <description id="securityLevel-description1" class="indent tip-caption"/> + <description id="securityLevel-description2" class="indent tip-caption"/> + <description id="securityLevel-description3" class="indent tip-caption"/> + </vbox> + <vbox id="securityLevel-vbox-safest"> + <hbox> + <radio value="safest"/> + <vbox> + <spacer flex="1"/> + <label id="securityLevel-customWarning"/> + <spacer flex="1"/> + </vbox> + </hbox> + <description flex="1"> + <html:span id="securityLevel-summary" class="tail-with-learn-more"/> + <label id="securityLevel-restoreDefaults" + class="learnMore text-link" + onclick="SecurityLevelPreferences.restoreDefaults();"/> + </description> + <description id="securityLevel-description1" class="indent tip-caption"/> + <description id="securityLevel-description2" class="indent tip-caption"/> + <description id="securityLevel-description3" class="indent tip-caption"/> + </vbox> + </radiogroup> + </vbox> +</groupbox> diff --git a/browser/components/securitylevel/jar.mn b/browser/components/securitylevel/jar.mn new file mode 100644 index 000000000000..9ac408083fbc --- /dev/null +++ b/browser/components/securitylevel/jar.mn @@ -0,0 +1,6 @@ +browser.jar: + content/browser/securitylevel/securityLevel.js (content/securityLevel.js) + content/browser/securitylevel/securityLevelPanel.css (content/securityLevelPanel.css) + content/browser/securitylevel/securityLevelButton.css (content/securityLevelButton.css) + content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css) + content/browser/securitylevel/securityLevelButton.svg (content/securityLevelButton.svg) diff --git a/browser/components/securitylevel/moz.build b/browser/components/securitylevel/moz.build new file mode 100644 index 000000000000..7e103239c8d6 --- /dev/null +++ b/browser/components/securitylevel/moz.build @@ -0,0 +1 @@ +JAR_MANIFESTS += ['jar.mn']

1 0

[torbutton/master] Bug 28628: Change onboarding Security panel to open new Security Level panel.
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit 52c12d905ff4f6d35d5788b5cc379e474be429e9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 12 16:53:45 2019 -0400 Bug 28628: Change onboarding Security panel to open new Security Level panel. Add new string: label for the "action" button within the onboarding Security panel. --- src/chrome/locale/en-US/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en-US/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties index 6c2fb0c8..82c9bcca 100644 --- a/src/chrome/locale/en-US/browserOnboarding.properties +++ b/src/chrome/locale/en-US/browserOnboarding.properties @@ -25,7 +25,7 @@ onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=Security onboarding.tour-tor-security.title=Choose your experience. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security-level.button=See Your Security Level onboarding.tour-tor-expect-differences=Experience Tips onboarding.tour-tor-expect-differences.title=Expect some differences.

1 0

[torbutton/master] Bug 27478: Torbutton in Tor Browser 8 difficult to see in dark theme
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit 2930d898032e04443527af8c6528481f202a2c4e Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Mar 14 14:26:39 2019 -0700 Bug 27478: Torbutton in Tor Browser 8 difficult to see in dark theme Changed the torbutton icon svgs to use 'context-fill' for fill and 'context-opacity' for opacity attributes. With this change firefox will provide the correct color values to our icons so they always look correct for with the current theme. --- src/chrome/skin/torbutton-dark-update-needed.svg | 13 ------------- src/chrome/skin/torbutton-dark.svg | 9 --------- src/chrome/skin/torbutton-update-needed.svg | 16 ++++++---------- src/chrome/skin/torbutton.css | 15 --------------- src/chrome/skin/torbutton.svg | 10 ++++------ 5 files changed, 10 insertions(+), 53 deletions(-) diff --git a/src/chrome/skin/torbutton-dark-update-needed.svg b/src/chrome/skin/torbutton-dark-update-needed.svg deleted file mode 100644 index 44df4a00..00000000 --- a/src/chrome/skin/torbutton-dark-update-needed.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g id="Icon---Tor-Update---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Tor-Button-Icon" fill="#F9F9FA" fill-opacity="0.8"> - <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> - <path d="M9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 Z" id="Half-Content"></path> - </g> - <g id="!" transform="translate(0.000000, 6.100000)"> - <polygon id="Triangle-Copy" fill="#414141" points="5 0.714285714 9.28571429 9.28571429 0.714285714 9.28571429"></polygon> - <path d="M9.78067261,7.86561722 C10.0020131,8.30856238 9.97819173,8.83453755 9.71771774,9.25566142 C9.45724375,9.6767853 8.9972698,9.93299087 8.50210118,9.93276007 L1.42710118,9.93276007 C0.932880889,9.93225088 0.474029854,9.67633171 0.213899592,9.2561101 C-0.0462306709,8.83588849 -0.0706843715,8.31106384 0.149244037,7.86847436 L3.68710118,0.789902932 C3.92904842,0.305811394 4.42377158,0 4.96495832,0 C5.50614506,0 6.00086822,0.305811394 6.24281547,0.789902932 L9.78067261,7.86561722 Z M4.25067261,2.78990293 L4.25067261,5.64704579 C4.25067261,6.0415349 4.57046922,6.3613315 4.96495832,6.3613315 C5.35944743,6.3613315 5.67924404,6.0415349 5.67924404,5.64704579 L5.67924404,2.78990293 C5.67924404,2.39541382 5.35944743,2.07561722 4.96495832,2.07561722 C4.57046922,2.07561722 4.25067261,2.39541382 4.25067261,2.78990293 Z M4.96495832,8.68276007 C5.45806971,8.68276007 5.85781547,8.28301432 5.85781547,7.78990293 C5.85781547,7.29679155 5.45806971,6.89704579 4.96495832,6.89704579 C4.47 184694,6.89704579 4.07210118,7.29679155 4.07210118,7.78990293 C4.07210118,8.28301432 4.47184694,8.68276007 4.96495832,8.68276007 Z" id="Shape-Copy" fill="#FFE900" fill-rule="nonzero"></path> - </g> - </g> -</svg> diff --git a/src/chrome/skin/torbutton-dark.svg b/src/chrome/skin/torbutton-dark.svg deleted file mode 100644 index 55d633e8..00000000 --- a/src/chrome/skin/torbutton-dark.svg +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g id="Icon---Tor---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8"> - <g id="Tor-Button-Icon" fill="#F9F9FA"> - <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> - <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> - </g> - </g> -</svg> diff --git a/src/chrome/skin/torbutton-update-needed.svg b/src/chrome/skin/torbutton-update-needed.svg index 12bcca31..654f5ef1 100644 --- a/src/chrome/skin/torbutton-update-needed.svg +++ b/src/chrome/skin/torbutton-update-needed.svg @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g id="Icon---Tor-Update---Grey" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> - <g id="Tor-Button-Icon" fill="#0C0C0D" fill-opacity="0.8"> - <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> - <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> - </g> - <g id="!" transform="translate(0.000000, 6.100000)"> - <polygon id="Triangle-Copy" fill="#414141" points="5 0.714285714 9.28571429 9.28571429 0.714285714 9.28571429"></polygon> - <path d="M9.78067261,7.86561722 C10.0020131,8.30856238 9.97819173,8.83453755 9.71771774,9.25566142 C9.45724375,9.6767853 8.9972698,9.93299087 8.50210118,9.93276007 L1.42710118,9.93276007 C0.932880889,9.93225088 0.474029854,9.67633171 0.213899592,9.2561101 C-0.0462306709,8.83588849 -0.0706843715,8.31106384 0.149244037,7.86847436 L3.68710118,0.789902932 C3.92904842,0.305811394 4.42377158,0 4.96495832,0 C5.50614506,0 6.00086822,0.305811394 6.24281547,0.789902932 L9.78067261,7.86561722 Z M4.25067261,2.78990293 L4.25067261,5.64704579 C4.25067261,6.0415349 4.57046922,6.3613315 4.96495832,6.3613315 C5.35944743,6.3613315 5.67924404,6.0415349 5.67924404,5.64704579 L5.67924404,2.78990293 C5.67924404,2.39541382 5.35944743,2.07561722 4.96495832,2.07561722 C4.57046922,2.07561722 4.25067261,2.39541382 4.25067261,2.78990293 Z M4.96495832,8.68276007 C5.45806971,8.68276007 5.85781547,8.28301432 5.85781547,7.78990293 C5.85781547,7.29679155 5.45806971,6.89704579 4.96495832,6.89704579 C4.47 184694,6.89704579 4.07210118,7.29679155 4.07210118,7.78990293 C4.07210118,8.28301432 4.47184694,8.68276007 4.96495832,8.68276007 Z" id="Shape-Copy" fill="#FFE900" fill-rule="nonzero"></path> - </g> - </g> + <g fill="context-fill" fill-opacity="context-fill-opacity"> + <path d="M7.06561268 5.02241519C6.77772045 5.2116121 5.67952408 5.90554501 5.6853992 5.90178938C5.35790364 6.11113858 5.09635335 6.28354515 4.86413018 6.44457064C4.45268439 6.72987059 4.15887546 6.96359333 3.97499388 7.15193679C2.95731966 8.16499644 2.66333288 8.97771922 2.77290903 10.3548433C2.86347409 11.8242645 4.01769529 13.1628244 5.73360996 13.7141752C6.42393225 13.9308094 7.08993386 14.0 8.24418607 14.0C9.69409954 14.0 11.010192 13.6175745 11.8475477 12.9475461C12.7611494 12.2214478 13.2954545 11.1244618 13.2954545 10.0058997C13.2954545 8.86286776 12.7876949 7.76058164 11.8769727 6.9600938C11.3838667 6.53505399 10.722397 6.11798563 9.75901067 5.60447735C9.08955454 5.26286683 8.4719792 4.75203246 8.02479915 4.11379651C7.77978416 4.4739196 7.45874047 4.78154253 7.06561268 5.02241519C7.06561268 5.02241519 7.06561268 5.02241519 7.06561268 5.02241519M13.1898674 5.45132743C14.5364638 6.63126844 15.2954545 8.28318584 15.2954545 10.0058997C15.2954545 11.7286136 14.4874967 13.4041 298 13.0919331 14.5132743C11.7943039 15.5516224 9.98251962 16.0 8.24418607 16.0C7.16690894 16.0 6.1875661 15.9528024 5.13477254 15.6224189C2.71089901 14.8436578 0.923598318 12.8613569 0.776696891 10.4778761C0.629795465 8.63716814 1.07049974 7.22123894 2.56399758 5.73451327C3.32298828 4.95575221 4.88993683 4.05899705 5.96721396 3.35103245C6.50585253 3.02064897 7.06897466 2.02949853 5.99169753 0.16519174C5.99169753 0.16519174 6.21204967 0.0 6.21204967 0.0C6.21204967 0.0 9.41939748 1.27433628 9.41939748 1.27433628C8.97869321 2.64306785 10.2518389 3.61061947 10.6680596 3.82300885C11.5984353 4.31858407 12.4798439 4.83775811 13.1898674 5.45132743C13.1898674 5.45132743 13.1898674 5.45132743 13.1898674 5.45132743" /> + <path d="M8.27272727 5.0C8.49625435 5.67889606 9.03172133 6.21869701 9.63636041 6.5268042C10.3279607 6.89485621 10.8036714 7.19446079 11.1684763 7.5087455C11.8759239 8.12902347 12.2727273 8.98864463 12.2727273 9.88278877C12.2727273 10.7655864 11.852758 11.6266312 11.1353943 12.1959748C10.4876507 12.713565 9.5005326 13.0 8.42423809 13.0C8.37244863 13.0 8.32197458 12.9998006 8.27272727 12.9993871C8.27272727 12.9993871 8.27272727 5.0 8.27272727 5.0C8.27272727 5.0 8.27272727 5.0 8.27272727 5.0" /> + </g> + <polygon points="5,7 9,15 1,15" fill="#414141"/> + <path fill-rule="nonzero" fill="#FFE900" d="M9.78067261 13.96561722C10.0020131 14.40856238 9.97819173 14.93453755 9.71771774 15.35566142C9.45724375 15.7767853 8.9972698 16.03299087 8.50210118 16.03276007C8.50210118 16.03276007 1.42710118 16.03276007 1.42710118 16.03276007C0.932880889 16.03225088 0.474029854 15.77633171 0.213899592 15.3561101C-0.0462306709 14.93588849 -0.0706843715 14.41106384 0.149244037 13.96847436C0.149244037 13.96847436 3.68710118 6.889902932 3.68710118 6.889902932C3.92904842 6.405811394 4.42377158 6.1 4.96495832 6.1C5.50614506 6.1 6.00086822 6.405811394 6.24281547 6.889902932C6.24281547 6.889902932 9.78067261 13.96561722 9.78067261 13.96561722C9.78067261 13.96561722 9.78067261 13.96561722 9.78067261 13.96561722M4.25067261 8.88990293C4.25067261 8.88990293 4.25067261 11.74704579 4.25067261 11.74704579C4.25067261 12.1415349 4.57046922 12.4613315 4.96495832 12.4613315C5.35944743 12.4613315 5.67924404 12.1415349 5.67924404 11.74704579C5.67924404 11.74704579 5.67924 404 8.88990293 5.67924404 8.88990293C5.67924404 8.49541382 5.35944743 8.17561722 4.96495832 8.17561722C4.57046922 8.17561722 4.25067261 8.49541382 4.25067261 8.88990293C4.25067261 8.88990293 4.25067261 8.88990293 4.25067261 8.88990293M4.96495832 14.78276007C5.45806971 14.78276007 5.85781547 14.38301432 5.85781547 13.88990293C5.85781547 13.39679155 5.45806971 12.99704579 4.96495832 12.99704579C4.47184694 12.99704579 4.07210118 13.39679155 4.07210118 13.88990293C4.07210118 14.38301432 4.47184694 14.78276007 4.96495832 14.78276007C4.96495832 14.78276007 4.96495832 14.78276007 4.96495832 14.78276007" /> </svg> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 28333874..638520f9 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -6,21 +6,10 @@ list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } } -@keyframes blink-update-dark { - 0% { - list-style-image: url("chrome://torbutton/skin/torbutton-dark-update-needed.svg"); - } - 100% { - list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); - } -} #torbutton-button { list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } -toolbar[brighttext] #torbutton-button { - list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); -} #torbutton-button[tbstatus="on"] { opacity: 1.0; } @@ -31,10 +20,6 @@ toolbar[brighttext] #torbutton-button { opacity: 1.0; animation: blink-update normal 1s infinite ease-in-out; } -toolbar[brighttext] #torbutton-button[tbUpdateNeeded="true"] { - opacity: 1.0; - animation: blink-update-dark normal 1s infinite ease-in-out; -} #torbutton-button-tb { list-style-image: url("chrome://torbutton/skin/torbutton.svg"); diff --git a/src/chrome/skin/torbutton.svg b/src/chrome/skin/torbutton.svg index 11892c6f..d0e4a69c 100644 --- a/src/chrome/skin/torbutton.svg +++ b/src/chrome/skin/torbutton.svg @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g id="Icon---Tor---Grey" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8"> - <g id="Tor-Button-Icon" fill="#0C0C0D"> - <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> - <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> - </g> - </g> + <g fill="context-fill" fill-opacity="context-fill-opacity"> + <path d="M7.06561268 5.02241519C6.77772045 5.2116121 5.67952408 5.90554501 5.6853992 5.90178938C5.35790364 6.11113858 5.09635335 6.28354515 4.86413018 6.44457064C4.45268439 6.72987059 4.15887546 6.96359333 3.97499388 7.15193679C2.95731966 8.16499644 2.66333288 8.97771922 2.77290903 10.3548433C2.86347409 11.8242645 4.01769529 13.1628244 5.73360996 13.7141752C6.42393225 13.9308094 7.08993386 14.0 8.24418607 14.0C9.69409954 14.0 11.010192 13.6175745 11.8475477 12.9475461C12.7611494 12.2214478 13.2954545 11.1244618 13.2954545 10.0058997C13.2954545 8.86286776 12.7876949 7.76058164 11.8769727 6.9600938C11.3838667 6.53505399 10.722397 6.11798563 9.75901067 5.60447735C9.08955454 5.26286683 8.4719792 4.75203246 8.02479915 4.11379651C7.77978416 4.4739196 7.45874047 4.78154253 7.06561268 5.02241519C7.06561268 5.02241519 7.06561268 5.02241519 7.06561268 5.02241519M13.1898674 5.45132743C14.5364638 6.63126844 15.2954545 8.28318584 15.2954545 10.0058997C15.2954545 11.7286136 14.4874967 13.4041 298 13.0919331 14.5132743C11.7943039 15.5516224 9.98251962 16.0 8.24418607 16.0C7.16690894 16.0 6.1875661 15.9528024 5.13477254 15.6224189C2.71089901 14.8436578 0.923598318 12.8613569 0.776696891 10.4778761C0.629795465 8.63716814 1.07049974 7.22123894 2.56399758 5.73451327C3.32298828 4.95575221 4.88993683 4.05899705 5.96721396 3.35103245C6.50585253 3.02064897 7.06897466 2.02949853 5.99169753 0.16519174C5.99169753 0.16519174 6.21204967 0.0 6.21204967 0.0C6.21204967 0.0 9.41939748 1.27433628 9.41939748 1.27433628C8.97869321 2.64306785 10.2518389 3.61061947 10.6680596 3.82300885C11.5984353 4.31858407 12.4798439 4.83775811 13.1898674 5.45132743C13.1898674 5.45132743 13.1898674 5.45132743 13.1898674 5.45132743" /> + <path d="M8.27272727 5.0C8.49625435 5.67889606 9.03172133 6.21869701 9.63636041 6.5268042C10.3279607 6.89485621 10.8036714 7.19446079 11.1684763 7.5087455C11.8759239 8.12902347 12.2727273 8.98864463 12.2727273 9.88278877C12.2727273 10.7655864 11.852758 11.6266312 11.1353943 12.1959748C10.4876507 12.713565 9.5005326 13.0 8.42423809 13.0C8.37244863 13.0 8.32197458 12.9998006 8.27272727 12.9993871C8.27272727 12.9993871 8.27272727 5.0 8.27272727 5.0C8.27272727 5.0 8.27272727 5.0 8.27272727 5.0" /> + </g> </svg>

1 0

[torbutton/master] Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 15 Mar '19

15 Mar '19

commit 5a3d6d26e1f8046b20e51d93ca9457a729063bfc Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Mar 14 13:55:28 2019 -0700 Bug 25658: Replace security slider with security level UI This patch has security level related changes for torbutton. Migrated 'security level' related strings from torbutton.dtd to new securityLevel.properties file, loaded by JS in the new securitylevel component in Tor Browser. Removed the old Security Slider xul and menu entry in the torbutton menu. Also 'fixed' the german (de) torbutton.dtd file (was valid listing of XML entities, but it broke my dtd parser used to migrate strings) Added new "extensions.torbutton.inserted_security_level" pref to torbutton that piggy backs off the existing "extensions.torbutton.inserted_button" pref logic. Toolbars are reset to the Tor Browser default when the new 'inserted_security_level' pref is false. Coupled with the changes in tor-browser, users which upgrade will have their toolbars reset to the new design. --- .gitignore | 1 + src/chrome/content/popup.xul | 5 - src/chrome/content/preferences.js | 126 ------------------ src/chrome/content/preferences.xul | 155 ----------------------- src/chrome/content/torbutton.js | 59 ++++----- 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/securityLevel.properties | 16 +++ src/chrome/locale/ar/torbutton.dtd | 4 - src/chrome/locale/arn/torbutton.dtd | 1 - src/chrome/locale/ast/torbutton.dtd | 1 - src/chrome/locale/az/securityLevel.properties | 1 + src/chrome/locale/az/torbutton.dtd | 1 - src/chrome/locale/be/torbutton.dtd | 1 - src/chrome/locale/bg/securityLevel.properties | 1 + src/chrome/locale/bg/torbutton.dtd | 1 - src/chrome/locale/bms/securityLevel.properties | 1 + src/chrome/locale/bms/torbutton.dtd | 1 - src/chrome/locale/bn-BD/securityLevel.properties | 16 +++ src/chrome/locale/bn-BD/torbutton.dtd | 4 - 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/securityLevel.properties | 1 + src/chrome/locale/bs/torbutton.dtd | 1 - src/chrome/locale/ca/securityLevel.properties | 16 +++ src/chrome/locale/ca/torbutton.dtd | 4 - src/chrome/locale/cs/securityLevel.properties | 16 +++ src/chrome/locale/cs/torbutton.dtd | 4 - src/chrome/locale/csb/torbutton.dtd | 1 - src/chrome/locale/cy/torbutton.dtd | 1 - src/chrome/locale/da/securityLevel.properties | 16 +++ src/chrome/locale/da/torbutton.dtd | 4 - src/chrome/locale/de/securityLevel.properties | 16 +++ src/chrome/locale/de/torbutton.dtd | 7 +- src/chrome/locale/dz/torbutton.dtd | 1 - src/chrome/locale/el/securityLevel.properties | 16 +++ src/chrome/locale/el/torbutton.dtd | 4 - src/chrome/locale/en-US/securityLevel.properties | 22 ++++ src/chrome/locale/en-US/torbutton.dtd | 4 - src/chrome/locale/eo/securityLevel.properties | 1 + src/chrome/locale/eo/torbutton.dtd | 1 - src/chrome/locale/es-AR/securityLevel.properties | 16 +++ src/chrome/locale/es-AR/torbutton.dtd | 4 - src/chrome/locale/es/securityLevel.properties | 16 +++ src/chrome/locale/es/torbutton.dtd | 4 - src/chrome/locale/et/torbutton.dtd | 1 - src/chrome/locale/eu/securityLevel.properties | 16 +++ src/chrome/locale/eu/torbutton.dtd | 4 - src/chrome/locale/fa/securityLevel.properties | 16 +++ src/chrome/locale/fa/torbutton.dtd | 4 - src/chrome/locale/fi/securityLevel.properties | 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/securityLevel.properties | 16 +++ src/chrome/locale/fr/torbutton.dtd | 4 - src/chrome/locale/fur/torbutton.dtd | 1 - src/chrome/locale/fy/torbutton.dtd | 1 - src/chrome/locale/ga/securityLevel.properties | 16 +++ src/chrome/locale/ga/torbutton.dtd | 4 - src/chrome/locale/gl/securityLevel.properties | 1 + src/chrome/locale/gl/torbutton.dtd | 1 - src/chrome/locale/gu/securityLevel.properties | 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/securityLevel.properties | 16 +++ src/chrome/locale/he/torbutton.dtd | 4 - 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/securityLevel.properties | 16 +++ src/chrome/locale/hu/torbutton.dtd | 4 - src/chrome/locale/hy/torbutton.dtd | 1 - src/chrome/locale/id/securityLevel.properties | 16 +++ src/chrome/locale/id/torbutton.dtd | 4 - src/chrome/locale/is/securityLevel.properties | 16 +++ src/chrome/locale/is/torbutton.dtd | 4 - src/chrome/locale/it/securityLevel.properties | 16 +++ src/chrome/locale/it/torbutton.dtd | 4 - src/chrome/locale/ja/securityLevel.properties | 16 +++ src/chrome/locale/ja/torbutton.dtd | 4 - src/chrome/locale/jv/torbutton.dtd | 1 - src/chrome/locale/ka/securityLevel.properties | 16 +++ src/chrome/locale/ka/torbutton.dtd | 4 - src/chrome/locale/km/torbutton.dtd | 1 - src/chrome/locale/kn/torbutton.dtd | 1 - src/chrome/locale/ko/securityLevel.properties | 16 +++ src/chrome/locale/ko/torbutton.dtd | 4 - 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/lg/torbutton.dtd | 1 - src/chrome/locale/ln/torbutton.dtd | 1 - src/chrome/locale/lo/torbutton.dtd | 1 - src/chrome/locale/lt/securityLevel.properties | 1 + src/chrome/locale/lt/torbutton.dtd | 1 - src/chrome/locale/lv/securityLevel.properties | 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/securityLevel.properties | 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/securityLevel.properties | 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/securityLevel.properties | 16 +++ src/chrome/locale/nb/torbutton.dtd | 4 - src/chrome/locale/ne/torbutton.dtd | 1 - src/chrome/locale/nl/securityLevel.properties | 16 +++ src/chrome/locale/nl/torbutton.dtd | 4 - 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/securityLevel.properties | 16 +++ src/chrome/locale/pl/torbutton.dtd | 4 - src/chrome/locale/pms/torbutton.dtd | 1 - src/chrome/locale/ps/torbutton.dtd | 1 - src/chrome/locale/pt-BR/securityLevel.properties | 16 +++ src/chrome/locale/pt-BR/torbutton.dtd | 4 - src/chrome/locale/pt/securityLevel.properties | 1 + src/chrome/locale/pt/torbutton.dtd | 4 - src/chrome/locale/ro/securityLevel.properties | 1 + src/chrome/locale/ro/torbutton.dtd | 1 - src/chrome/locale/ru/securityLevel.properties | 16 +++ src/chrome/locale/ru/torbutton.dtd | 4 - src/chrome/locale/sco/torbutton.dtd | 1 - src/chrome/locale/sk/securityLevel.properties | 1 + src/chrome/locale/sk/torbutton.dtd | 1 - src/chrome/locale/sl/securityLevel.properties | 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/securityLevel.properties | 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/securityLevel.properties | 16 +++ src/chrome/locale/sv/torbutton.dtd | 4 - 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/securityLevel.properties | 16 +++ src/chrome/locale/tr/torbutton.dtd | 4 - src/chrome/locale/uk/securityLevel.properties | 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/securityLevel.properties | 16 +++ src/chrome/locale/vi/torbutton.dtd | 4 - src/chrome/locale/wa/torbutton.dtd | 1 - src/chrome/locale/wo/torbutton.dtd | 1 - src/chrome/locale/zh-CN/securityLevel.properties | 16 +++ src/chrome/locale/zh-CN/torbutton.dtd | 4 - src/chrome/locale/zh-HK/torbutton.dtd | 1 - src/chrome/locale/zh-TW/securityLevel.properties | 16 +++ src/chrome/locale/zh-TW/torbutton.dtd | 4 - src/chrome/locale/zu/torbutton.dtd | 1 - src/defaults/preferences/preferences.js | 1 + trans_tools/import-translations.sh | 1 + 178 files changed, 566 insertions(+), 541 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..5fff1d9c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +pkg diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 582593f6..5d9b76ce 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -27,11 +27,6 @@ insertafter="context-stop" hidden="true" oncommand="torbutton_open_cookie_dialog()"/> - <menuitem id="torbutton-preferences" - label="&torbutton.context_menu.preferences;" - accesskey="&torbutton.context_menu.preferences.key;" - insertafter="context-stop" - oncommand="torbutton_open_prefs_dialog()"/> <menuitem id="torbutton-networksettings" label="&torbutton.context_menu.networksettings;" accesskey="&torbutton.context_menu.networksettings.key;" diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js deleted file mode 100644 index 81668d6e..00000000 --- a/src/chrome/content/preferences.js +++ /dev/null @@ -1,126 +0,0 @@ -// # Security Settings User Interface - -// Utilities -let { utils: Cu } = Components; -let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } = - Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; - -let { getLocale, show_torbrowser_manual } = - Cu.import("resource://torbutton/modules/utils.js", {}); - -// Description elements have the follow names. -const descNames = - [, "desc_safest", "desc_safer", "desc_standard"]; -// "Learn-more"-elements have the follow names. -const linkNames = - [, "link_safest", "link_safer", "link_standard"]; -// A single `state` object that reflects the user settings in this UI. - -let state = { slider : 0, custom : false}; - -// Utility functions to convert between the legacy 4-value pref index -// and the 3-valued security slider. -let sliderPositionToPrefSetting = pos => [, 1, 2, 4][pos]; -let prefSettingToSliderPosition = pref => [, 1, 2, 2, 3][pref]; - -// Set the desired slider value and update UI. -function torbutton_set_slider(sliderPosition) { - state.slider = sliderPosition; - let slider = document.getElementById("torbutton_sec_slider"); - slider.value = sliderPosition; - let descs = descNames.map(name => document.getElementById(name)); - descs.forEach((desc, i) => desc.collapsed = sliderPosition !== i); -}; - -// Set the desired custom value and update UI. -function torbutton_set_custom(customValue) { - state.custom = customValue; - let sliderSettings = document.getElementById("torbutton_slider_settings"); - let customSettings = document.getElementById("torbutton_custom_settings"); - sliderSettings.hidden = customValue; - customSettings.hidden = !customValue; -}; - -// Read prefs 'extensions.torbutton.security_slider' and -// 'extensions.torbutton.security_custom', and initialize the UI. -function torbutton_init_security_ui() { - torbutton_set_slider(prefSettingToSliderPosition( - getIntPref("extensions.torbutton.security_slider"))); - torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); - torbutton_set_learn_more_links(); - // Make sure the "Accept"-button is focused when we show the dialog and not a - // possible "Learn more"-link. See: comment:16 in bug 21847. - let okBtn = document.documentElement.getButton("accept"); - if (okBtn) - okBtn.focus(); - setTimeout(adjustDialogSize, 0); -}; - -// Write the two prefs from the current settings. -function torbutton_save_security_settings() { - setIntPref("extensions.torbutton.security_slider", - sliderPositionToPrefSetting(state.slider)); - setBoolPref("extensions.torbutton.security_custom", state.custom); -}; - -// We follow the way we treat the links to the Tor Browser User Manual on the -// Help Menu and on about:tor: if we have the manual available for a locale, -// let's show the "Learn more"-link, otherwise hide it. -function torbutton_set_learn_more_links() { - let show_manual = show_torbrowser_manual(); - let locale = "" - if (show_manual) { - locale = getLocale(); - } - let links = linkNames.map(name => document.getElementById(name)); - links.forEach(link => {; - if (show_manual && locale != "") { - link.href= "https:/tb-manual.torproject.org/" + locale + - "/security-slider.html"; - link.hidden = false; - } else { - link.hidden = true; - } - }); -} - -// Increase the height of this window so that a vertical scrollbar is not -// needed on the description box. -function adjustDialogSize() { - try { - // Find the height required by the tallest description element. - let descHeight = 0; - let descs = descNames.map(name => document.getElementById(name)); - descs.forEach(elem => { - let origCollapsed = elem.collapsed; - elem.collapsed = false; - let h = elem.scrollHeight; - elem.collapsed = origCollapsed; - if (h > descHeight) - descHeight = h; - }); - - // Cap the height (just in case). - const kMaxDescriptionHeight = 550; - if (descHeight > kMaxDescriptionHeight) - descHeight = kMaxDescriptionHeight; - - // Increase the height of the description container if it is too short. - let boxElem = document.getElementById("descBox"); - if (boxElem.clientHeight < descHeight) { - boxElem.setAttribute("height", descHeight); - - // Resize the XUL window to account for the new description height. In - // order for sizeToContent() to work correctly, it seems that we must - // remove the height attribute from the dialog (that attribute is added - // after a user manually resizes the window). - document.documentElement.removeAttribute("height"); - sizeToContent(); - } - } catch (e) {} - - // Show a scrollbar for the description text if one is needed. - // To avoid bug 21330, we set the overflow=auto style here instead - // of directly in the XUL. - document.getElementById("descBox").style.overflow = "auto"; -} diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul deleted file mode 100644 index a6fabff3..00000000 --- a/src/chrome/content/preferences.xul +++ /dev/null @@ -1,155 +0,0 @@ -<?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"> - -<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.security_settings;" - buttons="accept,cancel" - persist="screenX screenY width height" - onload="torbutton_init_security_ui()" - align="stretch" - pack="center" - maxheight="600" - minwidth="400" - maxwidth="800" - ondialogaccept="torbutton_save_security_settings()" - width="500" > - - <script type="application/x-javascript" src="torbutton_util.js"/> - <script type="application/x-javascript" src="preferences.js"/> - <vbox flex="1" align="stretch"> - <groupbox align="stretch" flex="1">  - <caption label="&torbutton.prefs.sec_caption;"/> - <hbox id="torbutton_slider_settings" flex="1" align="stretch" hidden="false"> - <vbox> - <hbox flex="1" minheight="220"> - <vbox> - <scale id="torbutton_sec_slider" flex="1" min="1" max="3" - movetoclick="true" orient="vertical" - onchange="torbutton_set_slider(this.value)"/> - </vbox> - <vbox> - <hbox flex="1" align="start"> - <description id="torbutton_sec_safest" - onclick="torbutton_set_slider(1);" - tooltip="safest_preview"> - &torbutton.prefs.sec_safest_label; - </description> - </hbox> - <hbox flex="1" align="center"> - <description id="torbutton_sec_safer" - onclick="torbutton_set_slider(2);" - tooltip="safer_preview"> - &torbutton.prefs.sec_safer_label; - </description> - </hbox> - <hbox flex="1" align="end"> - <description id="torbutton_sec_standard" - onclick="torbutton_set_slider(3);" - tooltip="standard_preview"> - &torbutton.prefs.sec_standard_label; - </description> - </hbox> - </vbox> - </hbox> - </vbox> - <vbox id="descBox" flex="1" style="overflow: hidden;"> - <vbox id="desc_safest" collapsed="true"> - <description - class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_safest_description; - </description> - <separator orient="horizontal" class="thin"/> - <description class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_safest_list_label; - </description> - <description class="slider-text-size"> - &torbutton.prefs.sec_js_disabled; - </description> - <description class="slider-text-size"> - &torbutton.prefs.sec_limit_graphics_and_typography; - </description> - <description class="slider-text-size"> - &torbutton.prefs.sec_click_to_play_media; - </description> - <separator orient="horizontal" class="thin"/> - <label id="link_safest" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </label> - </vbox> - <vbox id="desc_safer" collapsed="true"> - <description - class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_safer_description; - </description> - <separator orient="horizontal" class="thin"/> - <description class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_safer_list_label; - </description> - <description class="slider-text-size"> - &torbutton.prefs.sec_js_on_https_sites_only; - </description> - <description class="slider-text-size"> - &torbutton.prefs.sec_limit_typography; - </description> - <description class="slider-text-size"> - &torbutton.prefs.sec_click_to_play_media; - </description> - <separator orient="horizontal" class="thin"/> - <label id="link_safer" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </label> - </vbox> - <vbox id="desc_standard" collapsed="false"> - <description - class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_standard_description; - </description> - <separator orient="horizontal" class="thin"/> - <label id="link_standard" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </label> - </vbox> - </vbox> - </hbox> - <vbox id="torbutton_custom_settings" - hidden="true" - width="300" - height="200" - style="overflow:auto;"> - <description> - &torbutton.prefs.custom_warning; - </description> - <hbox> - <button id="torbutton_restore_defaults_button" - oncommand="torbutton_set_custom(false);" - label="&torbutton.prefs.restore_defaults;"/> - </hbox> - </vbox> - </groupbox> - </vbox> - - <tooltip id="safest_preview"> - <html:b>&torbutton.prefs.sec_safest_list_label;</html:b> - <html:br></html:br> - <html:br></html:br> - <html:div>&torbutton.prefs.sec_js_disabled;</html:div> - <html:div>&torbutton.prefs.sec_limit_graphics_and_typography;</html:div> - <html:div>&torbutton.prefs.sec_click_to_play_media;</html:div> - </tooltip> - <tooltip id="safer_preview"> - <html:b>&torbutton.prefs.sec_safer_list_label;</html:b> - <html:br></html:br> - <html:br></html:br> - <html:div>&torbutton.prefs.sec_js_on_https_sites_only;</html:div> - <html:div>&torbutton.prefs.sec_limit_typography;</html:div> - <html:div>&torbutton.prefs.sec_click_to_play_media;</html:div> - </tooltip> - <tooltip id="standard_preview"> - <html:b>&torbutton.prefs.sec_standard_description;</html:b> - </tooltip> - </dialog> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b425a276..15e8d174 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -125,7 +125,7 @@ var torbutton_unique_pref_observer = * registers. Thankfully, these notifications arrive only on * the main thread, *however*, our confirmation dialog suspends * execution and allows more events to arrive until it is answered - */ + */ if (!m_tb_confirming_plugins) { m_tb_confirming_plugins = true; torbutton_confirm_plugins(); @@ -368,22 +368,27 @@ function torbutton_init() { //if (contextMenu) // contextMenu.addEventListener("popupshowing", torbutton_check_contextmenu, false); - // Add toolbutton to the bar. + // Add torbutton and security level button to the bar. // This should maybe be in the startup function, but we want to add // the button to the panel before it's state (color) is set.. - if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button")) { + if (!m_tb_prefs.getBoolPref("extensions.torbutton.inserted_button") || + !m_tb_prefs.getBoolPref("extensions.torbutton.inserted_security_level")) { torbutton_log(3, 'Adding button'); try { // ESR31-style toolbar is handled by the existing compiled-in pref. // We also need to prevent first-run toolbar reorg (#13378), so we // reset this toolbar state on first-run. try { + // reverts the serialized toolbar state to default set in Tor Browser m_tb_prefs.clearUserPref("browser.uiCustomization.state"); } catch(e) {} + // reverts toolbar state to firefox defaults CustomizableUI.reset(); + // 'restores' toolbar state from serialized state in "browser.uiCustomization.state" CustomizableUI.undoReset(); torbutton_log(3, 'Button added'); m_tb_prefs.setBoolPref("extensions.torbutton.inserted_button", true); + m_tb_prefs.setBoolPref("extensions.torbutton.inserted_security_level", true); } catch(e) { torbutton_log(4, 'Failed to add Torbutton to toolbar: '+e); } @@ -477,7 +482,7 @@ function torbutton_confirm_plugins() { torbutton_log(3, "False positive on plugin notification. Ignoring"); return; } - + torbutton_log(3, "Confirming plugin usage."); var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] @@ -485,7 +490,7 @@ function torbutton_confirm_plugins() { // Display two buttons, both with string titles. var flags = prompts.STD_YES_NO_BUTTONS + prompts.BUTTON_DELAY_ENABLE; - + var message = torbutton_get_property_string("torbutton.popup.confirm_plugins"); var askAgainText = torbutton_get_property_string("torbutton.popup.never_ask_again"); var askAgain = {value: false}; @@ -500,7 +505,7 @@ function torbutton_confirm_plugins() { // 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 != + if (no_plugins != m_tb_prefs.getBoolPref("plugin.disable")) m_tb_prefs.setBoolPref("plugin.disable", no_plugins); else @@ -511,12 +516,12 @@ function torbutton_confirm_plugins() { var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] .getService(Components.interfaces.nsIWindowMediator); var browserEnumerator = wm.getEnumerator("navigator:browser"); - + // Check each browser instance for our URL while (browserEnumerator.hasMoreElements()) { var browserWin = browserEnumerator.getNext(); var tabbrowser = browserWin.gBrowser; - + // Check each tab of this browser instance var numTabs = tabbrowser.browsers.length; for (var index = 0; index < numTabs; index++) { @@ -650,7 +655,7 @@ function torbutton_do_async_versioncheck() { req.open('GET', url, true); req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; req.overrideMimeType("text/json"); - req.onreadystatechange = function (oEvent) { + req.onreadystatechange = function (oEvent) { if (req.readyState === 4) { if(req.status == 200) { if(!req.responseText) { @@ -696,8 +701,8 @@ function torbutton_do_async_versioncheck() { } torbutton_log(5, "Version check failed! Web server error: "+req.status); return -1; - } - }; + } + }; req.send(null); } catch(e) { if(e.result == 0x80004005) { // NS_ERROR_FAILURE @@ -1651,13 +1656,6 @@ function torbutton_open_cookie_dialog() { 'Cookie Protections', 'centerscreen,chrome,dialog,modal,resizable'); } -// Bug 1506 P2/P3: Prefs are handled differently on android, I guess? -function torbutton_open_prefs_dialog() { - showDialog(window, "chrome://torbutton/content/preferences.xul", - "torbutton-preferences","centerscreen, chrome"); - torbutton_log(2, 'opened preferences window'); -} - // -------------- HISTORY & COOKIES --------------------- // Bug 1506 P4: Used by New Identity if cookie protections are @@ -1666,7 +1664,7 @@ function torbutton_clear_cookies() { torbutton_log(2, 'called torbutton_clear_cookies'); var cm = Components.classes["@mozilla.org/cookiemanager;1"] .getService(Components.interfaces.nsICookieManager); - + cm.removeAll(); } @@ -1688,7 +1686,7 @@ function torbutton_disable_browser_js(browser) { } catch(e) { torbutton_log(4, "Failed to disable JS events: "+e) } - + if (browser.docShell) browser.docShell.allowJavascript = false; @@ -1721,9 +1719,9 @@ function torbutton_disable_window_js(win) { var b = browser.browsers[i]; if (b && !b.docShell) { try { - if (b.currentURI) + if (b.currentURI) torbutton_log(5, "DocShell is null for: "+b.currentURI.spec); - else + else torbutton_log(5, "DocShell is null for unknown URL"); } catch(e) { torbutton_log(5, "DocShell is null for unparsable URL: "+e); @@ -1867,12 +1865,12 @@ function torbutton_is_windowed(wind) { torbutton_log(2, "Window is fullScreen"); return false; } - if(wind.outerHeight == wind.screen.availHeight + if(wind.outerHeight == wind.screen.availHeight && wind.outerWidth == wind.screen.availWidth) { torbutton_log(3, "Window is ratpoisoned/evilwm'ed"); return false; } - + torbutton_log(2, "Window is normal"); return true; } @@ -1955,12 +1953,7 @@ function torbutton_new_window(event) Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); } - // Register the TorOpenSecuritySettings observer, which is used by - // UITour to open the security slider dialog. - stopOpenSecuritySettingsObserver = observe("TorOpenSecuritySettings", - torbutton_open_prefs_dialog); - - // Check the version on every new window. We're already pinging check in these cases. + // Check the version on every new window. We're already pinging check in these cases. torbutton_do_async_versioncheck(); torbutton_do_tor_check(); @@ -1977,9 +1970,9 @@ function torbutton_close_window(event) { false); // TODO: This is a real ghetto hack.. When the original window - // closes, we need to find another window to handle observing - // unique events... The right way to do this is to move the - // majority of torbutton functionality into a XPCOM component.. + // closes, we need to find another window to handle observing + // unique events... The right way to do this is to move the + // majority of torbutton functionality into a XPCOM component.. // But that is a major overhaul.. if (m_tb_is_main_window) { torbutton_log(3, "Original window closed. Searching for another"); diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/af/torbutton.dtd +++ b/src/chrome/locale/af/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ak/torbutton.dtd +++ b/src/chrome/locale/ak/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/am/torbutton.dtd +++ b/src/chrome/locale/am/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ar/securityLevel.properties b/src/chrome/locale/ar/securityLevel.properties new file mode 100644 index 00000000..c8e3c161 --- /dev/null +++ b/src/chrome/locale/ar/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = مستوى الأمان +securityLevel.standard.level = عادي +securityLevel.standard.summary = كل خصائص متصفح تور ومواقع الوب مفعلة +securityLevel.safer.level = آمِن +securityLevel.safer.summary = يعطل مميزات مواقع الوب التي عادة ما تكون خطيرة. يتسبب في تعطل خصائص بعض المواقع. +securityLevel.safer.description1 = تعطل جافا سكربت على المواقع التي لا تستخدم HTTPS +securityLevel.safer.description2 = تعطّل بعض الخطوط والرموز الرياضية. +securityLevel.safer.description3 = الصوت والفيديو يحتاج للنقر لتشغيله. +securityLevel.safest.level = الأكثر أمنا +securityLevel.safest.summary = اسمح فقط بالخصائص المطلوبة للمواقع غير الديناميكية والخدمات الأساسية. تؤثر هذه التغييرات على الصور والوسائط والنصوص البرمجية. +securityLevel.safest.description1 = تعطل جافا سكربت مبدئيا على جميع المواقع. +securityLevel.safest.description2 = تعطّل بعض الخطوط والأيقونات والرموز الرياضية والصور. +securityLevel.safest.description3 = الصوت والفيديو يحتاج للنقر لتشغيله. +securityLevel.custom.summary = تفضيلاتك الخاصة للمتصفح تسببت في إعدادات أمان غير معتادة. لأمان وخصوصية أفضل ننصح باستخدام أحد مستويات الأمان المبدئية. +securityLevel.learnMore = تعرّف على المزيد +securityLevel.restoreDefaults = استعد الإعادات المبدئية diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index baa7e5ff..9c2b5292 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "إعدادات شبكة تور..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "تحقق من تحديثات متصفح تور..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "انقر لبدء زر تور"> <!ENTITY torbutton.prefs.security_settings "إعدادات أمان متصفح طور"> -<!ENTITY torbutton.prefs.restore_defaults "استعد الإعادات المبدئية"> -<!ENTITY torbutton.prefs.custom_warning "تفضيلاتك الخاصة للمتصفح تسببت في إعدادات أمان غير معتادة. لأمان وخصوصية أفضل ننصح باستخدام أحد مستويات الأمان المبدئية."> <!ENTITY torbutton.cookiedialog.title "إدارة إعدادت الحماية لملفات تعريف الارتباط"> <!ENTITY torbutton.cookiedialog.lockCol "محمية"> <!ENTITY torbutton.cookiedialog.domainCol "استضافة"> diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/arn/torbutton.dtd +++ b/src/chrome/locale/arn/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ast/torbutton.dtd +++ b/src/chrome/locale/ast/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/az/securityLevel.properties b/src/chrome/locale/az/securityLevel.properties new file mode 100644 index 00000000..16b086a7 --- /dev/null +++ b/src/chrome/locale/az/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Varsayılanları yenidən yüklə diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd index 5a5f20ca..589c6fe2 100644 --- a/src/chrome/locale/az/torbutton.dtd +++ b/src/chrome/locale/az/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Tordüyməsini başlatmaq üçün klikləyin"> -<!ENTITY torbutton.prefs.restore_defaults "Varsayılanları yenidən yüklə"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/be/torbutton.dtd +++ b/src/chrome/locale/be/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/bg/securityLevel.properties b/src/chrome/locale/bg/securityLevel.properties new file mode 100644 index 00000000..6d147b67 --- /dev/null +++ b/src/chrome/locale/bg/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Възстанови стандартните diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd index 289efda2..52adc2ec 100644 --- a/src/chrome/locale/bg/torbutton.dtd +++ b/src/chrome/locale/bg/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Възстанови стандартните"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/bms/securityLevel.properties b/src/chrome/locale/bms/securityLevel.properties new file mode 100644 index 00000000..8cbfd400 --- /dev/null +++ b/src/chrome/locale/bms/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = မူလအေျခအေနသို႕ ျပန္လည္ ထည့္သြင္းရန္ diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd index 8a7c8252..773b9efa 100644 --- a/src/chrome/locale/bms/torbutton.dtd +++ b/src/chrome/locale/bms/torbutton.dtd @@ -1,7 +1,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton စတင္ရန္ ကလစ္လုပ္ပါ"> -<!ENTITY torbutton.prefs.restore_defaults "မူလအေျခအေနသို႕ ျပန္လည္ ထည့္သြင္းရန္"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/bn-BD/securityLevel.properties b/src/chrome/locale/bn-BD/securityLevel.properties new file mode 100644 index 00000000..731353ea --- /dev/null +++ b/src/chrome/locale/bn-BD/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = নিরাপত্তার মাত্রা +securityLevel.standard.level = মান +securityLevel.standard.summary = সমস্ত টর ব্রাউজার এবং ওয়েবসাইট বৈশিষ্ট্য সক্ষম করা হয়। +securityLevel.safer.level = নিরাপদ +securityLevel.safer.summary = ওয়েবসাইটের বৈশিষ্ট্যগুলি প্রায়ই বিপজ্জনক করে, যা কিছু সাইটগুলি কার্যকারিতা হারাতে বাধা দেয়। +securityLevel.safer.description1 = Non-HTTPS সাইটগুলিতে জাভাস্ক্রিপ্ট অক্ষম করা আছে। +securityLevel.safer.description2 = কিছু ফন্ট এবং গণিত চিহ্ন অক্ষম আছে। +securityLevel.safer.description3 = অডিও এবং ভিডিও (HTML5 মিডিয়া) ক্লিক-টু-খেলা। +securityLevel.safest.level = নিরাপদ +securityLevel.safest.summary = শুধুমাত্র স্থায়ী সাইট এবং মৌলিক পরিষেবাগুলির জন্য প্রয়োজনীয় ওয়েবসাইট বৈশিষ্ট্যগুলি মঞ্জুরি দেয় এই পরিবর্তনগুলি ইমেজ, মিডিয়া এবং স্ক্রিপ্টগুলি প্রভাবিত করে। +securityLevel.safest.description1 = জাভাস্ক্রিপ্ট সব সাইটে ডিফল্ট দ্বারা নিষ্ক্রিয় করা হয়। +securityLevel.safest.description2 = কিছু ফন্ট, আইকন, গণিত প্রতীক এবং ছবি অক্ষম রয়েছে। +securityLevel.safest.description3 = অডিও এবং ভিডিও (HTML5 মিডিয়া) ক্লিক-টু-খেলা। +securityLevel.custom.summary = আপনার কাস্টম ব্রাউজারের পছন্দগুলির কারণে অস্বাভাবিক নিরাপত্তা সেটিংস দেখা দিয়েছে নিরাপত্তা এবং গোপনীয়তার কারণে, আমরা আপনাকে ডিফল্ট নিরাপত্তা স্তরগুলির একটি চয়ন করার সুপারিশ করি। +securityLevel.learnMore = আরও জানুন +securityLevel.restoreDefaults = পূর্বনির্ধারন পুনরুধার diff --git a/src/chrome/locale/bn-BD/torbutton.dtd b/src/chrome/locale/bn-BD/torbutton.dtd index 201f3111..449a49e3 100644 --- a/src/chrome/locale/bn-BD/torbutton.dtd +++ b/src/chrome/locale/bn-BD/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "টর নেটওয়ার্ক সেটিংস ..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "টর ব্রাউজার আপডেটের জন্য চেক করুন ..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton আরম্ভ করার জন্য ক্লিক করুন"> <!ENTITY torbutton.prefs.security_settings "টর ব্রাউজার নিরাপত্তা সেটিংস"> -<!ENTITY torbutton.prefs.restore_defaults "পূর্বনির্ধারন পুনরুধার"> -<!ENTITY torbutton.prefs.custom_warning "আপনার কাস্টম ব্রাউজারের পছন্দগুলির কারণে অস্বাভাবিক নিরাপত্তা সেটিংস দেখা দিয়েছে নিরাপত্তা এবং গোপনীয়তার কারণে, আমরা আপনাকে ডিফল্ট নিরাপত্তা স্তরগুলির একটি চয়ন করার সুপারিশ করি।"> <!ENTITY torbutton.cookiedialog.title "কুকি প্রোটেকশনগুলি পরিচালনা করুন"> <!ENTITY torbutton.cookiedialog.lockCol "রক্ষিত"> <!ENTITY torbutton.cookiedialog.domainCol "নিমন্ত্রণকর্তা"> diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/bn-IN/torbutton.dtd +++ b/src/chrome/locale/bn-IN/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/bn/torbutton.dtd +++ b/src/chrome/locale/bn/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/bo/torbutton.dtd +++ b/src/chrome/locale/bo/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/br/torbutton.dtd +++ b/src/chrome/locale/br/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/bs/securityLevel.properties b/src/chrome/locale/bs/securityLevel.properties new file mode 100644 index 00000000..a713fa96 --- /dev/null +++ b/src/chrome/locale/bs/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Vrati početno diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd index 59167eb2..207f4312 100644 --- a/src/chrome/locale/bs/torbutton.dtd +++ b/src/chrome/locale/bs/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Zaštita kolačića"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbutton-a"> -<!ENTITY torbutton.prefs.restore_defaults "Vrati početno"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ca/securityLevel.properties b/src/chrome/locale/ca/securityLevel.properties new file mode 100644 index 00000000..b17fba84 --- /dev/null +++ b/src/chrome/locale/ca/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Nivell de seguretat +securityLevel.standard.level = Estàndard +securityLevel.standard.summary = Totes les característiques del buscador Tor i de la pàgina web estan actives. +securityLevel.safer.level = Més segur. +securityLevel.safer.summary = Desactivar les funcions del lloc web que sovint són perilloses, pot fent que alguns llocs perden funcionalitat. +securityLevel.safer.description1 = El JavaScript està desactivat per defecte en tots els llocs no-HTTPS +securityLevel.safer.description2 = Algunes fonts i símbols matemàtics estan desactivats. +securityLevel.safer.description3 = L'àudio i el vídeo (mitjans de comunicació HTML5) són click-to-play. +securityLevel.safest.level = més segur +securityLevel.safest.summary = Només es permeten funcions del lloc web requerides per a llocs estàtics i serveis bàsics. Aquests canvis afecten imatges, mitjans de comunicació i scripts. +securityLevel.safest.description1 = El JavaScript està desactivat per defecte a tots els llocs. +securityLevel.safest.description2 = Algunes fonts, icones, símbols matemàtics, i imatges estan desactivats. +securityLevel.safest.description3 = L'àudio i el vídeo (mitjans de comunicació HTML5) són click-to-play. +securityLevel.custom.summary = El navegador personalitzat ha obtingut uns paràmetres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecció d'un nivell de seguretat per defecte. +securityLevel.learnMore = Apreneu-ne més +securityLevel.restoreDefaults = Torna a les opcions per defecte diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd index 0041973e..7537e1d7 100644 --- a/src/chrome/locale/ca/torbutton.dtd +++ b/src/chrome/locale/ca/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nou circuit Tor per a aquest lloc"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Paràmetres de seguretat..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Preferències de la Xarxa Tor...7"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Cerca una actualització del navegador Tor..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton"> <!ENTITY torbutton.prefs.security_settings "Paràmetres de seguretat del navegador Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Torna a les opcions per defecte"> -<!ENTITY torbutton.prefs.custom_warning "El navegador personalitzat ha obtingut uns paràmetres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecció d'un nivell de seguretat per defecte."> <!ENTITY torbutton.cookiedialog.title "Configura proteccions de les galetes"> <!ENTITY torbutton.cookiedialog.lockCol "Protegit"> <!ENTITY torbutton.cookiedialog.domainCol "Allotjador"> diff --git a/src/chrome/locale/cs/securityLevel.properties b/src/chrome/locale/cs/securityLevel.properties new file mode 100644 index 00000000..f9ab389a --- /dev/null +++ b/src/chrome/locale/cs/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Úroveň zabezpečení +securityLevel.standard.level = Standardní +securityLevel.standard.summary = Všechny funkce prohlížeče Tor jsou zapnuté. +securityLevel.safer.level = Bezpečnější +securityLevel.safer.summary = Některé méně bezpečné funkce jsou vypnuty, ale některé stránky nemusí fungovat. +securityLevel.safer.description1 = JavaScript je na stránkách bez HTTPS vypnut. +securityLevel.safer.description2 = Některá písma a matematické symboly jsou zablokovány. +securityLevel.safer.description3 = Audio a video (HTML5 média) se přehrávají po kliknutí. +securityLevel.safest.level = Nejbezpečnější +securityLevel.safest.summary = Povolí jen funkce pro zobrazení statických webových stránek a fungování základních služeb. Ovlivněno bude zobrazení obrázků, médií a fungování skriptů. +securityLevel.safest.description1 = JavaScript je ve výchozím nastavení vypnut na všech stránkách. +securityLevel.safest.description2 = Některá písma, matematické symboly a obrázky jsou zablokovány. +securityLevel.safest.description3 = Audio a video (HTML5 média) se přehrávají po kliknutí. +securityLevel.custom.summary = Vaše nastavení prohlížeče neodpovídá standardnímu nastavení zabezpečení. Z důvodu ochrany soukromí a zvýšení bezpečnosti vám doporučujeme vybrat si jednu z výchozích bezpečnostních úrovní. +securityLevel.learnMore = Zjistit více +securityLevel.restoreDefaults = Obnovit výchozí diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index 239dbc2f..1a4feeed 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "i"> <!ENTITY torbutton.context_menu.new_circuit "Nový okruh Toru pro tuto stránku"> <!ENTITY torbutton.context_menu.new_circuit_key "o"> -<!ENTITY torbutton.context_menu.preferences "Nastavení zabezpečení…"> -<!ENTITY torbutton.context_menu.preferences.key "b"> <!ENTITY torbutton.context_menu.networksettings "Nastavení sítě Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Vyhledat aktualizace prohlížeče Tor…"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "c"> <!ENTITY torbutton.button.tooltip "Klepněte pro inicializaci Torbutton"> <!ENTITY torbutton.prefs.security_settings "Nastavení zabezpečení prohlížeče Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Obnovit výchozí"> -<!ENTITY torbutton.prefs.custom_warning "Vaše nastavení prohlížeče neodpovídá standardnímu nastavení zabezpečení. Z důvodu ochrany soukromí a zvýšení bezpečnosti vám doporučujeme vybrat si jednu z výchozích bezpečnostních úrovní."> <!ENTITY torbutton.cookiedialog.title "Správa ochrany cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Chráněné"> <!ENTITY torbutton.cookiedialog.domainCol "Server"> diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/csb/torbutton.dtd +++ b/src/chrome/locale/csb/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd index 84b229b1..507d6960 100644 --- a/src/chrome/locale/cy/torbutton.dtd +++ b/src/chrome/locale/cy/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Cliciwch i ymgychwyn Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/da/securityLevel.properties b/src/chrome/locale/da/securityLevel.properties new file mode 100644 index 00000000..8f18cc57 --- /dev/null +++ b/src/chrome/locale/da/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Sikkerhedsniveau +securityLevel.standard.level = Standard +securityLevel.standard.summary = Alle Tor Browser- og webstedsfunktionaliteter er aktiveret. +securityLevel.safer.level = Mere sikker +securityLevel.safer.summary = Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister deres funktionalitet. +securityLevel.safer.description1 = JavaScript er deaktiveret på ikke-HTTPS steder. +securityLevel.safer.description2 = Nogle skrifttyper og matematiksymboler er deaktiverede. +securityLevel.safer.description3 = Lyd og video (HTML5-medier) er klik-for-at-afspille. +securityLevel.safest.level = Mest sikker +securityLevel.safest.summary = Tillader kun webstedsfunktionaliteter som kræves til statiske steder og grundlæggende tjenester. Ændringerne påvirker billeder, medier og scripts. +securityLevel.safest.description1 = JavaScript er som standard deaktiveret på alle steder. +securityLevel.safest.description2 = Nogle skrifttyper, ikoner, matematiksymboler og billeder er deaktiveret. +securityLevel.safest.description3 = Lyd og video (HTML5-medier) er klik-for-at-afspille. +securityLevel.custom.summary = Dine tilpassede browserpræferencer har resulterede i usædvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsårsagen, anbefaler vi at du vælger en af standardsikkerhedsniveauerne. +securityLevel.learnMore = Lær mere +securityLevel.restoreDefaults = Gendan Standarder diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index e32001d1..4fa64baa 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nyt Tor-kredsløb for dette sted"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Sikkerhedsindstillinger…"> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-netværksindstillinger..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Søg efter opdateringer til Tor Browser..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton"> <!ENTITY torbutton.prefs.security_settings "Tor Browser-sikkerhedsindstillinger"> -<!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder"> -<!ENTITY torbutton.prefs.custom_warning "Dine tilpassede browserpræferencer har resulterede i usædvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsårsagen, anbefaler vi at du vælger en af standardsikkerhedsniveauerne."> <!ENTITY torbutton.cookiedialog.title "Håndtér Cookie-beskyttelser"> <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet"> <!ENTITY torbutton.cookiedialog.domainCol "Vært"> diff --git a/src/chrome/locale/de/securityLevel.properties b/src/chrome/locale/de/securityLevel.properties new file mode 100644 index 00000000..871f8378 --- /dev/null +++ b/src/chrome/locale/de/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Sicherheitsstufe +securityLevel.standard.level = Standard +securityLevel.standard.summary = Alle Tor Browser und Webseiten Funktionen sind aktiviert. +securityLevel.safer.level = Sicherer +securityLevel.safer.summary = Deaktiviert Webseiten-Funktionen, die oft gefährlich sind. Sorgt dafür, dass manche Seiten nicht mehr so gut funktionieren +securityLevel.safer.description1 = JavaScript ist auf Nicht-HTTTPS-Sites deaktiviert. +securityLevel.safer.description2 = Einige Schriftarten und mathematische Symbole sind deaktiviert. +securityLevel.safer.description3 = Audio und Video (HTML5-Medien) müssen zur Wiedergabe angeklickt werden. +securityLevel.safest.level = Am sichersten +securityLevel.safest.summary = Erlaubt nur Webseiten-Funktionen, die für statische Seiten und Basisdienste benötigt werden. Diese Änderungen betreffen Bilder, Medien und Skripte. +securityLevel.safest.description1 = JavaScript ist standardmäßig auf allen Seiten deaktiviert. +securityLevel.safest.description2 = Einige Schriftarten, Symbole, mathematische Symbole und Bilder sind deaktiviert. +securityLevel.safest.description3 = Audio und Video (HTML5-Medien) müssen zur Wiedergabe angeklickt werden. +securityLevel.custom.summary = Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewöhnlichen Sicherheitseinstellungen geführt. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir dir eine der vorgegebenen Sicherheitsstufen auszuwählen. +securityLevel.learnMore = Erfahre mehr +securityLevel.restoreDefaults = Standardeinstellungen wiederherstellen diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index d155a4ef..1846ff51 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal für diese Seite"> <!ENTITY torbutton.context_menu.new_circuit_key "K"> -<!ENTITY torbutton.context_menu.preferences "Sicherheitseinstellungen …"> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-Netzwerk-Einstellungen …"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Auf Tor-Browser-Aktualisierungen prüfen …"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> <!ENTITY torbutton.prefs.security_settings "Tor-Browser-Sicherheitseinstellungen"> -<!ENTITY torbutton.prefs.restore_defaults "Standardeinstellungen wiederherstellen"> -<!ENTITY torbutton.prefs.custom_warning "Ihre benutzerdefinierten Browser-Einstellungen haben zu ungewöhnlichen Sicherheitseinstellungen geführt. Aus Gründen der Sicherheit und Privatsphäre empfehlen wir dir eine der vorgegebenen Sicherheitsstufen auszuwählen."> <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten"> <!ENTITY torbutton.cookiedialog.lockCol "Geschützt"> <!ENTITY torbutton.cookiedialog.domainCol "Rechner"> @@ -27,8 +23,7 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schützen"> <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler kannst du bestimmte Browserfunktionen, die deinen Browser für mögliche Attacken anfälliger machen, deaktivieren."> -<!ENTITY torbutton.prefs.sec_standard_label "Standard -"> +<!ENTITY torbutton.prefs.sec_standard_label "Standard"> <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser und Webseiten Funktionen sind aktiviert."> <!ENTITY torbutton.prefs.sec_safer_label "Sicherer"> <!ENTITY torbutton.prefs.sec_safer_description "Deaktiviert Webseiten-Funktionen, die oft gefährlich sind. Sorgt dafür, dass manche Seiten nicht mehr so gut funktionieren"> diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/dz/torbutton.dtd +++ b/src/chrome/locale/dz/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/el/securityLevel.properties b/src/chrome/locale/el/securityLevel.properties new file mode 100644 index 00000000..722678df --- /dev/null +++ b/src/chrome/locale/el/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Επίπεδο ασφάλειας +securityLevel.standard.level = Βασικό +securityLevel.standard.summary = Όλες οι παροχές του περιηγητή Tor και της ιστοσελίδας είναι ενεργοποιημένες. +securityLevel.safer.level = Ασφαλέστερο +securityLevel.safer.summary = Απενεργοποιεί παροχές ιστοσελίδων που είναι επικίνδυνες και οδηγούν κάποιες ιστοσελίδες στο να χάνουν λειτουργικότητα. +securityLevel.safer.description1 = Η JavaScript είναι απενεργοποιημένη σε ιστότοπους που δεν είναι HTTPS. +securityLevel.safer.description2 = Μερικές γραμματοσειρές και μαθηματικά σύμβολα είναι απενεργοποιημένα. +securityLevel.safer.description3 = Οι ήχοι και τα βίντεο (μέσα HTML5) παίζουν, αφού γίνει κλικ για αναπαραγωγή. +securityLevel.safest.level = Ασφαλέστατο +securityLevel.safest.summary = Επιτρέπει μόνο τις παροχές ιστοσελίδας που απαιτούνται για βασικές ιστοσελίδες και υπηρεσίες. Αυτό επηρεάζει εικόνες, μέσα και scripts. +securityLevel.safest.description1 = Η JavaScript είναι απενεργοποιημένη σε όλους τους ιστότοπους ως προεπιλογή. +securityLevel.safest.description2 = Ορισμένες γραμματοσειρές, εικονίδια, μαθηματικά σύμβολα και εικόνες είναι απενεργοποιημένα. +securityLevel.safest.description3 = Οι ήχοι και τα βίντεο (μέσα HTML5) παίζουν, αφού γίνει κλικ για αναπαραγωγή. +securityLevel.custom.summary = Οι προσαρμοσμένες προτιμήσεις του browser σας έχουν οδηγήσει σε ασυνήθιστες ρυθμίσεις ασφάλειας. Για λόγους ασφαλείας και ιδιωτικότητας, προτείνουμε να επιλέξετε ένα από τα προεπιλεγμένα επίπεδα ασφάλειας. +securityLevel.learnMore = Μάθετε περισσότερα +securityLevel.restoreDefaults = Επαναφορά προεπιλογών diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index 63d7597a..4f474387 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "Ρυθμίσεις του Δικτύου Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Έλεγχος για ενημέρωση του Tor Browser..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Κάντε κλικ για να εκκινήσετε το Torbutton"> <!ENTITY torbutton.prefs.security_settings "Ρυθμίσεις ασφαλείας του Tor Browser"> -<!ENTITY torbutton.prefs.restore_defaults "Επαναφορά προεπιλογών"> -<!ENTITY torbutton.prefs.custom_warning "Οι προσαρμοσμένες προτιμήσεις του browser σας έχουν οδηγήσει σε ασυνήθιστες ρυθμίσεις ασφάλειας. Για λόγους ασφαλείας και ιδιωτικότητας, προτείνουμε να επιλέξετε ένα από τα προεπιλεγμένα επίπεδα ασφάλειας."> <!ENTITY torbutton.cookiedialog.title "Διαχείριση Προστασίας Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Προστατευμένα"> <!ENTITY torbutton.cookiedialog.domainCol "Οικοδεσπότης"> diff --git a/src/chrome/locale/en-US/securityLevel.properties b/src/chrome/locale/en-US/securityLevel.properties new file mode 100644 index 00000000..6ccbb033 --- /dev/null +++ b/src/chrome/locale/en-US/securityLevel.properties @@ -0,0 +1,22 @@ +securityLevel.securityLevel = Security Level +securityLevel.customWarning = Custom +securityLevel.overview = Disable certain web features that can be used to attack your security and anonymity. +securityLevel.standard.level = Standard +securityLevel.standard.tooltip = Security Level : Standard +securityLevel.standard.summary = All Tor Browser and website features are enabled. +securityLevel.safer.level = Safer +securityLevel.safer.tooltip = Security Level : Safer +securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality. +securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites. +securityLevel.safer.description2 = Some fonts and math symbols are disabled. +securityLevel.safer.description3 = Audio and video (HTML5 media) are click-to-play. +securityLevel.safest.level = Safest +securityLevel.safest.tooltip = Security Level : Safest +securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. +securityLevel.safest.description1 = JavaScript is disabled by default on all sites. +securityLevel.safest.description2 = Some fonts, icons, math symbols, and images are disabled. +securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-play. +securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. +securityLevel.learnMore = Learn more +securityLevel.restoreDefaults = Restore Defaults +securityLevel.advancedSecuritySettings = Advanced Security Settings… \ No newline at end of file diff --git a/src/chrome/locale/en-US/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd index 1a299af9..83b1ffb5 100644 --- a/src/chrome/locale/en-US/torbutton.dtd +++ b/src/chrome/locale/en-US/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "Security Settings…"> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/eo/securityLevel.properties b/src/chrome/locale/eo/securityLevel.properties new file mode 100644 index 00000000..aa80f5cb --- /dev/null +++ b/src/chrome/locale/eo/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Restaŭri defaŭltojn diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd index 8dd75e5c..a4c2f3ab 100644 --- a/src/chrome/locale/eo/torbutton.dtd +++ b/src/chrome/locale/eo/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restaŭri defaŭltojn"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/es-AR/securityLevel.properties b/src/chrome/locale/es-AR/securityLevel.properties new file mode 100644 index 00000000..ae089179 --- /dev/null +++ b/src/chrome/locale/es-AR/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Nivel de seguridad +securityLevel.standard.level = Estándar +securityLevel.standard.summary = Todas las características del navegador Tor y el sitio web están habilitadas. +securityLevel.safer.level = Más seguro +securityLevel.safer.summary = Deshabilita características del sitio web que son a menudo peligrosas, causando que algunos sitios pierdan funcionalidad. +securityLevel.safer.description1 = JavaScript está deshabilitado en sitios no-HTTPS. +securityLevel.safer.description2 = Algunos tipos de letra y símbolos matemáticos están deshabilitados. +securityLevel.safer.description3 = Audio y video (medios HTML5) son cliquear-para-reproducir. +securityLevel.safest.level = En extremo seguro +securityLevel.safest.summary = Sólo permite características del sitio web requeridas por sitios estáticos y servicios básicos. Estos cambios afectan imágenes, medios y código ejecutable. +securityLevel.safest.description1 = JavaScript está deshabilitado por defecto en todos los sitios. +securityLevel.safest.description2 = Algunos tipos de letra, iconos, símbolos matemáticos e imágenes están deshabilitados. +securityLevel.safest.description3 = Audio y video (medios HTML5) son cliquear-para-reproducir. +securityLevel.custom.summary = Tus preferencias personalizadas del navegador han resultado en ajustes de seguridad inusuales. Por razones de seguridad y privacidad, recomendamos que elijas uno de los niveles de seguridad por defecto. +securityLevel.learnMore = Más informacion +securityLevel.restoreDefaults = Restablecer valores por defecto diff --git a/src/chrome/locale/es-AR/torbutton.dtd b/src/chrome/locale/es-AR/torbutton.dtd index d58dfb56..3d2315af 100644 --- a/src/chrome/locale/es-AR/torbutton.dtd +++ b/src/chrome/locale/es-AR/torbutton.dtd @@ -2,8 +2,6 @@ <!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 Seguridad..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configuraciones de la Red de Tor"> <!ENTITY torbutton.context_menu.networksettings.key "R"> <!ENTITY torbutton.context_menu.downloadUpdate "Comprobar si hay Actualización para el Navegador Tor"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "K"> <!ENTITY torbutton.button.tooltip "Cliqueá para inicializar Torbutton"> <!ENTITY torbutton.prefs.security_settings "Configuración de Seguridad del Navegador Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Restablecer valores por defecto"> -<!ENTITY torbutton.prefs.custom_warning "Tus preferencias personalizadas del navegador han resultado en ajustes de seguridad inusuales. Por razones de seguridad y privacidad, recomendamos que elijas uno de los niveles de seguridad por defecto."> <!ENTITY torbutton.cookiedialog.title "Manejar la Protección de cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protegido"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/es/securityLevel.properties b/src/chrome/locale/es/securityLevel.properties new file mode 100644 index 00000000..2aebcdbf --- /dev/null +++ b/src/chrome/locale/es/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Nivel de seguridad +securityLevel.standard.level = Estándar +securityLevel.standard.summary = Están habilitadas todas las características de Tor Browser y sitio web. +securityLevel.safer.level = Más segura +securityLevel.safer.summary = Deshabilita características del sitio web que a menudo son peligrosas, lo que causa que algunos sitios pierdan funcionalidad. +securityLevel.safer.description1 = JavaScript está deshabilitado en sitios no-HTTPS. +securityLevel.safer.description2 = Algunas fuentes y símbolos matemáticos están deshabilitados. +securityLevel.safer.description3 = Audio y vídeo (medios HTML5) son de tipo pulsar-para-reproducir. +securityLevel.safest.level = La más segura +securityLevel.safest.summary = Sólo permite las características de sitio web requeridas para sitios estáticos y servicios básicos. Estos cambios afectan a imágenes, medios, y scripts. +securityLevel.safest.description1 = JavaScript está deshabilitado por defecto en todos los sitios. +securityLevel.safest.description2 = Algunas fuentes, iconos, símbolos matemáticos, e imágenes están deshabilitados. +securityLevel.safest.description3 = Audio y vídeo (medios HTML5) son de tipo pulsar-para-reproducir. +securityLevel.custom.summary = Tus preferencias personalizadas para el navegador han resultado en una configuración de seguridad inusual. Por motivos de seguridad y privacidad, te recomendamos uno de los de los niveles de seguridad predeterminados. +securityLevel.learnMore = Conocer más +securityLevel.restoreDefaults = Restaurar valores predeterminados diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 3a6c636a..a44dfc6f 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -2,8 +2,6 @@ <!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 seguridad..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configuración de red Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "R"> <!ENTITY torbutton.context_menu.downloadUpdate "Comprobar actualización del Tor Browser..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton"> <!ENTITY torbutton.prefs.security_settings "Configuración de seguridad del Tor Browser"> -<!ENTITY torbutton.prefs.restore_defaults "Restaurar valores predeterminados"> -<!ENTITY torbutton.prefs.custom_warning "Tus preferencias personalizadas para el navegador han resultado en una configuración de seguridad inusual. Por motivos de seguridad y privacidad, te recomendamos uno de los de los niveles de seguridad predeterminados."> <!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Protegidas"> <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)"> diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/et/torbutton.dtd +++ b/src/chrome/locale/et/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/eu/securityLevel.properties b/src/chrome/locale/eu/securityLevel.properties new file mode 100644 index 00000000..bd9dfc0d --- /dev/null +++ b/src/chrome/locale/eu/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Segurtasun maila +securityLevel.standard.level = Estandarra +securityLevel.standard.summary = Tor Nabigatzailearen eta web-orriaren ezaugarri guztiak gaituta daude. +securityLevel.safer.level = Seguruagoa +securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality. +securityLevel.safer.description1 = JavaScript ezgaituta dago HTTPS ez diren web-orrietan. +securityLevel.safer.description2 = Some fonts and math symbols are disabled. +securityLevel.safer.description3 = Audio and video (HTML5 media) are click-to-play. +securityLevel.safest.level = Seguruena +securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. +securityLevel.safest.description1 = JavaScript is disabled by default on all sites. +securityLevel.safest.description2 = Some fonts, icons, math symbols, and images are disabled. +securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-play. +securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. +securityLevel.learnMore = Gehiago jakin +securityLevel.restoreDefaults = Lehenetsiak berrezarri diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index ca42906b..18b0bb8f 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "Segurtasun Ezarpenak..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor Sarearen Ezarpenak..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser eguneraketa egiaztatu"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko"> <!ENTITY torbutton.prefs.security_settings "Tor Nagibatzailearen Segurtasun Ezarpenak"> -<!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> <!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu"> <!ENTITY torbutton.cookiedialog.lockCol "Babestuta"> <!ENTITY torbutton.cookiedialog.domainCol "Ostalaria"> diff --git a/src/chrome/locale/fa/securityLevel.properties b/src/chrome/locale/fa/securityLevel.properties new file mode 100644 index 00000000..9336f836 --- /dev/null +++ b/src/chrome/locale/fa/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = سطح امنیت +securityLevel.standard.level = استاندارد +securityLevel.standard.summary = همه مرورگر تور و ویژگی‌های وبسایت به کار انداخته شده‌اند. +securityLevel.safer.level = ایمن تر +securityLevel.safer.summary = از کار انداختن ویژگی‌های وبسایت که اغلب خطرناک هستند و باعث از دست رفتن برخی سایت‌ها می‌شوند. +securityLevel.safer.description1 = جاوا اسکریپت روی سایت‌های غیر HTTPS کار نمی‌کند. +securityLevel.safer.description2 = برخی از فونت ها و نمادهای ریاضی غیرفعال هستند +securityLevel.safer.description3 = صدا و ویدیو ( HTML5 رسانه ) برای بازی کلیک می‌کنند. +securityLevel.safest.level = ایمن ترین +securityLevel.safest.summary = تنها اجازه می‌دهد که ویژگی‌های وبسایت برای سایت‌های ایستا و خدمات پایه مورد نیاز باشد. این تغییرات بر تصاویر، رسانه‌ها و متن تاثیر می‌گذارند. +securityLevel.safest.description1 = جاوا اسکریپت به طور پیش فرض در تمامی سایت ها غیر فعال است. +securityLevel.safest.description2 = برخی از فونت ها، شمایل‌ها، علایم ریاضی و تصاویر از کار افتاده هستند. +securityLevel.safest.description3 = صدا و ویدیو ( HTML5 رسانه ) برای بازی کلیک می‌کنند. +securityLevel.custom.summary = تنظیمات سفارشی شما در مرورگر منجر به تغییرات غیر معمول در تنظیمات امنیتی شده است.برای امن نگه داشتن حریم خصوصی خود ما پیشنهاد میکنیم یکی از تنظیمات پیشفرض امنیتی را انتخاب کنید. +securityLevel.learnMore = اطلاعات بیشتر +securityLevel.restoreDefaults = بازگردانی تنظیمات اولیه diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 49385ee1..b748951f 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "تنظیمات شبکه تور"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "بررسی بروز رسانی مرورگر تور"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "جهت شروع دكمه تُرکليک کنيد"> <!ENTITY torbutton.prefs.security_settings "تنظیمات امنیتی مرورگر تور"> -<!ENTITY torbutton.prefs.restore_defaults "بازگردانی تنظیمات اولیه"> -<!ENTITY torbutton.prefs.custom_warning "تنظیمات سفارشی شما در مرورگر منجر به تغییرات غیر معمول در تنظیمات امنیتی شده است.برای امن نگه داشتن حریم خصوصی خود ما پیشنهاد میکنیم یکی از تنظیمات پیشفرض امنیتی را انتخاب کنید. "> <!ENTITY torbutton.cookiedialog.title "مديريت حفاظت کلوچک‌ها"> <!ENTITY torbutton.cookiedialog.lockCol "حفاظت شده"> <!ENTITY torbutton.cookiedialog.domainCol "ميزبان"> diff --git a/src/chrome/locale/fi/securityLevel.properties b/src/chrome/locale/fi/securityLevel.properties new file mode 100644 index 00000000..f270671f --- /dev/null +++ b/src/chrome/locale/fi/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Palauta Oletukset diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd index 136cca34..d2088a6a 100644 --- a/src/chrome/locale/fi/torbutton.dtd +++ b/src/chrome/locale/fi/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Evästeiden suojaukset"> <!ENTITY torbutton.context_menu.cookieProtections.key "E"> <!ENTITY torbutton.button.tooltip "Klikkaa Torbutton aktiiviseksi"> -<!ENTITY torbutton.prefs.restore_defaults "Palauta Oletukset"> <!ENTITY torbutton.cookiedialog.title "Hallitse evästeiden suojauksia"> <!ENTITY torbutton.cookiedialog.lockCol "Suojaus"> <!ENTITY torbutton.cookiedialog.domainCol "Palvelin"> diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/fil/torbutton.dtd +++ b/src/chrome/locale/fil/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/fo/torbutton.dtd +++ b/src/chrome/locale/fo/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/fr/securityLevel.properties b/src/chrome/locale/fr/securityLevel.properties new file mode 100644 index 00000000..54f59750 --- /dev/null +++ b/src/chrome/locale/fr/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Niveau de sécurité +securityLevel.standard.level = Normal +securityLevel.standard.summary = Toutes les fonctions du Navigateur Tor et des sites Web sont activées. +securityLevel.safer.level = Plus sûr +securityLevel.safer.summary = Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web. +securityLevel.safer.description1 = JavaScript est désactivé pour les sites non HTTPS. +securityLevel.safer.description2 = Certaines polices et certains symboles mathématiques sont désactivés. +securityLevel.safer.description3 = Le son et la vidéo (médias HTML5) sont « cliquer pour lire ». +securityLevel.safest.level = Le plus sûr +securityLevel.safest.summary = Ne permettre que les fonctions de sites Web qui sont exigées pour les sites fixes et les services de base. Ces changements affectent les images, les médias et les scripts. +securityLevel.safest.description1 = JavaScript est désactivé par défaut pour tous les sites. +securityLevel.safest.description2 = Certaines polices, icônes, images et certains symboles mathématiques sont désactivés. +securityLevel.safest.description3 = Le son et la vidéo (médias HTML5) sont « cliquer pour lire ». +securityLevel.custom.summary = Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des informations personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut. +securityLevel.learnMore = En apprendre davantage +securityLevel.restoreDefaults = Revenir aux paramètres par défaut diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 294c2f9f..be848ce6 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -2,8 +2,6 @@ <!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 sécurité"> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> <!ENTITY torbutton.context_menu.networksettings.key "R"> <!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du Navigateur Tor"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "T"> <!ENTITY torbutton.button.tooltip "Cliquer pour lancer BoutonTor"> <!ENTITY torbutton.prefs.security_settings "Paramètres de sécurité du Navigateur Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Revenir aux paramètres par défaut"> -<!ENTITY torbutton.prefs.custom_warning "Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des informations personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut."> <!ENTITY torbutton.cookiedialog.title "Gérer les protections des fichiers témoins"> <!ENTITY torbutton.cookiedialog.lockCol "Protégé"> <!ENTITY torbutton.cookiedialog.domainCol "Hôte"> diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/fur/torbutton.dtd +++ b/src/chrome/locale/fur/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/fy/torbutton.dtd +++ b/src/chrome/locale/fy/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ga/securityLevel.properties b/src/chrome/locale/ga/securityLevel.properties new file mode 100644 index 00000000..e728187e --- /dev/null +++ b/src/chrome/locale/ga/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Leibhéal Slándála +securityLevel.standard.level = Gnáthshlándáil +securityLevel.standard.summary = Gach gné de bhrabhsálaí Tor agus gach gné de shuímh Ghréasáin ar siúl. +securityLevel.safer.level = Níos Sábháilte +securityLevel.safer.summary = Díchumasaítear gnéithe de shuímh atá contúirteach go minic; dá bharr seo, ní fheidhmeoidh gach suíomh mar is ceart. +securityLevel.safer.description1 = Tá JavaScript díchumasaithe ar shuímh nach mbaineann úsáid as HTTPS. +securityLevel.safer.description2 = Tá roinnt clófhoirne agus siombailí matamaiticiúla díchumasaithe. +securityLevel.safer.description3 = Caithfidh tú fuaimeanna agus físeáin (meáin HTML5) a chliceáil lena seinm. +securityLevel.safest.level = Is Sábháilte +securityLevel.safest.summary = Ní cheadaítear ach na gnéithe atá de dhíth ar shuímh statacha agus ar bhunseirbhísí. Téann na hathruithe seo i bhfeidhm ar íomhánna, ar mheáin, agus ar scripteanna. +securityLevel.safest.description1 = Tá JavaScript díchumasaithe ar gach suíomh de réir réamhshocraithe. +securityLevel.safest.description2 = Tá roinnt clófhoirne, deilbhíní, siombailí matamaiticiúla, agus íomhánna díchumasaithe. +securityLevel.safest.description3 = Caithfidh tú fuaimeanna agus físeáin (meáin HTML5) a chliceáil lena seinm. +securityLevel.custom.summary = Tá socruithe slándála an bhrabhsálaí as an ngnáth faoi láthair, mar thoradh ar do chuid sainroghanna. Ar chúiseanna slándála agus príobháideachais, molaimid duit ceann de na leibhéil slándála réamhshocraithe a roghnú. +securityLevel.learnMore = Tuilleadh eolais +securityLevel.restoreDefaults = Fill ar na Réamhshocruithe diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd index 8738ae94..6f92b5bf 100644 --- a/src/chrome/locale/ga/torbutton.dtd +++ b/src/chrome/locale/ga/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Ciorcad Nua Tor don Suíomh seo"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Socruithe Slándála..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Socruithe Líonra Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Lorg Nuashonrú ar Bhrabhsálaí Tor..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Cliceáil chun cnaipe Tor a thúsú"> <!ENTITY torbutton.prefs.security_settings "Socruithe Slándála Bhrabhsálaí Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Fill ar na Réamhshocruithe"> -<!ENTITY torbutton.prefs.custom_warning "Tá socruithe slándála an bhrabhsálaí as an ngnáth faoi láthair, mar thoradh ar do chuid sainroghanna. Ar chúiseanna slándála agus príobháideachais, molaimid duit ceann de na leibhéil slándála réamhshocraithe a roghnú."> <!ENTITY torbutton.cookiedialog.title "Bainistigh Caomhnú Fianán"> <!ENTITY torbutton.cookiedialog.lockCol "Cosanta"> <!ENTITY torbutton.cookiedialog.domainCol "Óstríomhaire"> diff --git a/src/chrome/locale/gl/securityLevel.properties b/src/chrome/locale/gl/securityLevel.properties new file mode 100644 index 00000000..fd621499 --- /dev/null +++ b/src/chrome/locale/gl/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Restabelecer valores predeterminados diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd index fae2b37a..c6ae5f79 100644 --- a/src/chrome/locale/gl/torbutton.dtd +++ b/src/chrome/locale/gl/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restabelecer valores predeterminados"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/gu/securityLevel.properties b/src/chrome/locale/gu/securityLevel.properties new file mode 100644 index 00000000..e6eabc59 --- /dev/null +++ b/src/chrome/locale/gu/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = મૂળભૂત પાછું લાવો diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd index 32adbee7..0a9faa2d 100644 --- a/src/chrome/locale/gu/torbutton.dtd +++ b/src/chrome/locale/gu/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "ટોરબટન શરુ કરવા ક્લિક કરો"> -<!ENTITY torbutton.prefs.restore_defaults "મૂળભૂત પાછું લાવો"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/gun/torbutton.dtd +++ b/src/chrome/locale/gun/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ha/torbutton.dtd +++ b/src/chrome/locale/ha/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/he/securityLevel.properties b/src/chrome/locale/he/securityLevel.properties new file mode 100644 index 00000000..2875a982 --- /dev/null +++ b/src/chrome/locale/he/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = רמת אבטחה +securityLevel.standard.level = תקני +securityLevel.standard.summary = כל המאפיינים של דפדפן Tor ומאפייני אתר מושבתים. +securityLevel.safer.level = בטוח יותר +securityLevel.safer.summary = משבית מאפייני אתר שמסוכנים לעיתים קרובות, מה שגורם למספר אתרים לאבד תפקודיות. +securityLevel.safer.description1 = JavaScript מושבת בכל האתרים שאינם HTTPS. +securityLevel.safer.description2 = מספר גופנים וסמלים מתמטיים מושבתים. +securityLevel.safer.description3 = שמע ווידאו (מדית HTML5) הם לחץ-כדי-לנגן. +securityLevel.safest.level = הכי בטוח +securityLevel.safest.summary = מתיר רק למאפייני אתר הדרושים עבור אתרים נייחים ושירותים יסודיים. שינויים אלו משפיעים על תמונות, מדיה ותסריטים. +securityLevel.safest.description1 = JavaScript מושבת כברירת מחדל בכל האתרים. +securityLevel.safest.description2 = מספר גופנים, צלמיות, סמלים מתמטיים ותמונות מושבתים. +securityLevel.safest.description3 = שמע ווידאו (מדית HTML5) הם לחץ-כדי-לנגן. +securityLevel.custom.summary = העדפות הדפדפן המותאמות שלך נבעו מהגדרות אבטחה בלתי שגרתיות. מטעמי אבטחה ופרטיות, אנו ממליצים לך לבחור באחת מרמות האבטחה של ברירת המחדל. +securityLevel.learnMore = למד עוד +securityLevel.restoreDefaults = שחזר ברירות מחדל diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index c5373e36..0392f837 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "הגדרות רשת Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "בדוק אחר עדכון לדפדפן Tor..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "לחץ בכדי לאתחל את Torbutton"> <!ENTITY torbutton.prefs.security_settings "הגדרות אבטחה של דפדפן Tor"> -<!ENTITY torbutton.prefs.restore_defaults "שחזר ברירות מחדל"> -<!ENTITY torbutton.prefs.custom_warning "העדפות הדפדפן המותאמות שלך נבעו מהגדרות אבטחה בלתי שגרתיות. מטעמי אבטחה ופרטיות, אנו ממליצים לך לבחור באחת מרמות האבטחה של ברירת המחדל."> <!ENTITY torbutton.cookiedialog.title "נהל הגנות עוגיות"> <!ENTITY torbutton.cookiedialog.lockCol "מוגן"> <!ENTITY torbutton.cookiedialog.domainCol "מארח"> diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd index 710b298e..8f3852af 100644 --- a/src/chrome/locale/hi/torbutton.dtd +++ b/src/chrome/locale/hi/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "टोर बटन को आरंभित करने के लिये क्लिक करे"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd index 67d9f181..e46ff88f 100644 --- a/src/chrome/locale/hr/torbutton.dtd +++ b/src/chrome/locale/hr/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Zaštite kolačića"> <!ENTITY torbutton.context_menu.cookieProtections.key "Z"> <!ENTITY torbutton.button.tooltip "Kliknite za pokretanje Torbuttona"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ht/torbutton.dtd +++ b/src/chrome/locale/ht/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/hu/securityLevel.properties b/src/chrome/locale/hu/securityLevel.properties new file mode 100644 index 00000000..9fd3e174 --- /dev/null +++ b/src/chrome/locale/hu/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Biztonsági szint +securityLevel.standard.level = Normál +securityLevel.standard.summary = Minden Tor Browser és weboldal szolgáltatás engedélyezve. +securityLevel.safer.level = Biztonságosabb +securityLevel.safer.summary = Azon weboldal szolgáltatások tiltása, amelyek többnyire veszélyesek, ami néhány oldal működésének problémáit okozhatja. +securityLevel.safer.description1 = A JavaScript tiltott a nem-HTTPS oldalkon. +securityLevel.safer.description2 = Néhány betűtípus és matematikai szimbólum tiltásra került. +securityLevel.safer.description3 = Audió és videó (HTML5 média) kattintásra indul. +securityLevel.safest.level = Legbiztonságosabb +securityLevel.safest.summary = Csak azon weboldal szolgáltatások engedélyezése, amelyek a statikus, vagy alap szolgáltatásokhoz szükségesek. Ezek a beállítások érintik a képeket, médiákat és scripteket. +securityLevel.safest.description1 = A JavaScript alapértelmezetten tiltott minden oldalon. +securityLevel.safest.description2 = Néhány betűtípus, ikon és matematikai szimbólum és a képek tiltásra kerültek. +securityLevel.safest.description3 = Audió és videó (HTML5 média) kattintásra indul. +securityLevel.custom.summary = Az Ön által eszközölt egyéni böngészői beállítások eredményeképp biztonsági kockázatok merülhetnek fel. Biztonsági és adatvédelmi szempontokból kérjük válasszon az alapértelmezett biztonsági szintek közül. +securityLevel.learnMore = További információ +securityLevel.restoreDefaults = Alapértelmezések visszaállítása diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index 4e71b100..0cfce62f 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "S"> <!ENTITY torbutton.context_menu.new_circuit "Új Tor áramkör ehhez az oldalhoz"> <!ENTITY torbutton.context_menu.new_circuit_key "S"> -<!ENTITY torbutton.context_menu.preferences "Biztonsági beállítások..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor hálózati beállítások"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser frissítések keresése"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Kattintson a Torbutton inicializálásához"> <!ENTITY torbutton.prefs.security_settings "Tor Browser biztonsági beállítások"> -<!ENTITY torbutton.prefs.restore_defaults "Alapértelmezések visszaállítása"> -<!ENTITY torbutton.prefs.custom_warning "Az Ön által eszközölt egyéni böngészői beállítások eredményeképp biztonsági kockázatok merülhetnek fel. Biztonsági és adatvédelmi szempontokból kérjük válasszon az alapértelmezett biztonsági szintek közül."> <!ENTITY torbutton.cookiedialog.title "Süti védelem kezelése"> <!ENTITY torbutton.cookiedialog.lockCol "Védett"> <!ENTITY torbutton.cookiedialog.domainCol "Állomás"> diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/hy/torbutton.dtd +++ b/src/chrome/locale/hy/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/id/securityLevel.properties b/src/chrome/locale/id/securityLevel.properties new file mode 100644 index 00000000..597c9ebe --- /dev/null +++ b/src/chrome/locale/id/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Tingkat Keamanan +securityLevel.standard.level = Standar +securityLevel.standard.summary = Semua fitur dari Tor Browser dan situs web diaktifkan. +securityLevel.safer.level = Lebih aman +securityLevel.safer.summary = Menonaktifkan fitur-fitur situs web yang sering berbahaya, ini akan membuat beberapa situs kehilangan fungsionalitas. +securityLevel.safer.description1 = JavaScript dinonaktifkan di semua situs non-HTTPS. +securityLevel.safer.description2 = Beberapa font dan simbol matematika dinonaktifkan. +securityLevel.safer.description3 = Audio dan video (media HTML5 media) dijalankan saat diklik. +securityLevel.safest.level = Paling aman +securityLevel.safest.summary = Hanya menjalankan fitur-fitur situs yang diperlukan untuk menjalankan situs web statis dan servis dasar. Perubahan ini mempengaruhi gambar, media, dan skrip. +securityLevel.safest.description1 = JavaScript dinonaktifkan secara default di semua situs. +securityLevel.safest.description2 = Beberapa font, icon, simbol matematika, dan gambar dinonaktifkan. +securityLevel.safest.description3 = Audio dan video (media HTML5 media) dijalankan saat diklik. +securityLevel.custom.summary = Preferensi browser khusus anda telah membuat pengaturan keamanan yang tidak biasa. Untuk alasan keamanan dan privasi, kami menyarankan anda untuk memilih satu dari tingkat keamanan bawaan. +securityLevel.learnMore = Pelajari lebih lanjut +securityLevel.restoreDefaults = Kembalikan Kestandar diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd index c12cfb6b..ecf771f4 100644 --- a/src/chrome/locale/id/torbutton.dtd +++ b/src/chrome/locale/id/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Sirkuit Tor Baru untuk Situs ini"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Pengaturan Keamanan..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Pengaturan Jaringan Tor…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Cek Versi Peramban Tor Terkini"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan TombolTor"> <!ENTITY torbutton.prefs.security_settings "Pengaturan Keamanan Tor Browser"> -<!ENTITY torbutton.prefs.restore_defaults "Kembalikan Kestandar"> -<!ENTITY torbutton.prefs.custom_warning "Preferensi browser khusus anda telah membuat pengaturan keamanan yang tidak biasa. Untuk alasan keamanan dan privasi, kami menyarankan anda untuk memilih satu dari tingkat keamanan bawaan."> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/is/securityLevel.properties b/src/chrome/locale/is/securityLevel.properties new file mode 100644 index 00000000..b58ccd38 --- /dev/null +++ b/src/chrome/locale/is/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Öryggisstig +securityLevel.standard.level = Staðlað +securityLevel.standard.summary = Allir eiginleikar Tor-vafrans og vefsvæðisins eru virkjaðir. +securityLevel.safer.level = Öruggara +securityLevel.safer.summary = Gerir óvirka ýmsa eiginleika vefsvæða sem oft eru hættulegir, en veldur því að sum vefsvæði hætta að virka eins og þau eiga að gera. +securityLevel.safer.description1 = JavaScript er óvirkt á öllum ekki-HTTPS vefjum. +securityLevel.safer.description2 = Sumt letur og stærðfræðitákn eru óvirk. +securityLevel.safer.description3 = Hljóð og myndskeið (HTML5-gagnamiðla) þarf að smella á til að spila. +securityLevel.safest.level = Öruggast +securityLevel.safest.summary = Leyfir aðeins þá eiginleika vefsvæða sem krafist er fyrir beinan lestur (static sites) og grunnþjónustur. Þessar breytingar hafa áhrif á myndir, margmiðlunargögn og skriftur. +securityLevel.safest.description1 = JavaScript er sjálfgefið óvirkt á öllum vefsvæðum. +securityLevel.safest.description2 = Sumt letur, táknmyndir, myndir og stærðfræðitákn eru óvirk. +securityLevel.safest.description3 = Hljóð og myndskeið (HTML5-gagnamiðla) þarf að smella á til að spila. +securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. +securityLevel.learnMore = Læra meira +securityLevel.restoreDefaults = Frumstilla á sjálfgefið diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index a03a7329..2468114e 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Ný Tor-rás fyrir þetta vefsvæði"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Öryggisstillingar…"> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Netkerfisstillingar Tor…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Athugaðu með uppfærslur Tor-vafra..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Smelltu til að kveikja á Tor-hnapp"> <!ENTITY torbutton.prefs.security_settings "Öryggisstillingar Tor-vafrans"> -<!ENTITY torbutton.prefs.restore_defaults "Frumstilla á sjálfgefið"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> <!ENTITY torbutton.cookiedialog.title "Sýsla með varnir gegn vefkökum"> <!ENTITY torbutton.cookiedialog.lockCol "Varið"> <!ENTITY torbutton.cookiedialog.domainCol "Hýsilvél"> diff --git a/src/chrome/locale/it/securityLevel.properties b/src/chrome/locale/it/securityLevel.properties new file mode 100644 index 00000000..14793258 --- /dev/null +++ b/src/chrome/locale/it/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Livello di Sicurezza +securityLevel.standard.level = Standard +securityLevel.standard.summary = Tutte le funzionalità di Tor Browser e dei siti sono attive. +securityLevel.safer.level = Sicuro +securityLevel.safer.summary = Disattiva le caratteristiche dei siti spesso pericolose, causando la perdita di funzionalità di alcuni siti. +securityLevel.safer.description1 = JavaScript è disattivato nei siti non-HTTPS. +securityLevel.safer.description2 = Alcuni caratteri e simboli matematici sono disattivati. +securityLevel.safer.description3 = Audio e video (media HTML5) sono click-to-play. +securityLevel.safest.level = Molto sicuro +securityLevel.safest.summary = Permette solo le funzionalità necessarie per siti statici e servizi di base. Queste modifiche influiscono su immagini, media e script. +securityLevel.safest.description1 = JavaScript è disattivato in tutti i siti in modo predefinito. +securityLevel.safest.description2 = Alcuni caratteri, icone, simboli matematici e immagini sono disattivati. +securityLevel.safest.description3 = Audio e video (media HTML5) sono click-to-play. +securityLevel.custom.summary = Le tue impostazioni personalizzate del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti. +securityLevel.learnMore = Per saperne di più +securityLevel.restoreDefaults = Ripristina impostazioni iniziali diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index a45be803..3c46b13e 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -2,8 +2,6 @@ <!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 di sicurezza..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Impostazioni della rete Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Controllo degli aggiornamenti di Tor Browser..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> <!ENTITY torbutton.prefs.security_settings "Impostazioni di Sicurezza Tor Browser"> -<!ENTITY torbutton.prefs.restore_defaults "Ripristina impostazioni iniziali"> -<!ENTITY torbutton.prefs.custom_warning "Le tue impostazioni personalizzate del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti."> <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protetto"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ja/securityLevel.properties b/src/chrome/locale/ja/securityLevel.properties new file mode 100644 index 00000000..30c74471 --- /dev/null +++ b/src/chrome/locale/ja/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = セキュリティレベル +securityLevel.standard.level = 標準 +securityLevel.standard.summary = Tor Browser とウェブサイトのすべての機能が有効化されます。 +securityLevel.safer.level = より安全 +securityLevel.safer.summary = ウェブサイトのしばしば危険である機能を無効化します。サイトによっては正常に動作しなくなります。 +securityLevel.safer.description1 = HTTPS非対応のサイトで JavaScript が無効化されます。 +securityLevel.safer.description2 = いくつかのフォントと数学記号が無効化されます。 +securityLevel.safer.description3 = オーディオとビデオ(HTML5メディア)はクリックすると再生されます。 +securityLevel.safest.level = 最も安全 +securityLevel.safest.summary = 静的なサイトと基本的なサービスに必要な機能だけを許可します。この変更は画像、メディア、スクリプトに影響します。 +securityLevel.safest.description1 = すべてのサイトで JavaScript が無効化されます。 +securityLevel.safest.description2 = いくつかのアイコン、数学記号および画像が無効化されます。 +securityLevel.safest.description3 = オーディオとビデオ(HTML5メディア)はクリックすると再生されます。 +securityLevel.custom.summary = あなたのブラウザーにおけるカスタム設定はセキュリティ結果に影響を及ぼしません。セキュリティとプライバシーに関してはデフォルトのセキュリティレベルのひとつを選択することをおすすめいたします。 +securityLevel.learnMore = さらに知る +securityLevel.restoreDefaults = デフォルトにもどす diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index ae495084..be6c4dc0 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "Tor ネットワークの設定..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser のアップデートを確認"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbuttonを初期状態に戻す"> <!ENTITY torbutton.prefs.security_settings "Tor Browser セキュリティの設定"> -<!ENTITY torbutton.prefs.restore_defaults "デフォルトにもどす"> -<!ENTITY torbutton.prefs.custom_warning "あなたのブラウザーにおけるカスタム設定はセキュリティ結果に影響を及ぼしません。セキュリティとプライバシーに関してはデフォルトのセキュリティレベルのひとつを選択することをおすすめいたします。"> <!ENTITY torbutton.cookiedialog.title "Cookie保護を管理"> <!ENTITY torbutton.cookiedialog.lockCol "保護済み"> <!ENTITY torbutton.cookiedialog.domainCol "ホスト"> diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/jv/torbutton.dtd +++ b/src/chrome/locale/jv/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ka/securityLevel.properties b/src/chrome/locale/ka/securityLevel.properties new file mode 100644 index 00000000..758209d6 --- /dev/null +++ b/src/chrome/locale/ka/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = უსაფრთხოების დონე +securityLevel.standard.level = ჩვეულებრივი +securityLevel.standard.summary = Tor-ბრაუზერისა და ვებსაიტის ყველა შესაძლებლობა ჩართულია. +securityLevel.safer.level = მეტად დაცული +securityLevel.safer.summary = გაითიშება ვებსაიტის საფრთხისშემცველი შესაძლებლობები, სავარაუდოდ საიტების ნაწილი ვერ იმუშავებს გამართულად. +securityLevel.safer.description1 = JavaScript გათიშულია HTTPS-ს არმქონე ყველა საიტზე. +securityLevel.safer.description2 = შრიფტებისა და მათემატიკური სიმბოლოების ნაწილი გათიშულია. +securityLevel.safer.description3 = ხმოვანი და ვიდეოფაილები (HTML5) ეშვება მხოლოდ დაწკაპებით. +securityLevel.safest.level = სრულიად დაცული +securityLevel.safest.summary = დაშვებულია მხოლოდ ის შესაძლებლობები, რომლებსაც საჭიროებს უცვლელი შიგთავსის მქონე საიტები და ძირითადი მომსახურებები. ცვლილებები შეეხება სურათებს, ფაილებსა და სკრიპტებს. +securityLevel.safest.description1 = JavaScript გათიშულია ყველა საიტზე ნაგულისხმევად. +securityLevel.safest.description2 = შრიფტების, ხატულების, მათემატიკური სიმბოლოებისა და სურათების ნაწილი გათიშულია. +securityLevel.safest.description3 = ხმოვანი და ვიდეოფაილები (HTML5) ეშვება მხოლოდ დაწკაპებით. +securityLevel.custom.summary = თქვენ მიერ მითითებული პარამეტრები ბრაუზერში, არაა მისაღები უსაფრთხოებისთვის. პირადი მონაცემების სათანადოდ დაცვის უზრუნველსაყოფად, გირჩევთ შეარჩიოთ უსაფრთხოების ნაგულისხმევი დონეებიდან რომელიმე. +securityLevel.learnMore = იხილეთ ვრცლად +securityLevel.restoreDefaults = ნაგულისხმევის აღდგენა diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index 47b49321..ca4fa8b6 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "ვ"> <!ENTITY torbutton.context_menu.new_circuit "ახალი Tor-წრედი ამ საიტისთვის"> <!ENTITY torbutton.context_menu.new_circuit_key "წ"> -<!ENTITY torbutton.context_menu.preferences "უსაფრთხოების პარამეტრები"> -<!ENTITY torbutton.context_menu.preferences.key "უ"> <!ENTITY torbutton.context_menu.networksettings "Tor-ქსელის პარამეტრები..."> <!ENTITY torbutton.context_menu.networksettings.key "ქ"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor-ბრაუზერის განახლებებზე შემოწმება..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "ფ"> <!ENTITY torbutton.button.tooltip "დააწკაპეთ Torbutton-ის გასაშვებად"> <!ENTITY torbutton.prefs.security_settings "Tor-ბრაუზერის უსაფრთხოების პარამეტრები"> -<!ENTITY torbutton.prefs.restore_defaults "ნაგულისხმევის აღდგენა"> -<!ENTITY torbutton.prefs.custom_warning "თქვენ მიერ მითითებული პარამეტრები ბრაუზერში, არაა მისაღები უსაფრთხოებისთვის. პირადი მონაცემების სათანადოდ დაცვის უზრუნველსაყოფად, გირჩევთ შეარჩიოთ უსაფრთხოების ნაგულისხმევი დონეებიდან რომელიმე."> <!ENTITY torbutton.cookiedialog.title "ფუნთუშების უსაფრთხოების მართვა"> <!ENTITY torbutton.cookiedialog.lockCol "დაცულია"> <!ENTITY torbutton.cookiedialog.domainCol "მისამართი"> diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/km/torbutton.dtd +++ b/src/chrome/locale/km/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/kn/torbutton.dtd +++ b/src/chrome/locale/kn/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ko/securityLevel.properties b/src/chrome/locale/ko/securityLevel.properties new file mode 100644 index 00000000..bc5238d0 --- /dev/null +++ b/src/chrome/locale/ko/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = 보안 등급 +securityLevel.standard.level = 표준 +securityLevel.standard.summary = 모든 Tor 브라우저와 웹사이트의 기능들이 활성화 됩니다. +securityLevel.safer.level = 더 안전합니다 +securityLevel.safer.summary = 이 설정으로 흔히 위험한 웹사이트의 기능이 비활성화하면 일부의 사이트의 기능들을 사용 할 수 없습니다. +securityLevel.safer.description1 = JavaScript가 HTTPS을 적용되지 않은 사이트에서 비활성화 됩니다. +securityLevel.safer.description2 = 일부 글꼴이며 수학기호가 비활성화 됩니다. +securityLevel.safer.description3 = 오디오와 동영상(HTML5 media) 보려면 누르십시오. +securityLevel.safest.level = 제일 안전합니다 +securityLevel.safest.summary = 정적 사이트와 기본 서비스에 필요한 기능이만 용남합니다. 그 변경들은 사진이며 메디아며 스크립트를 영향할 것입니다. +securityLevel.safest.description1 = 자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다. +securityLevel.safest.description2 = 일부 글꼴이며 상징이며 수학기호며 사진이 비활성화 됩니다. +securityLevel.safest.description3 = 오디오와 동영상(HTML5 media) 보려면 누르십시오. +securityLevel.custom.summary = 사용자 지정 브라우저 기본 설정으로 인해 비정상적인 보안 설정이 발생했습니다. 보안 및 개인 정보 보호를 위해 기본 보안 수준 중 하나를 선택하는 것이 좋습니다. +securityLevel.learnMore = 더 알아보기 +securityLevel.restoreDefaults = 기본값으로 복구 diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index ab359411..03dfc033 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "토르 네트워크 설정..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "토르 브라우저 업데이트 체크하기..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> <!ENTITY torbutton.prefs.security_settings "Tor 브라우저 보안 설정"> -<!ENTITY torbutton.prefs.restore_defaults "기본값으로 복구"> -<!ENTITY torbutton.prefs.custom_warning "사용자 지정 브라우저 기본 설정으로 인해 비정상적인 보안 설정이 발생했습니다. 보안 및 개인 정보 보호를 위해 기본 보안 수준 중 하나를 선택하는 것이 좋습니다."> <!ENTITY torbutton.cookiedialog.title "쿠키 보호 관리"> <!ENTITY torbutton.cookiedialog.lockCol "보호됨"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ku/torbutton.dtd +++ b/src/chrome/locale/ku/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/kw/torbutton.dtd +++ b/src/chrome/locale/kw/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd index 8be58090..5fe03c20 100644 --- a/src/chrome/locale/ky/torbutton.dtd +++ b/src/chrome/locale/ky/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/lb/torbutton.dtd +++ b/src/chrome/locale/lb/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd index ee8c0d28..a8e1fe51 100644 --- a/src/chrome/locale/lg/torbutton.dtd +++ b/src/chrome/locale/lg/torbutton.dtd @@ -1,7 +1,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ln/torbutton.dtd +++ b/src/chrome/locale/ln/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/lo/torbutton.dtd +++ b/src/chrome/locale/lo/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/lt/securityLevel.properties b/src/chrome/locale/lt/securityLevel.properties new file mode 100644 index 00000000..92fcf4b1 --- /dev/null +++ b/src/chrome/locale/lt/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Atstatyti numatytuosius diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd index 85e41b2d..6cf6f9ca 100644 --- a/src/chrome/locale/lt/torbutton.dtd +++ b/src/chrome/locale/lt/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Slapukų apsaugos"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Paspauskite kad aktyvuoti Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Atstatyti numatytuosius"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/lv/securityLevel.properties b/src/chrome/locale/lv/securityLevel.properties new file mode 100644 index 00000000..f3d2eab9 --- /dev/null +++ b/src/chrome/locale/lv/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Atjaunot noklusējuma vērtības diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd index ea5e250b..2b52a966 100644 --- a/src/chrome/locale/lv/torbutton.dtd +++ b/src/chrome/locale/lv/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Aizsardzība no sīkdatnēm"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Noklikšķināt, lai inicializētu Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Atjaunot noklusējuma vērtības"> <!ENTITY torbutton.cookiedialog.title "Pārvaldīt aizsardzību no sīkdatnēm"> <!ENTITY torbutton.cookiedialog.lockCol "Aizsargāts"> <!ENTITY torbutton.cookiedialog.domainCol "Viesotājs"> diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/mg/torbutton.dtd +++ b/src/chrome/locale/mg/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/mi/torbutton.dtd +++ b/src/chrome/locale/mi/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/mk/securityLevel.properties b/src/chrome/locale/mk/securityLevel.properties new file mode 100644 index 00000000..b6ceb35c --- /dev/null +++ b/src/chrome/locale/mk/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Стандардни подесувања diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd index 28cfc0b8..cc240827 100644 --- a/src/chrome/locale/mk/torbutton.dtd +++ b/src/chrome/locale/mk/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Кликнете за иницирање на Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Стандардни подесувања"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ml/torbutton.dtd +++ b/src/chrome/locale/ml/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/mn/torbutton.dtd +++ b/src/chrome/locale/mn/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/mr/torbutton.dtd +++ b/src/chrome/locale/mr/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ms/torbutton.dtd +++ b/src/chrome/locale/ms/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/mt/torbutton.dtd +++ b/src/chrome/locale/mt/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/my/securityLevel.properties b/src/chrome/locale/my/securityLevel.properties new file mode 100644 index 00000000..69808509 --- /dev/null +++ b/src/chrome/locale/my/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = မူလအတိုင်း ပြန်ထားရန် diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd index b628fd23..06bc4078 100644 --- a/src/chrome/locale/my/torbutton.dtd +++ b/src/chrome/locale/my/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "ကွတ်ကီး ကာကွယ်မှုများ"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton ကို အစပြုရန် နှိပ်ပါ။"> -<!ENTITY torbutton.prefs.restore_defaults " မူလအတိုင်း ပြန်ထားရန်"> <!ENTITY torbutton.cookiedialog.title "ကွတ်ကီး ကာကွယ်မှုများကို စီမံခန့်ခွဲရန်"> <!ENTITY torbutton.cookiedialog.lockCol "အကာအကွယ် လုပ်ထားသည်"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/nah/torbutton.dtd +++ b/src/chrome/locale/nah/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/nap/torbutton.dtd +++ b/src/chrome/locale/nap/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/nb/securityLevel.properties b/src/chrome/locale/nb/securityLevel.properties new file mode 100644 index 00000000..8b36964f --- /dev/null +++ b/src/chrome/locale/nb/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Sikkerhetsnivå +securityLevel.standard.level = Forvalg +securityLevel.standard.summary = Alle Tor-nettleser- og nettside-funksjoner er på. +securityLevel.safer.level = Tryggere +securityLevel.safer.summary = Skrur av nettsidefunksjoner som ofte er farlige, som gjør at noen sider blir skadelidende. +securityLevel.safer.description1 = JavaScript er avskrudd på sider som ikke er HTTPS. +securityLevel.safer.description2 = Noen skrifter og mattesymboler er avskrudd. +securityLevel.safer.description3 = Lyd og video (HTML5-media) må klikkes for å spilles av. +securityLevel.safest.level = Tryggest +securityLevel.safest.summary = Tillater bare nettsidefunksjoner som kreves for statiske sider og grunnleggende tjenester. Disse endringene har innvirkning på bilder, media, og skript. +securityLevel.safest.description1 = JavaScript er som forvalg slått av for alle nettsteder. +securityLevel.safest.description2 = Noen skrifter, ikoner, mattesymboler og bilder er avskrudd. +securityLevel.safest.description3 = Lyd og video (HTML5-media) må klikkes for å spilles av. +securityLevel.custom.summary = Dine nettleserinnstillinger har ført med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivåene. +securityLevel.learnMore = Lær mer +securityLevel.restoreDefaults = Gjenopprett forvalg diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd index 67e2fc2b..be9665d5 100644 --- a/src/chrome/locale/nb/torbutton.dtd +++ b/src/chrome/locale/nb/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets for denne siden"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Sikkerhetsinnstillinger…"> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Nettverksinnstillinger for Tor…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for Tor-nettleseren…"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klikk for å igangsette Torbutton"> <!ENTITY torbutton.prefs.security_settings "Sikkerhetsinnstillinger for Tor-nettleseren"> -<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett forvalg"> -<!ENTITY torbutton.prefs.custom_warning "Dine nettleserinnstillinger har ført med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivåene."> <!ENTITY torbutton.cookiedialog.title "Administrer beskyttelse av informasjonskapsler"> <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet"> <!ENTITY torbutton.cookiedialog.domainCol "Vert"> diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ne/torbutton.dtd +++ b/src/chrome/locale/ne/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/nl/securityLevel.properties b/src/chrome/locale/nl/securityLevel.properties new file mode 100644 index 00000000..2410b725 --- /dev/null +++ b/src/chrome/locale/nl/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Beveiligingsniveau +securityLevel.standard.level = Standaard +securityLevel.standard.summary = Alle Tor Browser- en websitefuncties zijn ingeschakeld. +securityLevel.safer.level = Veiliger +securityLevel.safer.summary = Uitgeschakelde websitefuncties die zijn meestal gevaarlijk, waardoor sommige sites functionaliteit vaak verliezen. +securityLevel.safer.description1 = JavaScript zijn uitgeschakeld op non-HTTP sites. +securityLevel.safer.description2 = Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld. +securityLevel.safer.description3 = Audio en video (HTML5-media) zijn klik-bij-afspelen. +securityLevel.safest.level = Veiligste +securityLevel.safest.summary = Alleen websitefuncties toestaan die vereist zijn voor statische sites en basis diensten. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts. +securityLevel.safest.description1 = Javascript zijn standaard uitgeschakeld op alle sites. +securityLevel.safest.description2 = Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld. +securityLevel.safest.description3 = Audio en video (HTML5-media) zijn klik-bij-afspelen. +securityLevel.custom.summary = Je aangepaste browservoorkeuren hebben geleid tot ongebruikelijke beveiligingsinstellingen. Uit veiligheids- en privacy-overwegingen raden we je aan één van de standaardbeveiligingsniveaus te kiezen. +securityLevel.learnMore = Leer Meer +securityLevel.restoreDefaults = Standaardwaarden herstellen diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index d31b4153..0ab3164b 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "Beveiligingsinstellingen…"> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-netwerkinstellingen…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Controleer op updates voor de Tor-browser..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik hier om Tor-knop te initialiseren"> <!ENTITY torbutton.prefs.security_settings "Tor-browser Beveiligingsinstellingen"> -<!ENTITY torbutton.prefs.restore_defaults "Standaardwaarden herstellen"> -<!ENTITY torbutton.prefs.custom_warning "Je aangepaste browservoorkeuren hebben geleid tot ongebruikelijke beveiligingsinstellingen. Uit veiligheids- en privacy-overwegingen raden we je aan één van de standaardbeveiligingsniveaus te kiezen."> <!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen"> <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/nn/torbutton.dtd +++ b/src/chrome/locale/nn/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/nso/torbutton.dtd +++ b/src/chrome/locale/nso/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/oc/torbutton.dtd +++ b/src/chrome/locale/oc/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/or/torbutton.dtd +++ b/src/chrome/locale/or/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd index c7185f22..2ff04d9a 100644 --- a/src/chrome/locale/pa/torbutton.dtd +++ b/src/chrome/locale/pa/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/pap/torbutton.dtd +++ b/src/chrome/locale/pap/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/pl/securityLevel.properties b/src/chrome/locale/pl/securityLevel.properties new file mode 100644 index 00000000..0b5e04da --- /dev/null +++ b/src/chrome/locale/pl/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Poziom bezpieczeństwa +securityLevel.standard.level = Standardowy +securityLevel.standard.summary = Wszystkie funkcje Przeglądarki Tor i strony zostały włączone. +securityLevel.safer.level = Bezpieczniej +securityLevel.safer.summary = Wyłącza funkcje witryny, które często są niebezpieczne, co powoduje, że niektóre witryny tracą funkcjonalność. +securityLevel.safer.description1 = Obsługa skryptów Java na stronach bez HTTPS jest wyłączona. +securityLevel.safer.description2 = Niektóre fonty i symbole są wyłączone. +securityLevel.safer.description3 = Dźwięk i obraz (media HTML5) to "kliknij, aby odtworzyć". +securityLevel.safest.level = Najbezpieczniejszy +securityLevel.safest.summary = Pozwala tylko na funkcje serwisu wymagane w przypadku witryn statycznych i podstawowych usług. Te zmiany dotyczą obrazów, multimediów i skryptów. +securityLevel.safest.description1 = JavaScript jest domyślnie wyłączona na wszystkich stronach. +securityLevel.safest.description2 = Niektóre fonty, ikony, symbole i obrazki są wyłączone. +securityLevel.safest.description3 = Dźwięk i obraz (media HTML5) to "kliknij, aby odtworzyć". +securityLevel.custom.summary = Niestandardowe preferencje przeglądarki spowodowały nietypowe ustawienia zabezpieczeń. Ze względów bezpieczeństwa i prywatności zalecamy wybranie jednego z domyślnych poziomów zabezpieczeń. +securityLevel.learnMore = Dowiedz się więcej +securityLevel.restoreDefaults = Przywróć domyślne diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index ba43142b..134b01fe 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -2,8 +2,6 @@ <!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 bezpieczeństwa..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Ustawienia Sieci Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Sprawdź czy są aktualizacje Tor Browser..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "c"> <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton"> <!ENTITY torbutton.prefs.security_settings "Ustawienia Bezpieczeństwa Przeglądarki Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Przywróć domyślne"> -<!ENTITY torbutton.prefs.custom_warning "Niestandardowe preferencje przeglądarki spowodowały nietypowe ustawienia zabezpieczeń. Ze względów bezpieczeństwa i prywatności zalecamy wybranie jednego z domyślnych poziomów zabezpieczeń."> <!ENTITY torbutton.cookiedialog.title "Zarządzaj ochroną ciasteczek"> <!ENTITY torbutton.cookiedialog.lockCol "Chronione"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/pms/torbutton.dtd +++ b/src/chrome/locale/pms/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ps/torbutton.dtd +++ b/src/chrome/locale/ps/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/pt-BR/securityLevel.properties b/src/chrome/locale/pt-BR/securityLevel.properties new file mode 100644 index 00000000..5ad5d318 --- /dev/null +++ b/src/chrome/locale/pt-BR/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Nível de Segurança +securityLevel.standard.level = Padrão +securityLevel.standard.summary = Todos os recursos do Navegador Tor e do website estão ativos. +securityLevel.safer.level = Seguro +securityLevel.safer.summary = Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade. +securityLevel.safer.description1 = JavaScript está desativado em todos os sites sem HTTPS. +securityLevel.safer.description2 = Algumas fontes e símbolos matemáticos estão desativados. +securityLevel.safer.description3 = Clicar para tocar ou ver áudio ou vídeo (mídia HTML5). +securityLevel.safest.level = Segurança máxima +securityLevel.safest.summary = Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts. +securityLevel.safest.description1 = JavaScript está desativado por padrão em todos os sites. +securityLevel.safest.description2 = Algumas fontes, ícones, símbolos matemáticas e imagens estão desativadas. +securityLevel.safest.description3 = Clicar para tocar ou ver áudio ou vídeo (mídia HTML5). +securityLevel.custom.summary = As configurações personalizadas do seu navegador ficaram fora do comum. Por razões de segurança e de privacidade, recomendamos que você escolha um dos níveis padrões de segurança. +securityLevel.learnMore = Aprenda mais +securityLevel.restoreDefaults = Restaurar Padrões diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 5ca71899..cf4026bd 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "Eu"> <!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..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Procurar Atualizações do Navegador Tor..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton"> <!ENTITY torbutton.prefs.security_settings "Configurações de Segurança do Navegador Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Restaurar Padrões"> -<!ENTITY torbutton.prefs.custom_warning "As configurações personalizadas do seu navegador ficaram fora do comum. Por razões de segurança e de privacidade, recomendamos que você escolha um dos níveis padrões de segurança. "> <!ENTITY torbutton.cookiedialog.title "Gerenciar Proteções de Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protegido"> <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro"> diff --git a/src/chrome/locale/pt/securityLevel.properties b/src/chrome/locale/pt/securityLevel.properties new file mode 100644 index 00000000..1c8fdfe2 --- /dev/null +++ b/src/chrome/locale/pt/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.securityLevel = Nível de Segurança diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index efff3d9b..24c8df67 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "Security Settings…"> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Procurar por atualizações do Navegador Tor..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton"> <!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> <!ENTITY torbutton.cookiedialog.title "Gerir Proteções dos Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protegido"> <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro"> diff --git a/src/chrome/locale/ro/securityLevel.properties b/src/chrome/locale/ro/securityLevel.properties new file mode 100644 index 00000000..52d4889f --- /dev/null +++ b/src/chrome/locale/ro/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Restaurează setările implicite diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd index 8bbcaf85..9a9f85fe 100644 --- a/src/chrome/locale/ro/torbutton.dtd +++ b/src/chrome/locale/ro/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Protectii Cookie-uri."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Apasă pentru pornirea Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restaurează setările implicite"> <!ENTITY torbutton.cookiedialog.title "Gestionează Protecţii Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Protejat"> <!ENTITY torbutton.cookiedialog.domainCol "Gazda"> diff --git a/src/chrome/locale/ru/securityLevel.properties b/src/chrome/locale/ru/securityLevel.properties new file mode 100644 index 00000000..ed2685d8 --- /dev/null +++ b/src/chrome/locale/ru/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Уровень безопасности +securityLevel.standard.level = Стандартные +securityLevel.standard.summary = Все функции Tor Browser и веб-сайтов включены. +securityLevel.safer.level = Более безопасные +securityLevel.safer.summary = Отключены функции веб-сайтов, которые часто бывают опасны, что может привести к потере функциональности некоторыми сайтами. +securityLevel.safer.description1 = JavaScript отключен на всех не HTTPS сайтах. +securityLevel.safer.description2 = Некоторые шрифты и математические символы отключены. +securityLevel.safer.description3 = Аудио и видео (HTML5 медиа) проигрываются только после клика. +securityLevel.safest.level = Наиболее безопасные +securityLevel.safest.summary = Разрешены только функции веб-сайтов, требующиеся для статических сайтов и основных сервисов. Эти изменения влияют на изображения, медиа и скрипты. +securityLevel.safest.description1 = JavaScript отключен по умолчанию на всех сайтах. +securityLevel.safest.description2 = Некоторые шрифты, значки, математические символы и изображения отключены. +securityLevel.safest.description3 = Аудио и видео (HTML5 медиа) проигрываются только после клика. +securityLevel.custom.summary = Ваши настройки браузера привели к необычным параметрам безопасности. По соображениям безопасности и приватности мы рекомендуем выбрать один из уровней безопасности по умолчанию. +securityLevel.learnMore = Подробнее +securityLevel.restoreDefaults = Восстановить значения по умолчанию diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 3acf77f4..bbf416a4 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "Настройки сети Tor"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Проверить на наличие обновлений Tor Browser"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Нажмите, чтобы инициализировать Torbutton"> <!ENTITY torbutton.prefs.security_settings "Настройки безопасности Tor Browser"> -<!ENTITY torbutton.prefs.restore_defaults "Восстановить значения по умолчанию"> -<!ENTITY torbutton.prefs.custom_warning "Ваши настройки браузера привели к необычным параметрам безопасности. По соображениям безопасности и приватности мы рекомендуем выбрать один из уровней безопасности по умолчанию."> <!ENTITY torbutton.cookiedialog.title "Управление защитой куки-файлов"> <!ENTITY torbutton.cookiedialog.lockCol "Защищено"> <!ENTITY torbutton.cookiedialog.domainCol "Ведущий узел"> diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/sco/torbutton.dtd +++ b/src/chrome/locale/sco/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/sk/securityLevel.properties b/src/chrome/locale/sk/securityLevel.properties new file mode 100644 index 00000000..e0a3a746 --- /dev/null +++ b/src/chrome/locale/sk/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Obnoviť predvolené diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd index 25dc5886..f4e7ad73 100644 --- a/src/chrome/locale/sk/torbutton.dtd +++ b/src/chrome/locale/sk/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Obnoviť predvolené"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/sl/securityLevel.properties b/src/chrome/locale/sl/securityLevel.properties new file mode 100644 index 00000000..4418f738 --- /dev/null +++ b/src/chrome/locale/sl/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Privzete nastavitve diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd index 475724e3..f3243f95 100644 --- a/src/chrome/locale/sl/torbutton.dtd +++ b/src/chrome/locale/sl/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "piškotkina zaščita"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razširitve Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Privzete nastavitve"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/so/torbutton.dtd +++ b/src/chrome/locale/so/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/son/torbutton.dtd +++ b/src/chrome/locale/son/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd index 0f77148b..9d2ddd42 100644 --- a/src/chrome/locale/sq/torbutton.dtd +++ b/src/chrome/locale/sq/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/sr/securityLevel.properties b/src/chrome/locale/sr/securityLevel.properties new file mode 100644 index 00000000..57f1ebf1 --- /dev/null +++ b/src/chrome/locale/sr/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = Поврати подразумевано diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd index a945b001..dd24b25c 100644 --- a/src/chrome/locale/sr/torbutton.dtd +++ b/src/chrome/locale/sr/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Дозволе за колачиће"> <!ENTITY torbutton.context_menu.cookieProtections.key "Ц"> <!ENTITY torbutton.button.tooltip "Кликните да бисте покренули Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Поврати подразумевано"> <!ENTITY torbutton.cookiedialog.title "Уреди заштиту колачића"> <!ENTITY torbutton.cookiedialog.lockCol "Заштићен"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/st/torbutton.dtd +++ b/src/chrome/locale/st/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/su/torbutton.dtd +++ b/src/chrome/locale/su/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/sv/securityLevel.properties b/src/chrome/locale/sv/securityLevel.properties new file mode 100644 index 00000000..8a51da05 --- /dev/null +++ b/src/chrome/locale/sv/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Säkerhetsnivå +securityLevel.standard.level = Standard +securityLevel.standard.summary = Alla funktioner för Tor Browser och webbplatsfunktioner är aktiverade. +securityLevel.safer.level = Säkrare +securityLevel.safer.summary = Inaktiverar webbplatsfunktioner som ofta är farliga, vilket gör att vissa webbplatser förlorar funktionalitet. +securityLevel.safer.description1 = JavaScript är inaktiverat på webbplatser utan HTTPS. +securityLevel.safer.description2 = Vissa typsnitt och matte symboler är inaktiverade. +securityLevel.safer.description3 = Ljud och video (HTML5-media) är klicka-för-att-spel. +securityLevel.safest.level = Säkrast +securityLevel.safest.summary = Tillåt endast webbplatsfunktioner som krävs för statiska webbplatser och grundläggande tjänster. Dessa förändringar påverkar bilder, media och skript. +securityLevel.safest.description1 = JavaScript är inaktiverat som standard på alla webbplatser. +securityLevel.safest.description2 = Vissa typsnitt, ikoner, matte symboler och bilder är inaktiverade. +securityLevel.safest.description3 = Ljud och video (HTML5-media) är klicka-för-att-spel. +securityLevel.custom.summary = Dina anpassade webbläsarinställningar har resulterat i ovanliga säkerhetsinställningar. Av säkerhets- och integritetsskäl rekommenderar vi att du använder en av de fördefinierade säkerhetsnivåerna. +securityLevel.learnMore = Läs mer +securityLevel.restoreDefaults = Återställ standard diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index d05c163e..5c074a65 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "N"> <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbplatsen"> <!ENTITY torbutton.context_menu.new_circuit_key "S"> -<!ENTITY torbutton.context_menu.preferences "Säkerhetsinställningar..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-nätverksinställningar..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Sök efter uppdateringar för Tor Browser..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Klicka för att initialisera Torbutton"> <!ENTITY torbutton.prefs.security_settings "Säkerhetsinställningar i Tor Browser"> -<!ENTITY torbutton.prefs.restore_defaults "Återställ standard"> -<!ENTITY torbutton.prefs.custom_warning "Dina anpassade webbläsarinställningar har resulterat i ovanliga säkerhetsinställningar. Av säkerhets- och integritetsskäl rekommenderar vi att du använder en av de fördefinierade säkerhetsnivåerna."> <!ENTITY torbutton.cookiedialog.title "Hantera Cookies skydd"> <!ENTITY torbutton.cookiedialog.lockCol "Skyddad"> <!ENTITY torbutton.cookiedialog.domainCol "Värd"> diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/sw/torbutton.dtd +++ b/src/chrome/locale/sw/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ta/torbutton.dtd +++ b/src/chrome/locale/ta/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/te/torbutton.dtd +++ b/src/chrome/locale/te/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/tg/torbutton.dtd +++ b/src/chrome/locale/tg/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd index 4f4b87fd..e0da4be2 100644 --- a/src/chrome/locale/th/torbutton.dtd +++ b/src/chrome/locale/th/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ti/torbutton.dtd +++ b/src/chrome/locale/ti/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/tk/torbutton.dtd +++ b/src/chrome/locale/tk/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/tr/securityLevel.properties b/src/chrome/locale/tr/securityLevel.properties new file mode 100644 index 00000000..45ca83be --- /dev/null +++ b/src/chrome/locale/tr/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Güvenlik Düzeyi +securityLevel.standard.level = Standart +securityLevel.standard.summary = Tüm Tor Browser ve web sitesi özellikleri kullanılabilir. +securityLevel.safer.level = Daha Güvenli +securityLevel.safer.summary = Sıklıkla tehlikeli olan web sitesi özellikleri devre dışı bırakılır ve bazı sitelerin işlevlerinde kayıplar olabilir. +securityLevel.safer.description1 = JavaScript, HTTPS kullanmayan sitelerde devre dışı bırakılır. +securityLevel.safer.description2 = Bazı yazı türleri ve matematik simgeleri devre dışı bırakılır. +securityLevel.safer.description3 = Ses ve görüntüler (HTML5 ortamı) tıklayarak çalıştırılabilir. +securityLevel.safest.level = En Güvenli +securityLevel.safest.summary = Yalnız durağan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu değişiklikler görselleri, ortamları ve betikleri etkiler. +securityLevel.safest.description1 = JavaScript betikleri tüm sitelerde varsayılan olarak devre dışı bırakılır. +securityLevel.safest.description2 = Bazı yazı türleri, simgeler, matematik simgeleri ve görseller devre dışı bırakılır. +securityLevel.safest.description3 = Ses ve görüntüler (HTML5 ortamı) tıklayarak çalıştırılabilir. +securityLevel.custom.summary = Tarayıcınız standart olmayan özel güvenlik ayarları kullanıyor. Güvenlik ve gizlilik nedenleriyle aşağıdaki varsayılan güvenlik ayarı düzeylerinden birini seçmeniz önerilir. +securityLevel.learnMore = Ayrıntılı bilgi alın +securityLevel.restoreDefaults = Varsayılanlara Sıfırla diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 24b3dfff..e6be6713 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Bu Sitenin Tor Devresini Yenile"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Güvenlik Ayarları..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor Ağ Ayarları..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser Güncelleme Denetimi..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton uygulamasını başlatmak için tıklayın"> <!ENTITY torbutton.prefs.security_settings "Tor Browser Güvenlik Ayarları"> -<!ENTITY torbutton.prefs.restore_defaults "Varsayılanlara Sıfırla"> -<!ENTITY torbutton.prefs.custom_warning "Tarayıcınız standart olmayan özel güvenlik ayarları kullanıyor. Güvenlik ve gizlilik nedenleriyle aşağıdaki varsayılan güvenlik ayarı düzeylerinden birini seçmeniz önerilir."> <!ENTITY torbutton.cookiedialog.title "Çerez Koruması Yönetimi"> <!ENTITY torbutton.cookiedialog.lockCol "Korunmuş"> <!ENTITY torbutton.cookiedialog.domainCol "Sunucu"> diff --git a/src/chrome/locale/uk/securityLevel.properties b/src/chrome/locale/uk/securityLevel.properties new file mode 100644 index 00000000..0148214f --- /dev/null +++ b/src/chrome/locale/uk/securityLevel.properties @@ -0,0 +1 @@ +securityLevel.restoreDefaults = За Замовчуванням diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd index 742060f9..1a746b53 100644 --- a/src/chrome/locale/uk/torbutton.dtd +++ b/src/chrome/locale/uk/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Захист куки"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Клацніть для запуску Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "За Замовчуванням"> <!ENTITY torbutton.cookiedialog.title "Керувати Захистом Куків"> <!ENTITY torbutton.cookiedialog.lockCol "Захищено"> <!ENTITY torbutton.cookiedialog.domainCol "Хост"> diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ur/torbutton.dtd +++ b/src/chrome/locale/ur/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/ve/torbutton.dtd +++ b/src/chrome/locale/ve/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/vi/securityLevel.properties b/src/chrome/locale/vi/securityLevel.properties new file mode 100644 index 00000000..314ba0bd --- /dev/null +++ b/src/chrome/locale/vi/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = Mức độ Bảo mật +securityLevel.standard.level = Chuẩn +securityLevel.standard.summary = Tất cả các tính năng của Trình duyệt Tor và trang web đều được bật. +securityLevel.safer.level = An toàn hơn +securityLevel.safer.summary = Vô hiệu hóa tính năng website thường gây nguy hiểm, khiến một số trang web mất chức năng. +securityLevel.safer.description1 = JavaScript bị vô hiệu trên các trang web không có HTTPS. +securityLevel.safer.description2 = Một số phông chữ và ký hiêu toán học bị vô hiệu. +securityLevel.safer.description3 = Âm thanh và video (HTML5 media) phải bấm-để-phát. +securityLevel.safest.level = An toàn nhất +securityLevel.safest.summary = Chỉ cho phép các tính năng trang web được yêu cầu cho các trang web tĩnh và các dịch vụ cơ bản. Những thay đổi này ảnh hưởng đến hình ảnh, phương tiện và tập lệnh. +securityLevel.safest.description1 = JavaScript mặc định bị vô hiệu trên tất cả các trang. +securityLevel.safest.description2 = Một số phông chữ, biểu tượng, và hình ảnh bị vô hiệu. +securityLevel.safest.description3 = Âm thanh và video (HTML5 media) phải bấm-để-phát. +securityLevel.custom.summary = Những điều chỉnh trong trình duyệt của bạn vừa tạo ra những lỗi bảo mật bất thường. Vì những lý do bảo mật và riêng tư, chúng tôi khuyến cáo bạn chọn những cấp độ bảo mật mặc định khác. +securityLevel.learnMore = Biết thêm +securityLevel.restoreDefaults = Khôi phục trạng thái mặc định diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 9f1c50e3..695f6bf1 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -2,8 +2,6 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Mạch nối Tor mới cho trang này"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Những cài đặt về an ninh..."> -<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Những cài đặt Mạng Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Kiểm tra Bản cập nhật của trình duyệt Tor..."> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Bấm chuột để khởi chạy Torbutton"> <!ENTITY torbutton.prefs.security_settings "Những cài đặt bảo mật cho trình duyệt Tor"> -<!ENTITY torbutton.prefs.restore_defaults "Khôi phục trạng thái mặc định"> -<!ENTITY torbutton.prefs.custom_warning "Những điều chỉnh trong trình duyệt của bạn vừa tạo ra những lỗi bảo mật bất thường. Vì những lý do bảo mật và riêng tư, chúng tôi khuyến cáo bạn chọn những cấp độ bảo mật mặc định khác."> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/wa/torbutton.dtd +++ b/src/chrome/locale/wa/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/wo/torbutton.dtd +++ b/src/chrome/locale/wo/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/zh-CN/securityLevel.properties b/src/chrome/locale/zh-CN/securityLevel.properties new file mode 100644 index 00000000..93cea12e --- /dev/null +++ b/src/chrome/locale/zh-CN/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = 安全等级 +securityLevel.standard.level = 标准安全性 +securityLevel.standard.summary = 将启用所有Tor浏览器与网站功能。 +securityLevel.safer.level = 中等安全性 +securityLevel.safer.summary = 禁用网站功能通常是危险的，这会导致一些站不能正常运作。 +securityLevel.safer.description1 = 在非HTTPS网站，JavaScripts被禁用。 +securityLevel.safer.description2 = 一些字体与数学符号被禁用。 +securityLevel.safer.description3 = 点击播放音频或视频（HTML5 媒体）。 +securityLevel.safest.level = 最高安全性 +securityLevel.safest.summary = 只允许网站请求静态网页与基本服务。这将会影响图片，媒体与脚本。 +securityLevel.safest.description1 = 在所有网站上默认禁用JavaScript。 +securityLevel.safest.description2 = 一些字体，图标，数学符号与图片被禁用。 +securityLevel.safest.description3 = 点击播放音频或视频（HTML5 媒体）。 +securityLevel.custom.summary = 您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。 +securityLevel.learnMore = 更多详情 +securityLevel.restoreDefaults = 恢复默认设置 diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 5cdea120..483b5c44 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "Tor 网络设置…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser 检查更新…"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> <!ENTITY torbutton.prefs.security_settings "Tor 浏览器安全设置"> -<!ENTITY torbutton.prefs.restore_defaults "恢复默认设置"> -<!ENTITY torbutton.prefs.custom_warning "您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> <!ENTITY torbutton.cookiedialog.domainCol "主机"> diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/zh-HK/torbutton.dtd +++ b/src/chrome/locale/zh-HK/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/chrome/locale/zh-TW/securityLevel.properties b/src/chrome/locale/zh-TW/securityLevel.properties new file mode 100644 index 00000000..0b5f36a0 --- /dev/null +++ b/src/chrome/locale/zh-TW/securityLevel.properties @@ -0,0 +1,16 @@ +securityLevel.securityLevel = 安全等級 +securityLevel.standard.level = 標準 +securityLevel.standard.summary = 所有瀏覽器與網站的功能都啟用 +securityLevel.safer.level = 較安全 +securityLevel.safer.summary = 停用某些功能,因為其有危險,會造成部份網站失能 +securityLevel.safer.description1 = 所有非HTTPS網站會預設停用JavaScript +securityLevel.safer.description2 = 有些字形與數學符號被停用 +securityLevel.safer.description3 = 聲音和影片 (HTML5 媒體) 要點擊播放 +securityLevel.safest.level = 最安全 +securityLevel.safest.summary = 只同意靜態網站和基本服務的網站功能.這些變動會影響圖片,媒體和腳本. +securityLevel.safest.description1 = 所有網站會預設停用JavaScript +securityLevel.safest.description2 = 有些字型,圖標,數學符號與圖片被停用 +securityLevel.safest.description3 = 聲音和影片 (HTML5 媒體) 要點擊播放 +securityLevel.custom.summary = 您的瀏覽器個人化設定可能會造成安全性的疑慮。基於個人網路安全與隱私的考量，建議您選用預設的安全性層級選項。 +securityLevel.learnMore = 繼續閱讀 +securityLevel.restoreDefaults = 恢復到預設值 diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index e3824e9c..8f3fefcf 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -2,8 +2,6 @@ <!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 "S"> <!ENTITY torbutton.context_menu.networksettings "洋蔥路由網路設定..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "檢查洋蔥路由瀏覽器更新…"> @@ -12,8 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "按一下以初始化 Torbutton"> <!ENTITY torbutton.prefs.security_settings "洋蔥路由瀏覽器之安全性設定"> -<!ENTITY torbutton.prefs.restore_defaults "恢復到預設值"> -<!ENTITY torbutton.prefs.custom_warning "您的瀏覽器個人化設定可能會造成安全性的疑慮。基於個人網路安全與隱私的考量，建議您選用預設的安全性層級選項。"> <!ENTITY torbutton.cookiedialog.title "管理 Cookie 的保護"> <!ENTITY torbutton.cookiedialog.lockCol "受保護"> <!ENTITY torbutton.cookiedialog.domainCol "主機"> diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd index baffea1d..fa587065 100644 --- a/src/chrome/locale/zu/torbutton.dtd +++ b/src/chrome/locale/zu/torbutton.dtd @@ -6,7 +6,6 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 270131d2..e5d66d55 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -18,6 +18,7 @@ pref("extensions.torbutton.use_nontor_proxy",false); // State prefs: pref("extensions.torbutton.startup",false); pref("extensions.torbutton.inserted_button",false); +pref("extensions.torbutton.inserted_security_level",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 00de8243..088cdf95 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -24,6 +24,7 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" "browserOnboarding.properties:torbutton-browseronboardingproperties" "torbutton.dtd:torbutton-torbuttondtd" "torbutton.properties:torbutton-torbuttonproperties" + "securityLevel.properties:torbutton-securityLevelproperties" ) # Verify that the FILEMAP contains an entry for each Torbutton file.

1 0

[tor-browser-build/maint-8.0] Picking up build2 from Mozilla
by gk＠torproject.org 14 Mar '19

14 Mar '19

commit 7411e180c3eb2e1c37867a67473ba3775d7eee7c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 14 07:09:12 2019 +0000 Picking up build2 from Mozilla --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 9476cac..0d7834c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 3de1879..8d3377b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.7' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0.6 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 29182: Fix Android build bustage"
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 9b575de574d95df16c34e64e38aa6d0b53b76837 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 25 07:53:53 2019 +0000 Revert "Bug 29182: Fix Android build bustage" This reverts commit 5f2ca067b1a8baa523e60fd7d5e6a0202d669c2e. --- parser/expat/lib/xmlparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c index 95ff14f8e154..209f20e094dc 100644 --- a/parser/expat/lib/xmlparse.c +++ b/parser/expat/lib/xmlparse.c @@ -839,7 +839,7 @@ generate_hash_secret_salt(XML_Parser parser) { unsigned long entropy; (void)parser; -#if !defined(__ANDROID__) && (defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)) +#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__) (void)gather_time_entropy; arc4random_buf(&entropy, sizeof(entropy)); return ENTROPY_DEBUG("arc4random_buf", entropy);

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 1516642 - Add a function declaration for arc4random_buf in expat. r=peterv
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 8de1662514e5191715055479b503dbb016899e84 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Fri Feb 8 13:48:36 2019 +0000 Bug 1516642 - Add a function declaration for arc4random_buf in expat. r=peterv The function has been in bionic (Android's libc since the first commit in the upstream repository), but it's not been in stdlib.h until recently. As it happens, we have a similar declaration in xpcom/base/nsUUIDGenerator.cpp. Differential Revision: https://phabricator.services.mozilla.com/D19120 --HG-- extra : moz-landing-system : lando --- parser/expat/lib/xmlparse.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c index 209f20e094dc..12a7fc232e5f 100644 --- a/parser/expat/lib/xmlparse.c +++ b/parser/expat/lib/xmlparse.c @@ -818,6 +818,13 @@ gather_time_entropy(void) # include <bsd/stdlib.h> #endif +/* BEGIN MOZILLA CHANGE (not all Android NDK versions have the function + * declaration, although the function has been available in bionic forever) */ +#if defined(HAVE_ARC4RANDOM_BUF) && defined(__ANDROID__) +__attribute__((visibility("default"))) void arc4random_buf(void*, size_t); +#endif +/* END MOZILLA CHANGE */ + static unsigned long ENTROPY_DEBUG(const char * label, unsigned long entropy) { /* BEGIN MOZILLA CHANGE (don't getenv every time we set up a hash) */

1 0

[torbutton/master] Revert "Bug 26962: Circuit display onboarding (part 2)."
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit d45e7f502c05101660e77d430d939582728952f2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 13 10:42:45 2019 -0400 Revert "Bug 26962: Circuit display onboarding (part 2)." Remove strings that were used for the "New Circuit Display" promotional banner which previously was shown on the about:tbupdate page. This reverts commit c93f06417e0bdbd6d709ec5109938347d1d38123. --- src/chrome/locale/en-US/aboutTBUpdate.dtd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/chrome/locale/en-US/aboutTBUpdate.dtd b/src/chrome/locale/en-US/aboutTBUpdate.dtd index f7b3f2ed..37567bd7 100644 --- a/src/chrome/locale/en-US/aboutTBUpdate.dtd +++ b/src/chrome/locale/en-US/aboutTBUpdate.dtd @@ -4,7 +4,3 @@ <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> - -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More">

1 0

[torbutton/master] Bug 29440: Update about:tor when Tor Browser is updated
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 82a5f8665a6b5a7f5d4c78f0a526dfa16834ec7f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 11 11:28:20 2019 -0400 Bug 29440: Update about:tor when Tor Browser is updated After the browser has been updated, notify the user by displaying a message on the about:tor page. Also, in release and alpha builds, include on the about:tor page below the Tor Browser version a link to a simplified changelog page (which continues to be located at about:tbupdate). --- src/chrome/content/aboutTor/aboutTor-content.js | 15 +++++++++-- src/chrome/content/aboutTor/aboutTor.xhtml | 16 +++++++++--- src/chrome/content/torbutton.js | 30 +++++++++++++++++++--- src/chrome/locale/en-US/aboutTBUpdate.dtd | 6 +++-- src/chrome/locale/en-US/aboutTor.dtd | 2 ++ src/chrome/skin/aboutTor.css | 33 ++++++++++++++++--------- 6 files changed, 79 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index b91fd17d..2b65dbcf 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -94,6 +94,17 @@ var AboutTorListener = { else body.removeAttribute("showmanual"); + if (aData.updateChannel) + body.setAttribute("updatechannel", aData.updateChannel); + else + body.removeAttribute("updatechannel"); + + if (aData.hasBeenUpdated) { + body.setAttribute("hasbeenupdated", "yes"); + content.document.getElementById("update-infolink").setAttribute("href", + aData.updateMoreInfoURL); + } + if (aData.mobile) body.setAttribute("mobile", "yes"); @@ -114,11 +125,11 @@ var AboutTorListener = { .createBundle(kBrandBundle); let productName = brandBundle.GetStringFromName("brandFullName"); let tbbVersion = Services.prefs.getCharPref("torbrowser.version"); - elem = content.document.getElementById("torstatus-version"); + let elem = content.document.getElementById("torbrowser-version"); while (elem.firstChild) elem.removeChild(elem.firstChild); - elem.appendChild(content.document.createTextNode(productName + '\n' + elem.appendChild(content.document.createTextNode(productName + ' ' + tbbVersion)); } catch (e) {} } diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 639c2fca..0789f851 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -14,6 +14,8 @@ %globalDTD; <!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> %aboutTorDTD; + <!ENTITY % tbUpdateDTD SYSTEM "chrome://browser/locale/aboutTBUpdate.dtd"> + %tbUpdateDTD; ]> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -33,15 +35,23 @@ window.addEventListener("pageshow", function() { </head> <body dir="&locale.dir;"> <div class="torcontent-container"> - <div id="torstatus-version"/> + <div id="torbrowser-info"> + <div id="torbrowser-version"/> + <div id="torbrowser-changelog-link"><a href="about:tbupdate">&aboutTor.viewChangelog.label;</a></div> + </div> <img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/> <div id="torstatus" class="top"> - <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> + <div class="hideIfTorOff hideIfHasBeenUpdated torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> <br/> <div class="heading2">&aboutTor.ready2.label;</div> </div> - <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> + <div class="showIfHasBeenUpdated torstatus-container"> + <div class="heading1">&aboutTBUpdate.updated;</div> + <br/> + <div class="heading2">&aboutTBUpdate.linkPrefix;<a id="update-infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> + </div> + <div class="hideIfTorOn torstatus-container"> <div class="heading1">&aboutTor.failure.label;</div> <br/> <div class="heading2">&aboutTor.failure2.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f99be5b0..b425a276 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -8,6 +8,7 @@ // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); +const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); @@ -418,7 +419,7 @@ var torbutton_abouttor_message_handler = { switch(aMessage.name) { case "AboutTor:Loaded": aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", - this.chromeData); + this.getChromeData(true)); break; } }, @@ -426,7 +427,7 @@ var torbutton_abouttor_message_handler = { // Send privileged data to all of the about:tor content scripts. updateAllOpenPages: function() { window.messageManager.broadcastAsyncMessage("AboutTor:ChromeData", - this.chromeData); + this.getChromeData(false)); }, // The chrome data contains all of the data needed by the about:tor @@ -434,11 +435,32 @@ var torbutton_abouttor_message_handler = { // It is sent to the content process when an about:tor window is opened // and in response to events such as the browser noticing that Tor is // not working. - get chromeData() { - return { + getChromeData: function(aIsRespondingToPageLoad) { + let dataObj = { mobile: torbutton_is_mobile(), + updateChannel: AppConstants.MOZ_UPDATE_CHANNEL, torOn: torbutton_tor_check_ok() }; + + if (aIsRespondingToPageLoad) { + const kShouldNotifyPref = "torbrowser.post_update.shouldNotify"; + if (m_tb_prefs.getBoolPref(kShouldNotifyPref, false)) { + m_tb_prefs.clearUserPref(kShouldNotifyPref); + dataObj.hasBeenUpdated = true; + dataObj.updateMoreInfoURL = this.getUpdateMoreInfoURL(); + } + } + + return dataObj; + }, + + getUpdateMoreInfoURL: function() { + try { + return Services.prefs.getCharPref("torbrowser.post_update.url"); + } catch (e) {} + + // Use the default URL as a fallback. + return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); } }; diff --git a/src/chrome/locale/en-US/aboutTBUpdate.dtd b/src/chrome/locale/en-US/aboutTBUpdate.dtd index 37567bd7..2d1e59b4 100644 --- a/src/chrome/locale/en-US/aboutTBUpdate.dtd +++ b/src/chrome/locale/en-US/aboutTBUpdate.dtd @@ -1,6 +1,8 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> <!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.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.version "Version"> +<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index 1400d7b5..4f360a91 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -6,6 +6,8 @@ <!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.viewChangelog.label "View Changelog"> + <!ENTITY aboutTor.ready.label "Explore. Privately."> <!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 1bdf301d..baa92b42 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -60,16 +60,25 @@ body:not([initialized]) { } } -#torstatus-version { +#torbrowser-info { position: absolute; - top: 6px; - offset-inline-end: 6px; - inset-inline-end: 6px; - height: 30px; + top: 16px; + offset-inline-end: 16px; + inset-inline-end: 16px; + height: 36px; width: 200px; - font-size: 15px; +} + +#torbrowser-info div { + font-size: 14px; white-space: pre-wrap; text-align: end; + margin-bottom: 6px; +} + +/* Hide "View Changelog" link if update channel is not release or alpha. */ +body:not([updatechannel="release"]):not([updatechannel="alpha"]) #torbrowser-changelog-link { + display: none; } a { @@ -79,15 +88,13 @@ a { #torstatus { margin-top: 135px; display: flex; - justify-content: center; + flex-direction: column; + align-content: center; + justify-content: flex-end; vertical-align: bottom; min-height: 92px; } -#torstatus > div { - align-self: flex-end; /* align text to bottom of container */ -} - .top { white-space: nowrap; } @@ -96,11 +103,13 @@ a { text-align: center; } +body[hasbeenupdated] .hideIfHasBeenUpdated, body[toron] .hideIfTorOn, body:not([toron]) .hideIfTorOff { display: none; } +body:not([hasbeenupdated]) .showIfHasBeenUpdated, body:not([showmanual]) .showForManual { display: none; } @@ -303,7 +312,7 @@ body:not([showmanual]) .showForManual { display: none; } -body[mobile] #torstatus-version, +body[mobile] #torbrowser-info, body[mobile] .searchbox, body[mobile] .top .heading2, body[mobile] #manual,

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 26962 - implement new features onboarding (part 2)."
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 681eefdd4234007f4984dd88abc2dfe10cbc2740 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 6 16:04:42 2019 -0500 Revert "Bug 26962 - implement new features onboarding (part 2)." This reverts commit 73018a0de3eab8cf12f0b9554a7595b35ceaeb53. --- .../base/content/abouttbupdate/aboutTBUpdate.css | 25 ---------------------- .../base/content/abouttbupdate/aboutTBUpdate.js | 9 +------- .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 5 ----- browser/base/content/tab-content.js | 10 --------- .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 4 ---- 5 files changed, 1 insertion(+), 52 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index dc42f8ff5f9e..90252d77a739 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -53,31 +53,6 @@ a { margin-bottom: 20px; } -#new-features { - margin-bottom: 15px; - padding: 10px; - text-align: center; - /* swap text and background colors in this section */ - color: var(--abouttor-bg-toron-color); - background-color: var(--abouttor-text-color); -} - -#new-features-description { - margin: 15px auto; - max-width: 500px; - font-size: 85%; -} - -#new-features button { - padding: 8px 20px; - border: none; - border-radius: 3px; - font-size: 90%; - color: var(--abouttor-text-color); - background-color: var(--abouttor-bg-toron-color); - cursor: pointer; -} - #changelog-container { margin: 0px 20px 20px 20px; } diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js index fa8bd3241a28..8243647c5708 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.js +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -8,10 +8,3 @@ function init() let event = new CustomEvent("AboutTBUpdateLoad", { bubbles: true }); document.dispatchEvent(event); } - -function showNewFeaturesOnboarding() -{ - let event = new CustomEvent("AboutTBUpdateNewFeaturesOnboarding", - { bubbles: true }); - document.dispatchEvent(event); -} diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index a046f2658a5a..fe8ed69b537f 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -28,11 +28,6 @@ </div> </div> <br clear="all"/> -<div id="new-features"> - <div>&aboutTBUpdate.circuitDisplayHeading;</div> - <div id="new-features-description">&aboutTBUpdate.circuitDisplayDescription;</div> - <button onclick="showNewFeaturesOnboarding()">&aboutTBUpdate.learnMore;</button> -</div> <div id="changelog-container"> <div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> <div id="changelog"></div> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index c0987dbc05c7..e0cf6747aaa4 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -359,8 +359,6 @@ AboutReaderListener.init(); let AboutTBUpdateListener = { init: function(chromeGlobal) { chromeGlobal.addEventListener('AboutTBUpdateLoad', this, false, true); - chromeGlobal.addEventListener("AboutTBUpdateNewFeaturesOnboarding", - this, false, true); }, get isAboutTBUpdate() { @@ -375,9 +373,6 @@ let AboutTBUpdateListener = { case "AboutTBUpdateLoad": this.onPageLoad(); break; - case "AboutTBUpdateNewFeaturesOnboarding": - this.onNewFeaturesOnboarding(); - break; case "pagehide": this.onPageHide(aEvent); break; @@ -411,11 +406,6 @@ let AboutTBUpdateListener = { removeEventListener("pagehide", this, true); }, - onNewFeaturesOnboarding: function() { - // Tell the onboarding extension to open the circuit display onboarding. - sendAsyncMessage("Onboarding:OnContentMessage", - {action: "tor-open-circuit-display-page"}); - }, }; AboutTBUpdateListener.init(this); #endif diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd index f7b3f2ed8fcd..37567bd7e38c 100644 --- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -4,7 +4,3 @@ <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> - -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More">

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] squash! Bug 16940: After update, load local change notes.
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 0c7bd3b2fa73e8be38f5aac46cbc68d025071f05 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 7 15:48:00 2019 -0500 squash! Bug 16940: After update, load local change notes. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. --- .../base/content/abouttbupdate/aboutTBUpdate.css | 71 ++++++++++++---------- .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 26 ++++---- browser/base/content/tab-content.js | 13 +++- browser/components/nsBrowserContentHandler.js | 49 +++++++++------ .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 6 +- browser/modules/AboutTBUpdate.jsm | 67 ++++++++++++++------ 6 files changed, 147 insertions(+), 85 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index 90252d77a739..7c1a34b77f17 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, The Tor Project, Inc. + * Copyright (c) 2019, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -12,56 +12,63 @@ body { font-family: Helvetica, Arial, sans-serif; - font-size: 110%; color: var(--abouttor-text-color); background-color: var(--abouttor-bg-toron-color); background-attachment: fixed; background-size: 100% 100%; } -#torbrowser-version { - /* These CSS rules match the about:tor page */ - position: fixed; - top: 6px; - right: 6px; - height: 30px; - width: 200px; - font-size: 15px; - white-space: pre-wrap; - text-align: right; -} - a { color: var(--abouttor-text-color); } -#logo { - background-image: url("chrome://branding/content/icon128.png"); - height: 128px; - width: 128px; - margin: 20px; - float: left; +.two-column-grid { + display: inline-grid; + grid-template-columns: auto auto; + grid-column-gap: 50px; + margin: 10px 0px 0px 50px; +} + +.two-column-grid div { + margin-top: 40px; + align-self: baseline; /* Align baseline of text across the row. */ +} + +.label-column { + font-size: 14px; + font-weight: 400; +} + +/* + * Use a reduced top margin to bring the row that contains the + * "visit our website" link closer to the row that precedes it. This + * looks better because the "visit our website" row does not have a + * label in the left column. + */ +div.more-info-row { + margin-top: 5px; + font-size: 14px; } -#msg { - margin-top: 50px; - float: left; +#version-content { + font-size: 50px; + font-weight: 300; } -#msg-updated { - font-size: 120%; - margin-bottom: 20px; +body:not([havereleasedate]) .release-date-cell { + display: none; } -#changelog-container { - margin: 0px 20px 20px 20px; +#releasedate-content { + font-size: 17px; } -#changelog-heading { - margin-bottom: 4px; +#releasenotes-label { + align-self: start; /* Anchor "Release Notes" label at the top. */ } -#changelog { - margin-left: 20px; +#releasenotes-content { + font-family: monospace; + font-size: 15px; white-space: pre; } diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index fe8ed69b537f..f703fe1e13a1 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -13,24 +13,26 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>&aboutTBUpdate.title;</title> + <title>&aboutTBUpdate.changelogTitle;</title> <link rel="stylesheet" type="text/css" href="chrome://browser/content/abouttbupdate/aboutTBUpdate.css"/> <script src="chrome://browser/content/abouttbupdate/aboutTBUpdate.js" type="text/javascript"/> </head> <body dir="&locale.dir;" onload="init()"> -<div id="torbrowser-version"/> -<div id="logo"/> -<div id="msg"> -<div id="msg-updated">&aboutTBUpdate.updated;</div> -<div>&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix; -</div> -</div> -<br clear="all"/> -<div id="changelog-container"> -<div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> -<div id="changelog"></div> +<div class="two-column-grid"> + <div class="label-column">&aboutTBUpdate.version;</div> + <div id="version-content"/> + + <div class="label-column release-date-cell">&aboutTBUpdate.releaseDate;</div> + <div id="releasedate-content" class="release-date-cell"/> + + <div class="more-info-row"/> + <div class="more-info-row">&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> + + <div id="releasenotes-label" + class="label-column">&aboutTBUpdate.releaseNotes;</div> + <div id="releasenotes-content"></div> </div> </body> </html> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index e0cf6747aaa4..6450baa6d060 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -384,12 +384,21 @@ let AboutTBUpdateListener = { this.onUpdate(aMessage.data); }, + // aData may contain the following string properties: + // version + // releaseDate + // moreInfoURL + // releaseNotes onUpdate: function(aData) { let doc = content.document; - doc.getElementById("torbrowser-version").textContent = aData.productInfo; + doc.getElementById("version-content").textContent = aData.version; + if (aData.releaseDate) { + doc.body.setAttribute("havereleasedate", "true"); + doc.getElementById("releasedate-content").textContent = aData.releaseDate; + } if (aData.moreInfoURL) doc.getElementById("infolink").setAttribute("href", aData.moreInfoURL); - doc.getElementById("changelog").textContent = aData.changeLog; + doc.getElementById("releasenotes-content").textContent = aData.releaseNotes; }, onPageLoad: function() { diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js index a640bfc57663..4c698a9ebd90 100644 --- a/browser/components/nsBrowserContentHandler.js +++ b/browser/components/nsBrowserContentHandler.js @@ -541,6 +541,21 @@ nsBrowserContentHandler.prototype = { } } + // Retrieve the home page early so we can compare it against about:tor + // to decide whether or not we need an override page (second tab) after + // an update was applied. + var startPage = ""; + try { + var choice = prefb.getIntPref("browser.startup.page"); + if (choice == 1 || choice == 3) + startPage = this.startPage; + } catch (e) { + Cu.reportError(e); + } + + if (startPage == "about:blank") + startPage = ""; + var override; var overridePage = ""; var additionalPage = ""; @@ -580,11 +595,14 @@ nsBrowserContentHandler.prototype = { // we may open the startPage in addition to restoring the session. // // Tor Browser: Instead of opening the post-update "override page" - // directly, an about:tbupdate page is opened that includes a link - // to the override page as well as text from the first part of the - // local ChangeLog.txt file. The override page URL comes from the - // openURL attribute within the updates.xml file or, if no showURL - // action is present, from the startup.homepage_override_url pref. + // directly, we ensure that about:tor will be opened in a special + // mode that notifies the user that their browser was updated. + // The about:tor page will provide a link to the override page + // where the user can learn more about the update, as well as a + // link to the Tor Browser changelog page (about:tbupdate). The + // override page URL comes from the openURL attribute within the + // updates.xml file or, if no showURL action is present, from the + // startup.homepage_override_url pref. var ss = Cc["@mozilla.org/browser/sessionstartup;1"] .getService(Ci.nsISessionStartup); willRestoreSession = ss.isAutomaticRestoreEnabled(); @@ -606,7 +624,14 @@ nsBrowserContentHandler.prototype = { if (overridePage) { prefb.setCharPref("torbrowser.post_update.url", overridePage); - overridePage = "about:tbupdate" + prefb.setBoolPref("torbrowser.post_update.shouldNotify", true); + // If the user's homepage is about:tor, we will inform them + // about the update on that page; otherwise, we arrange to + // open about:tor in a secondary tab. + if (startPage === "about:tor") + overridePage = ""; + else + overridePage = "about:tor"; } #endif break; @@ -636,18 +661,6 @@ nsBrowserContentHandler.prototype = { } } - var startPage = ""; - try { - var choice = prefb.getIntPref("browser.startup.page"); - if (choice == 1 || choice == 3) - startPage = this.startPage; - } catch (e) { - Cu.reportError(e); - } - - if (startPage == "about:blank") - startPage = ""; - let skipStartPage = override == OVERRIDE_NEW_PROFILE && prefb.getBoolPref("browser.startup.firstrunSkipsHomepage"); // Only show the startPage if we're not restoring an update session and are diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd index 37567bd7e38c..2d1e59b40eaf 100644 --- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -1,6 +1,8 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> <!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.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.version "Version"> +<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> diff --git a/browser/modules/AboutTBUpdate.jsm b/browser/modules/AboutTBUpdate.jsm index 49d9d9b0e18d..4d18d2980a6c 100644 --- a/browser/modules/AboutTBUpdate.jsm +++ b/browser/modules/AboutTBUpdate.jsm @@ -40,10 +40,8 @@ var AboutTBUpdate = { }, sendAboutTBUpdateData: function(aTarget) { - let data = { productInfo: this.productInfo, - moreInfoURL: this.moreInfoURL, - changeLog: this.changeLog }; - + let data = this.releaseNoteInfo; + data.moreInfoURL = this.moreInfoURL; if (aTarget && aTarget.messageManager) { aTarget.messageManager.sendAsyncMessage(kSendUpdateMessageName, data); } else { @@ -53,15 +51,6 @@ var AboutTBUpdate = { } }, - get productInfo() { - const kBrandBundle = "chrome://branding/locale/brand.properties"; - let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] - .getService(Ci.nsIStringBundleService) - .createBundle(kBrandBundle); - return brandBundle.GetStringFromName("brandFullName") - + "\n" + TOR_BROWSER_VERSION; - }, - get moreInfoURL() { try { return Services.prefs.getCharPref("torbrowser.post_update.url"); @@ -71,12 +60,22 @@ var AboutTBUpdate = { return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); }, - // Read and return the text from the beginning of the changelog file that is - // located at TorBrowser/Docs/ChangeLog.txt. + // Read the text from the beginning of the changelog file that is located + // at TorBrowser/Docs/ChangeLog.txt and return an object that contains + // the following properties: + // version e.g., Tor Browser 8.5 + // releaseDate e.g., March 31 2019 + // releaseNotes details of changes (lines 2 - end of ChangeLog.txt) + // We attempt to parse the first line of ChangeLog.txt to extract the + // version and releaseDate. If parsing fails, we return the entire first + // line in version and omit releaseDate. + // // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir - // to support Gatekeeper signing, the file is located in + // to support Gatekeeper signing, the ChangeLog.txt file is located in // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. - get changeLog() { + get releaseNoteInfo() { + let info = {}; + try { #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR // "XREExeF".parent is the directory that contains firefox, i.e., @@ -103,9 +102,39 @@ var AboutTBUpdate = { fs.close(); // Truncate at the first empty line. - return s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + + // Split into first line (version plus releaseDate) and + // remainder (releaseNotes). + // This first match() uses multiline mode with two capture groups: + // first line: (.*$) + // remaining lines: ([\s\S]+) + // [\s\S] matches all characters including end of line. This trick + // is needed because when using JavaScript regex in multiline mode, + // . does not match an end of line character. + let matchArray = s.match(/(.*$)\s*([\s\S]+)/m); + if (matchArray && (matchArray.length == 3)) { + info.releaseNotes = matchArray[2]; + let line1 = matchArray[1]; + // Extract the version and releaseDate. The first line looks like: + // Tor Browser 8.5 -- May 1 2019 + // The regex uses two capture groups: + // text that does not include a hyphen: (^[^-]*) + // remaining text: (.*$) + // In between we match optional whitespace, one or more hyphens, and + // optional whitespace by using: \s*-+\s* + matchArray = line1.match(/(^[^-]*)\s*-+\s*(.*$)/); + if (matchArray && (matchArray.length == 3)) { + info.version = matchArray[1]; + info.releaseDate = matchArray[2]; + } else { + info.version = line1; // Match failed: return entire line in version. + } + } else { + info.releaseNotes = s; // Only one line: use as releaseNotes. + } } catch (e) {} - return ""; + return info; }, };

1 0

[tor-browser-build/maint-8.0] Bug 29081: Harden libwinpthread
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 2da5df458e3aa88a578210a1dc22a46387e39fba Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 14 08:22:40 2019 +0000 Bug 29081: Harden libwinpthread --- projects/mingw-w64/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 1e25290..b2117c5 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -43,8 +43,8 @@ make install mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ - LDFLAGS="-Wl,--no-insert-timestamp" \ - --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 + LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp" \ + --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 make -j[% c("buildconf/num_procs") %] make install

1 0

[tor-browser-build/maint-8.0] Prepare -build2 for 8.0.7
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 8487e3a1e498dcb5604d884d422ab999957877f8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 12:47:08 2019 +0000 Prepare -build2 for 8.0.7 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ projects/torbutton/config | 2 +- rbm.conf | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6a941a1..4d533ce 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,10 @@ Tor Browser 8.0.7 -- March 19 2019 * Update Firefox to 60.6.0esr * Update Tor to 0.3.5.8 * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Update Torbutton to 2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + * Windows + * Bug 29081: Harden libwinpthread * Linux * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy diff --git a/projects/torbutton/config b/projects/torbutton/config index c262950..0d66ae0 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.10 +version: 2.0.11 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 49166f2..3de1879 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.6 project_name: tor-browser

1 0

[torbutton/maint-2.0] Release preparations for 2.0.11
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 70d44df529402368ec599955a7eef033ecb9b0e0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 12:42:24 2019 +0000 Release preparations for 2.0.11 Version bump and CHANGELOG update --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 2b0d2db0..b8d462ac 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + 2.0.10 * Bug 29035: Clean up our donation campaign and add newsletter sign-up link * Bug 27175: Add pref to allow users to persist custom noscript settings diff --git a/src/install.rdf b/src/install.rdf index c39fbfb8..1aa768b4 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>2.0.10</em:version> + <em:version>2.0.11</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-2.0] Bug 29021: Tell NoScript it is running within Tor Browser
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 9ad542c9a851ee531ff75773c763a17758867bdb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 09:58:54 2019 +0000 Bug 29021: Tell NoScript it is running within Tor Browser --- src/modules/noscript-control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 275f9dba..e164510b 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -78,6 +78,7 @@ let noscriptSettings = safetyLevel => ( "enforced": true, "autoAllowTop": false }, + "isTorBrowser": true, "tabId": -1 });

1 0

[torbutton/master] Bug 29021: Tell NoScript it is running within Tor Browser
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 3187dd92b4804c20fa08e225e629c3ec94eead03 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 09:58:54 2019 +0000 Bug 29021: Tell NoScript it is running within Tor Browser --- src/modules/noscript-control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 895889c8..31ee98c2 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -78,6 +78,7 @@ let noscriptSettings = safetyLevel => ( "enforced": true, "autoAllowTop": false }, + "isTorBrowser": true, "tabId": -1 });

1 0

[tor-browser-build/master] Bug 29758: Build firefox debug symbols for linux-i686
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 4097d931d0fd5a0376ca57437c2cdd76adf62d57 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 13 12:25:19 2019 +0100 Bug 29758: Build firefox debug symbols for linux-i686 This reverts commit 7dc74d1652c560e193d1a4c3331efcfb08ee67b0. --- projects/firefox/build | 4 ++-- projects/firefox/mozconfig-linux-i686 | 3 ++- projects/tor-browser/build | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index f3d3c27..9bc025a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -259,7 +259,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir -[% IF c("var/linux-x86_64") %] +[% IF c("var/linux") %] # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) for LIB in Browser/*.so Browser/firefox.real Browser/plugin-container Browser/updater @@ -303,7 +303,7 @@ END; tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', }) %] -[% IF c("var/linux-x86_64") %] +[% IF c("var/linux") %] [% c('tar', { tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index abc7b0e..ef952aa 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -27,9 +27,10 @@ ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar +ac_add_options --disable-strip +ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug -ac_add_options --disable-debug-symbols ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4661f7a..fc64ee1 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -316,10 +316,8 @@ rm -rf $distdir/${PKG_DIR} SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ -[% IF c("var/linux-x86_64") -%] - cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz -[% END -%] [% IF c("var/linux") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%]

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.7
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit b68bceab5040b9d48808295add017b83b4788b7d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 08:17:25 2019 +0000 Release preparations for 8.0.7 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ rbm.conf | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index c6d2a6a..9476cac 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.5.1 + firefox_platform_version: 60.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e1dbaa3..6a941a1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 8.0.7 -- March 19 2019 + * All platforms + * Update Firefox to 60.6.0esr + * Update Tor to 0.3.5.8 + * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Linux + * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy + Tor Browser 8.0.6 -- February 12 2019 * All platforms * Update Firefox to 60.5.1esr diff --git a/rbm.conf b/rbm.conf index 2983684..49166f2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.6' + torbrowser_version: '8.0.7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.5 + - 8.0.6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.0] Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 5c5b8b1fa1940bf85f0fbbd10229ec97ae617d07 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 14 19:11:20 2019 +0100 Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy --- projects/fteproxy/build | 2 ++ projects/fteproxy/config | 2 ++ projects/fteproxy/fteproxy.wrapper | 10 ++++++++++ projects/libfte/build | 4 ++-- .../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/projects/fteproxy/build b/projects/fteproxy/build index 310c9a5..6b6a82f 100644 --- a/projects/fteproxy/build +++ b/projects/fteproxy/build @@ -22,6 +22,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %] cp -a fteproxy/defs/*.json $PTDIR/fteproxy/defs rm -Rf $pydir [% ELSE -%] + cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper + chmod +x $PTDIR/fteproxy.wrapper cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ [% END -%] diff --git a/projects/fteproxy/config b/projects/fteproxy/config index d58095e..06ea149 100644 --- a/projects/fteproxy/config +++ b/projects/fteproxy/config @@ -28,3 +28,5 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' enable: '[% c("var/windows") %]' + - filename: fteproxy.wrapper + enable: '[% c("var/linux") %]' diff --git a/projects/fteproxy/fteproxy.wrapper b/projects/fteproxy/fteproxy.wrapper new file mode 100644 index 0000000..ca10086 --- /dev/null +++ b/projects/fteproxy/fteproxy.wrapper @@ -0,0 +1,10 @@ +#!/bin/sh +basedir=$(dirname "$0") +libdir=$(cd "$basedir"/fteproxy-lib ; pwd) +if test -z "$LD_LIBRARY_PATH" +then + export LD_LIBRARY_PATH="$libdir" +else + export LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH" +fi +exec "$basedir/fteproxy.bin" "$@" diff --git a/projects/libfte/build b/projects/libfte/build index 4f3455f..5d62453 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -28,8 +28,8 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] export PYTHON=python2 make cp -ra fte $PTDIR/ - mkdir -p $distdir/TorBrowser/Tor - cp /var/tmp/dist/gmp/lib/libgmp.so.10 $distdir/TorBrowser/Tor/ + mkdir -p $PTDIR/fteproxy-lib + cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib [% END -%] cp -a {LICENSE,README.md} $DOCSDIR/ cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 12b8aad..d9988fb 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,5 +1,5 @@ ## fteproxy configuration -ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed +ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.wrapper --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy

1 0

[tor-browser-build/master] Bug 26323: remove wheezy-i386 from debootstrap-image
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit 8d4bbf894e3b0c380d4240a61fdd83caeb0c030d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 12 21:30:46 2019 +0100 Bug 26323: remove wheezy-i386 from debootstrap-image --- projects/debootstrap-image/config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 4dbbfef..9499eb8 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -57,14 +57,6 @@ targets: suite: wheezy arch: amd64 - wheezy-i386: - var: - # Missing apt packages for i386: - # http://deb.freexian.com/extended-lts/pool/main/a/apt/ - container: - suite: wheezy - arch: i386 - jessie-amd64: var: minimal_apt_version: 1.0.9.8.5

1 0

[tor-browser-build/master] Bug 26323: Build 32bit Linux bundles on 64bit Debian Wheezy
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit a76388bf16a6ff28f4427b47198c20c4aa8c113a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 1 14:09:53 2019 +0100 Bug 26323: Build 32bit Linux bundles on 64bit Debian Wheezy --- projects/binutils/build | 2 -- projects/firefox/config | 23 +++++++++++++++++++---- projects/firefox/mozconfig-linux-i686 | 2 ++ projects/gcc/config | 15 ++------------- projects/go-webrtc/config | 7 ++++++- projects/go/config | 3 +++ projects/libfte/build | 7 ++++++- projects/libfte/config | 21 ++++++++++++++++++++- projects/pycrypto/build | 4 ++-- projects/pycrypto/config | 20 +++++++++++++++++++- projects/rust/config | 14 ++++++++++---- projects/snowflake/config | 7 ++++++- projects/tor/build | 7 ++++--- projects/tor/config | 13 ++++++++----- projects/twisted/build | 12 ++++++++---- projects/twisted/config | 22 ++++++++++++++++++++-- projects/webrtc/config | 30 ++++++++++++++++++++++-------- rbm.conf | 16 ++++++---------- 18 files changed, 163 insertions(+), 62 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index ee22a1c..6c01d27 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -8,8 +8,6 @@ distdir=/var/tmp/dist/binutils export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 -[% END -%] -[% IF c("var/linux-x86_64") %] # The libstdc++ shipped by default is non-PIC which breaks the binutils build # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND # make sure it gets used before the non-PIC one would. diff --git a/projects/firefox/config b/projects/firefox/config index 2f40fe2..a56f3f9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -58,8 +58,9 @@ targets: arch_deps: - openjdk-8-jdk - linux: + linux-x86_64: var: + martools_filename: mar-tools-linux64.zip arch_deps: - libgtk2.0-dev - libgtk-3-dev @@ -76,13 +77,27 @@ targets: - libmpc2 # needed to remove RUNPATH added by selfrando (see #22242) - chrpath - linux-x86_64: - var: - martools_filename: mar-tools-linux64.zip linux-i686: var: martools_filename: mar-tools-linux32.zip + sort_deps: 0 + arch_deps: + - libgtk2.0-dev:i386 + - libgtk-3-dev:i386 + - libdbus-glib-1-dev:i386 + - libxt-dev:i386 + # To pass configure since ESR 31. + - libpulse-dev:i386 + # To pass configure since ESR 45. + - libgconf2-dev:i386 + # To pass configure since ESR 52 + - libx11-xcb-dev:i386 + # We built GCC but not the libmpc2, thus we need to install it + - libmpc2 + # needed to remove RUNPATH added by selfrando (see #22242) + - chrpath + - hardening-wrapper osx-x86_64: var: diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index ee5082a..abc7b0e 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -11,7 +11,9 @@ export CXXFLAGS=-m32 export LDFLAGS=-m32 export XLDOPTS=-m32 export ASFLAGS=-m32 +export BINDGEN_CFLAGS='-m32 --gcc-toolchain=/var/tmp/dist/gcc' +ac_add_options --target=i686-linux-gnu ac_add_options --host=i686-linux-gnu ac_add_options --enable-optimize diff --git a/projects/gcc/config b/projects/gcc/config index b13a738..88dabdd 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -12,11 +12,7 @@ var: mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/gcc/bin:$PATH" - [% IF c("var/osname") == "linux-i686" -%] - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib - [% ELSE -%] - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64 - [% END -%] + export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64:/var/tmp/dist/gcc/lib32 [% IF c("hardened_gcc") -%] # Config options for hardening-wrapper @@ -47,19 +43,12 @@ targets: - zlib1g-dev linux: hardened_gcc: 1 - linux-i686: - var: - configure_opt: --enable-multilib --enable-languages=c,c++ --with-system-zlib - arch_deps: - - hardening-wrapper - - libc6-dev - - zlib1g-dev - linux-x86_64: var: configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686 arch_deps: - hardening-wrapper - libc6-dev-i386 + input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.xz' diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 8136122..5dbee5f 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -35,7 +35,12 @@ var: [% END -%] targets: - linux: + linux-i686: + var: + arch_deps: + - pkg-config + - libx11-dev:i386 + linux-x86_64: var: arch_deps: - pkg-config diff --git a/projects/go/config b/projects/go/config index be9f84d..ab0a6d3 100644 --- a/projects/go/config +++ b/projects/go/config @@ -15,6 +15,9 @@ var: export GOARCH=[% c("var/GOARCH") %] export GOPATH=/var/tmp/dist/gopath export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" + [% IF c("var/linux-i686") -%] + export CGO_ENABLED=1 + [% END -%] # Template build script for building a go library. # This can be called as projects/go/var/build_go_lib. diff --git a/projects/libfte/build b/projects/libfte/build index 5d62453..3eaeadb 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -12,6 +12,11 @@ tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gmp') %] ln -s /var/tmp/dist/gmp thirdparty/gmp mkdir -p $distdir tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] +[% IF c("var/linux-i686") -%] + export CFLAGS=-m32 + export CXXFLAGS=-m32 + export LDFLAGS=-m32 +[% END -%] [% IF c("var/windows") -%] patch -p1 < $rootdir/bug20302.patch pydir=$distdir/python @@ -25,7 +30,7 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] $PYTHON setup.py install --prefix=$(wine winepath -w "$pydir") $PYTHON setup.py install [% ELSE -%] - export PYTHON=python2 + export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] make cp -ra fte $PTDIR/ mkdir -p $PTDIR/fteproxy-lib diff --git a/projects/libfte/config b/projects/libfte/config index 2079040..415544f 100644 --- a/projects/libfte/config +++ b/projects/libfte/config @@ -9,11 +9,30 @@ var: use_container: 1 targets: - linux: + linux-x86_64: var: arch_deps: - python-setuptools - python-dev + + linux-i686: + var: + pre_pkginst: | + dpkg --add-architecture i386 + # python2.7:i386 cannot be installed because the mime-support package + # in wheezy is not marked "Multi-Arch: foreign": + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 + # We fix this by installing the jessie mime-support package. + wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… + echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c + dpkg -i mime-support_3.58_all.deb + post_pkginst: | + export DEBIAN_FRONTEND=noninteractive + apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 + apt-get install -q -y hardening-wrapper + apt-get download -q -y python-setuptools python-pkg-resources + dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb + windows-i686: var: compiler: winpython diff --git a/projects/pycrypto/build b/projects/pycrypto/build index 084939f..ecb9bb8 100644 --- a/projects/pycrypto/build +++ b/projects/pycrypto/build @@ -29,9 +29,9 @@ cd /var/tmp/build/[% project %]-[% c('version') %] $PYTHON setup.py build_ext -c mingw32 $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] - export PYTHON=python2 + export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] ./configure --build=i686-linux-gnu [% c("var/configure_opt") %] - python2 setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ [% END -%] cd $distdir diff --git a/projects/pycrypto/config b/projects/pycrypto/config index c55844b..879484f 100644 --- a/projects/pycrypto/config +++ b/projects/pycrypto/config @@ -6,12 +6,30 @@ var: use_container: 1 targets: - linux: + linux-x86_64: var: arch_deps: - python-dev - python-setuptools + linux-i686: + var: + pre_pkginst: | + dpkg --add-architecture i386 + # python2.7:i386 cannot be installed because the mime-support package + # in wheezy is not marked "Multi-Arch: foreign": + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 + # We fix this by installing the jessie mime-support package. + wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… + echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c + dpkg -i mime-support_3.58_all.deb + post_pkginst: | + export DEBIAN_FRONTEND=noninteractive + apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 + apt-get install -q -y hardening-wrapper + apt-get download -q -y python-setuptools python-pkg-resources + dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb + windows-i686: var: compiler: winpython diff --git a/projects/rust/config b/projects/rust/config index 3d78ad3..0c3b280 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: '[% c("input_file_var/rust_version") %]' # those values can be changed from the input_files section of other @@ -32,10 +32,16 @@ targets: linux: var: - arch_deps: - - hardening-wrapper + rust_arch: x86_64 + deps: + - libc6-dev-i386 + - lib32stdc++6 + - build-essential + - python + - automake - libssl-dev - pkg-config + - hardening-wrapper # We use # `--enable-local-rust` to avoid downloading the required compiler during # build time @@ -62,7 +68,7 @@ targets: # version mismatch. We avoid that with this configure option. We need to # build our own GCC in the first place as 4.7.2 is too old to get all the # Rust pieces compiled. - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-unknown-linux-gnu --set=target.[% c("arch") %]-unknown-linux-gnu.cc=gcc + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc osx-x86_64: var: diff --git a/projects/snowflake/config b/projects/snowflake/config index c9a84b3..7043c12 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -9,7 +9,12 @@ var: use_container: 1 targets: - linux: + linux-i686: + var: + arch_deps: + - pkg-config + - libx11-dev:i386 + linux-x86_64: var: arch_deps: - pkg-config diff --git a/projects/tor/build b/projects/tor/build index d6018d9..0860b6f 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -44,6 +44,9 @@ openssldir=/var/tmp/dist/openssl $gcclibs/*.dll $mingwlibs/libwinpthread-1.dll $distdir/Tor/ [% END %] +[% IF c("var/linux-i686") && c("var/nightly") -%] + export TOR_RUST_TARGET=i686-unknown-linux-gnu +[% END -%] [% IF c("var/linux") %] mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" @@ -64,9 +67,7 @@ openssldir=/var/tmp/dist/openssl chmod 700 "$distdir"/Tor/*.so* chmod 700 "$distdir"/Tor/libstdc++/*.so* # This is needed to make RPATH unavailable. See bug 9150. - export LD_LIBRARY_PATH="$distdir/Tor/" - # Add libstdc++ to LD_LIBRARY_PATH to avoid rust link issue (bug 27101) - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$distdir/Tor/libstdc++/" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$distdir/Tor/" [% END %] [% IF c("var/osx") %] diff --git a/projects/tor/config b/projects/tor/config index ffdb200..9eb4c16 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -22,18 +22,21 @@ targets: git_hash: master tag_gpg_id: 0 - linux: + linux-i686: var: + libdir: lib32 + sort_deps: 0 arch_deps: - libtool - - zlib1g-dev + - zlib1g-dev:i386 - hardening-wrapper - linux-i686: - var: - libdir: lib linux-x86_64: var: libdir: lib64 + arch_deps: + - libtool + - zlib1g-dev + - hardening-wrapper osx-x86_64: var: arch_deps: diff --git a/projects/twisted/build b/projects/twisted/build index 077143c..9aebe24 100644 --- a/projects/twisted/build +++ b/projects/twisted/build @@ -1,15 +1,19 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% ELSE -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% IF ! c("var/windows") -%] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR [% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2 cd /var/tmp/build/Twisted-[% c('version') %] +[% IF c("var/linux-i686") -%] + export CFLAGS=-m32 + export CXXFLAGS=-m32 + export LDFLAGS=-m32 +[% END -%] [% IF c("var/windows") -%] pydir="$distdir/python" export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" @@ -27,7 +31,7 @@ cd /var/tmp/build/Twisted-[% c('version') %] export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) [% ELSE -%] - export PYTHON=python2 + export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ [% END -%] diff --git a/projects/twisted/config b/projects/twisted/config index 4dbbb26..d9a7eeb 100644 --- a/projects/twisted/config +++ b/projects/twisted/config @@ -7,11 +7,30 @@ var: use_container: 1 targets: - linux: + linux-x86_64: var: arch_deps: - python-setuptools - python-dev + + linux-i686: + var: + pre_pkginst: | + dpkg --add-architecture i386 + # python2.7:i386 cannot be installed because the mime-support package + # in wheezy is not marked "Multi-Arch: foreign": + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 + # We fix this by installing the jessie mime-support package. + wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… + echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c + dpkg -i mime-support_3.58_all.deb + post_pkginst: | + export DEBIAN_FRONTEND=noninteractive + apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 + apt-get install -q -y hardening-wrapper + apt-get download -q -y python-setuptools python-pkg-resources + dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb + windows-i686: var: compiler: winpython @@ -26,4 +45,3 @@ input_files: sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/projects/webrtc/config b/projects/webrtc/config index 37b4615..2846765 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -28,6 +28,28 @@ targets: var: webrtc: os: linux + linux-i686: + var: + webrtc: + lib_path: lib/libwebrtc-linux-386-magic.a + sort_deps: 0 + arch_deps: + - lib32asound2-dev + - lib64expat1 + - libexpat1-dev:i386 + - libglib2.0-dev:i386 + - libgtk2.0-dev:i386 + - libgtk-3-dev:i386 + - libudev-dev:i386 + - libx11-dev:i386 + - libxext-dev:i386 + - libxrandr-dev:i386 + - pkg-config + - hardening-wrapper + linux-x86_64: + var: + webrtc: + lib_path: lib/libwebrtc-linux-amd64-magic.a arch_deps: - libasound2-dev - libexpat1-dev @@ -39,14 +61,6 @@ targets: - libxext-dev - libxrandr-dev - pkg-config - linux-i686: - var: - webrtc: - lib_path: lib/libwebrtc-linux-386-magic.a - linux-x86_64: - var: - webrtc: - lib_path: lib/libwebrtc-linux-amd64-magic.a osx-x86_64: var: webrtc: diff --git a/rbm.conf b/rbm.conf index df31741..d39316c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -215,21 +215,13 @@ targets: var: linux-x86_64: 1 osname: linux-x86_64 - container: - arch: amd64 linux-i686: arch: i686 var: linux-i686: 1 osname: linux-i686 - container: - arch: i386 - setarch: | - if test -z "$RBM_SETARCH" - then - export RBM_SETARCH=1 - exec setarch i686 ./build - fi + configure_opt_i686: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' + configure_opt: '[% c("var/configure_opt_i686") %]' linux: var: linux: 1 @@ -241,7 +233,11 @@ targets: selfrando: '[% c("var/linux-x86_64") && ! c("var/release") %]' container: suite: wheezy + arch: amd64 + pre_pkginst: dpkg --add-architecture i386 deps: + - libc6-dev-i386 + - lib32stdc++6 - build-essential - python - bison

1 0

[tor-browser-build/master] Bug 26323: Set BINDGEN_CFLAGS in mozconfig-linux-x86_64
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit 84e07663467ea304503f6a2e93d7d5930ad78cde Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 26 18:00:28 2019 +0100 Bug 26323: Set BINDGEN_CFLAGS in mozconfig-linux-x86_64 Make sure we use the includes from our build of gcc instead of the ones from /usr/lib/gcc: https://trac.torproject.org/projects/tor/ticket/26323#comment:7 --- projects/firefox/mozconfig-linux-x86_64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 917e32c..75fba50 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -6,6 +6,8 @@ mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 +export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' + ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding

1 0

[tor-browser-build/master] Bug 25876: Generate source tarballs during build
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit 1b79a12ecc1b918c379c29b58954d2680672e201 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 25 15:10:30 2018 +0200 Bug 25876: Generate source tarballs during build We now generate source tarballs for firefox, torbutton and tor-launcher during stable, alpha and nightly builds. We don't generate them with |make testbuild|, but they can be generated with |make testbuild-src|. --- Makefile | 15 +++++++++++++++ README.MAKEFILE | 11 ++++++++--- projects/firefox/config | 12 ++++++++++++ projects/release/build | 6 ++++++ projects/release/config | 32 ++++++++++++++++++++++++++++++++ projects/tor-launcher/config | 8 ++++++++ projects/torbutton/config | 8 ++++++++ rbm.conf | 9 +++++++++ 8 files changed, 98 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d419422..285b49d 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,9 @@ release-windows-x86_64: submodule-update release-osx-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-osx-x86_64 +release-src: submodule-update + $(rbm) build release --target release --target torbrowser-src + alpha: submodule-update $(rbm) build release --target alpha --target torbrowser-all @@ -56,6 +59,9 @@ alpha-windows-x86_64: submodule-update alpha-osx-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-osx-x86_64 +alpha-src: submodule-update + $(rbm) build release --target alpha --target torbrowser-src + nightly: submodule-update $(rbm) build release --target nightly --target torbrowser-all @@ -83,6 +89,9 @@ nightly-windows-x86_64: submodule-update nightly-osx-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-osx-x86_64 +nightly-src: submodule-update + $(rbm) build release --target nightly --target torbrowser-src + alpha_nightly: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-all @@ -107,6 +116,9 @@ alpha_nightly-windows-x86_64: submodule-update alpha_nightly-osx-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64 +alpha_nightly-src: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-src + testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all @@ -134,6 +146,9 @@ testbuild-windows-i686: submodule-update testbuild-osx-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-osx-x86_64 +testbuild-src: submodule-update + $(rbm) build release --target testbuild --target torbrowser-src-testbuild + signtag-release: submodule-update $(rbm) build release --step signtag --target release diff --git a/README.MAKEFILE b/README.MAKEFILE index 1514780..7351c5f 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -46,14 +46,19 @@ The same as alpha_nightly, for the selected platform only. testbuild --------- Build a Tor Browser test build. To make the build faster, only the en-US -locale is created, without mar files. By default it is based on the -alpha channel, but you can change that by editing rbm.local.conf. -The resulting build can be found in directory testbuild. +locale is created, without mar files, and without the source tarballs. +By default it is based on the alpha channel, but you can change that by +editing rbm.local.conf. The resulting build can be found in directory +testbuild. {release,alpha,nightly,testbuild}-linux-x86_64-debug ---------------------------------------------------- Create a debug build for Linux x86_64 with debug features such as ASan. +{release,alpha,nightly,testbuild}-src +------------------------------------- +Create source tarballs for firefox, torbutton and tor-launcher. + fetch ----- Fetch new commits from all components. This is useful when you want to diff --git a/projects/firefox/config b/projects/firefox/config index 4d68969..2f40fe2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -28,6 +28,18 @@ var: # used by projects/firefox-locale-bundle l10n-changesets.json: '[% exec("cat mobile/locales/l10n-changesets.json") %]' +steps: + src-tarballs: + filename: 'src-[% project %]-[% c("version") %].tar.xz' + version: '[% c("git_hash") %]' + input_files: [] + var: + container: + use_container: 0 + targets: + nightly: + version: '[% c("abbrev") %]' + targets: release: var: diff --git a/projects/release/build b/projects/release/build index ca7b26d..af9d673 100644 --- a/projects/release/build +++ b/projects/release/build @@ -27,6 +27,12 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-src") -%] + mv [% c('input_files_by_name/src-firefox') %] \ + [% c('input_files_by_name/src-torbutton') %] \ + [% c('input_files_by_name/src-tor-launcher') %] \ + "$destdir"/ +[% END -%] cd "$destdir" cat > .htaccess <<EOF RewriteEngine On diff --git a/projects/release/config b/projects/release/config index 1a742ac..52a416a 100644 --- a/projects/release/config +++ b/projects/release/config @@ -16,6 +16,7 @@ targets: - torbrowser-osx-x86_64 - torbrowser-android-armv7 - torbrowser-android-x86 + - torbrowser-src torbrowser-android-armv7: var: torbrowser-android-armv7: 1 @@ -41,6 +42,12 @@ targets: torbrowser-osx-x86_64: var: torbrowser-osx-x86_64: 1 + torbrowser-src: + var: + torbrowser-src: '[% ! c("var/testbuild") %]' + torbrowser-src-testbuild: + var: + torbrowser-src: 1 notarget: - release @@ -74,6 +81,7 @@ targets: testbuild: output_dir: 'testbuild' var: + testbuild: 1 build_target: torbrowser-testbuild publish_dir: '' @@ -153,6 +161,30 @@ input_files: - torbrowser-windows-x86_64 - expert-bundle + - name: src-firefox + project: firefox + enable: '[% c("var/torbrowser-src") %]' + pkg_type: src-tarballs + target: + - '[% c("var/build_target") %]' + - torbrowser-src + + - name: src-torbutton + project: torbutton + enable: '[% c("var/torbrowser-src") %]' + pkg_type: src-tarballs + target: + - '[% c("var/build_target") %]' + - torbrowser-src + + - name: src-tor-launcher + project: tor-launcher + enable: '[% c("var/torbrowser-src") %]' + pkg_type: src-tarballs + target: + - '[% c("var/build_target") %]' + - torbrowser-src + steps: signtag: build_log: '-' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 4f2d2b7..8087727 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -11,6 +11,14 @@ var: input_files: - project: container-image +steps: + src-tarballs: + filename: 'src-[% project %]-[% c("version") %].tar.xz' + input_files: [] + var: + container: + use_container: 0 + targets: nightly: version: '[% c("abbrev") %]' diff --git a/projects/torbutton/config b/projects/torbutton/config index 5d42fc5..369d7e4 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -11,6 +11,14 @@ var: input_files: - project: container-image +steps: + src-tarballs: + filename: 'src-[% project %]-[% c("version") %].tar.xz' + input_files: [] + var: + container: + use_container: 0 + targets: nightly: version: '[% c("abbrev") %]' diff --git a/rbm.conf b/rbm.conf index 1b82e60..df31741 100644 --- a/rbm.conf +++ b/rbm.conf @@ -7,6 +7,15 @@ build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %] pkg_type: build +steps: + src-tarballs: + compress_tar: xz + src-tarballs: | + #!/bin/bash + set -e + mkdir -p '[% dest_dir %]' + mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' + # buildconf contains build options that the user can change in rbm.local.conf # When adding a new option to buildconf, a default value should be defined # in var/build_id, so that changing this option does not affect the build_id.

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25876_v9'
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit f44c5d73cfe8d47a6394939e9c237cfbd45a0c5f Merge: 93a114b 1b79a12 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 12 14:05:21 2019 +0000 Merge remote-tracking branch 'boklm/bug_25876_v9' Makefile | 15 +++++++++++++++ README.MAKEFILE | 11 ++++++++--- projects/firefox/config | 12 ++++++++++++ projects/release/build | 6 ++++++ projects/release/config | 32 ++++++++++++++++++++++++++++++++ projects/tor-launcher/config | 8 ++++++++ projects/torbutton/config | 8 ++++++++ rbm.conf | 9 +++++++++ 8 files changed, 98 insertions(+), 3 deletions(-)

1 0