May 2018 - tor-commits - lists.torproject.org

[torbutton/master] Bug 26100: Migrate general.useragent.locale to intl.locale.requested
by gk＠torproject.org 25 May '18

25 May '18

commit 399d2ba81505e4a74535b61f60563f4a9c2a8f6d Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 13:43:48 2018 -0300 Bug 26100: Migrate general.useragent.locale to intl.locale.requested intl.locale.requested is the new way that Gecko handles locales. See https://bugzilla.mozilla.org/show_bug.cgi?id=1414390 --- src/chrome/content/aboutTor/aboutTor-content.js | 6 ++++-- src/chrome/content/menu-overlay.xul | 2 +- src/chrome/content/preferences.js | 5 ++++- src/chrome/content/torbutton.js | 10 +++++----- src/modules/utils.js | 10 ++++++++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ec515bb..1a8d5cf 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -67,8 +67,10 @@ var AboutTorListener = { onPageLoad: function() { // Arrange to update localized text and links. - bindPrefAndInit("general.useragent.locale", aNewVal => { - this.onLocaleChange(aNewVal); + bindPrefAndInit("intl.locale.requested", aNewVal => { + if (aNewVal !== null) { + this.onLocaleChange(aNewVal); + } }); // Add message and event listeners. diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index 53654c5..f6c6fbd 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -22,6 +22,6 @@ position="1" label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;" - oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.prefs.getCharPref('general.useragent.locale'))" /> + oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.locale.getRequestedLocale())" /> </menupopup> </overlay> diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 721ff46..36c8818 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -5,6 +5,9 @@ let { utils: Cu } = Components; let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } = Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; +let { getLocale } = + Cu.import("resource://torbutton/modules/utils.js", {}); + // Description elements have the follow names. const descNames = [, "desc_safest", "desc_safer", "desc_standard"]; @@ -67,7 +70,7 @@ function torbutton_set_learn_more_links() { let show_manual = window.opener.torbutton_show_torbrowser_manual(); let locale = "" if (show_manual) { - locale = getCharPref('general.useragent.locale'); + locale = getLocale(); } let links = linkNames.map(name => document.getElementById(name)); links.forEach(link => {; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2f1f689..d744d15 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -10,7 +10,7 @@ let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm', {}); let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); -let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); @@ -818,14 +818,14 @@ function torbutton_update_toolbutton() // Bug 1506 P3: Support code for language+uagent spoofing function torbutton_get_general_useragent_locale() { try { - var locale = m_tb_prefs.getCharPref("general.useragent.locale"); + const locale = getLocale(); if (/chrome:\/\//.test(locale)) { - return m_tb_prefs.getComplexValue("general.useragent.locale", + return m_tb_prefs.getComplexValue("intl.locale.requested", Components.interfaces.nsIPrefLocalizedString).data; } return locale; } catch(err) { - torbutton_log(4, "Error while getting general.useragent.locale:" + err); + torbutton_log(4, "Error while getting locale" + err); return 'en-US'; } } @@ -2380,7 +2380,7 @@ function torbutton_show_torbrowser_manual() { // torbutton_show_torbrowser_manual() returns true. function torbutton_init_user_manual_links() { let menuitem = document.getElementById("torBrowserUserManual"); - bindPrefAndInit("general.useragent.locale", val => { + bindPrefAndInit("intl.locale.requested", val => { menuitem.hidden = !torbutton_show_torbrowser_manual(); torbutton_abouttor_message_handler.updateAllOpenPages(); }); diff --git a/src/modules/utils.js b/src/modules/utils.js index fa4405e..0a2649d 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -79,6 +79,12 @@ var getEnv = function (name) { return env.exists(name) ? env.get(name) : undefined; }; +// __getLocale +// Reads the browser locale, the default locale is en-US. +var getLocale = function() { + return Services.locale.getRequestedLocale() || "en-US"; +} + // ## Windows // __dialogsByName__. @@ -200,5 +206,5 @@ var unescapeTorString = function(str) { }; // Export utility functions for external use. -let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getPrefValue", - "observe", "showDialog", "unescapeTorString"]; +let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", + "getPrefValue", "observe", "showDialog", "unescapeTorString"];

1 0

[torbutton/master] Bug 26100: Update xmlhttprequest calls after changes in xpcom interface
by gk＠torproject.org 25 May '18

25 May '18

commit 91f1c5deae6fb8415e0c22a99d4c0c3eac7db7b5 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 17:42:33 2018 -0300 Bug 26100: Update xmlhttprequest calls after changes in xpcom interface The xmlhttprequest xpcom interface was deprecated in favor of the XMLHttpRequest. --- src/chrome/content/torbutton.js | 12 +++++++----- src/components/torCheckService.js | 5 ++--- src/components/torbutton-logger.js | 4 +--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4b15c5f..cf39dc2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -7,13 +7,14 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm', {}); let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +Cu.importGlobalProperties(["XMLHttpRequest"]); + const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; @@ -733,9 +734,7 @@ function torbutton_do_async_versioncheck() { torbutton_log(3, "Checking version with socks port: " +m_tb_prefs.getIntPref("network.proxy.socks_port")); try { - var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Components.interfaces.nsIXMLHttpRequest); - //var req = new XMLHttpRequest(); Blocked by content policy + var req = new XMLHttpRequest(); var url = m_tb_prefs.getCharPref("extensions.torbutton.versioncheck_url"); req.open('GET', url, true); req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; @@ -1130,6 +1129,9 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing Offline Cache"); try { + const LoadContextInfo = Cc["@mozilla.org/load-context-info-factory;1"] + .getService(Ci.nsILoadContextInfoFactory); + for (let contextInfo of [LoadContextInfo.default, LoadContextInfo.private]) { let appCacheStorage = Services.cache2.appCacheStorage(contextInfo, null); // The following call (asyncEvictStorage) is actually synchronous, either @@ -2023,7 +2025,7 @@ let stopLanguagePromptObserver; function torbutton_new_window(event) { torbutton_log(3, "New window"); - var browser = getBrowser(); + var browser = window.gBrowser; if(!browser) { torbutton_log(5, "No browser for new window."); diff --git a/src/components/torCheckService.js b/src/components/torCheckService.js index 04708d4..19e13f4 100644 --- a/src/components/torCheckService.js +++ b/src/components/torCheckService.js @@ -77,9 +77,8 @@ TBTorCheckService.prototype = createCheckRequest: function(aAsync) { - let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Ci.nsIXMLHttpRequest); - //let req = new XMLHttpRequest(); Blocked by content policy + Cu.importGlobalProperties(["XMLHttpRequest"]); + let req = new XMLHttpRequest(); let prefs = Cc["@mozilla.org/preferences-service;1"] .getService(Ci.nsIPrefBranch); let url = prefs.getCharPref("extensions.torbutton.test_url"); diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index 620113f..18a5f1e 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -22,9 +22,7 @@ function TorbuttonLogger() { .getService(Components.interfaces.nsIPrefBranch); // Register observer - var pref_service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranchInternal); - this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); + this._branch = this.prefs.QueryInterface(Components.interfaces.nsIPrefBranch); this._branch.addObserver("extensions.torbutton", this, false); this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel");

1 0

[torbutton/master] Bug 26100: Use new asynchronous applyFilter
by gk＠torproject.org 25 May '18

25 May '18

commit d07608265a3720f6f0a35f1e1bfa3c4d08706861 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed May 16 13:48:39 2018 -0700 Bug 26100: Use new asynchronous applyFilter applyFilter changed its signature to include a callback object: https://hg.mozilla.org/mozilla-central/rev/77c14093bc69 --- src/components/domain-isolator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a698439..fc28703 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -43,8 +43,8 @@ mozilla.protocolProxyService = Cc["@mozilla.org/network/protocol-proxy-service;1 // for the given channel, and should return a new Proxy or list of Proxies. mozilla.registerProxyChannelFilter = function (filterFunction, positionIndex) { let proxyFilter = { - applyFilter : function (aProxyService, aChannel, aProxy) { - return filterFunction(aChannel, aProxy); + applyFilter : function (aProxyService, aChannel, aProxy, aCallback) { + aCallback.onProxyFilterResult(filterFunction(aChannel, aProxy)); } }; mozilla.protocolProxyService.registerChannelFilter(proxyFilter, positionIndex);

1 0

