- tbb-commits - lists.torproject.org

[torbutton/master] Bug 26100: Update deprecated JS and CSS code
by gk＠torproject.org 25 May '18

25 May '18

commit 3047f3fcb9c606a659c6e7ffa7e4d97e33cd0ebe Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 17:38:59 2018 -0300 Bug 26100: Update deprecated JS and CSS code - catch statement can not have if statements. https://bugzilla.mozilla.org/show_bug.cgi?id=1228841 - Use 0o to represent octal numbers. https://bugzilla.mozilla.org/show_bug.cgi?id=1263074 - remove -moz- prefix in css https://bugzilla.mozilla.org/show_bug.cgi?id=1270406 --- src/chrome/content/torbutton.js | 9 ++++++--- src/chrome/skin/aboutTor.css | 6 +++--- src/chrome/skin/tor-circuit-display.css | 4 ++-- src/components/cookie-jar-selector.js | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d744d15..4b15c5f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1140,9 +1140,12 @@ function torbutton_do_new_identity() { // #5715 also makes this synchronous. So we pass a null callback. try { appCacheStorage.asyncEvictStorage(null); - } catch (err if err.name == 'NS_ERROR_NOT_AVAILABLE') { - // We ignore "not available" errors because they occur if a cache - // has not been used, e.g., if no browsing has been done. + } catch (err) { + // We ignore "not available" errors because they occur if a cache + // has not been used, e.g., if no browsing has been done. + if (err.name !== 'NS_ERROR_NOT_AVAILABLE') { + throw err; + } } } } catch(e) { diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 7ba7e7c..873f6d0 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -25,11 +25,11 @@ body { } body { - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); + background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); } body[toron] { - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); + background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); } /* Hide the entire document by default to avoid showing the incorrect @@ -221,7 +221,7 @@ body .top div.hideIfTorIsUpToDate h1 { padding: 5px 0 0 22px; } -#middle ul:-moz-dir(rtl) { +#middle ul:dir(rtl) { padding: 5px 22px 0 0; } diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 640d595..c9e682a 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -21,7 +21,7 @@ and lines drawn between them to represent Tor network inter-relay connections. width: 100%; } -#circuit-display-content:-moz-locale-dir(rtl) { +#circuit-display-content:dir(rtl) { background-position: calc(100% - 1em) 1em; } @@ -65,7 +65,7 @@ ul#circuit-display-nodes li { white-space: nowrap; } -ul#circuit-display-nodes li:-moz-locale-dir(rtl) { +ul#circuit-display-nodes li:dir(rtl) { background-position: right center; } diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index f6d579e..4f137d7 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -143,7 +143,7 @@ function CookieJarSelector() { var file = getProfileFile("cookies-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); - foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); + foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0); var data = JSON.stringify(this["cookiesobj-" + name]); foStream.write(data, data.length); foStream.close(); @@ -154,7 +154,7 @@ function CookieJarSelector() { var file = getProfileFile("protected-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); - foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); + foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0); var data = JSON.stringify(this["protected-" + name]); foStream.write(data, data.length); foStream.close();

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

[tor-launcher/master] Synchronize some prefs.js and get{Bool, Char, Int}Pref() defaults
by gk＠torproject.org 23 May '18

23 May '18