[torbutton/master] Bug 26100: Use inputStream.asyncWait instead of nsIInputStreamPump
by gk＠torproject.org 25 May '18

25 May '18

commit 2764f9a0019b1eb8704e6748bfa46b9f58aaf74a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 17 22:35:51 2018 -0700 Bug 26100: Use inputStream.asyncWait instead of nsIInputStreamPump --- src/modules/tor-control-port.js | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 3491efc..2b75e22 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -68,35 +68,26 @@ io.asyncSocketStreams = function (ipcFile, host, port) { }; // __io.pumpInputStream(scriptableInputStream, onInputData, onError)__. -// Run an "input stream pump" that takes an input stream and -// asynchronously pumps incoming data to the onInputData callback. +// Take an input stream and asynchronously pass data to the onInputData callback. io.pumpInputStream = function (inputStream, onInputData, onError) { // Wrap raw inputStream with a "ScriptableInputStream" so we can read incoming data. let ScriptableInputStream = Components.Constructor( "@mozilla.org/scriptableinputstream;1", "nsIScriptableInputStream", "init"), scriptableInputStream = new ScriptableInputStream(inputStream), - // A private method to read all data available on the input stream. - readAll = function() { - return scriptableInputStream.read(scriptableInputStream.available()); - }, - pump = Cc["@mozilla.org/network/input-stream-pump;1"] - .createInstance(Components.interfaces.nsIInputStreamPump); - // Start the pump. - pump.init(inputStream, -1, -1, 0, 0, true); - // Tell the pump to read all data whenever it is available, and pass the data - // to the onInputData callback. The first argument to asyncRead implements - // nsIStreamListener. - pump.asyncRead({ onStartRequest: function (request, context) { }, - onStopRequest: function (request, context, code) { }, - onDataAvailable : function (request, context, stream, offset, count) { - try { - onInputData(readAll()); - } catch (error) { - // readAll() or onInputData(...) has thrown an error. - // Notify calling code through onError. - onError(error); - } - } }, null); + awaitNextChunk = function () { + inputStream.asyncWait({ + onInputStreamReady: (stream) => { + try { + let chunk = scriptableInputStream.read(scriptableInputStream.available()); + onInputData(chunk); + awaitNextChunk(); + } catch (err) { + onError(err); + } + } + }, 0, 0, Services.tm.currentThread); + }; + awaitNextChunk(); }; // __io.asyncSocket(ipcFile, host, port, onInputData, onError)__.

1 0

[torbutton/master] Bug 26100: Update about:tor code after changes in the resource and js
by gk＠torproject.org 25 May '18

25 May '18

commit e37b97e4af14fdbccfcb485f6b4ecf136aeb2e18 Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu May 17 16:13:47 2018 -0300 Bug 26100: Update about:tor code after changes in the resource and js code - Move all the resource files to the same directory and change the chrome.manifest file to allow them to be accessible by the chrome.[1] - jsversion.h was removed, we don't need to specify the JS version anymore.[2] - Since Torbutton has now logic to load the default preferences and we don't know when a string is a complex data, for the sake of simplicity, we are now retiring non-localized.properties and hard coding the about:tor in the preferences file. - Use tabbrowser-initialBrowser instead of content [1] https://bugzilla.mozilla.org/show_bug.cgi?id=863246 [2] https://bugzilla.mozilla.org/show_bug.cgi?id=1440043 --- src/chrome.manifest | 1 + src/chrome/content/aboutTor/aboutTor.xhtml | 4 ++-- src/chrome/content/locale/non-localized.properties | 6 ------ src/chrome/content/torbutton.js | 2 +- src/chrome/skin/aboutTor.css | 14 +++++++------- .../{content/aboutTor => skin}/onionArrow-extension.png | Bin .../{content/aboutTor => skin}/onionArrow-leftBend.png | Bin .../{content/aboutTor => skin}/onionArrow-rightBend.png | Bin .../{content/aboutTor => skin}/onionArrow-short.png | Bin src/chrome/{content/aboutTor => skin}/search.png | Bin src/chrome/{content/aboutTor => skin}/tor-off.png | Bin src/chrome/{content/aboutTor => skin}/tor-on.png | Bin src/defaults/preferences/preferences.js | 2 +- 13 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 230a1e6..7b57d39 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -6,6 +6,7 @@ overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome: overlay about:addons chrome://torbutton/content/torbutton-extensions.xul overlay chrome://mozapps/content/extensions/extensions.xul chrome://torbutton/content/torbutton-extensions.xul resource torbutton ./ +resource torbutton-assets resource://torbutton/chrome/skin/ contentaccessible=yes # browser branding override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 0d8f680..5cb2a60 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -20,8 +20,8 @@ <head> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" - href="resource://torbutton/chrome/skin/aboutTor.css"/> -<script type="text/javascript;version=1.7"> + href="resource://torbutton-assets/aboutTor.css"/> +<script type="text/javascript"> <![CDATA[ window.addEventListener("pageshow", function() { let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); diff --git a/src/chrome/content/locale/non-localized.properties b/src/chrome/content/locale/non-localized.properties deleted file mode 100644 index dca7863..0000000 --- a/src/chrome/content/locale/non-localized.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file must be located in a subdirectory named "locale" so that -# about:config will display the correct value for browser.startup.homepage. -# See fetchPref() inside toolkit/components/viewconfig/content/config.js - -# Default home page -browser.startup.homepage=about:tor diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 40d63fd..7f750bc 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -664,7 +664,7 @@ function torbutton_get_toolbarbutton_xpos() { let tbItem = torbutton_get_toolbutton(); if (tbItem) { let tbItemRect = tbItem.getBoundingClientRect(); - let contentElem = document.getElementById("content"); + let contentElem = document.getElementById("tabbrowser-initialBrowser"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 873f6d0..62c9256 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -59,7 +59,7 @@ body:not([initialized]) { } body[toron] #torstatus-image { - background-image: url('chrome://torbutton/content/aboutTor/tor-on.png'); + background-image: url('chrome://torbutton/skin/tor-on.png'); } #torstatus-image { @@ -68,7 +68,7 @@ body[toron] #torstatus-image { left: 85px; height: 128px; width: 128px; - background-image: url('chrome://torbutton/content/aboutTor/tor-off.png'); + background-image: url('chrome://torbutton/skin/tor-off.png'); background-repeat: no-repeat; background-position: center; z-index: -1; @@ -84,23 +84,23 @@ body[toron] #torstatus-image { top: 4px; width: 30px; height: 36px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-short.png'); + background-image: url('chrome://torbutton/skin/onionArrow-short.png'); } #toolbarIconArrowVertExtension, #toolbarIconArrowHorzExtension { width: 11px; height: 11px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-extension.png'); + background-image: url('chrome://torbutton/skin/onionArrow-extension.png'); } #toolbarIconArrowBend { width: 22px; height: 22px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-leftBend.png'); + background-image: url('chrome://torbutton/skin/onionArrow-leftBend.png'); } #toolbarIconArrowBend[pos="right"] { - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-rightBend.png'); + background-image: url('chrome://torbutton/skin/onionArrow-rightBend.png'); } a { @@ -288,7 +288,7 @@ body .top div.hideIfTorIsUpToDate h1 { height: 34px; width: 33px; border: 0; - background: url('chrome://torbutton/content/aboutTor/search.png') no-repeat top left; + background: url('chrome://torbutton/skin/search.png') no-repeat top left; cursor: pointer; } diff --git a/src/chrome/content/aboutTor/onionArrow-extension.png b/src/chrome/skin/onionArrow-extension.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-extension.png rename to src/chrome/skin/onionArrow-extension.png diff --git a/src/chrome/content/aboutTor/onionArrow-leftBend.png b/src/chrome/skin/onionArrow-leftBend.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-leftBend.png rename to src/chrome/skin/onionArrow-leftBend.png diff --git a/src/chrome/content/aboutTor/onionArrow-rightBend.png b/src/chrome/skin/onionArrow-rightBend.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-rightBend.png rename to src/chrome/skin/onionArrow-rightBend.png diff --git a/src/chrome/content/aboutTor/onionArrow-short.png b/src/chrome/skin/onionArrow-short.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-short.png rename to src/chrome/skin/onionArrow-short.png diff --git a/src/chrome/content/aboutTor/search.png b/src/chrome/skin/search.png similarity index 100% rename from src/chrome/content/aboutTor/search.png rename to src/chrome/skin/search.png diff --git a/src/chrome/content/aboutTor/tor-off.png b/src/chrome/skin/tor-off.png similarity index 100% rename from src/chrome/content/aboutTor/tor-off.png rename to src/chrome/skin/tor-off.png diff --git a/src/chrome/content/aboutTor/tor-on.png b/src/chrome/skin/tor-on.png similarity index 100% rename from src/chrome/content/aboutTor/tor-on.png rename to src/chrome/skin/tor-on.png diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f61cb89..f51c7db 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -53,7 +53,7 @@ pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); // Browser home page: -pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); +pref("browser.startup.homepage", "about:tor"); // This pref specifies an ad-hoc "version" for various pref update hacks we need to do pref("extensions.torbutton.pref_fixup_version", 0);