commit 51c1dfb76f02f870b60b7b3cdf86cc36b85eec2f Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 15 22:35:09 2018 +0000 Synchronize some prefs.js and get{Bool,Char,Int}Pref() defaults --- src/chrome/content/network-settings.js | 3 ++- src/components/tl-process.js | 3 ++- src/components/tl-protocol.js | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index dc3c9ab..f86402d 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2533,7 +2533,8 @@ function requestMoatCaptcha(aProxySettings, aMeekClientPath, aMeekClientArgs) aMeekClientPath, aMeekClientArgs) .then(()=> { - let bridgeType = TorLauncherUtil.getCharPref(kPrefBridgeDBType); + let bridgeType = TorLauncherUtil.getCharPref(kPrefBridgeDBType, + "obfs4"); moatRequestor.fetchBridges([bridgeType]) .then(aCaptchaInfo => { diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 1c67817..615227f 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -455,7 +455,8 @@ TorProcessService.prototype = if (socksPortArg) { let socksPortFlags = TorLauncherUtil.getCharPref( - "extensions.torlauncher.socks_port_flags"); + "extensions.torlauncher.socks_port_flags", + "IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth"); if (socksPortFlags) socksPortArg += ' ' + socksPortFlags; args.push("+__SocksPort"); diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 6659621..a5fd1d9 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -53,7 +53,7 @@ function TorProtocolService() this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10); let useIPC = !isWindows && TorLauncherUtil.getBoolPref( - "extensions.torlauncher.control_port_use_ipc", true); + "extensions.torlauncher.control_port_use_ipc", false); if (!this.mControlHost && !this.mControlPort && useIPC) this.mControlIPCFile = TorLauncherUtil.getTorFile("control_ipc", false); else @@ -157,7 +157,7 @@ function TorProtocolService() if (useIPC === undefined) { useIPC = !isWindows && TorLauncherUtil.getBoolPref( - "extensions.torlauncher.socks_port_use_ipc", true); + "extensions.torlauncher.socks_port_use_ipc", false); } // Fill in missing SOCKS info from prefs. @@ -183,6 +183,7 @@ function TorProtocolService() { let socksPort = TorLauncherUtil.getIntPref("network.proxy.socks_port", 0); + // This pref is set as 0 by default in Firefox, use 9150 if we get 0. this.mSOCKSPortInfo.port = (socksPort != 0) ? socksPort : 9150; } } @@ -1506,7 +1507,7 @@ TorProtocolService.prototype = else { var maxEntries = - TorLauncherUtil.getIntPref(this.kPrefMaxTorLogEntries, 0); + TorLauncherUtil.getIntPref(this.kPrefMaxTorLogEntries, 1000); if ((maxEntries > 0) && (this.mTorLog.length >= maxEntries)) this.mTorLog.splice(0, 1); }

1 0

[tor-launcher/master] Merge remote-tracking branch 'sysrqb/bug25750_6'
by gk＠torproject.org 23 May '18

23 May '18

commit b15da273aa1c6de5a1725e24a171ad043864bf69 Merge: 9aa5fd4 51c1dfb Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 23 18:07:50 2018 +0000 Merge remote-tracking branch 'sysrqb/bug25750_6' src/chrome/content/network-settings.js | 3 +- src/components/tl-process.js | 31 +++++++-- src/components/tl-protocol.js | 25 ++++---- src/install.rdf | 8 +++ src/modules/tl-logger.jsm | 6 +- src/modules/tl-util.jsm | 114 ++++++++++++++++++++++++++++++++- 6 files changed, 163 insertions(+), 24 deletions(-)

1 0

[tor-launcher/master] Add fennec target application
by gk＠torproject.org 23 May '18

23 May '18

commit 785568d05b12f819a29b90c2dcd4e55b821a2047 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:43:05 2018 +0000 Add fennec target application --- src/install.rdf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/install.rdf b/src/install.rdf index d0debd0..a71a21a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -39,6 +39,14 @@ <em:maxVersion>*.*.*</em:maxVersion> </Description> </em:targetApplication> +  + <em:targetApplication> + <Description> + <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id> + <em:minVersion>45.0</em:minVersion> + <em:maxVersion>*</em:maxVersion> + </Description> + </em:targetApplication> </Description> </RDF>

1 0

[tor-launcher/master] Mozilla dropped support for Ci.nsIProgrammingLanguage.JAVASCRIPT
by gk＠torproject.org 23 May '18

23 May '18

commit 9fa37a1fbf6ed9f004f70cccac762a0e4ed454b3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:44:18 2018 +0000 Mozilla dropped support for Ci.nsIProgrammingLanguage.JAVASCRIPT See https://bugzilla.mozilla.org/show_bug.cgi?id=1149830#c18 --- src/components/tl-process.js | 3 +-- src/components/tl-protocol.js | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..74d5f41 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2017, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -272,7 +272,6 @@ TorProcessService.prototype = contractID: this.kContractID, classDescription: this.kServiceName, classID: this.kClassID, - implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT, flags: Ci.nsIClassInfo.DOM_OBJECT, // nsIFactory implementation. diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index ab33bd3..79b327e 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -256,7 +256,6 @@ TorProtocolService.prototype = contractID: this.kContractID, classDescription: this.kServiceName, classID: this.kClassID, - implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT, flags: Ci.nsIClassInfo.DOM_OBJECT, // nsIFactory implementation.

1 0

[tor-launcher/master] Fix deprecated octal literals
by gk＠torproject.org 23 May '18

23 May '18

commit c5cf235c8f530ef5dc64eea3bb404ca0d48eb0a8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:50:01 2018 +0000 Fix deprecated octal literals See https://bugzilla.mozilla.org/show_bug.cgi?id=1263074 --- src/components/tl-process.js | 2 +- src/modules/tl-util.jsm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 74d5f41..8d3efb7 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -978,7 +978,7 @@ TorProcessService.prototype = let stream = Cc["@mozilla.org/network/safe-file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); stream.init(aFile, 0x02 | 0x08 | 0x20, /* WRONLY CREATE TRUNCATE */ - 0600, 0); + 0o600, 0); stream.write(data, data.length); stream.QueryInterface(Ci.nsISafeOutputStream).finish(); } diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index a79e2bd..d669112 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -658,9 +658,9 @@ let TorLauncherUtil = // Public try { if ("tordatadir" == aTorFileType) - torFile.create(torFile.DIRECTORY_TYPE, 0700); + torFile.create(torFile.DIRECTORY_TYPE, 0o700); else - torFile.create(torFile.NORMAL_FILE_TYPE, 0600); + torFile.create(torFile.NORMAL_FILE_TYPE, 0o600); } catch (e) { @@ -883,7 +883,7 @@ let TLUtilInternal = // Private let d = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); d.initWithPath(aBasePath); d.append("Tor"); - d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0700); + d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o700); return d; } catch (e)

1 0

[tor-launcher/master] Mozilla ripped out nsIPrefBranchInternal
by gk＠torproject.org 23 May '18

23 May '18

commit a2a42c64de4322f96a77451e64e839ada353eda7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:56:38 2018 +0000 Mozilla ripped out nsIPrefBranchInternal Apparently nsIPrefBranchInternal was a trivial subclass of nsIPrefBranch, so we simply switch which class we use. https://bugzilla.mozilla.org/show_bug.cgi?id=1374847 --- src/modules/tl-logger.jsm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tl-logger.jsm b/src/modules/tl-logger.jsm index 19168d2..a2ea404 100644 --- a/src/modules/tl-logger.jsm +++ b/src/modules/tl-logger.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2013, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Based on torbutton-logger.js (pull in copyright and license?) // @@ -108,8 +108,8 @@ let TLLoggerInternal = // Private { // Register observer var prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranchInternal) - .QueryInterface(Ci.nsIPrefBranchInternal); + .getService(Ci.nsIPrefBranch) + .QueryInterface(Ci.nsIPrefBranch); prefs.addObserver("extensions.torlauncher", this, false); this.mLogLevel = TorLauncherUtil.getIntPref(

1 0

[tor-launcher/master] Replace nsIScriptableDateFormat with Services.intl.DateTimeFormat
by gk＠torproject.org 23 May '18

23 May '18

commit eccf3749f046da385eae27176f4c9e692a5784ff Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri May 4 21:17:32 2018 +0000 Replace nsIScriptableDateFormat with Services.intl.DateTimeFormat In bug 1313625 Mozilla ripped out support for nsIScriptableDateFormat because ECMAScript now has support for this. This change is based on bug 1383463. --- src/components/tl-protocol.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 79b327e..6659621 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -13,6 +13,7 @@ const Cr = Components.results; const Cu = Components.utils; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", @@ -636,10 +637,6 @@ TorProtocolService.prototype = let s = ""; if (this.mTorLog) { - let dateFmtSvc = Cc["@mozilla.org/intl/scriptabledateformat;1"] - .getService(Ci.nsIScriptableDateFormat); - let dateFormat = dateFmtSvc.dateFormatShort; - let timeFormat = dateFmtSvc.timeFormatSecondsForce24Hour; let eol = (TorLauncherUtil.isWindows) ? "\r\n" : "\n"; let count = this.mTorLog.length; if (aCountObj) @@ -648,12 +645,16 @@ TorProtocolService.prototype = { let logObj = this.mTorLog[i]; let secs = logObj.date.getSeconds(); - let timeStr = dateFmtSvc.FormatDateTime("", dateFormat, timeFormat, - logObj.date.getFullYear(), logObj.date.getMonth() + 1, - logObj.date.getDate(), logObj.date.getHours(), - logObj.date.getMinutes(), secs); + + let options = { year: '2-digit', month: 'numeric', day: 'numeric', + hour: 'numeric', minute: 'numeric', second: 'numeric', + hour12: false }; + let timeStr = new Intl.DateTimeFormat('en-US', options) + .format(logObj.date, options); + if (' ' == timeStr.substr(-1)) timeStr = timeStr.substr(0, timeStr.length - 1); + let fracSecsStr = "" + logObj.date.getMilliseconds(); while (fracSecsStr.length < 3) fracSecsStr += "0";

1 0

[tor-launcher/master] Load default prefs during initialization
by gk＠torproject.org 23 May '18

23 May '18

commit 949379555010a04633c64b08ed52896a86c2cce6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri May 4 14:26:32 2018 +0000 Load default prefs during initialization In bug 1413413 Mozilla ripped out support for loading default prefs from extensions. Unfortunately, backing out that changeset is non-trivial so it is easier if we set the default prefs manually. Here we define a function named pref() and it sets the preference based on the type of the pref's value. We only support a few types: boolean, number, and string. All other types are handled by the default case where a message is logged and the pref is skipped. The default prefs must be set before Tor Launcher begins making decisions based on them. An exception is thrown with Cr.NS_ERROR_NOT_INITIALIZED when this requirement is violated. --- src/components/tl-process.js | 23 ++++++++- src/modules/tl-util.jsm | 108 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 8d3efb7..1c67817 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -19,6 +19,13 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", function TorProcessService() { + this.mDefaultPreferencesAreLoaded = TorLauncherUtil.loadDefaultPreferences(); + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("Setting (some) default preferences failed!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + this.wrappedJSObject = this; this.mProtocolSvc = Cc["@torproject.org/torlauncher-protocol-service;1"] .getService(Ci.nsISupports).wrappedJSObject; @@ -98,6 +105,13 @@ TorProcessService.prototype = this.mObsSvc.addObserver(this, kUserQuitTopic, false); this.mObsSvc.addObserver(this, kBootstrapStatusTopic, false); + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("Default preferences not loaded at " + + "profile-after-change notification!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + if (TorLauncherUtil.shouldOnlyConfigureTor) { this._controlTor(true, false); @@ -304,6 +318,13 @@ TorProcessService.prototype = TorStartAndControlTor: function(aForceDisableNetwork) { + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("TorLauncher is starting Tor but " + + "the default preferences were not set!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + this._startTor(aForceDisableNetwork); let isRunningTor = (this.mTorProcessStatus == this.kStatusStarting) || (this.mTorProcessStatus == this.kStatusRunning); @@ -333,7 +354,7 @@ TorProcessService.prototype = mQuitSoon: false, // Quit was requested by the user; do so soon. mLastTorWarningPhase: null, mLastTorWarningReason: null, - + mDefaultPreferencesAreLoaded: false, // Private Methods ///////////////////////////////////////////////////////// _startTor: function(aForceDisableNetwork) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index d669112..292f88b 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -226,6 +226,11 @@ let TorLauncherUtil = // Public }, // Preferences + loadDefaultPreferences: function() + { + return TLUtilInternal._loadPreferences(); + }, + getBoolPref: function(aPrefName, aDefaultVal) { var rv = (undefined != aDefaultVal) ? aDefaultVal : false; @@ -749,6 +754,9 @@ let TLUtilInternal = // Private mAppDir: null, // nsIFile (cached; access via this._appDir) mDataDir: null, // nsIFile (cached; access via this._dataDir) mIsFirstIPCPathRequest : true, + mNumDefaultPrefsDefined: 0, + mNumDefaultPrefsLoaded: 0, + mDefaultPreferencesLoaded: false, _init: function() { @@ -756,6 +764,106 @@ let TLUtilInternal = // Private .getService(Ci.nsIPrefBranch); }, + _getPrefDefaultBranch: function(aBranchName) + { + return Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefService) + .getDefaultBranch(aBranchName); + }, + + _setPref: function(aSetPrefFunc, aPrefName, aValue) + { + try + { + aSetPrefFunc(aPrefName, aValue); + } + catch(e) + { + TorLauncherLogger.log(5, "Setting default pref '" + aPrefName + + "' threw exception: " + e); + return false; + } + + return true; + }, + + pref: function (aPrefName, aValue) + { + // Increment this counter for each pref() call. + this.mNumDefaultPrefsDefined += 1; + + let lastPeriod = aPrefName.lastIndexOf("."); + // This pref doesn't contain a period (".") + // or the period is the first character. + if (lastPeriod == 0 || lastPeriod == -1) + { + TorLauncherLogger.log(5, "Ignoring invalid pref '" + aPrefName + "'"); + return; + } + // This pref has a period at the last character, we can't set + // a default value on a pref root. + if (aPrefName.length == (lastPeriod + 1)) + { + TorLauncherLogger.log(5, + "Ignoring invalid pref ending with a period: '" + aPrefName + "'"); + return; + } + + let prefRoot = aPrefName.substring(0, lastPeriod + 1); + let defaultBranch = this._getPrefDefaultBranch(prefRoot); + let prefName = aPrefName.substring(lastPeriod + 1); + let setPrefFunc; + switch (typeof aValue) + { + case "boolean": + setPrefFunc = defaultBranch.setBoolPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + case "number": + setPrefFunc = defaultBranch.setIntPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + case "string": + setPrefFunc = defaultBranch.setCharPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + default: + TorLauncherLogger.log(5, "Cowardly not setting pref '" + + aPrefName + "' of type '" + (typeof aValue) + "'"); + return; + } + + // Increment this counter for each pref() call where the default preference + // was successfully set. + this.mNumDefaultPrefsLoaded += 1; + }, + + _loadPreferences: function() + { + if (this.mDefaultPreferencesLoaded) + { + return this.mDefaultPreferencesLoaded; + } + + var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"] + .getService(Ci.mozIJSSubScriptLoader); + loader.loadSubScript( + "resource://torlauncher/defaults/preferences/prefs.js", this); + + this.mDefaultPreferencesLoaded = + (this.mNumDefaultPrefsDefined == this.mNumDefaultPrefsLoaded); + return this.mDefaultPreferencesLoaded; + }, + get _stringBundle() { if (!this.mStringBundle)

1 0

[tor-browser-build/master] Bug 26054: Make sure to create incrementals from previously signed MAR files
by gk＠torproject.org 23 May '18

23 May '18

commit 0bfae091fa18b6bca05de2cac42bacac47381876 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 15:54:31 2018 +0200 Bug 26054: Make sure to create incrementals from previously signed MAR files --- tools/update-responses/update_responses | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bf2415d..1df35b3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -209,6 +209,10 @@ sub create_incremental_mar { my $tmpdir = get_tmpdir($config); extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); + # bug 26054: make sure previous macOS version is code signed + if (($os eq 'osx64') && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") { + exit_error "Missing code signature in $from_version while creating $mar_file"; + } if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") {

1 0

[tor-browser-build/master] Bug 26059: Use signed directory when generating incremental mars
by gk＠torproject.org 23 May '18

23 May '18

commit ae1c8fd96fdb9f3208a84cca6ec9c8d546ada459 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 13:14:13 2018 +0200 Bug 26059: Use signed directory when generating incremental mars We update the update_responses script to be able to specify a different $releases_dir for each version. When generating incremental mars, this allows us to set the default releases_dir to {alpha,release}/signed and the current version's releases_dir to {alpha,release}/unsigned. --- Makefile | 4 ++-- projects/release/config | 4 ++++ projects/release/update_responses_config.yml | 5 ++++- tools/update-responses/update_responses | 27 ++++++++++++++++----------- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2707d41..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -111,13 +111,13 @@ signtag-alpha: submodule-update $(rbm) build release --step signtag --target alpha incrementals-release: submodule-update - $(rbm) build release --step update_responses_config --target release + $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update - $(rbm) build release --step update_responses_config --target alpha + $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha diff --git a/projects/release/config b/projects/release/config index e48fb01..2aba446 100644 --- a/projects/release/config +++ b/projects/release/config @@ -73,6 +73,10 @@ targets: var: signed_status: signed + create_unsigned_incrementals: + var: + create_unsigned_incrementals: 1 + input_files: # Release diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 01c6950..1a9b0cf 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -5,7 +5,7 @@ appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win32: torbrowser-install appname_bundle_win64: torbrowser-install-win64 -releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %] +releases_dir: [% path(c('output_dir')) %]/signed download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../keyring/torbrowser.gpg @@ -25,6 +25,9 @@ channels: [% pc('firefox', 'var/torbrowser_update_channel') %]: [% c("var/torbrowser_version") %] versions: [% c("var/torbrowser_version") %]: +[% IF c("var/create_unsigned_incrementals") -%] + releases_dir: [% path(c('output_dir')) %]/unsigned +[% END -%] platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] detailsURL: https://blog.torproject.org/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released incremental_from: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 658f451..bf2415d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -92,7 +92,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $appname = $config->{appname_marfile}; my $files = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $version); my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { @@ -126,7 +126,7 @@ sub get_version_files { sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $version); my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { @@ -179,15 +179,15 @@ sub extract_mar { } sub mar_filename { - my ($appname, $version, $os, $lang) = @_; - "$releases_dir/$version/$appname-$os-${version}_$lang.mar"; + my ($config, $appname, $version, $os, $lang) = @_; + version_dir($config, $version) . "/$appname-$os-${version}_$lang.mar"; } sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; my $appname = $config->{appname_marfile}; my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar"; - my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n"; return; @@ -207,8 +207,8 @@ sub create_incremental_mar { }; return if $pm->start($finished_file); my $tmpdir = get_tmpdir($config); - extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); - extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); + extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); + extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { @@ -250,6 +250,11 @@ sub get_config { // $config->{$name}; } +sub version_dir { + my ($config, $version) = @_; + return get_config($config, $version, 'any', 'releases_dir') . "/$version"; +} + sub channel_to_version { my ($config, @channels) = @_; return values %{$config->{channels}} unless @channels; @@ -270,7 +275,7 @@ sub get_buildinfos { next unless $files->{$os}{$lang}{complete}; my $tmpdir = get_tmpdir($config); extract_mar( - mar_filename($config->{appname_marfile}, $version, $os, $lang), + mar_filename($config, $config->{appname_marfile}, $version, $os, $lang), "$tmpdir"); my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; $appfile = "$tmpdir/Contents/Resources/application.ini" @@ -423,7 +428,7 @@ my $martools_tmpdir; sub extract_martools { my ($config, $version) = @_; my $osname = osname; - my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; + my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; chdir $martools_tmpdir; @@ -523,7 +528,7 @@ sub check_update_responses_channel { sub download_version { my ($config, $version) = @_; my $tmpdir = get_tmpdir($config); - my $destdir = "$releases_dir/$version"; + my $destdir = version_dir($config, $version); my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { @@ -576,7 +581,7 @@ sub download_missing_versions { my $cversion = $config->{channels}{$channel}; next unless $config->{versions}{$cversion}{incremental_from}; foreach my $version (@{$config->{versions}{$cversion}{incremental_from}}) { - next if -d "$releases_dir/$version"; + next if -d version_dir($config, $version); download_version($config, $version); } }

1 0

[torbutton/master] Bug 24309: Fix identity popup dimensions
by gk＠torproject.org 23 May '18

23 May '18

commit 8057989d2d37edcce8cc3bf04e6a145d19440be6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 22 10:04:37 2018 -0700 Bug 24309: Fix identity popup dimensions On some OSes relay lines are wrapping and the doorhanger is sometimes rendering too small to show everything inside. We avoid the line wrapping and resize the identity popup where needed. --- src/chrome/content/tor-circuit-display.js | 43 +++++++++++++++++++++++++++++++ src/chrome/skin/tor-circuit-display.css | 1 + 2 files changed, 44 insertions(+) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index cbea569..5bd02bc 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -392,6 +392,44 @@ let setupGuardNote = function () { learnMoreString]]); }; +// __ensureCorrectPopupDimensions()__. +// Make sure the identity popup always displays with the correct height. +let ensureCorrectPopupDimensions = function () { + let setDimensions = () => { + setTimeout(() => { + let view = document.querySelector("#identity-popup-multiView .panel-viewcontainer"); + let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); + let view2 = document.getElementById("identity-popup-mainView"); + if (view && stack && view2) { + let newWidth = Math.max(...[...view2.children].map(el => el.clientWidth)) + 10; + let newHeight = stack.clientHeight; + stack.setAttribute("width", newWidth); + view2.style.minWidth = view2.style.maxWidth = newWidth + "px"; + view.setAttribute("width", newWidth); + view.setAttribute("height", newHeight); + } + }, 0); + }; + let removeDimensions = () => { + let view = document.querySelector("#identity-popup-multiView .panel-viewcontainer"); + let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); + let view2 = document.getElementById("identity-popup-mainView"); + if (view && stack && view2) { + view.removeAttribute("width"); + view.removeAttribute("height"); + stack.removeAttribute("width"); + view2.style.minWidth = view2.style.maxWidth = ""; + } + }; + let popupMenu = document.getElementById("identity-popup"); + popupMenu.addEventListener("popupshowing", setDimensions); + popupMenu.addEventListener("popuphiding", removeDimensions); + return () => { + popupMenu.removeEventListener("popupshowing", setDimensions); + popupMenu.removeEventListener("popuphiding", removeDimensions); + }; +}; + // ## Main function // __setupDisplay(ipcFile, host, port, password, enablePrefName)__. @@ -403,6 +441,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, + stopEnsuringCorrectPopupDimensions = null, stop = function() { syncDisplayWithSelectedTab(false); if (myController) { @@ -412,6 +451,9 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { if (stopCollectingBrowserCredentials) { stopCollectingBrowserCredentials(); } + if (stopEnsuringCorrectPopupDimensions) { + stopEnsuringCorrectPopupDimensions(); + } myController = null; } }, @@ -428,6 +470,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { syncDisplayWithSelectedTab(true); stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); stopCollectingBrowserCredentials = collectBrowserCredentials(); + stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions(); } }; try { diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 71c283c..640d595 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -62,6 +62,7 @@ ul#circuit-display-nodes li { background-repeat: no-repeat; list-style: none; padding-inline-start: 1.5em; + white-space: nowrap; } ul#circuit-display-nodes li:-moz-locale-dir(rtl) {

1 0

[torbutton/master] Fix two typos
by gk＠torproject.org 22 May '18

22 May '18

commit a3447ddb13c279e7e4c384610b98a045e7f932bb Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 22 08:40:01 2018 +0000 Fix two typos --- src/chrome/content/tor-circuit-display.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index cb43499..cbea569 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -282,13 +282,13 @@ let xmlTree = function xmlTree (ns, data) { // __htmlTree(data)__. // Takes a data structure representing html elements like // [tag, { attr-key: attr-value }, ...html-children] -// and return nested html element objects. +// and returns nested html element objects. let htmlTree = data => xmlTree("http://www.w3.org/1999/xhtml", data); // __appendHtml(parent, data)__. // Takes a data structure representing html elements like // [tag, { attr-key: attr-value }, ...html-children] -// and append nested html element objects to the parent element. +// and appends nested html element objects to the parent element. let appendHtml = (parent, data) => parent.appendChild(htmlTree(data)); // __circuitCircuitData()__.

1 0

[torbutton/master] Bug 24309: Move circuit display to the identity popup.
by gk＠torproject.org 22 May '18

22 May '18

commit 26d4ce95369819a1aeefd30fd52f670fc589b5ea Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 12 15:36:44 2018 -0700 Bug 24309: Move circuit display to the identity popup. New circuit display design by Antonela Debiasi. The new design includes a "Guard" indicator, a "Load New Circuit" button, new Photon-compatible style. --- src/chrome.manifest | 1 + src/chrome/content/popup.xul | 12 -- src/chrome/content/tor-circuit-display.js | 130 +++++++++++++++------ src/chrome/content/tor-circuit-display.xul | 34 ++++++ src/chrome/locale/en/torbutton.dtd | 3 +- src/chrome/locale/en/torbutton.properties | 5 +- src/chrome/skin/relay.svg | 10 ++ src/chrome/skin/tor-circuit-display.css | 176 ++++++++++++++++------------- 8 files changed, 247 insertions(+), 124 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 65f55a9..f72fffa 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -15,6 +15,7 @@ overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/abou # UI customization overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul +overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul # Strings for the about:tbupdate page override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 9447b70..b088a82 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> -<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> @@ -51,17 +50,6 @@ insertafter="context-stop" oncommand="torbutton_check_for_update()"/> </vbox> - <vbox id="circuit-display-container"> - <div id="circuit-display" xmlns="http://www.w3.org/1999/xhtml" dir="auto"> - <p id="title">&torbutton.circuit_display.title;</p> - <p id="domain">(example.com)</p> - <ul id="circuit-nodes" dir="auto"> - <li>example A</li> - <li>example B</li> - <li>example C</li> - </ul> - </div> - </vbox> </hbox> </panel> </overlay> diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index b5c24f8..cb43499 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -215,7 +215,7 @@ let regionBundle = Services.strings.createBundle( // Convert a country code to a localized country name. // Example: `'de'` -> `'Deutschland'` in German locale. let localizedCountryNameFromCode = function (countryCode) { - if (typeof(countryCode) === "undefined") return undefined; + if (!countryCode) return uiString("unknown_country"); try { return regionBundle.GetStringFromName(countryCode.toLowerCase()); } catch (e) { @@ -249,7 +249,7 @@ let nodeLines = function (nodeData) { (country ? " (" + country + ")" : "")) : // For each non-bridge relay, show its host country and IP. - (country || uiString("unknown_country")) + + country + // As we don't have a bridge, show the IP address // of the node. Use unicode escapes to ensure that // parentheses behave properly in both left-to-right @@ -260,46 +260,90 @@ let nodeLines = function (nodeData) { return result; }; -// __onionSiteRelayLine__. -// When we have an onion site, we simply show the word '(relay)'. -let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; +// __xmlTree(ns, data)__. +// Takes an xml namespace, ns, and a +// data structure representing xml elements like +// [tag, { attr-key: attr-value }, ...xml-children] +// and returns nested xml element objects. +let xmlTree = function xmlTree (ns, data) { + let [type, attrs, ...children] = data; + let element = document.createElementNS(ns, type); + for (let [key, val] of Object.entries(attrs)) { + element.setAttribute(key, val); + } + for (let child of children) { + if (child !== null && child !== undefined) { + element.append(typeof child === "string" ? child : xmlTree(ns, child)); + } + } + return element; +}; + +// __htmlTree(data)__. +// Takes a data structure representing html elements like +// [tag, { attr-key: attr-value }, ...html-children] +// and return nested html element objects. +let htmlTree = data => xmlTree("http://www.w3.org/1999/xhtml", data); + +// __appendHtml(parent, data)__. +// Takes a data structure representing html elements like +// [tag, { attr-key: attr-value }, ...html-children] +// and append nested html element objects to the parent element. +let appendHtml = (parent, data) => parent.appendChild(htmlTree(data)); + +// __circuitCircuitData()__. +// Obtains the circuit used by the given browser. +let currentCircuitData = function (browser) { + if (browser) { + let credentials = browserToCredentialsMap.get(browser); + if (credentials) { + let [SOCKS_username, SOCKS_password] = credentials; + let nodeData = credentialsToNodeDataMap[`${SOCKS_username}|${SOCKS_password}`]; + let domain = SOCKS_username; + return { domain, nodeData }; + } + } + return { domain: null, nodeData: null }; +}; // __updateCircuitDisplay()__. // Updates the Tor circuit display, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { - let selectedBrowser = gBrowser.selectedBrowser; - if (selectedBrowser) { - let credentials = browserToCredentialsMap.get(selectedBrowser), - nodeData = null; - if (credentials) { - let [SOCKS_username, SOCKS_password] = credentials; - // Check if we have anything to show for these credentials. - nodeData = credentialsToNodeDataMap[SOCKS_username + "|" + SOCKS_password]; - if (nodeData) { - // Update the displayed domain. - let domain = SOCKS_username; - document.getElementById("domain").innerHTML = "(" + domain + "):"; - // Update the displayed information for the relay nodes. - let lines = nodeLines(nodeData), - nodeInnerHTML = "<li>" + uiString("this_browser") + "</li>"; - for (let line of lines) { - nodeInnerHTML += "<li>" + line + "</li>"; - } - nodeInnerHTML += domain.endsWith(".onion") ? - (onionSiteRelayLine + - onionSiteRelayLine + - onionSiteRelayLine + - "<li>" + uiString("onion_site") + "</li>") : - "<li>" + uiString("internet") + "</li>"; - document.getElementById("circuit-nodes").innerHTML = nodeInnerHTML; + let { domain, nodeData } = currentCircuitData(gBrowser.selectedBrowser); + if (domain && nodeData) { + // Update the displayed information for the relay nodes. + let nodeHtmlList = document.getElementById("circuit-display-nodes"); + let li = (...data) => appendHtml(nodeHtmlList, ["li", {}, ...data]); + nodeHtmlList.innerHTML = ""; + li(uiString("this_browser")); + for (let i = 0; i < nodeData.length; ++i) { + let relayText; + if (nodeData[i].type === "bridge") { + relayText = uiString("tor_bridge") + + ((nodeData[i].bridgeType !== "vanilla") ? `: ${nodeData[i].bridgeType}` : ""); + } else { + relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } - } else { - logger.eclog(5, "no SOCKS credentials found for current document."); + li(relayText, " ", + ["span", { class: "circuit-ip-address" }, nodeData[i].ip], " ", + (i === 0 && nodeData[0].type !== "bridge") ? + ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); } + if (domain.endsWith(".onion")) { + for (let i = 0; i < 3; ++i) { + li(uiString("relay")); + } + } + li(domain); + // Hide the note about guards if we are using a bridge. + document.getElementById("circuit-guard-note-container").style.display = + (nodeData[0].type === "bridge") ? "none" : "block"; + } else { // Only show the Tor circuit if we have credentials and node data. - showCircuitDisplay(credentials && nodeData); + logger.eclog(5, "no SOCKS credentials found for current document."); } + showCircuitDisplay(domain && nodeData); }; // __syncDisplayWithSelectedTab(syncOn)__. @@ -314,7 +358,7 @@ let syncDisplayWithSelectedTab = (function() { } } }; return function (syncOn) { - let popupMenu = document.getElementById("torbutton-context-menu"); + let popupMenu = document.getElementById("identity-popup"); if (syncOn) { // Update the circuit display just before the popup menu is shown. popupMenu.addEventListener("popupshowing", updateCircuitDisplay); @@ -331,6 +375,23 @@ let syncDisplayWithSelectedTab = (function() { }; })(); +// __setupGuardNote()__. +// Call once to show the Guard note as intended. +let setupGuardNote = function () { + let guardNote = document.getElementById("circuit-guard-note-container"); + let guardNoteString = uiString("guard_note"); + let learnMoreString = uiString("learn_more"); + let [noteBefore, name, noteAfter] = guardNoteString.split(/[\[\]]/); + let localeCode = torbutton_get_general_useragent_locale(); + appendHtml(guardNote, + ["div", {}, + noteBefore, ["span", {class: "circuit-guard-name"}, name], + noteAfter, " ", + ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/${localeCode}');`, + class: "circuit-link"}, + learnMoreString]]); +}; + // ## Main function // __setupDisplay(ipcFile, host, port, password, enablePrefName)__. @@ -338,6 +399,7 @@ let syncDisplayWithSelectedTab = (function() { // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { + setupGuardNote(); let myController = null, stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, diff --git a/src/chrome/content/tor-circuit-display.xul b/src/chrome/content/tor-circuit-display.xul new file mode 100644 index 0000000..b4d4ac7 --- /dev/null +++ b/src/chrome/content/tor-circuit-display.xul @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> + +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + +<overlay id="circuit-display-overlay" + xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> + <panelview id="identity-popup-mainView"> +  + <xul:hbox id="circuit-display-container" + class="identity-popup-section" + insertafter="identity-popup-security"> + <xul:vbox id="circuit-display-content" flex="1"> + <xul:label id="circuit-display-headline" + class="identity-popup-headline" + value="&torbutton.circuit_display.title;"/> + <html:ul id="circuit-display-nodes" dir="auto"> + <li>example A</li> + <li>example B</li> + <li>example C</li> + </html:ul> + </xul:vbox> + <xul:vbox id="circuit-reload-content" flex="1"> + <html:button id="circuit-reload-button" + onclick="torbutton_new_circuit()"> + &torbutton.circuit_display.new_circuit; + </html:button> + <xul:hbox id="circuit-guard-note-container"> + </xul:hbox> + </xul:vbox> + </xul:hbox> + </panelview> +</overlay> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 7ccad6a..a0ef5f9 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 2391e69..468a532 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP unknown torbutton.circuit_display.onion_site = Onion site torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Learn more torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg new file mode 100644 index 0000000..b2f5f16 --- /dev/null +++ b/src/chrome/skin/relay.svg @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +  + <title>relay</title> + <desc>Created with Sketch.</desc> + <defs></defs> + <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-448.000000, -65.000000)"> + <path d="M462.904942,71.0268217 L467.575247,74.1403583 C468.095041,73.9073638 468.671277,73.7777778 469.277778,73.7777778 C471.57895,73.7777778 473.444444,75.6432726 473.444444,77.9444444 C473.444444,80.2456163 471.57895,82.1111111 469.277778,82.1111111 C468.296528,82.1111111 467.394661,81.7717448 466.682726,81.2041667 L462.234549,83.9842882 C462.366276,84.5801474 462.366276,85.197587 462.234549,85.7934462 L466.682726,88.5735677 C467.394661,88.006033 468.296528,87.6666667 469.277778,87.6666667 C471.57895,87.6666667 473.444444,89.5321615 473.444444,91.8333333 C473.444444,94.1345052 471.57895,96 469.277778,96 C466.976606,96 465.111111,94.1345052 465.111111,91.8333333 C465.111023,91.5291178 465.144147,91.2258017 465.209896,90.928776 L460.761719,88.1486545 C460.049783,88.7161892 459.147917,89.0555556 458.166667,89.0555556 C455.865495,89.0555556 454,87.1900608 454,84.8888889 C454,82.587717 455.865495,80.7222222 458.166667,80.7222222 C459.147917,80.7222222 460.049783,81.0615885 46 0.761719,81.6291233 L465.209896,78.8490017 C465.145399,78.5577257 465.111111,78.2551215 465.111111,77.9444444 C465.111111,77.2224682 465.29474,76.5433776 465.617841,75.95133 L461.36038,73.1130222 C460.739536,73.5327021 459.990981,73.7777778 459.185185,73.7777778 C457.037411,73.7777778 455.296296,72.0366629 455.296296,69.8888889 C455.296296,67.7411149 457.037411,66 459.185185,66 C461.332959,66 463.074074,67.7411149 463.074074,69.8888889 C463.074074,70.2848045 463.01491,70.6669018 462.904942,71.0268217 Z" id="Line-2" fill="#000000" fill-rule="nonzero"></path> + </g> +</svg> \ No newline at end of file diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index d3b5edc..71c283c 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -4,110 +4,134 @@ a domain, and a bulleted list. Each bullet in the circuit node list is supposed to represent a Tor circuit node, and lines drawn between them to represent Tor network inter-relay connections. - -CSS for line between bullets is derived in part from https://jsfiddle.net/5JP8Q/ */ -/* The circuit-display div encloses all other HTML elements. - Color the background to make circuit display distinct - from the rest of the popup. */ -div#circuit-display { - background-color: #e8f4f4; - font-family: Arial; - width: 100%; - height: 100%; - padding: 8px; - /* Magically keep popup menu from clipping div: */ - display: table-cell; + +#circuit-display-content { + background-image: url(chrome://torbutton/skin/relay.svg); + background-position: 1em 1em; + background-repeat: no-repeat; + background-size: 24px auto; + background-color: rgba(255,255,255,0.4); + background-blend-mode: lighten; cursor: default; + padding: 0.5em 0px 0.5em; + padding-inline-end: 1em; + padding-inline-start: calc(2em + 24px); + width: 100%; } -/* Format the title text. */ -div#circuit-display p#title { - font-size: 15px; - font-weight: bold; - color: #2c26a7; - margin: 0; +#circuit-display-content:-moz-locale-dir(rtl) { + background-position: calc(100% - 1em) 1em; +} + +#circuit-reload-content { + background-color: #f7f7f7; + cursor: default; + padding: 1em 0px 1em; + padding-inline-end: 3em; + padding-inline-start: calc(2em + 24px); + width: 100%; } /* Format the domain text. */ -div#circuit-display p#domain { - font-size: 13px; - color: black; - margin: 4px; +#circuit-display-domain { + opacity: 0.8; +} + +#circuit-div { + position: relative; + margin-inline-start: 6px; } /* Format the circuit node list. */ -ul#circuit-nodes { - font-family: Arial; - font-size: 14px; - color: black; - margin-top: 8px; - padding-left: 8px; - padding-right: 8px; -} - -/* Hide default bullets, and position pseudoelements (our new bullets) relative - to the list items. */ -ul#circuit-nodes li { +ul#circuit-display-nodes { + /* font-family: Arial; */ + font-size: 16px; + line-height: 26px; + /* color: black;*/ + margin-top: 4px; + margin-bottom: 2px; + padding-inline-start: 4px; +} + +/* Hide default bullets, and draw our own bullets */ +ul#circuit-display-nodes li { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%270%25%27%20x2%3D%2750%25%27%20y2%3D%27100%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); + background-position: left center; + background-repeat: no-repeat; list-style: none; - position:relative; + padding-inline-start: 1.5em; } -/* Pad the list item text at left or right to be tastefully - separated from bullets. */ -ul#circuit-nodes li:-moz-dir(ltr) { - padding-left: 18px; +ul#circuit-display-nodes li:-moz-locale-dir(rtl) { + background-position: right center; } -ul#circuit-nodes li:-moz-dir(rtl) { - padding-right: 18px; + +ul#circuit-display-nodes li:first-child { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%2750%25%27%20x2%3D%2750%25%27%20y2%3D%27100%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); +} + +ul#circuit-display-nodes li:last-child { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%270%25%27%20x2%3D%2750%25%27%20y2%3D%2750%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); +} + +.circuit-guard-help { + -moz-context-properties: fill, stroke; + fill: #6200a4; + stroke: #6200a4; +} + +.circuit-ip-address { + font-size: 80%; + opacity: 0.4; + padding-inline-start: 3px; } -/* Drawn bullets, centered vertically for each list item. */ -ul#circuit-nodes li:after { - /* bullets */ - content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2711%27%20height%3D%2711%27%3E%3Ccircle%20cx%3D%275.5%27%20cy%3D%275.5%27%20r%3D%274%27%20style%3D%27stroke%3A%20%23195021%3B%20stroke-width%3A%202px%3B%20fill%3A%20white%3B%27%2F%3E%3C%2Fsvg%3E"); - position: absolute; - top: 1px; +.circuit-guard-info { + font-size: 80%; + font-weight: bold; + color: #6200a4; + padding-inline-start: 3px; } -/* Move the bullets to the far left or right, - depending on text directionality. */ -ul#circuit-nodes li:-moz-dir(ltr):after { - left: 0px; +#circuit-reload-button { + background-color: #0060df; + border-radius: 3px; + border: none; + color: white; + cursor: pointer; + font-size: 18px; + padding: 10px; } -ul#circuit-nodes li:-moz-dir(rtl):after { - right: 0px; + +#circuit-reload-button:hover { + background-color: #0058cf; } -/* Draw a connecting vertical line through the bullets. */ -ul#circuit-nodes li:before { - content: ""; - position: absolute; - border-left: 3px solid #4d363a; - height: 100%; - width: 0px; +#circuit-reload-button:active { + background-color: #0050bf; } -/* Position lines through the middle of the bullet. */ -ul#circuit-nodes li:-moz-dir(ltr):before { - left: 4px; +#circuit-guard-note-container { + margin-top: 10px; } -ul#circuit-nodes li:-moz-dir(rtl):before { - right: 4px; + +#circuit-guard-note-container div { + margin-left: 3px; + margin-right: 3px; } -/* Shorten the first list item's line so that it starts under the bullet. */ -ul#circuit-nodes li:first-child:before { - top: 50%; +.circuit-guard-name { + font-weight: bold; + color: #6200a4; } -/* Shorten the last list item's line so that it ends under the bullet. */ -ul#circuit-nodes li:last-child:before { - height: 50%; +.circuit-link { + cursor: pointer; + color: #0000ee; } -/* Onion site relay node text should be gray. */ -ul#circuit-nodes li.relay { - color: gray; -} \ No newline at end of file +.circuit-link:hover { + text-decoration: underline; +}

1 0

[tor-launcher/master] Bug 20890: Increase control port connection timeout
by gk＠torproject.org 17 May '18

17 May '18

commit 9aa5fd46cb33528150400a9b94c14ad5e9b7d4ee Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 16 14:17:16 2018 -0400 Bug 20890: Increase control port connection timeout On slow computers, it can take longer than 30 seconds for Tor Launcher to connect to the tor control port. Increase the timeout to 5 minutes. --- src/components/tl-process.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..2bf5a4c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -38,8 +38,8 @@ TorProcessService.prototype = kWizardProgressPageID: "progress", kInitialControlConnDelayMS: 25, - kMaxControlConnRetryMS: 500, - kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start. + kMaxControlConnRetryMS: 2000, // Retry at least every 2 seconds. + kControlConnTimeoutMS: 5*60*1000, // Wait at most 5 minutes for tor to start. kStatusUnknown: 0, // Tor process status. kStatusStarting: 1,

1 0

[tor-browser-build/maint-7.5] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit efa9901ec57d0d78aa1f8034a922da4f792c0ee0 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-build/master] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit 22af54508a1e98bec13ee9580aac7c1b907043e8 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-build/master] Bug 26057: make it easy to see commit used in nightly builds
by gk＠torproject.org 15 May '18