1 0

[torbutton/master] Bug 26100: baseMenuOverlay.xul was removed by Mozilla
by gk＠torproject.org 25 May '18

25 May '18

commit 5905b318d348f608f6c8e59dccac28015aea6672 Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu May 17 14:28:58 2018 -0300 Bug 26100: baseMenuOverlay.xul was removed by Mozilla Now it is inline in the browser.xul[1]. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1441378 --- src/chrome.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index f72fffa..230a1e6 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -13,7 +13,7 @@ override chrome://branding/locale/brand.properties chrome://torbutton/locale/bra overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul # UI customization -overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul +overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul

1 0

[torbutton/master] Bug 26100: Don't use console object for logging
by gk＠torproject.org 25 May '18

25 May '18

commit 482abfb95de85bce98043338d8f7fcad9f6b7845 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 17 23:05:44 2018 -0700 Bug 26100: Don't use console object for logging --- src/modules/tor-control-port.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 2b75e22..2c39936 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -26,14 +26,9 @@ Cu.import("resource://gre/modules/Services.jsm"); // __log__. // Logging function -let log; -if ((typeof console) !== "undefined") { - log = x => console.log(typeof(x) === "string" ? x.trimRight().replace(/\r\n/g, "\n") : JSON.stringify(x)); -} else { - let logger = Cc["@torproject.org/torbutton-logger;1"] - .getService(Components.interfaces.nsISupports).wrappedJSObject; - log = x => logger.eclog(3, x.trimRight().replace(/\r\n/g, "\n")); -} +let logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Components.interfaces.nsISupports).wrappedJSObject; +let log = x => logger.eclog(3, x.trimRight().replace(/\r\n/g, "\n")); // ### announce this file log("Loading tor-control-port.js\n");

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 25 May '18

25 May '18

commit e5b48ea77322a69483371e02f64b4bc0c4f891ed Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 02:17:05 2018 +0000 Update translations for https_everywhere_completed --- templates/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/https-everywhere.dtd b/templates/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/templates/https-everywhere.dtd +++ b/templates/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 25 May '18

25 May '18