15 May '18

commit 78ab93d70e73cf37550f45d6fb8fd61825bc1e95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed May 9 10:29:18 2018 +0200 Bug 26057: make it easy to see commit used in nightly builds In order to make it easy to see which commit was used, we include the abbreviated commit hash in the filename of all components that are based on master in the nightly build. To do that, we set git_hash to master, and version (which is included in the filename) to '[% c("abbrev") %]". --- projects/obfs4/config | 1 + projects/sandbox/config | 1 + projects/tor-launcher/config | 3 ++- projects/tor/config | 2 +- projects/torbutton/config | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/obfs4/config b/projects/obfs4/config index 916887f..2bae851 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -13,6 +13,7 @@ var: targets: nightly: git_hash: master + version: '[% c("abbrev") %]' tag_gpg_id: 0 input_files: diff --git a/projects/sandbox/config b/projects/sandbox/config index a7ed768..11fe6be 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -21,6 +21,7 @@ var: targets: nightly: git_hash: master + version: '[% c("abbrev") %]' tag_gpg_id: 0 input_files: diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index e72ce10..fe21a49 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -13,5 +13,6 @@ input_files: targets: nightly: - version: master + version: '[% c("abbrev") %]' + git_hash: master tag_gpg_id: 0 diff --git a/projects/tor/config b/projects/tor/config index 78d834f..6219ea6 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -18,7 +18,7 @@ var: targets: nightly: - version: master + version: '[% c("abbrev") %]' git_hash: master tag_gpg_id: 0 diff --git a/projects/torbutton/config b/projects/torbutton/config index 93bef30..f153cf6 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -13,5 +13,6 @@ input_files: targets: nightly: - version: master + version: '[% c("abbrev") %]' + git_hash: master tag_gpg_id: 0

1 0

[tor-browser-build/master] Bug 25318: Add Tor Browser nightly builds email notification
by gk＠torproject.org 08 May '18

08 May '18

commit 4580c03c937e8ccab86446d60a0d4ee29b7c07c8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 23 13:35:39 2018 +0200 Bug 25318: Add Tor Browser nightly builds email notification Authentication configuration for the email setup is stored in group_vars/boklm-tbb-nightly/dma-auth.yml, encrypted using ansible-vault. The file contains the dma_auth_conf variable, which is the content of the /etc/dma/auth.conf file. --- tools/ansible/Makefile | 2 +- tools/ansible/boklm-tbb-nightly-build.yml | 1 + .../ansible/group_vars/boklm-tbb-nightly/dma-auth.yml | 10 ++++++++++ tools/ansible/group_vars/boklm-tbb-nightly/dma.yml | 8 ++++++++ .../group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 ++ tools/ansible/roles/mta/tasks/main.yml | 18 ++++++++++++++++++ .../roles/tbb-nightly-build/templates/testsuite-config | 5 +++++ 7 files changed, 45 insertions(+), 1 deletion(-) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 72deb5b..ea63a44 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -5,4 +5,4 @@ fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml boklm-tbb-nightly-build: - ansible-playbook -i inventory boklm-tbb-nightly-build.yml + ansible-playbook --vault-password-file=~/ansible-vault/boklm-tbb-nightly -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml index cc37e23..2fe48cd 100644 --- a/tools/ansible/boklm-tbb-nightly-build.yml +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -5,3 +5,4 @@ - role: tbb-builder - role: tbb-nightly-build - role: unattended-upgrades + - role: mta diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml new file mode 100644 index 0000000..254291c --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml @@ -0,0 +1,10 @@ +$ANSIBLE_VAULT;1.1;AES256 +64353537366566623534653938363036396164303631616138313130663766626463303034336564 +6339346639633765383534653561646366626665393333340a343533636436333838633039363265 +33393762363563323338356634396137393466616336326337323761643332363438313735646135 +6633326462616261310a663738306463613237326164663533326230316662333935333361636334 +61336433633964643631653230633861393131646532666536653738376261386535356636666262 +30303761333230623662323037376130386134373939613861343233363038636464623132363135 +66386532346165303839346563383934633462386534383330636432356166666238383332353930 +39316439653733376239343661373265303033323237366132366161316535636165336539333130 +3033 diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml new file mode 100644 index 0000000..b210a3a --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml @@ -0,0 +1,8 @@ +--- +dma_conf: | + SMARTHOST mail.riseup.net + AUTHPATH /etc/dma/auth.conf + SECURETRANSFER + STARTTLS + MAILNAME /etc/mailname + MASQUERADE boklm-tbb-nightly(a)riseup.net diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index ebaadfe..77c4ad6 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -1,3 +1,5 @@ --- nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' +nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org' ]," diff --git a/tools/ansible/roles/mta/tasks/main.yml b/tools/ansible/roles/mta/tasks/main.yml index de469d8..9c5ac49 100644 --- a/tools/ansible/roles/mta/tasks/main.yml +++ b/tools/ansible/roles/mta/tasks/main.yml @@ -4,3 +4,21 @@ apt: name: dma state: present + +- name: create dma auth.conf + copy: + dest: /etc/dma/auth.conf + mode: 0640 + owner: root + group: mail + content: "{{ dma_auth_conf }}" + when: dma_auth_conf is defined + +- name: create dma.conf + copy: + dest: /etc/dma/dma.conf + mode: 0640 + owner: root + group: mail + content: "{{ dma_conf }}" + when: dma_conf is defined diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config index b537f56..c07c52c 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -23,5 +23,10 @@ my %res = ( name => $name, args => [ $testsuite ], tags => [ 'nightly' ], + 'reports-url' => '{{ nightly_build_url }}/reports/', + 'email-subject' => '[build result: [% success ? "ok" : "failed" %]] [% options.name %]', + {% if nightly_build_email_to is defined %}'email-report' => 1,{% endif %} + {% if nightly_build_email_to is defined %}'email-to' => {{ nightly_build_email_to }}{% endif %} + {% if nightly_build_email_from is defined %}'email-from' => {{ nightly_build_email_from }}{% endif %} ); %res;

1 0

[tor-browser-build/master] Bug 25817: add ansible roles for tbb-nightly setup
by gk＠torproject.org 08 May '18

08 May '18

commit a2f565643d4c34a49712c37e3931dd6f80da7ba1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 16 19:30:02 2018 +0200 Bug 25817: add ansible roles for tbb-nightly setup --- README | 43 ++------ tools/ansible/Makefile | 3 + tools/ansible/README | 6 ++ tools/ansible/boklm-tbb-nightly-build.yml | 7 ++ .../boklm-tbb-nightly/tbb-nightly-build.yml | 3 + tools/ansible/inventory | 4 + .../roles/tbb-nightly-build/defaults/main.yml | 11 ++ .../roles/tbb-nightly-build/handlers/main.yml | 5 + .../ansible/roles/tbb-nightly-build/tasks/main.yml | 84 +++++++++++++++ .../roles/tbb-nightly-build/templates/nginx.conf | 16 +++ .../tbb-nightly-build/templates/rbm.local.conf | 116 +++++++++++++++++++++ .../tbb-nightly-build/templates/start-tbb-nightly | 5 + .../tbb-nightly-build/templates/testsuite-config | 27 +++++ .../tbb-nightly-build/templates/www-index.html | 10 ++ 14 files changed, 306 insertions(+), 34 deletions(-) diff --git a/README b/README index d498c05..a20b659 100644 --- a/README +++ b/README @@ -138,43 +138,18 @@ Automated builds using tbb-testsuite ------------------------------------ The Tor Browser testsuite scripts can also be used to do nightly builds -and publish the build logs. +and publish the build logs. The recommended way to do that is to use +the ansible roles from the tools/ansible directory. See next section +for details. -If you want to do that, start by cloning the git repository: - $ git clone https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +Using ansible to set up a nightly build machine +----------------------------------------------- -Install some dependencies: - - # apt-get install -y libdata-dump-perl libfile-slurp-perl \ - libio-captureoutput-perl perlmagick libjson-perl \ - libwww-perl liblwp-protocol-https-perl libtemplate-perl \ - libyaml-syck-perl libdatetime-perl \ - libemail-sender-perl libemail-simple-perl libfile-type-perl \ - libipc-run-perl libxml-libxml-perl - -Copy the config/tor-browser_build-boklm file and edit it: - - $ cd tor-browser-bundle-testsuite - $ cp config/tor-browser_build-boklm config/tor-browser_build-$user - $ vim config/tor-browser_build-$user - -Change the publish_dir and publish_url options. The publish_dir option is -the local directory where the builds will be stored. The publish_url -option is the public URL where the builds will be available. - -Copy the tools/tor-browser-builds-boklm file and edit it to change the ---config= option: - - $ cp tools/tor-browser-builds-boklm tools/tor-browser-builds-$user - $ vim tools/tor-browser-builds-$user - -You can now run ./tools/tor-browser-builds-$user to start the build, and -add it to your crontab. - -The html build reports will be available in the reports/ directory, and -the build files in the tor-browser-builds/ directory (unless you changed -the publish_dir option). +The directory tools/ansible contains some ansible roles to set up a +nightly build machine. You can look at the playbook defined in +boklm-tbb-nightly-build.yml and variables in group_vars/boklm-tbb-nightly/ +for an example of how it can be used. Signing builds diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 608f932..72deb5b 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -3,3 +3,6 @@ ansible-tbb-build: fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml + +boklm-tbb-nightly-build: + ansible-playbook -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/README b/tools/ansible/README index 6b2e6a4..dc69ad7 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -16,3 +16,9 @@ fpcentral: you need to be in the fpcentral tpo ldap group. Your ldap password will be asked, to sudo to the fpcentral user. +boklm-tbb-nightly-build: + This target is used by boklm to deploy a nightly build machine. If + anybody else wants to set up their own nightly builds, it is possible to + do it by adding a new host to the inventory file and making copies of + group_vars/boklm-tbb-nightly/ and boklm-tbb-nightly-build.yml. + diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml new file mode 100644 index 0000000..cc37e23 --- /dev/null +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -0,0 +1,7 @@ +--- + +- hosts: boklm-tbb-nightly-build + roles: + - role: tbb-builder + - role: tbb-nightly-build + - role: unattended-upgrades diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml new file mode 100644 index 0000000..ebaadfe --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -0,0 +1,3 @@ +--- +nightly_build_hostname: f4amtbsowhix7rrf.onion +nightly_build_url: 'http://{{ nightly_build_hostname }}' diff --git a/tools/ansible/inventory b/tools/ansible/inventory index 32a5805..fc25842 100644 --- a/tools/ansible/inventory +++ b/tools/ansible/inventory @@ -1,8 +1,12 @@ build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True +boklm-tbb-nightly-build ansible_ssh_user=root ansible_become_method=su [tbb-build] build-sunet-a [fpcentral] fpcentral + +[boklm-tbb-nightly] +boklm-tbb-nightly-build diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml new file mode 100644 index 0000000..d84a161 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -0,0 +1,11 @@ +--- +nightly_build_user: tbb-nightly +nightly_build_cron_hour: 2 +nightly_build_cron_minute: 20 +nightly_build_keep_builds: 2 +testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" +testsuite_git_url: https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 +nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" +nightly_build_nginx_enable: true +nightly_build_nginx_listen: 127.0.0.1:80 diff --git a/tools/ansible/roles/tbb-nightly-build/handlers/main.yml b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml new file mode 100644 index 0000000..3350d73 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart nginx + service: + name: nginx + state: restarted diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml new file mode 100644 index 0000000..64d31a9 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -0,0 +1,84 @@ +--- +- name: create tbb-nightly user + user: + name: "{{ nightly_build_user }}" + comment: "Tor Browser Nightly Builds" + groups: tbb-build + createhome: yes + home: "/home/{{ nightly_build_user }}" + +- name: clone tor browser testsuite + become: yes + become_user: "{{ nightly_build_user }}" + git: + repo: "{{ testsuite_git_url }}" + dest: "{{ testsuite_dir }}" + version: "{{ testsuite_git_commit }}" + +- name: install testsuite dependencies + command: "{{ testsuite_dir }}/install-deps" + +- name: add testsuite config + template: + src: testsuite-config + dest: "{{ testsuite_dir }}/config/tbb-nightly" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: create rbm-config directory + file: + path: '{{ testsuite_dir }}/rbm-config/' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add rbm config + template: + src: rbm.local.conf + dest: "{{ testsuite_dir }}/rbm-config/tbb-nightly.rbm.local.conf" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: add start-tbb-nightly script + template: + src: start-tbb-nightly + dest: "/home/{{ nightly_build_user }}/start-tbb-nightly" + mode: 0755 + owner: "{{ nightly_build_user }}" + +- name: add cron to start nighly build + cron: + name: tbb-nightly-build + user: "{{ nightly_build_user }}" + hour: "{{ nightly_build_cron_hour }}" + minute: "{{ nightly_build_cron_minute }}" + job: "/home/{{ nightly_build_user }}/start-tbb-nightly" + +- name: create wwwdir + file: + path: '{{ nightly_build_wwwdir }}' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add index page + template: + src: www-index.html + dest: "{{ nightly_build_wwwdir }}/index.html" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: install nginx + apt: + name: nginx + state: present + when: nightly_build_nginx_enable + +- name: add nginx config + template: + src: nginx.conf + dest: /etc/nginx/sites-enabled/tbb-nightly-build + mode: 0644 + notify: + - restart nginx + when: nightly_build_nginx_enable diff --git a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf new file mode 100644 index 0000000..9d44bec --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf @@ -0,0 +1,16 @@ +server { + listen {{ nightly_build_nginx_listen }}; + server_name {{ nightly_build_hostname }}; + root {{ nightly_build_wwwdir }}; + index index.html; + location / { + try_files $uri $uri/ =404; + } + location /reports { + alias {{ testsuite_dir }}/reports; + } + location /tor-browser-builds { + alias {{ testsuite_dir }}/tor-browser-builds; + autoindex on; + } +} diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf new file mode 100644 index 0000000..fcd6b34 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf @@ -0,0 +1,116 @@ +--- +### This file is used to override options from rbm.conf to adapt them +### to your local setup. +### +### Copy this file as rbm.local.conf to enable it, and uncomment the +### options you want to modify. + + +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. +#tmp_dir: /tmp + +### The debug option defines whether a debugging shell should be opened +### automatically in the build directory/container in case of build +### failure. If you are doing automated builds, you might want to disable +### this. +#debug: 0 + +### The build_log option defines in which file the build logs of each +### component are stored. If you set it to '-' the logs are output on +### stdout and stderr. +#build_log: '-' + +### By default, the logs from previous builds are kept in the log files. +### If you set build_log_append to 0, then previous logs are cleaned +### when starting a new build. +#build_log_append: 0 + +buildconf: + buildconf: 1 + + ### The buildconf/num_procs option can be used to select the number of + ### build processes to run simultaneously. You can also use the + ### RBM_NUM_PROCS environment variable. The default is 4. + #num_procs: 8 + + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + +var: + local_conf: 1 + + ### The var/sign_build option defines if you want to sign the + ### sha256sums-unsigned-build.txt file with gpg. + #sign_build: 1 + + ### The var/sign_build_gpg_opts option can be used to define some gpg + ### options to select the key to use to sign the sha256sums-unsigned-build.txt + ### file. + #sign_build_gpg_opts: '--local-user XXXXXXXX' + + ### The clean configuration is used by the cleaning script to find the + ### branches and build targets you are using, to compute the list of + ### files that should be kept. + ### + ### If you only do alpha builds for all platforms, you can use the + ### following configuration: + clean: + HEAD: + - project: release + target: + - alpha + - torbrowser-all + - project: release + target: + - nightly + - torbrowser-all + # + ### If you are doing 'release' builds in the maint-7.0 branch and + ### 'alpha' builds in the master branch, you can use the following + ### configuration: + #clean: + # master: + # - project: release + # target: + # - alpha + # - torbrowser-all + # maint-7.0: + # - project: release + # target: + # - release + # - torbrowser-all + +targets: + + ### testbuild is based on alpha by default. Uncomment this if you want it + ### to be based on nightly. + #torbrowser-testbuild: + # - testbuild + # - nightly + + testbuild: + var: + testbuild: 1 + + ### Uncomment this if you want to create mar files in your test build. + #build_mar: 1 + + nightly: + + ### By default 'fetch' is set to 1 for nightly builds, meaning that new + ### commits will be fetched automatically during each build. You can + ### disable this during development if you want to do rebuilds to test + ### a specific change, but don't want rebuilds caused by unrelated + ### changes, or if you want to decide at which point new commits are + ### fetched. When 'fetch' is set to 'if_needed', new commits will only + ### be fetched if the selected commit (or branch, or tag) is not present, + ### which means that existing branches won't be updated. In that case + ### you can fetch new commits by running 'make fetch'. + fetch: 'if_needed' + +# vim: filetype=yaml sw=2 diff --git a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly new file mode 100644 index 0000000..3c1847d --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly @@ -0,0 +1,5 @@ +#!/bin/sh +cd {{ testsuite_dir }} +export RBM_NO_DEBUG=1 +./tbb-testsuite --config=tbb-nightly "$@" +./tools/prune-old-builds/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config new file mode 100644 index 0000000..b537f56 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -0,0 +1,27 @@ +# vim: filetype=perl expandtab +use strict; +use FindBin; +use DateTime; +use TBBTestSuite::TestSuite::TorBrowserBuild; + +my $date = DateTime->now->ymd; +my $name = "tor-browser-$date"; + +if (-d "$options->{'reports-dir'}/r/$name") { + print "Doing nothing: $name already done\n"; + return ( args => [] ); +} + +my $testsuite = TBBTestSuite::TestSuite::TorBrowserBuild->new({ + publish_dir => "$FindBin::Bin/tor-browser-builds/$date", + publish_url => "{{ nightly_build_url }}/tor-browser-builds/$date", + rbm_local_conf => "$FindBin::Bin/rbm-config/tbb-nightly.rbm.local.conf", + make_clean => 1, + }); + +my %res = ( + name => $name, + args => [ $testsuite ], + tags => [ 'nightly' ], +); +%res; diff --git a/tools/ansible/roles/tbb-nightly-build/templates/www-index.html b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html new file mode 100644 index 0000000..05050d8 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html @@ -0,0 +1,10 @@ +<html> +<head> + <title>Tor Browser Nightly Builds</title> +</head> +<body> + <h1>Tor Browser Nightly Builds</title> + <a href="reports/"><h3>Build Reports</h3></a> + <a href="tor-browser-builds/"><h3>Build files</h3></a> +</body> +</html>