commit 662d2e868e3304e835c50d7bd17b4e23f993a43d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 02:16:54 2018 +0000 Update translations for https_everywhere --- ach/https-everywhere.dtd | 1 + af/https-everywhere.dtd | 1 + ak/https-everywhere.dtd | 1 + am/https-everywhere.dtd | 1 + ar/https-everywhere.dtd | 1 + arn/https-everywhere.dtd | 1 + ast/https-everywhere.dtd | 1 + az/https-everywhere.dtd | 1 + be/https-everywhere.dtd | 1 + bg/https-everywhere.dtd | 1 + bn/https-everywhere.dtd | 1 + bn_BD/https-everywhere.dtd | 1 + bn_IN/https-everywhere.dtd | 1 + bo/https-everywhere.dtd | 1 + br/https-everywhere.dtd | 1 + brx/https-everywhere.dtd | 1 + bs/https-everywhere.dtd | 1 + ca/https-everywhere.dtd | 1 + cs/https-everywhere.dtd | 1 + csb/https-everywhere.dtd | 1 + cv/https-everywhere.dtd | 1 + cy/https-everywhere.dtd | 1 + da/https-everywhere.dtd | 1 + de/https-everywhere.dtd | 1 + dz/https-everywhere.dtd | 1 + el/https-everywhere.dtd | 1 + en_GB/https-everywhere.dtd | 1 + eo/https-everywhere.dtd | 1 + es/https-everywhere.dtd | 1 + es_AR/https-everywhere.dtd | 1 + es_CL/https-everywhere.dtd | 1 + es_CO/https-everywhere.dtd | 1 + es_MX/https-everywhere.dtd | 1 + et/https-everywhere.dtd | 1 + eu/https-everywhere.dtd | 1 + fa/https-everywhere.dtd | 1 + fi/https-everywhere.dtd | 1 + fil/https-everywhere.dtd | 1 + fo/https-everywhere.dtd | 1 + fr/https-everywhere.dtd | 1 + fr_CA/https-everywhere.dtd | 1 + fur/https-everywhere.dtd | 1 + fy/https-everywhere.dtd | 1 + ga/https-everywhere.dtd | 1 + gd/https-everywhere.dtd | 1 + gl/https-everywhere.dtd | 1 + gu/https-everywhere.dtd | 1 + gu_IN/https-everywhere.dtd | 1 + gun/https-everywhere.dtd | 1 + ha/https-everywhere.dtd | 1 + he/https-everywhere.dtd | 1 + hi/https-everywhere.dtd | 1 + hr/https-everywhere.dtd | 1 + hr_HR/https-everywhere.dtd | 1 + ht/https-everywhere.dtd | 1 + hu/https-everywhere.dtd | 1 + hy/https-everywhere.dtd | 1 + ia/https-everywhere.dtd | 1 + id/https-everywhere.dtd | 1 + is/https-everywhere.dtd | 1 + it/https-everywhere.dtd | 1 + ja/https-everywhere.dtd | 1 + jv/https-everywhere.dtd | 1 + ka/https-everywhere.dtd | 1 + kk/https-everywhere.dtd | 1 + km/https-everywhere.dtd | 1 + kn/https-everywhere.dtd | 1 + ko/https-everywhere.dtd | 1 + ko_KR/https-everywhere.dtd | 1 + ku/https-everywhere.dtd | 1 + ku_IQ/https-everywhere.dtd | 1 + kw/https-everywhere.dtd | 1 + ky/https-everywhere.dtd | 1 + la/https-everywhere.dtd | 1 + lb/https-everywhere.dtd | 1 + lg/https-everywhere.dtd | 1 + ln/https-everywhere.dtd | 1 + lo/https-everywhere.dtd | 1 + lt/https-everywhere.dtd | 1 + lv/https-everywhere.dtd | 1 + mg/https-everywhere.dtd | 1 + mi/https-everywhere.dtd | 1 + mk/https-everywhere.dtd | 1 + ml/https-everywhere.dtd | 1 + mn/https-everywhere.dtd | 1 + mr/https-everywhere.dtd | 1 + ms_MY/https-everywhere.dtd | 1 + mt/https-everywhere.dtd | 1 + my/https-everywhere.dtd | 1 + nah/https-everywhere.dtd | 1 + nap/https-everywhere.dtd | 1 + nb/https-everywhere.dtd | 1 + ne/https-everywhere.dtd | 1 + nl/https-everywhere.dtd | 1 + nl_BE/https-everywhere.dtd | 1 + nn/https-everywhere.dtd | 1 + nso/https-everywhere.dtd | 1 + oc/https-everywhere.dtd | 1 + om/https-everywhere.dtd | 1 + or/https-everywhere.dtd | 1 + pa/https-everywhere.dtd | 1 + pap/https-everywhere.dtd | 1 + pl/https-everywhere.dtd | 1 + pms/https-everywhere.dtd | 1 + ps/https-everywhere.dtd | 1 + pt/https-everywhere.dtd | 1 + pt_BR/https-everywhere.dtd | 1 + ro/https-everywhere.dtd | 1 + ru/https-everywhere.dtd | 1 + ru(a)petr1708/https-everywhere.dtd | 1 + sco/https-everywhere.dtd | 1 + si_LK/https-everywhere.dtd | 1 + sk/https-everywhere.dtd | 1 + sk_SK/https-everywhere.dtd | 1 + sl/https-everywhere.dtd | 1 + sl_SI/https-everywhere.dtd | 1 + sn/https-everywhere.dtd | 1 + so/https-everywhere.dtd | 1 + son/https-everywhere.dtd | 1 + sq/https-everywhere.dtd | 1 + sr/https-everywhere.dtd | 1 + sr(a)latin/https-everywhere.dtd | 1 + st/https-everywhere.dtd | 1 + su/https-everywhere.dtd | 1 + sv/https-everywhere.dtd | 1 + sw/https-everywhere.dtd | 1 + ta/https-everywhere.dtd | 1 + te/https-everywhere.dtd | 1 + templates/https-everywhere.dtd | 1 + tg/https-everywhere.dtd | 1 + th/https-everywhere.dtd | 1 + ti/https-everywhere.dtd | 1 + tk/https-everywhere.dtd | 1 + tr/https-everywhere.dtd | 1 + ug(a)Arab/https-everywhere.dtd | 1 + uk/https-everywhere.dtd | 1 + ur/https-everywhere.dtd | 1 + ur_PK/https-everywhere.dtd | 1 + uz/https-everywhere.dtd | 1 + ve/https-everywhere.dtd | 1 + vi/https-everywhere.dtd | 1 + wa/https-everywhere.dtd | 1 + wo/https-everywhere.dtd | 1 + zh_CN/https-everywhere.dtd | 1 + zh_HK/https-everywhere.dtd | 1 + zh_TW/https-everywhere.dtd | 1 + zu/https-everywhere.dtd | 1 + 147 files changed, 147 insertions(+) diff --git a/ach/https-everywhere.dtd b/ach/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/ach/https-everywhere.dtd +++ b/ach/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/af/https-everywhere.dtd b/af/https-everywhere.dtd index cc593ff96..841af4a9a 100644 --- a/af/https-everywhere.dtd +++ b/af/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ak/https-everywhere.dtd b/ak/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/ak/https-everywhere.dtd +++ b/ak/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/am/https-everywhere.dtd b/am/https-everywhere.dtd index 2efa8c0a0..88be80ea8 100644 --- a/am/https-everywhere.dtd +++ b/am/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "ወደ ነባሪዎች ዳግም አስጀምር"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd index 2eece7ce5..a1da678db 100644 --- a/ar/https-everywhere.dtd +++ b/ar/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "صدّر الإعدادات"> <!ENTITY https-everywhere.prefs.reset_defaults "استعادة الإعدادات الافتراضية"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "قواعد ثابتة"> <!ENTITY https-everywhere.chrome.stable_rules_description "افرض الاتصالات المشفرة على المواقع التالية:"> diff --git a/arn/https-everywhere.dtd b/arn/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/arn/https-everywhere.dtd +++ b/arn/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ast/https-everywhere.dtd b/ast/https-everywhere.dtd index fb2c001a3..a12189b6d 100644 --- a/ast/https-everywhere.dtd +++ b/ast/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Restablecer axustes predeterminaos"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/az/https-everywhere.dtd b/az/https-everywhere.dtd index 7b75cf826..2c57c0774 100644 --- a/az/https-everywhere.dtd +++ b/az/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "İlkin Hala Sıfırla"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/be/https-everywhere.dtd b/be/https-everywhere.dtd index 20fc6864c..96402530c 100644 --- a/be/https-everywhere.dtd +++ b/be/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Экспарт наладаў"> <!ENTITY https-everywhere.prefs.reset_defaults "Скінуць да стандартных"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd index c8b639357..4aa208bf9 100644 --- a/bg/https-everywhere.dtd +++ b/bg/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Изнасяне на настройки"> <!ENTITY https-everywhere.prefs.reset_defaults "Възстановяване на стандартните"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Устойчиви правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Принудително криптиране при свързването към тези сайтове:"> diff --git a/bn/https-everywhere.dtd b/bn/https-everywhere.dtd index 5ab47baef..cd0d78bbc 100644 --- a/bn/https-everywhere.dtd +++ b/bn/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/bn_BD/https-everywhere.dtd b/bn_BD/https-everywhere.dtd index b1a921f84..2adba306c 100644 --- a/bn_BD/https-everywhere.dtd +++ b/bn_BD/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "সেটিংস রপ্তানি করুন"> <!ENTITY https-everywhere.prefs.reset_defaults "ডিফল্টে রিসেট করুন"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "স্থিতিশীল নিয়ম"> <!ENTITY https-everywhere.chrome.stable_rules_description "এই ওয়েবসাইটগুলিতে এনক্রিপ্ট সংযোগ চালু করুন:"> diff --git a/bn_IN/https-everywhere.dtd b/bn_IN/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/bn_IN/https-everywhere.dtd +++ b/bn_IN/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/bo/https-everywhere.dtd b/bo/https-everywhere.dtd index 7a9e4d0a8..44a532a5b 100644 --- a/bo/https-everywhere.dtd +++ b/bo/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/br/https-everywhere.dtd b/br/https-everywhere.dtd index d1a6bf67d..4e9c6d4bc 100644 --- a/br/https-everywhere.dtd +++ b/br/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/brx/https-everywhere.dtd b/brx/https-everywhere.dtd index 5c2741782..29de641d9 100644 --- a/brx/https-everywhere.dtd +++ b/brx/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/bs/https-everywhere.dtd b/bs/https-everywhere.dtd index 450c64dcf..e7757f0d8 100644 --- a/bs/https-everywhere.dtd +++ b/bs/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ca/https-everywhere.dtd b/ca/https-everywhere.dtd index 6262d1679..dcfce9e64 100644 --- a/ca/https-everywhere.dtd +++ b/ca/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Configuració d' exportació"> <!ENTITY https-everywhere.prefs.reset_defaults "Torna a les opcions per defecte"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Normes estables."> <!ENTITY https-everywhere.chrome.stable_rules_description "Força les connexions encriptades per als llocs web següents:"> diff --git a/cs/https-everywhere.dtd b/cs/https-everywhere.dtd index aced4ca9e..818425dfa 100644 --- a/cs/https-everywhere.dtd +++ b/cs/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportovat nastavení"> <!ENTITY https-everywhere.prefs.reset_defaults "Vrátit výchozí nastavení"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabilní pravidla"> <!ENTITY https-everywhere.chrome.stable_rules_description "Vynutit šifrovaná spojení pro tyto stránky:"> diff --git a/csb/https-everywhere.dtd b/csb/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/csb/https-everywhere.dtd +++ b/csb/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/cv/https-everywhere.dtd b/cv/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/cv/https-everywhere.dtd +++ b/cv/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/cy/https-everywhere.dtd b/cy/https-everywhere.dtd index 33dae6834..40808a776 100644 --- a/cy/https-everywhere.dtd +++ b/cy/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Ailosod i'r ddiofynnau"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 87a735b2a..7a7ff3603 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Eksportér indstillinger"> <!ENTITY https-everywhere.prefs.reset_defaults "Nulstil til standardindstillinger"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabile regler"> <!ENTITY https-everywhere.chrome.stable_rules_description "Sørg for at forbindelserne krypteres til følgende websteder:"> diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd index e933fc6ef..7144c408d 100644 --- a/de/https-everywhere.dtd +++ b/de/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Einstellungen exportieren"> <!ENTITY https-everywhere.prefs.reset_defaults "Auf Standardeinstellungen zurücksetzen"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Funktionierende Regeln"> <!ENTITY https-everywhere.chrome.stable_rules_description "Erzwingen Sie eine verschlüsselte Verbindung zu diesen Webseiten:"> diff --git a/dz/https-everywhere.dtd b/dz/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/dz/https-everywhere.dtd +++ b/dz/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd index abd681508..793be451f 100644 --- a/el/https-everywhere.dtd +++ b/el/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Ρυθμίσεις Εξαγωγής"> <!ENTITY https-everywhere.prefs.reset_defaults "Επαναφορά προεπιλεγμένων κανόνων"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Σταθεροί κανόνες "> <!ENTITY https-everywhere.chrome.stable_rules_description "Εξαναγκασμένη κρυπτογραφημένη σύνδεση με αυτές τις σελίδες:"> diff --git a/en_GB/https-everywhere.dtd b/en_GB/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/en_GB/https-everywhere.dtd +++ b/en_GB/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd index c241a4e39..3d4b3cf22 100644 --- a/eo/https-everywhere.dtd +++ b/eo/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Elporti agordojn"> <!ENTITY https-everywhere.prefs.reset_defaults "Reŝargi al aprioraj"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabilaj reguloj"> <!ENTITY https-everywhere.chrome.stable_rules_description "Devigi ĉifritan konekton al tiuj retejoj"> diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 62195f4a4..dfffde463 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportar configuración"> <!ENTITY https-everywhere.prefs.reset_defaults "Restablecer configuraciones predeterminadas"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas estables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Fuerzan conexiones cifradas a estos sitios web:"> diff --git a/es_AR/https-everywhere.dtd b/es_AR/https-everywhere.dtd index f40b033f5..af77f71bb 100644 --- a/es_AR/https-everywhere.dtd +++ b/es_AR/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportar Configuraciones"> <!ENTITY https-everywhere.prefs.reset_defaults "Restablecer valores predeterminados"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas estables "> <!ENTITY https-everywhere.chrome.stable_rules_description "Forzar conexiones cifradas a estos sitios web:"> diff --git a/es_CL/https-everywhere.dtd b/es_CL/https-everywhere.dtd index d3749fe0d..071cea5ef 100644 --- a/es_CL/https-everywhere.dtd +++ b/es_CL/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar predeterminados"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/es_CO/https-everywhere.dtd b/es_CO/https-everywhere.dtd index c2597beef..5db849b5d 100644 --- a/es_CO/https-everywhere.dtd +++ b/es_CO/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reestablecer a Valores Predeterminados"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas estables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forzar conecciones encriptadas para estos sitios web:"> diff --git a/es_MX/https-everywhere.dtd b/es_MX/https-everywhere.dtd index 27a220316..1ed0cddb4 100644 --- a/es_MX/https-everywhere.dtd +++ b/es_MX/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportar configuraciónes."> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar a Valores Predeterminados"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas Estables"> <!ENTITY https-everywhere.chrome.stable_rules_description "A fuerza utilizar conexiones encriptado para estas sitios de web"> diff --git a/et/https-everywhere.dtd b/et/https-everywhere.dtd index d124afe32..5987ec76d 100644 --- a/et/https-everywhere.dtd +++ b/et/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Ekspordi seaded"> <!ENTITY https-everywhere.prefs.reset_defaults "Taasta algseaded"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiilsed reeglid"> <!ENTITY https-everywhere.chrome.stable_rules_description "Kohusta krüpteeritud ühendus nende veebisaitidega:"> diff --git a/eu/https-everywhere.dtd b/eu/https-everywhere.dtd index 5be7a0474..60112278f 100644 --- a/eu/https-everywhere.dtd +++ b/eu/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Lehenetsiak berrezarri"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Arau egonkorrak"> <!ENTITY https-everywhere.chrome.stable_rules_description "Behartu konexio enkriptatuak webgune hauetan:"> diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index 1d0265f72..2e390993f 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "خروجی گرفتن از تنظیمات"> <!ENTITY https-everywhere.prefs.reset_defaults "بازنشانی به پیشفرض"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "قوانین پایدار"> <!ENTITY https-everywhere.chrome.stable_rules_description "اتصالات رمزگذاری برای این وبگاه ها را اجباری کن :"> diff --git a/fi/https-everywhere.dtd b/fi/https-everywhere.dtd index d8bda4ab8..462d77dc6 100644 --- a/fi/https-everywhere.dtd +++ b/fi/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Vie asetukset"> <!ENTITY https-everywhere.prefs.reset_defaults "Palauta oletusarvoihin"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Vakaat käytännöt"> <!ENTITY https-everywhere.chrome.stable_rules_description "Pakota salatut yhteydet näihin nettisivustoihin:"> diff --git a/fil/https-everywhere.dtd b/fil/https-everywhere.dtd index cb471477e..0720a6c15 100644 --- a/fil/https-everywhere.dtd +++ b/fil/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Ibalik sa Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Mga stable na rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Puwersahin ang mga naka-encrypt na koneksyon sa mga website na ito:"> diff --git a/fo/https-everywhere.dtd b/fo/https-everywhere.dtd index 755207814..f2a6a5ab4 100644 --- a/fo/https-everywhere.dtd +++ b/fo/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Nullstill"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 177c30a9c..541cb4ee6 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> <!ENTITY https-everywhere.prefs.reset_defaults "Réinitialiser aux paramètres par défaut"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Règles stables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forcer des connexions chiffrées vers ces sites Web :"> diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd index e89a9da04..65a916c24 100644 --- a/fr_CA/https-everywhere.dtd +++ b/fr_CA/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> <!ENTITY https-everywhere.prefs.reset_defaults "Revenir aux paramètres par défaut"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Règles stables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forcer des connexions chiffrées vers ces sites Web :"> diff --git a/fur/https-everywhere.dtd b/fur/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/fur/https-everywhere.dtd +++ b/fur/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/fy/https-everywhere.dtd b/fy/https-everywhere.dtd index b6966cdfe..6229e737d 100644 --- a/fy/https-everywhere.dtd +++ b/fy/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Standertwearden ferfarskje"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ga/https-everywhere.dtd b/ga/https-everywhere.dtd index 64345066e..ff5ec6622 100644 --- a/ga/https-everywhere.dtd +++ b/ga/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Easpórtáil Socruithe"> <!ENTITY https-everywhere.prefs.reset_defaults "Fill ar Réamhshocruithe"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Rialacha cobhsaí"> <!ENTITY https-everywhere.chrome.stable_rules_description "Fórsáil ceangal criptithe leis na suímh seo:"> diff --git a/gd/https-everywhere.dtd b/gd/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/gd/https-everywhere.dtd +++ b/gd/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/gl/https-everywhere.dtd b/gl/https-everywhere.dtd index d91f82dd5..cb55f7851 100644 --- a/gl/https-everywhere.dtd +++ b/gl/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Restablecer a Valores por Defecto"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/gu/https-everywhere.dtd b/gu/https-everywhere.dtd index bc0f95b9e..ac7f67578 100644 --- a/gu/https-everywhere.dtd +++ b/gu/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/gu_IN/https-everywhere.dtd b/gu_IN/https-everywhere.dtd index fb563324b..d45b44528 100644 --- a/gu_IN/https-everywhere.dtd +++ b/gu_IN/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/gun/https-everywhere.dtd b/gun/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/gun/https-everywhere.dtd +++ b/gun/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ha/https-everywhere.dtd b/ha/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/ha/https-everywhere.dtd +++ b/ha/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index c226eb6ac..a468e57ac 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "ייצא הגדרות"> <!ENTITY https-everywhere.prefs.reset_defaults "אפס לברירות מחדל"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "כללים יציבים"> <!ENTITY https-everywhere.chrome.stable_rules_description ":אלץ חיבורים מוצפנים אל אתרים אלו"> diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd index 83f67e584..e09774e38 100644 --- a/hi/https-everywhere.dtd +++ b/hi/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "सेटिंग्स निर्यात करने के लिए क्लिक करें"> <!ENTITY https-everywhere.prefs.reset_defaults "डिफ़ॉल्ट पर रीसेट करें"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "स्थिर नियम"> <!ENTITY https-everywhere.chrome.stable_rules_description "इन वेबसाइटों पर एन्क्रिप्ट किए गए कनेक्शनों को बल दें:"> diff --git a/hr/https-everywhere.dtd b/hr/https-everywhere.dtd index f3bb75a1c..7e2722a71 100644 --- a/hr/https-everywhere.dtd +++ b/hr/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Izvoz postavki"> <!ENTITY https-everywhere.prefs.reset_defaults "Resetiraj na standardne postavke"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabilna pravila"> <!ENTITY https-everywhere.chrome.stable_rules_description "Prisli enkriptirane konekcije na sljedeće stranice:"> diff --git a/hr_HR/https-everywhere.dtd b/hr_HR/https-everywhere.dtd index a3dc745d6..536ebb14d 100644 --- a/hr_HR/https-everywhere.dtd +++ b/hr_HR/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Vrati na početno"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Pravila stabilnosti"> <!ENTITY https-everywhere.chrome.stable_rules_description "Prisili enkriptirane veze s ovim stranicama:"> diff --git a/ht/https-everywhere.dtd b/ht/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/ht/https-everywhere.dtd +++ b/ht/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/hu/https-everywhere.dtd b/hu/https-everywhere.dtd index 60ef598e5..f6a24eb47 100644 --- a/hu/https-everywhere.dtd +++ b/hu/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Beállítások exportálása"> <!ENTITY https-everywhere.prefs.reset_defaults "Visszaállítás alaphelyzetre"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabil szabályok"> <!ENTITY https-everywhere.chrome.stable_rules_description "Titkosított kapcsolatok kényszerítése ezekhez a weboldalakhoz:"> diff --git a/hy/https-everywhere.dtd b/hy/https-everywhere.dtd index b3b016689..51b8f6b34 100644 --- a/hy/https-everywhere.dtd +++ b/hy/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Ետ բերել լռելյայնները"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Կայուն կանոններ"> <!ENTITY https-everywhere.chrome.stable_rules_description "Ստիպել կոդավորված միացում այս կայքերին."> diff --git a/ia/https-everywhere.dtd b/ia/https-everywhere.dtd index adf44e20b..167d71504 100644 --- a/ia/https-everywhere.dtd +++ b/ia/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/id/https-everywhere.dtd b/id/https-everywhere.dtd index c9e76504e..023c665f5 100644 --- a/id/https-everywhere.dtd +++ b/id/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Pengaturan Ekspor"> <!ENTITY https-everywhere.prefs.reset_defaults "Kembalikan ke Bawaan"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Aturan stabil"> <!ENTITY https-everywhere.chrome.stable_rules_description "Paksa koneksi terenkripsi untuk situs ini:"> diff --git a/is/https-everywhere.dtd b/is/https-everywhere.dtd index 002487a90..59c6a1eef 100644 --- a/is/https-everywhere.dtd +++ b/is/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Flytja út stillingar"> <!ENTITY https-everywhere.prefs.reset_defaults "Frumstilla á sjálfgefnar stillingar"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stöðugar reglur"> <!ENTITY https-everywhere.chrome.stable_rules_description "Þvinga dulritaðar tengingar við þessi vefsvæði:"> diff --git a/it/https-everywhere.dtd b/it/https-everywhere.dtd index 7f2628451..28b387383 100644 --- a/it/https-everywhere.dtd +++ b/it/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Esporta impostazioni"> <!ENTITY https-everywhere.prefs.reset_defaults "Ripristina la configurazione predefinita"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Regole stabil"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forza connessione criptate a questi siti:"> diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd index 7d10309e8..6bab7acb6 100644 --- a/ja/https-everywhere.dtd +++ b/ja/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "エクスポートの設定"> <!ENTITY https-everywhere.prefs.reset_defaults "デフォルトにリセット"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "安定版ルール"> <!ENTITY https-everywhere.chrome.stable_rules_description "以下のサイトで暗号化された接続のみを利用する："> diff --git a/jv/https-everywhere.dtd b/jv/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/jv/https-everywhere.dtd +++ b/jv/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd index 7cc873564..c134a898b 100644 --- a/ka/https-everywhere.dtd +++ b/ka/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "სტაბილური წესები"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/kk/https-everywhere.dtd b/kk/https-everywhere.dtd index 0b845d5fa..baa188f7b 100644 --- a/kk/https-everywhere.dtd +++ b/kk/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd index e52c4e144..b712d9b95 100644 --- a/km/https-everywhere.dtd +++ b/km/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "កំណត់ទៅលំនាំដើមឡើងវិញ"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/kn/https-everywhere.dtd b/kn/https-everywhere.dtd index e4b72b11a..29fd18a04 100644 --- a/kn/https-everywhere.dtd +++ b/kn/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd index 4b008b1ae..5744926b8 100644 --- a/ko/https-everywhere.dtd +++ b/ko/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "설정 내보내기"> <!ENTITY https-everywhere.prefs.reset_defaults "기본값으로 다시 설정"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable, 안정된 규칙"> <!ENTITY https-everywhere.chrome.stable_rules_description "다음 사이트에 접속시 강제 암호화:"> diff --git a/ko_KR/https-everywhere.dtd b/ko_KR/https-everywhere.dtd index 3e1a24d59..ddc8cd689 100644 --- a/ko_KR/https-everywhere.dtd +++ b/ko_KR/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ku/https-everywhere.dtd b/ku/https-everywhere.dtd index 188734519..ed13fc912 100644 --- a/ku/https-everywhere.dtd +++ b/ku/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ku_IQ/https-everywhere.dtd b/ku_IQ/https-everywhere.dtd index 8209aaab7..6b38c07a4 100644 --- a/ku_IQ/https-everywhere.dtd +++ b/ku_IQ/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/kw/https-everywhere.dtd b/kw/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/kw/https-everywhere.dtd +++ b/kw/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ky/https-everywhere.dtd b/ky/https-everywhere.dtd index 003e768c1..91341954d 100644 --- a/ky/https-everywhere.dtd +++ b/ky/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/la/https-everywhere.dtd b/la/https-everywhere.dtd index f7a4c9499..cd5c4f5d1 100644 --- a/la/https-everywhere.dtd +++ b/la/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Ad initium reponere"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Leges states"> <!ENTITY https-everywhere.chrome.stable_rules_description "Coniunctiones ad eas paginas latetae esse debent"> diff --git a/lb/https-everywhere.dtd b/lb/https-everywhere.dtd index d47686b0a..a9c902671 100644 --- a/lb/https-everywhere.dtd +++ b/lb/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Op d'Standardastellungen zerécksetzen"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/lg/https-everywhere.dtd b/lg/https-everywhere.dtd index 28ac33755..c9c0c6184 100644 --- a/lg/https-everywhere.dtd +++ b/lg/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ln/https-everywhere.dtd b/ln/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/ln/https-everywhere.dtd +++ b/ln/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/lo/https-everywhere.dtd b/lo/https-everywhere.dtd index 901865542..bccc5dc9e 100644 --- a/lo/https-everywhere.dtd +++ b/lo/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "ການຕັ້ງຄ່າການສົ່ງອອກ"> <!ENTITY https-everywhere.prefs.reset_defaults "ປັບຄືນເປັນຄ່າເລີ່ມຕົ້ນ"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "ກົດທີ່ໝັ້ນຄົງ"> <!ENTITY https-everywhere.chrome.stable_rules_description "ບັງຄັບການເຊື່ອມຕໍ່ເຂົ້າລະຫັດໄປຍັງເວັບໄຊເຫຼົ່ານີ້."> diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index a188da4c7..8ae84889d 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Eksportuoti nustatymus"> <!ENTITY https-everywhere.prefs.reset_defaults "Atstatyti numatytas"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Pastovios taisyklės"> <!ENTITY https-everywhere.chrome.stable_rules_description "Priverstinis prisijungimų šifravimas į šiuos tinklalapius:"> diff --git a/lv/https-everywhere.dtd b/lv/https-everywhere.dtd index d4e790fd3..0467d2e97 100644 --- a/lv/https-everywhere.dtd +++ b/lv/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Eksporta iestatījumi"> <!ENTITY https-everywhere.prefs.reset_defaults "Atiestatīt uz noklusējuma vērtībām"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabilas kārtulas"> <!ENTITY https-everywhere.chrome.stable_rules_description "Uzspiest šifrētus savienojumus ar šīm tīmekļa vietnēm."> diff --git a/mg/https-everywhere.dtd b/mg/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/mg/https-everywhere.dtd +++ b/mg/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/mi/https-everywhere.dtd b/mi/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/mi/https-everywhere.dtd +++ b/mi/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/mk/https-everywhere.dtd b/mk/https-everywhere.dtd index caaf4918b..167e8af14 100644 --- a/mk/https-everywhere.dtd +++ b/mk/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Изнеси поставки"> <!ENTITY https-everywhere.prefs.reset_defaults "Врати на стандардни вредности / дифолт."> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Стабилни правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Присили енкриптирани конекции до овие веб страни:"> diff --git a/ml/https-everywhere.dtd b/ml/https-everywhere.dtd index 8bbf7ef81..145932989 100644 --- a/ml/https-everywhere.dtd +++ b/ml/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/mn/https-everywhere.dtd b/mn/https-everywhere.dtd index 5a100a728..bd6d7a1f9 100644 --- a/mn/https-everywhere.dtd +++ b/mn/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/mr/https-everywhere.dtd b/mr/https-everywhere.dtd index d002ee886..022ec2ce6 100644 --- a/mr/https-everywhere.dtd +++ b/mr/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "डीफॉल्ट रीसेट करा"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ms_MY/https-everywhere.dtd b/ms_MY/https-everywhere.dtd index 18e482248..86bace40e 100644 --- a/ms_MY/https-everywhere.dtd +++ b/ms_MY/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Eksport Tetapan"> <!ENTITY https-everywhere.prefs.reset_defaults "Tetapan Semula ke Lalai"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Peraturan Stabil"> <!ENTITY https-everywhere.chrome.stable_rules_description "Paksa sambungan tersulit ke laman sesawang ini:"> diff --git a/mt/https-everywhere.dtd b/mt/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/mt/https-everywhere.dtd +++ b/mt/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/my/https-everywhere.dtd b/my/https-everywhere.dtd index a6b270895..3c2d23331 100644 --- a/my/https-everywhere.dtd +++ b/my/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/nah/https-everywhere.dtd b/nah/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/nah/https-everywhere.dtd +++ b/nah/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/nap/https-everywhere.dtd b/nap/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/nap/https-everywhere.dtd +++ b/nap/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index e4704e064..696dbb89c 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Eksporter innstillinger"> <!ENTITY https-everywhere.prefs.reset_defaults "Tilbakestill til forvalg"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabile regler"> <!ENTITY https-everywhere.chrome.stable_rules_description "Tving krypterte forbindelser til disse nettstedene:"> diff --git a/ne/https-everywhere.dtd b/ne/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/ne/https-everywhere.dtd +++ b/ne/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index e18352eb2..d73c9f457 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Instellingen exporteren"> <!ENTITY https-everywhere.prefs.reset_defaults "Standaardwaarden herstellen"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels"> <!ENTITY https-everywhere.chrome.stable_rules_description "Dwing versleutelde verbindingen met deze websites:"> diff --git a/nl_BE/https-everywhere.dtd b/nl_BE/https-everywhere.dtd index 489453e45..a0ece995b 100644 --- a/nl_BE/https-everywhere.dtd +++ b/nl_BE/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exporteer Instellingen"> <!ENTITY https-everywhere.prefs.reset_defaults "Terugzetten naar Standaard Instellingen"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forceer geëncrypteerde verbindingen naar deze websites:"> diff --git a/nn/https-everywhere.dtd b/nn/https-everywhere.dtd index 6ecef7a89..c40aafdd1 100644 --- a/nn/https-everywhere.dtd +++ b/nn/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Eksporter innstillingar"> <!ENTITY https-everywhere.prefs.reset_defaults "Still tilbake til standard"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Støduge reglar"> <!ENTITY https-everywhere.chrome.stable_rules_description "Tving krypterte tilkoplingar åt desse nettstadane:"> diff --git a/nso/https-everywhere.dtd b/nso/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/nso/https-everywhere.dtd +++ b/nso/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/oc/https-everywhere.dtd b/oc/https-everywhere.dtd index 16e9530fd..803d38f71 100644 --- a/oc/https-everywhere.dtd +++ b/oc/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/om/https-everywhere.dtd b/om/https-everywhere.dtd index 26a323978..87ab0d6b7 100644 --- a/om/https-everywhere.dtd +++ b/om/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/or/https-everywhere.dtd b/or/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/or/https-everywhere.dtd +++ b/or/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/pa/https-everywhere.dtd b/pa/https-everywhere.dtd index 47b1eed0b..8c437f7c2 100644 --- a/pa/https-everywhere.dtd +++ b/pa/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "ਮੂਲ ਮੁੜ-ਸਟੋਰ ਕਰੋ"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "ਸਥਿਰ ਨਿਯਮ"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/pap/https-everywhere.dtd b/pap/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/pap/https-everywhere.dtd +++ b/pap/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/pl/https-everywhere.dtd b/pl/https-everywhere.dtd index 74df93b21..92dcbf1e7 100644 --- a/pl/https-everywhere.dtd +++ b/pl/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Eksportuj ustawienia"> <!ENTITY https-everywhere.prefs.reset_defaults "Przywróć ustawienia fabryczne"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Reguły stabilne"> <!ENTITY https-everywhere.chrome.stable_rules_description "Wymuszaj szyfrowane połączenie do tych stron internetowych:"> diff --git a/pms/https-everywhere.dtd b/pms/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/pms/https-everywhere.dtd +++ b/pms/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ps/https-everywhere.dtd b/ps/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/ps/https-everywhere.dtd +++ b/ps/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/pt/https-everywhere.dtd b/pt/https-everywhere.dtd index ea9d1bd34..d42cfa1cb 100644 --- a/pt/https-everywhere.dtd +++ b/pt/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportar parâmetros"> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar Predefinições"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Regras estáveis"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forçar ligações encriptadas a estes websites;"> diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index 5da666e56..da1eced6f 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportar Configurações"> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar as configurações padrão"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "protecção colectiva"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forçar conexões criptografadas para estes sites:"> diff --git a/ro/https-everywhere.dtd b/ro/https-everywhere.dtd index fd83adb90..ab82244cb 100644 --- a/ro/https-everywhere.dtd +++ b/ro/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportă Setări"> <!ENTITY https-everywhere.prefs.reset_defaults "Revino la setările inițiale"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Reguli stabile"> <!ENTITY https-everywhere.chrome.stable_rules_description "Pentru aceste pagini se folosesc obligatoriu conexiuni criptate:"> diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd index f75256247..08ed398fe 100644 --- a/ru/https-everywhere.dtd +++ b/ru/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Экспорт настроек"> <!ENTITY https-everywhere.prefs.reset_defaults "По умолчанию"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Стабильные правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Принудительное шифрование на этих сайтах:"> diff --git a/ru(a)petr1708/https-everywhere.dtd b/ru(a)petr1708/https-everywhere.dtd index 9cd25e5ca..f4d5a5eca 100644 --- a/ru(a)petr1708/https-everywhere.dtd +++ b/ru(a)petr1708/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/sco/https-everywhere.dtd b/sco/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/sco/https-everywhere.dtd +++ b/sco/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/si_LK/https-everywhere.dtd b/si_LK/https-everywhere.dtd index 8c20e515b..a1580fcfc 100644 --- a/si_LK/https-everywhere.dtd +++ b/si_LK/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "යථා තත්වයට පත් කරන්න"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/sk/https-everywhere.dtd b/sk/https-everywhere.dtd index 9e7acc6c1..ab95ff867 100644 --- a/sk/https-everywhere.dtd +++ b/sk/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Obnoviť predvolené"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/sk_SK/https-everywhere.dtd b/sk_SK/https-everywhere.dtd index deda4f144..2e0d2ca73 100644 --- a/sk_SK/https-everywhere.dtd +++ b/sk_SK/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportovať nastavenia"> <!ENTITY https-everywhere.prefs.reset_defaults "Obnoviť pôvodné"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabilné pravidlá"> <!ENTITY https-everywhere.chrome.stable_rules_description "Vynútiť šifrované spojenie pre tieto webové stránky:"> diff --git a/sl/https-everywhere.dtd b/sl/https-everywhere.dtd index 9fddf9201..bf511cb8a 100644 --- a/sl/https-everywhere.dtd +++ b/sl/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Ponastavi na privzeto"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/sl_SI/https-everywhere.dtd b/sl_SI/https-everywhere.dtd index 1afbd3a47..0037907c9 100644 --- a/sl_SI/https-everywhere.dtd +++ b/sl_SI/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Ponastavi"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/sn/https-everywhere.dtd b/sn/https-everywhere.dtd index 0b77ca01f..e200f302f 100644 --- a/sn/https-everywhere.dtd +++ b/sn/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/so/https-everywhere.dtd b/so/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/so/https-everywhere.dtd +++ b/so/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/son/https-everywhere.dtd b/son/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/son/https-everywhere.dtd +++ b/son/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/sq/https-everywhere.dtd b/sq/https-everywhere.dtd index 04903eb00..3199994a0 100644 --- a/sq/https-everywhere.dtd +++ b/sq/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Rivendoseni në Parazgjedhje"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Rregulla të qëndrueshme"> <!ENTITY https-everywhere.chrome.stable_rules_description "Lidhje të shifruara paraprakisht me këto webfaqe:"> diff --git a/sr/https-everywhere.dtd b/sr/https-everywhere.dtd index ce6906edd..6b25ebddc 100644 --- a/sr/https-everywhere.dtd +++ b/sr/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Vrati na uobicajeno"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/sr(a)latin/https-everywhere.dtd b/sr(a)latin/https-everywhere.dtd index bdbdb6c59..7c92b1ea2 100644 --- a/sr(a)latin/https-everywhere.dtd +++ b/sr(a)latin/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/st/https-everywhere.dtd b/st/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/st/https-everywhere.dtd +++ b/st/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/su/https-everywhere.dtd b/su/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/su/https-everywhere.dtd +++ b/su/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index 90adeae7d..03f9f3950 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exportera inställningar"> <!ENTITY https-everywhere.prefs.reset_defaults "Återställ till standardvärden"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stabila regler"> <!ENTITY https-everywhere.chrome.stable_rules_description "Tvinga krypterade anslutningar till dessa websidor:"> diff --git a/sw/https-everywhere.dtd b/sw/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/sw/https-everywhere.dtd +++ b/sw/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ta/https-everywhere.dtd b/ta/https-everywhere.dtd index 345af54dc..e934bdd47 100644 --- a/ta/https-everywhere.dtd +++ b/ta/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "அமைப்புகளை ஏற்றுமதி செய்"> <!ENTITY https-everywhere.prefs.reset_defaults "இயல்புநிலைக்கு மீட்டமை"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "நிலையான விதிகள்"> <!ENTITY https-everywhere.chrome.stable_rules_description "இந்த வலைதளங்களுக்கு குறியீடாக்க இணைப்புகளுக்கு நிர்பந்தி:"> diff --git a/te/https-everywhere.dtd b/te/https-everywhere.dtd index 2f5be950b..73109e1fe 100644 --- a/te/https-everywhere.dtd +++ b/te/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/templates/https-everywhere.dtd b/templates/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/templates/https-everywhere.dtd +++ b/templates/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/tg/https-everywhere.dtd b/tg/https-everywhere.dtd index 9cd25e5ca..f4d5a5eca 100644 --- a/tg/https-everywhere.dtd +++ b/tg/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/th/https-everywhere.dtd b/th/https-everywhere.dtd index 262abecdf..fe23d381b 100644 --- a/th/https-everywhere.dtd +++ b/th/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "ส่งออกการตั้งค่า"> <!ENTITY https-everywhere.prefs.reset_defaults "ล้างกลับเป็นค่าตั้งต้น"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "กฎเสถียร"> <!ENTITY https-everywhere.chrome.stable_rules_description "บังคับใช้การเชื่อมต่อที่เข้ารหัสลับกับเว็บไซต์เหล่านี้:"> diff --git a/ti/https-everywhere.dtd b/ti/https-everywhere.dtd index 3ea194b83..6d78e16ff 100644 --- a/ti/https-everywhere.dtd +++ b/ti/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/tk/https-everywhere.dtd b/tk/https-everywhere.dtd index 56ddd21d5..0bab4c332 100644 --- a/tk/https-everywhere.dtd +++ b/tk/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/tr/https-everywhere.dtd b/tr/https-everywhere.dtd index 1c0d087f9..990b9cd92 100644 --- a/tr/https-everywhere.dtd +++ b/tr/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Ayarları Dışa Aktar"> <!ENTITY https-everywhere.prefs.reset_defaults "Varsayılanları Yükle"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Kararlı kurallar"> <!ENTITY https-everywhere.chrome.stable_rules_description "Şu web siteleri için şifreli bağlantı dayatılsın:"> diff --git a/ug(a)Arab/https-everywhere.dtd b/ug(a)Arab/https-everywhere.dtd index fc382f052..626f0aada 100644 --- a/ug(a)Arab/https-everywhere.dtd +++ b/ug(a)Arab/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd index b9a3e1705..ed56c0bb1 100644 --- a/uk/https-everywhere.dtd +++ b/uk/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Експортувати налаштування"> <!ENTITY https-everywhere.prefs.reset_defaults "Скинути до типових"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Стабільні правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Примусово створювати зашифровані з'єдання до цих веб-сайтів: "> diff --git a/ur/https-everywhere.dtd b/ur/https-everywhere.dtd index 79698d437..08a5f1ce6 100644 --- a/ur/https-everywhere.dtd +++ b/ur/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ur_PK/https-everywhere.dtd b/ur_PK/https-everywhere.dtd index af79dcaf9..6cf9571d1 100644 --- a/ur_PK/https-everywhere.dtd +++ b/ur_PK/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/uz/https-everywhere.dtd b/uz/https-everywhere.dtd index ce49ddcf2..9f13a01ad 100644 --- a/uz/https-everywhere.dtd +++ b/uz/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/ve/https-everywhere.dtd b/ve/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/ve/https-everywhere.dtd +++ b/ve/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/vi/https-everywhere.dtd b/vi/https-everywhere.dtd index 4aaa3cbca..df7a0d1bb 100644 --- a/vi/https-everywhere.dtd +++ b/vi/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Xuất các cài đặt"> <!ENTITY https-everywhere.prefs.reset_defaults "Khôi phục về Mặc định"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Các quy tắc ổn định"> <!ENTITY https-everywhere.chrome.stable_rules_description "Ép buộc mã hóa các kết nối đến các trang web này:"> diff --git a/wa/https-everywhere.dtd b/wa/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/wa/https-everywhere.dtd +++ b/wa/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/wo/https-everywhere.dtd b/wo/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/wo/https-everywhere.dtd +++ b/wo/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index 5865a45e6..563956c28 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "导出设置"> <!ENTITY https-everywhere.prefs.reset_defaults "重置为默认值"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "稳定规则"> <!ENTITY https-everywhere.chrome.stable_rules_description "强制对这些网站加密连接："> diff --git a/zh_HK/https-everywhere.dtd b/zh_HK/https-everywhere.dtd index 25ec5ad6d..3c276f98e 100644 --- a/zh_HK/https-everywhere.dtd +++ b/zh_HK/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "回到預設"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "穩定規則"> <!ENTITY https-everywhere.chrome.stable_rules_description "喺以下網站強制使用加密連線："> diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd index 1dc000c8c..40476a4ec 100644 --- a/zh_TW/https-everywhere.dtd +++ b/zh_TW/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "匯出設定值"> <!ENTITY https-everywhere.prefs.reset_defaults "重設成預設值"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "穩定版規則"> <!ENTITY https-everywhere.chrome.stable_rules_description "與下列網站建立強制加密的連線："> diff --git a/zu/https-everywhere.dtd b/zu/https-everywhere.dtd index d5094d065..1e71f2b42 100644 --- a/zu/https-everywhere.dtd +++ b/zu/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Export Settings"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">