1 0

[tor-browser-build/maint-7.5] Bug 20892: use sha256sums-signed-build.txt in download_missing_versions
by gk＠torproject.org 07 May '18

07 May '18

commit da514cdf49e89fb5efbb969cfd74dd561d50f54e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 2 16:10:34 2018 +0100 Bug 20892: use sha256sums-signed-build.txt in download_missing_versions This fixes the download of the osx64 mar files. Previously we were unsigning the downloaded mar files and checking them with sha256sums-unsigned-build.txt. The signed osx64 mar files include files that are code-signed, so unsigning the mar file is not enough to get a mar file matching sha256sums-unsigned-build.txt. --- tools/update-responses/update_responses | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b68e46a..658f451 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -526,22 +526,22 @@ sub download_version { my $destdir = "$releases_dir/$version"; my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; - foreach my $file (qw(sha256sums-unsigned-build.txt sha256sums-unsigned-build.txt.asc)) { + foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { if (getstore("$urldir/$file", "$tmpdir/$file") != 200) { exit_error "Error downloading $urldir/$file"; } } if (system('gpg', '--no-default-keyring', '--keyring', "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/sha256sums-unsigned-build.txt.asc", - "$tmpdir/sha256sums-unsigned-build.txt")) { + "$tmpdir/sha256sums-signed-build.txt.asc", + "$tmpdir/sha256sums-signed-build.txt")) { exit_error "Error checking gpg signature for version $version"; } mkdir $destdir; - move "$tmpdir/sha256sums-unsigned-build.txt.asc", "$destdir/sha256sums-unsigned-build.txt.asc"; - move "$tmpdir/sha256sums-unsigned-build.txt", "$destdir/sha256sums-unsigned-build.txt"; + move "$tmpdir/sha256sums-signed-build.txt.asc", "$destdir/sha256sums-signed-build.txt.asc"; + move "$tmpdir/sha256sums-signed-build.txt", "$destdir/sha256sums-signed-build.txt"; my %sums = map { chomp; reverse split ' ', $_ } - read_file "$destdir/sha256sums-unsigned-build.txt"; + read_file "$destdir/sha256sums-signed-build.txt"; my $martools = 'mar-tools-' . osname . '.zip'; exit_error "Error downloading $urldir/$martools\n" @@ -557,19 +557,13 @@ sub download_version { unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); move "$tmpdir/$martools", "$destdir/$martools"; move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - extract_martools($config, $version); foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n" unless getstore("$urldir/$file", "$tmpdir/$file") == 200; - if ($sums{$file} ne sha256_hex(read_file("$tmpdir/$file"))) { - exit_error "Error unsigning $file" - if system('signmar', '-r', "$tmpdir/$file", "$tmpdir/$file.u"); - exit_error "Wrong checksum for $file" - unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file.u")); - move "$tmpdir/$file.u", "$tmpdir/$file"; - } + exit_error "Wrong checksum for $file" + unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file")); move "$tmpdir/$file", "$destdir/$file"; } }

1 0

[tor-browser-build/master] Release preparations for 8.0a7
by gk＠torproject.org 03 May '18

03 May '18

commit 88f2fc7c4731c73337e0e8f9fb20c87f4768b719 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 08:00:17 2018 +0000 Release preparations for 8.0a7 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 4 ++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index ee79a15..4458d48 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.7.3 + firefox_platform_version: 52.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b9d3941..089cbad 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,19 @@ +Tor Browser 8.0a7 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update Tor Launcher to 0.2.15.2 + * Bug 25807: Change front domain to unbreak Moat + * Translations update + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) + * Bug 25458: Fix broken UI customization + * Bug 25898: Make Youtube videos play automatically again + * Bug 25980: Improve backport of bug 1448771 (fixes broken Orfox build) + * OS X + * Bug 26010: Change Snowflake rendezvous to use the Azure domain front + * Linux + * Bug 26010: Change Snowflake rendezvous to use the Azure domain front + Tor Browser 8.0a6 -- April 19 2018 * All platforms * Update Tor to 0.3.3.5-rc diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 1d67b05..e72ce10 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.15.1 +version: 0.2.15.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 87ab109..bb53bcb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0a6' + torbrowser_version: '8.0a7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0a5 + - 8.0a6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Release preparations for 0.2.15.2
by gk＠torproject.org 03 May '18

03 May '18

commit 462e972213a2aedeee238361c47931dfa187fd7a Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:25:15 2018 +0000 Release preparations for 0.2.15.2 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index d0debd0..2686aee 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.15.1</em:version> + <em:version>0.2.15.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 03 May '18

03 May '18

commit 7df0806652ae0cba65f9927575fce900f80b5d03 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:23:24 2018 +0000 Translations update --- src/chrome/locale/ar/torlauncher.properties | 18 +++++++++--------- src/chrome/locale/bn-BD/network-settings.dtd | 8 ++++---- src/chrome/locale/da/network-settings.dtd | 8 ++++---- src/chrome/locale/da/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/de/network-settings.dtd | 2 +- src/chrome/locale/de/torlauncher.properties | 6 +++--- src/chrome/locale/es/torlauncher.properties | 4 ++-- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 4 ++-- src/chrome/locale/ga/network-settings.dtd | 10 +++++----- src/chrome/locale/ga/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/he/network-settings.dtd | 6 +++--- src/chrome/locale/he/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/hu/network-settings.dtd | 2 +- src/chrome/locale/is/network-settings.dtd | 12 ++++++------ src/chrome/locale/is/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/it/network-settings.dtd | 6 +++--- src/chrome/locale/it/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/ja/network-settings.dtd | 6 +++--- src/chrome/locale/ja/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/ka/torlauncher.properties | 2 +- src/chrome/locale/nb/torlauncher.properties | 6 +++--- src/chrome/locale/nl/network-settings.dtd | 6 +++--- src/chrome/locale/nl/torlauncher.properties | 10 +++++----- src/chrome/locale/pt-BR/torlauncher.properties | 14 +++++++------- src/chrome/locale/pt/network-settings.dtd | 10 +++++----- src/chrome/locale/ro/torlauncher.properties | 4 ++-- src/chrome/locale/ru/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/sk-SK/network-settings.dtd | 8 ++++---- src/chrome/locale/sv/network-settings.dtd | 6 +++--- src/chrome/locale/sv/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/te/torlauncher.properties | 2 +- src/chrome/locale/ti/network-settings.dtd | 4 ++-- src/chrome/locale/ti/torlauncher.properties | 2 +- src/chrome/locale/tr/network-settings.dtd | 4 ++-- src/chrome/locale/tr/torlauncher.properties | 22 +++++++++++----------- 36 files changed, 193 insertions(+), 193 deletions(-) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 8dbc19a..a0190e7 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من ع torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. torlauncher.error_default_bridges_type_missing=يجب عليك تحديد نوع الجسور المقدمة مع المتصفح. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=يُرجى طلب جسر. torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر بداخل الجسور المقدمة مع المتصفح. الرجاء تعديل إعداداتك. torlauncher.bridge_suffix.meek-amazon=(شغال في الصين) torlauncher.bridge_suffix.meek-azure=(شغال في الصين) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.request_a_bridge=عملية طلب جسرٍ جارية … +torlauncher.request_a_new_bridge=عملية طلب جسرٍ جديدة جارية … +torlauncher.contacting_bridgedb=عملية الإتصال بقاعدة الجسور BridgeDB جارية. يُرجى الإنتظار. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=الحل ليس سليمًا بعد. يُرجى إعادة المحاولة. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=المعذرة. لا توجد هناك جسور متوفرة حاليا. torlauncher.connect=اتصل torlauncher.restart_tor=إعادة تشغيل تور @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=لا طريق للمضيف torlauncher.bootstrapWarning.ioerror=خطأ في القراءة/الكتابة torlauncher.bootstrapWarning.pt_missing=الناقل المضاف مفقود -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=لقد قُطع الإتصال مع الخادوم. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=فشِل الإتصال بالخادوم. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=فشِل الإتصال بوكيل البروكسي. diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index 51469da..4129ee0 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -41,10 +41,10 @@ <!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়"> <!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন"> <!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org থেকে একটি সেতুর জন্য অনুরোধ করুন"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "ইমেজ থেকে অক্ষর লিখুন"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "একটি নতুন চ্যালেঞ্জ পান"> +<!ENTITY torsettings.useBridges.captchaSubmit "জমা করা"> <!ENTITY torsettings.useBridges.custom "একটি ব্রিজ প্রদান আমি জানি"> <!ENTITY torsettings.useBridges.label "বিশ্বস্ত উৎস থেকে ব্রিজ তথ্য প্রবেশ করান।"> <!ENTITY torsettings.useBridges.placeholder "টাইপ ঠিকানা: পোর্ট (প্রতি লাইন প্রতি)"> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index d196708..77ae01e 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -41,10 +41,10 @@ <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> <!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "Anmod om en bro fra torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Indtast tegnene fra billedet"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Få en ny udfordring"> +<!ENTITY torsettings.useBridges.captchaSubmit "Indsend"> <!ENTITY torsettings.useBridges.custom "Formidl en bro jeg kender"> <!ENTITY torsettings.useBridges.label "Indtast broinformation fra en betroet kilde."> <!ENTITY torsettings.useBridges.placeholder "skriv adresse:port (én pr. linje)"> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 8900731..daa4651 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller vært torlauncher.error_proxy_type_missing=Du skal vælge proxytypen: torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Anmod venligst om en bro. torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. torlauncher.bridge_suffix.meek-amazon=(virker i kina) torlauncher.bridge_suffix.meek-azure=(virker i kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Anmod om en bro… +torlauncher.request_a_new_bridge=Anmod om en ny bro… +torlauncher.contacting_bridgedb=Kontakter BridgeDB. Vent venligst. +torlauncher.captcha_prompt=Løs CAPTCHA'en for at anmode om en bro. +torlauncher.bad_captcha_solution=Løsningen er ikke korrekt. Prøv venligst igen. +torlauncher.unable_to_get_bridge=Kan ikke hente en bro fra BridgeDB.\n\n%S +torlauncher.no_meek=Browseren er ikke konfigureret til meek, som behøves for at hente broer. +torlauncher.no_bridges_available=Der er ingen broer tilgængelige på nuværende tidspunkt. Beklager. torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=ingen rute til vært torlauncher.bootstrapWarning.ioerror=læse/skrive fejl torlauncher.bootstrapWarning.pt_missing=mangler udskiftelig transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Mistede forbindelsen til serveren. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til serveren. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til proxyen. diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 760f7b6..9cefcf3 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -42,7 +42,7 @@ <!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen"> <!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Geben Sie das Zeichen aus dem Bild ein"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Übermitteln"> <!ENTITY torsettings.useBridges.custom "Biete mir eine Brücke an, die ich kenne"> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index e5a7be7..1aa2bf8 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -36,7 +36,7 @@ torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. @@ -74,5 +74,5 @@ torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler torlauncher.bootstrapWarning.pt_missing=Steckbarer Transport fehlt torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Konnte nicht mit dem Server verbinden. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Konnte nicht mit dem Proxy verbinden. diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 8fc6834..365318a 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -5,7 +5,7 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto se podría deber a un error en tu fichero torrc, un fallo en Tor o en otro programa de tu sistema, o a hardware defectuoso. Hasta que soluciones el problema subyacente y reinices Tor, el Navegador Tor no se iniciará. torlauncher.tor_exited=Tor se cerró inesperadamente. Esto podría deberse a un fallo con el propio Tor, con otro programa de su sistema, o por hardware defectuoso. Hasta que reinicie Tor, el Navegador Tor no podrá abrir ningún sitio web. Si el problema persiste, por favor envíe una copia de su Registro de Tor (log) al equipo de soporte. -torlauncher.tor_exited2=Al reiniciar Tor no se cerrarán las pestañas de su navegador. +torlauncher.tor_exited2=Al reiniciar Tor no se cerrarán las pestañas de tu navegador. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_control_failed=Fallo al tomar control de Tor. @@ -47,7 +47,7 @@ torlauncher.quit=Salir torlauncher.quit_win=Salir torlauncher.done=Listo -torlauncher.forAssistance=Para obtener ayuda, contacte con %S +torlauncher.forAssistance=Para obtener ayuda, contacta con %S torlauncher.forAssistance2=Para asistencia, visita %S torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico. diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index de2afe9..c93e71f 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Établissement d’une connexion">  -<!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor"> +<!ENTITY torlauncher.localePicker.title "Langue du Navigateur Tor"> <!ENTITY torlauncher.localePicker.prompt "Veuillez choisir une langue.">  diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 804dafa..e3a4b03 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le Navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le Navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index f058db5..2e86b28 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -41,15 +41,15 @@ <!ENTITY torsettings.useBridges.checkbox "Déantar cinsireacht ar Tor sa tír seo"> <!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite"> <!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "Iarr droichead ó torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Cuir isteach na carachtair a fheiceann tú sa bpictiúr"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Faigh dúshlán nua"> +<!ENTITY torsettings.useBridges.captchaSubmit "Seol"> <!ENTITY torsettings.useBridges.custom "Úsáid droichead ar m'eolas"> <!ENTITY torsettings.useBridges.label "Cuir isteach eolas faoi dhroichead ó fhoinse iontaofa."> <!ENTITY torsettings.useBridges.placeholder "clóscríobh seoladh:port (ceann amháin ar gach líne)"> -<!ENTITY torsettings.copyLog "Cóipeáil an Logchomhad Tor go dtí an Ghearrthaisce"> +<!ENTITY torsettings.copyLog "Cóipeáil Logchomhad Tor go dtí an Ghearrthaisce"> <!ENTITY torsettings.proxyHelpTitle "Cabhair le Seachfhreastalaithe"> <!ENTITY torsettings.proxyHelp1 "Úsáidtear seachfhreastalaí áitiúil nuair a cheanglaítear ó líonra i gcomhlacht, i scoil, nó in ollscoil. Mura bhfuil tú cinnte faoin fhreagra ba chóir duit a thabhairt, caith súil ar na socruithe Idirlín i mbrabhsálaí eile, nó ar shocruithe líonra do chórais, le fáil amach an bhfuil seachfhreastalaí de dhíth."> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index 9eb336b..27c4568 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Caithfidh tú seoladh IP nó óstainm agus torlauncher.error_proxy_type_missing=Caithfidh tú cineál an tseachfhreastalaí a roghnú. torlauncher.error_bridges_missing=Caithfidh tú droichead nó droichid a shonrú. torlauncher.error_default_bridges_type_missing=Caithfidh tú cineál iompair a roghnú do na droichid ionsuite. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Iarr droichead. torlauncher.error_bridge_bad_default_type=Níl aon droichead a úsáideann cineál iompair %S ar fáil. Athraigh do chuid socruithe. torlauncher.bridge_suffix.meek-amazon=(oibríonn sé sa tSín) torlauncher.bridge_suffix.meek-azure=(oibríonn sé sa tSín) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Iarr Droichead... +torlauncher.request_a_new_bridge=Iarr Droichead Nua... +torlauncher.contacting_bridgedb=Ag dul i dteagmháil le BridgeDB. Fan nóiméad. +torlauncher.captcha_prompt=Réitigh an CAPTCHA le droichead a iarraidh. +torlauncher.bad_captcha_solution=Níl an freagra sin ceart. Bain triail eile as. +torlauncher.unable_to_get_bridge=Níorbh fhéidir droichead a fháil ó BridgeDB.\n\n%S +torlauncher.no_meek=Níl thacaíonn an brabhsálaí seo le meek, acmhainn a theastaíonn uait chun droichid a fháil. +torlauncher.no_bridges_available=Níl aon droichead ar fáil faoi láthair. Ár leithscéal. torlauncher.connect=Ceangail torlauncher.restart_tor=Atosaigh Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=níl aon bhealach chuig an óstach torlauncher.bootstrapWarning.ioerror=earráid léite/scríofa torlauncher.bootstrapWarning.pt_missing=córas iompair ionphlugáilte ar iarraidh -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Briseadh an ceangal leis an bhfreastalaí. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Níorbh fhéidir ceangal leis an bhfreastalaí. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Níorbh fhéidir ceangal a bhunú leis an seachfhreastalaí. diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 02f7139..f11c418 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor מצונזר במדינה שלי"> <!ENTITY torsettings.useBridges.default "בחר גשר מובנה"> <!ENTITY torsettings.useBridges.default.placeholder "בחר גשר"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "בקש גשר מן torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "הכנס את התווים מהתמונה"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "קבל אתגר חדש"> <!ENTITY torsettings.useBridges.captchaSubmit "הגש"> <!ENTITY torsettings.useBridges.custom "סַפֵּק גשר שאני מכיר"> <!ENTITY torsettings.useBridges.label "הכנס מידע גשר ממקור מהימן."> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index cf04e2c..e9b3488 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP א torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי-הכוח. torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=אנא בקש גשר. torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. torlauncher.bridge_suffix.meek-amazon=(עובד בסין) torlauncher.bridge_suffix.meek-azure=(עובד בסין) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=בקש גשר... +torlauncher.request_a_new_bridge=בקש גשר חדש... +torlauncher.contacting_bridgedb=יוצר קשר עם BridgeDB. אנא המתן. +torlauncher.captcha_prompt=פתור את ה־CAPTCHA כדי לבקש גשר. +torlauncher.bad_captcha_solution=הפתרון אינו נכון. אנא נסה שוב. +torlauncher.unable_to_get_bridge=לא היה ניתן להשיג גשר מן BridgeDB.\n\n%S +torlauncher.no_meek=דפדפן זה אינו מוגדר עבור meek, אשר דרוש כדי להשיג גשרים. +torlauncher.no_bridges_available=אין גשרים זמינים הפעם. סליחה. torlauncher.connect=התחבר torlauncher.restart_tor=הפעל מחדש את Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=אין נתיב למארח torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=החיבור אל השרת אבד. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=לא היה ניתן להתחבר אל השרת. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=לא היה ניתן להתחבר אל ייפוי הכוח. diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 9ad1d97..d269276 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -42,7 +42,7 @@ <!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat"> <!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Adja meg a karaktereket amik a fenti képen láthatóak"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Elküld"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 617318a..6e259b9 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -41,12 +41,12 @@ <!ENTITY torsettings.useBridges.checkbox "Tor er ritskoðað í landinu mínu"> <!ENTITY torsettings.useBridges.default "Veldu innbyggða brú"> <!ENTITY torsettings.useBridges.default.placeholder "veldu brú"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.bridgeDB "Biðja um brú frá torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Settu inn stafina úr myndinni"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Fá nýja gátu"> +<!ENTITY torsettings.useBridges.captchaSubmit "Senda inn"> +<!ENTITY torsettings.useBridges.custom "Gefa brú sem ég þekki"> +<!ENTITY torsettings.useBridges.label "Settu inn upplýsingar um brú frá aðila sem þú treystir."> <!ENTITY torsettings.useBridges.placeholder "settu inn vistfang:gátt (eitt á hverja línu)"> <!ENTITY torsettings.copyLog "Afrita atvikaskrá Tor á klippispjald"> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index c7e04fa..c68bbdc 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=You must specify both an IP address or host torlauncher.error_proxy_type_missing=Þú verður að velja tegund milliþjóns. torlauncher.error_bridges_missing=Þú verður að tilgreina eina eða fleiri brýr. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Biðja um brú. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.bridge_suffix.meek-amazon=(virkar í Kína) torlauncher.bridge_suffix.meek-azure=(virkar í Kína) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Biðja um brú… +torlauncher.request_a_new_bridge=Biðja um nýja brú… +torlauncher.contacting_bridgedb=Tengist BridgeDB. Bíddu aðeins. +torlauncher.captcha_prompt=Leystu CAPTCHA-þrautina til að biðja um brú. +torlauncher.bad_captcha_solution=Þessi lausn er ekki rétt. Reyndu aftur. +torlauncher.unable_to_get_bridge=Tókst ekki að fá brú frá BridgeDB.\n\n%S +torlauncher.no_meek=Þessi vafri er ekki stilltur til að nota 'meek', sem er nauðsynlegt til að geta beðið um brýr. +torlauncher.no_bridges_available=Engar brýr eru tiltækar í augnablikinu. Því miður. torlauncher.connect=Tengjast torlauncher.restart_tor=Endurræsa Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=no route to host torlauncher.bootstrapWarning.ioerror=les/skrifvilla torlauncher.bootstrapWarning.pt_missing=vantar 'pluggable transport' tengileiðir -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Missti tengingu við þjóninn. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Tókst ekki að tengjast þjóninum. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Tókst ekki að tengjast milliþjóninum. diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 94ea8ce..4ad241a 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor viene censurato nel mio Paese"> <!ENTITY torsettings.useBridges.default "Seleziona un bridge integrato"> <!ENTITY torsettings.useBridges.default.placeholder "seleziona un bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Richiedi un bridge da torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Inserisci i caratteri dell'immagine"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Carica una nuova verifica"> <!ENTITY torsettings.useBridges.captchaSubmit "Invia"> <!ENTITY torsettings.useBridges.custom "Fornisci un bridge che conosco"> <!ENTITY torsettings.useBridges.label "Inserisci le informazioni del bridge da una fonte fidata."> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index c09ad56..7c62bd1 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Affinché Tor sia configurato all'utilizzo torlauncher.error_proxy_type_missing=Devi selezionare il tipo di proxy. torlauncher.error_bridges_missing=Devi specificare uno o più ponti. torlauncher.error_default_bridges_type_missing=È necessario selezionare un tipo di trasporto per il bridge preconfigurato. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Richiedi un bridge. torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il tipo di trasporto %S. Modificare le proprie impostazioni. torlauncher.bridge_suffix.meek-amazon=(funziona in Cina) torlauncher.bridge_suffix.meek-azure=(funziona in Cina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Richiedi un bridge... +torlauncher.request_a_new_bridge=Richiedi un nuovo bridge... +torlauncher.contacting_bridgedb=Contatto BridgeDB. Attendere, prego. +torlauncher.captcha_prompt=Risolvi il CAPTCHA per richiedere un bridge. +torlauncher.bad_captcha_solution=La soluzione è sbagliata. Riprova. +torlauncher.unable_to_get_bridge=Impossibile ottenere un bridge da BridgeDB.\n\n%S +torlauncher.no_meek=Questo browser non è configurato per meek, necessario per ottenere dei bridge. +torlauncher.no_bridges_available=Nessun bridge disponibile al momento. Spiacenti. torlauncher.connect=Connetti torlauncher.restart_tor=Riavvia Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=nessun rotta per l'host torlauncher.bootstrapWarning.ioerror=errore di lettura/scrittura torlauncher.bootstrapWarning.pt_missing=pluggable transport mancante -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Connessione al server persa. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Connessione al server fallita. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Connessione al proxy fallita. diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 2e17417..dfcfd48 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor は私の国では検閲されています"> <!ENTITY torsettings.useBridges.default "内蔵ブリッジを選択する"> <!ENTITY torsettings.useBridges.default.placeholder "ブリッジを選択"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.orgからブリッジの要求をする"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "画像から文字を入力してください..."> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "チャレンジを更新する"> <!ENTITY torsettings.useBridges.captchaSubmit "生成"> <!ENTITY torsettings.useBridges.custom "知っているブリッジを使う"> <!ENTITY torsettings.useBridges.label "信頼できる情報源からのブリッジ情報を入力してください。"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index 270ceba..b55a4df 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=インターネットのアクセスにプ torlauncher.error_proxy_type_missing=プロキシの種類を選択する必要があります。 torlauncher.error_bridges_missing=一つ以上のブリッジを記述する必要があります。 torlauncher.error_default_bridges_type_missing=提供されたブリッジ用のトランスポートタイプを選択する必要があります。 -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=ブリッジをリクエストしてください。 torlauncher.error_bridge_bad_default_type=トランスポートタイプ %S がある提供されたブリッジに利用できるものがありません。設定を調整してください。 torlauncher.bridge_suffix.meek-amazon=（中国で動作） torlauncher.bridge_suffix.meek-azure=（中国で動作） -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=ブリッジをリクエスト。\n +torlauncher.request_a_new_bridge=新たなブリッジをリクエスト。 +torlauncher.contacting_bridgedb=BridgeDBとの接続を確立しています。しばらく待って下さい。 +torlauncher.captcha_prompt= ブリッジをリクエストするにはCAPTCHAを解いて下さい。 +torlauncher.bad_captcha_solution=その解答は正しくありません。再度実行してください。 +torlauncher.unable_to_get_bridge=BridgeDBからブリッジを入手できません。\n\n%S +torlauncher.no_meek= このブラウザはmeekを使用するように設定されていないため、ブリッジを入手できません。 +torlauncher.no_bridges_available=今回利用可能なブリッジがありません。 torlauncher.connect=接続 torlauncher.restart_tor=Torを再起動する @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=ホストへの経路が見つかりませ torlauncher.bootstrapWarning.ioerror=読み書きエラー torlauncher.bootstrapWarning.pt_missing=プラグ可能な転送が見つかりません -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=サーバーへの接続が切断されました。\n +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=サーバーに接続できませんでした。\n +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=プロクシーに接続できませんでした。 diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 697b03f..c0dadd3 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -44,7 +44,7 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry. torlauncher.connect=დაკავშირება torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=გასვლა torlauncher.done=შესრულებულია torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 7e4a018..8e97a0d 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -32,10 +32,10 @@ torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har til torlauncher.bridge_suffix.meek-amazon=(virker i Kina) torlauncher.bridge_suffix.meek-azure=(virker i Kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.request_a_bridge=Forespør en bro… +torlauncher.request_a_new_bridge=Forespør ny bro… torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. +torlauncher.captcha_prompt=Løs CAPTCHA-en for å forespørre en bro. torlauncher.bad_captcha_solution=The solution is not correct. Please try again. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 004f989..91effd7 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor is geblokkeerd in mijn land."> <!ENTITY torsettings.useBridges.default "Selecteer een ingebouwde bridge"> <!ENTITY torsettings.useBridges.default.placeholder "Kies een bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Vraag een bridge aan bij torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Voer de tekens van het plaatje in"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Krijg een nieuwe uitdaging"> <!ENTITY torsettings.useBridges.captchaSubmit "Verzenden"> <!ENTITY torsettings.useBridges.custom "Geef een bridge weer die ik ken"> <!ENTITY torsettings.useBridges.label "Voer bridge informatie van een vertrouwde bron in."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index e2d4b69..9b19476 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -34,9 +34,9 @@ torlauncher.bridge_suffix.meek-azure=(werkt in China) torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=geen route naar de server torlauncher.bootstrapWarning.ioerror=lees/schrijffout torlauncher.bootstrapWarning.pt_missing=ontbrekend plugbaar vervoer -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=De verbinding met de server is verbroken. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon niet verbinden met de server. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon niet verbinden met de proxy. diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 1b20ee1..21d0106 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Você deve especificar um endereço IP ou u torlauncher.error_proxy_type_missing=Você deve selecionar um tipo de proxy. torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para as pontes fornecidas. -torlauncher.error_bridgedb_bridges_missing=Por favor, peça uma bridge. +torlauncher.error_bridgedb_bridges_missing=Por favor, solicite uma ponte. torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste as suas configurações. torlauncher.bridge_suffix.meek-amazon=(funciona na China) torlauncher.bridge_suffix.meek-azure=(funciona na China) -torlauncher.request_a_bridge=Pedir uma bridge... -torlauncher.request_a_new_bridge=Pedir uma nova bridge... +torlauncher.request_a_bridge=Solicitar uma ponte... +torlauncher.request_a_new_bridge=Solicitar uma nova ponte torlauncher.contacting_bridgedb=Entrando em contato com BridgeDB. Por favor, aguarde. -torlauncher.captcha_prompt=Resolva o CAPTCHA para pedir uma bridge. -torlauncher.bad_captcha_solution=A solução está incorreta. Tente novamente. -torlauncher.unable_to_get_bridge=Não foi possível obter uma ponte a partir do BridgeDB.\n\n$S +torlauncher.captcha_prompt=Resolva o CAPTCHA para solicitar uma ponte. +torlauncher.bad_captcha_solution=A solução não está correta. Por favor, tente novamente. +torlauncher.unable_to_get_bridge=Não é possível obter uma ponte do BridgeDB.\n\n$S torlauncher.no_meek=Este navegador não está configurado para usar o 'meek', que é necessário para obter pontes. -torlauncher.no_bridges_available=Não existem bridges disponíveis no momento. Sentimos muito. +torlauncher.no_bridges_available=Nenhuma ponte está disponível neste momento. Desculpe. torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar o Tor diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index a359691..f0576fd 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Clique em 'Ligar' para ligar ao Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Clique em “Configurar” para ajustar as definições de rede se estiver num país que censura o Tor (tal como China, Egito, Turquia) ou se estiver a ligar a partir de uma rede privada que requer um proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Ligar"> @@ -39,11 +39,11 @@ <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "Tor é censurado no meu país"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default "Selecionar um ponte integrada"> <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Solicitar uma ponte a partir de torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Insira os carateres da imagem"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obter um novo desafio"> <!ENTITY torsettings.useBridges.captchaSubmit "Submeter"> <!ENTITY torsettings.useBridges.custom "Fornecer uma ponte que eu conheça"> <!ENTITY torsettings.useBridges.label "Inserir a informação de ponte de uma fonte confiável"> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 85857f6..1c6f761 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -6,7 +6,7 @@ torlauncher.error_title=Lansator Tor torlauncher.tor_exited_during_startup=Tor s-a închis în mod neașteptat. Acest lucru se datorează fie unei erori în Tor, în alt program de pe sistemul dvs., sau a unei defecțiuni de hardware. Până nu vei fixa problema şi restartezi Tor,\nBrowserul Tor nu va porni. torlauncher.tor_exited=Tor s-a închis în mod neașteptat. Acest lucru se datorează fie unei erori în Tor, în alt program de pe sistemul dvs., sau a unei defecțiuni în hardware. Browserul Tor nu va putea accesa nici un site decât dacă reporniți Tor. Dacă problema persistă, vă rugăm să trimiteți o copie a Tor Log către echipa de suport. torlauncher.tor_exited2=Restartând Tor nu se vor închide ferestrele browserului dvs. -torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor. +torlauncher.tor_controlconn_failed=Nu s-a putut conecta la portul de control Tor. torlauncher.tor_failed_to_start=Tor nu poate porni. torlauncher.tor_control_failed=Eșec să preiau controlul Tor. torlauncher.tor_bootstrap_failed=Tor nu a reușit să facă o conexiune la rețeaua Tor. @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Tor nu poate porni. torlauncher.tor_missing=Fișierul executabil Tor lipsește. torlauncher.torrc_missing=Fişierul torrc lipseşte şi nu s-a putut crea. torlauncher.datadir_missing=Directorul de date Tor nu există şi nu a putut fi creat. -torlauncher.password_hash_missing=Eșec parole hashed. +torlauncher.password_hash_missing=Eroare la obținerea hash-ului parolei. torlauncher.failed_to_get_settings=Nu pot obține Tor settings.\n\n%S torlauncher.failed_to_save_settings=Nu pot salva Tor settings.\n\n%S diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 57c5361..3ff6b62 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Вы должны указать IP-адр torlauncher.error_proxy_type_missing=Необходимо выбрать тип прокси. torlauncher.error_bridges_missing=Необходимо указать один или несколько мостов. torlauncher.error_default_bridges_type_missing=Вы должны выбрать тип транспорта предопределенных мостов. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Пожалуйста, запросите мост. torlauncher.error_bridge_bad_default_type=Предопределенные мосты не поддерживают тип транспорта %S. Пожалуйста, исправьте ваши настройки. torlauncher.bridge_suffix.meek-amazon=(работает в Китае) torlauncher.bridge_suffix.meek-azure=(работает в Китае) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Запрос моста… +torlauncher.request_a_new_bridge=Запрос нового моста… +torlauncher.contacting_bridgedb=Обращение к BridgeDB. Пожалуйста, подождите. +torlauncher.captcha_prompt=Решите CAPTCHA для запроса моста. +torlauncher.bad_captcha_solution=Решение не является правильным. Попробуйте ещё раз. +torlauncher.unable_to_get_bridge=Не удалось получить мост из BridgeDB.\n\n%S +torlauncher.no_meek=Этот браузер не настроен должным образом, что необходимо для получения мостов. +torlauncher.no_bridges_available=В настоящее время мостов не имеется. Извините. torlauncher.connect=Соединиться torlauncher.restart_tor=Перезапустить Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=не указан путь к хосту torlauncher.bootstrapWarning.ioerror=ошибка чтения / записи torlauncher.bootstrapWarning.pt_missing=отсутствует подключаемый транспорт -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Соединение с сервером было потеряно. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Не удалось подключиться к серверу. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Не удалось подключиться к прокси. diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index ba160db..ce4cb7e 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Nastavenia Tor Network"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.default "Pripojiť k Tor"> <!ENTITY torsettings.wizard.title.configure "Nastavenia Tor Network"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Vytváram spojenie">  <!ENTITY torlauncher.localePicker.title "Jazyk Tor Browser"> @@ -25,7 +25,7 @@ <!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu používam proxy"> <!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač prechádza cez firewall, ktorý povoľuje spojenie len k určitým portom."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovaný"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index cc952f1..b7adc24 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor är censurerat i mitt land"> <!ENTITY torsettings.useBridges.default "Välj en inbyggd brygga"> <!ENTITY torsettings.useBridges.default.placeholder "Välj en brygga"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Begär en brygga från torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Ange tecknen från bilden"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Få en ny utmaning"> <!ENTITY torsettings.useBridges.captchaSubmit "Skicka"> <!ENTITY torsettings.useBridges.custom "Använd en egen brygga"> <!ENTITY torsettings.useBridges.label "Ange brygg informationen från en betrodd källa"> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 7a8ddda..92800d7 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller vä torlauncher.error_proxy_type_missing=Du måste välja typ av proxy. torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor. torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade bryggorna. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Vänligen begär en brygga. torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade bryggor för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. torlauncher.bridge_suffix.meek-amazon=(Fungerar i Kina) torlauncher.bridge_suffix.meek-azure=(Fungerar i Kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Begär en brygga... +torlauncher.request_a_new_bridge=Begär en ny brygga... +torlauncher.contacting_bridgedb=Kontaktar BridgeDB. Vänligen vänta. +torlauncher.captcha_prompt=Lös CAPTCHA:n för att begära en brygga. +torlauncher.bad_captcha_solution=Lösningen är inte korrekt. Vänligen försök igen. +torlauncher.unable_to_get_bridge=Kunde inte ta emot en brygga från BridgeDB.\n\n%S +torlauncher.no_meek=Den här webbläsaren är inte konfigurerad för meek, vilket krävs för att ta emot bryggor. +torlauncher.no_bridges_available=Inga bryggor finns tillgängliga för tillfället, tyvärr. torlauncher.connect=Anslut torlauncher.restart_tor=Starta om Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas torlauncher.bootstrapWarning.ioerror=läs-/skrivfel torlauncher.bootstrapWarning.pt_missing=Pluggable Transport saknas -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Anslutningen till servern förlorades. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunde inte ansluta till servern. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunde inte ansluta till proxyn. diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index a4d097a..209ac60 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -45,7 +45,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=పూర్తి torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index 4615146..bdceb7b 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "ኣራኽብ">  @@ -44,7 +44,7 @@ <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.captchaSubmit "ኣረክብ"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties index 28e2ff6..c438d31 100644 --- a/src/chrome/locale/ti/torlauncher.properties +++ b/src/chrome/locale/ti/torlauncher.properties @@ -41,7 +41,7 @@ torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. -torlauncher.connect=Connect +torlauncher.connect=ኣራኽብ torlauncher.restart_tor=Restart Tor torlauncher.quit=ኣቋርጽ torlauncher.quit_win=ውጻእ diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index add4561..8a45e77 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -41,8 +41,8 @@ <!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor engelleniyor"> <!ENTITY torsettings.useBridges.default "Bir hazır köprü seçin"> <!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org'dan köprü iste"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Resimdeki karakterleri girin"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Gönder"> <!ENTITY torsettings.useBridges.custom "Bildiğim bir köprü sağla"> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 1586384..a40956d 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=İnternet'e bir vekil sunucu üzerinden ba torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da birkaç köprü belirtmelisiniz. torlauncher.error_default_bridges_type_missing=Hazır köprüler için bir aktarım türü seçmelisiniz. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Lütfen köprü talep edin. torlauncher.error_bridge_bad_default_type=Hazır köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. torlauncher.bridge_suffix.meek-amazon=(Çin'de çalışır) torlauncher.bridge_suffix.meek-azure=(Çin'de çalışır) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S +torlauncher.request_a_bridge=Köprü talep edin... +torlauncher.request_a_new_bridge=Yeni Köprü talep edin... +torlauncher.contacting_bridgedb=Köprü veritabanına bağlanılıyor. Lütfen bekleyin. +torlauncher.captcha_prompt=Köprü talep etmek için lütfen güvenlik kodunu girin. +torlauncher.bad_captcha_solution=Çözümleme doğru değil. Lütfen yeniden deneyin. +torlauncher.unable_to_get_bridge=Köprü veritabanından köprü alınamıyor. torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=Şu anda hiçbir köprü müsait değil. Üzgünüz. torlauncher.connect=Bağlan torlauncher.restart_tor=Tor'u Yeniden Başlat @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=sunucu yöneltmesi yok torlauncher.bootstrapWarning.ioerror=okuma/yazma hatası torlauncher.bootstrapWarning.pt_missing=takılabilir aktarım bulunamadı -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Sunucuyla bağlantı kesildi +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Sunucuya bağlanılamadı. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Vekil sunucusuna bağlanılamadı.

1 0