1 0

[stem/master] Incorrect circuit digest for higher protocol versions
by atagar＠torproject.org 24 May '18

24 May '18

commit e3fab7bfbff6c6d82d9303dc90c4147421ba33ba Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 24 12:16:50 2018 -0700 Incorrect circuit digest for higher protocol versions I only got stem.client working for link protocol 3 when cobbling it together. We attempt to conform with the spec for higher protocol versions but it's mostly untested. While looking into #26060 I realized that we're using the wrong length for cell headers when the link protocol is higher than three. Link v4 and greater use a long for circuit identifiers rather than a short... circ_id (4 bytes) + command (1 byte) = 5 bytes --- stem/client/__init__.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 6e25f748..281888e7 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -235,20 +235,26 @@ class Circuit(object): orig_digest = self.forward_digest.copy() orig_key = copy.copy(self.forward_key) + # Digests and such are computed using the RELAY cell payload. This + # doesn't include the initial circuit id and cell type fields. + # Circuit ids vary in length depending on the protocol version. + + header_size = 5 if self.relay.link_protocol > 3 else 3 + try: cell = stem.client.cell.RelayCell(self.id, command, data, 0, stream_id) - payload_without_digest = cell.pack(self.relay.link_protocol)[3:] + payload_without_digest = cell.pack(self.relay.link_protocol)[header_size:] self.forward_digest.update(payload_without_digest) cell = stem.client.cell.RelayCell(self.id, command, data, self.forward_digest, stream_id) - header, payload = split(cell.pack(self.relay.link_protocol), 3) + header, payload = split(cell.pack(self.relay.link_protocol), header_size) encrypted_payload = header + self.forward_key.update(payload) reply = [] self.relay._orport.send(encrypted_payload) for cell in stem.client.cell.Cell.unpack(self.relay._orport.recv(), self.relay.link_protocol): - decrypted = self.backward_key.update(cell.pack(self.relay.link_protocol)[3:]) + decrypted = self.backward_key.update(cell.pack(self.relay.link_protocol)[header_size:]) reply.append(stem.client.cell.RelayCell._unpack(decrypted, self.id, self.relay.link_protocol)) return reply

1 0