February 2016 - tor-commits - lists.torproject.org

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 18 Feb '16

18 Feb '16

commit 15ee8cbecc8828b5e72298a77d3bad06765129ef Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 18 20:45:22 2016 +0000 Update translations for tails-persistence-setup --- fi/fi.po | 95 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/fi/fi.po b/fi/fi.po index f4e9761..0587dd1 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2016-01-25 17:34+0100\n" +"PO-Revision-Date: 2016-02-18 20:19+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -55,69 +55,69 @@ msgid "Pidgin profiles and OTR keyring" msgstr "Pidgin-profiilit ja OTR-avaimet" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Icedove" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Icedove profiles and locally stored email" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" msgstr "GNOME Keyring-taustaprosessi" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" msgstr "GNOME Keyringissä säilytetyt salaisuudet" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" msgstr "Verkkoyhteydet" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" msgstr "Verkkolaitteiden ja -yhteyksien asetukset" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" msgstr "Selaimen kirjanmerkit" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in the Tor Browser" msgstr "Kirjanmerkit tallennettu Tor-selaimeen" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" msgstr "Tulostimet" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" msgstr "Tulostimien asetukset" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" msgstr "Bitcoin-asiakasohjelma" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" msgstr "Electrumin bitcoin-lompakko ja asetukset" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "APT-paketit" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "APT:lla ladatut paketit" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "APT-pakettiluettelot" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "APT:n lataamat pakettiluettelot" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 -msgid "Icedove" -msgstr "" - -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 -msgid "Icedove profiles and locally stored email" -msgstr "" - #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Pisteellä alkavat tiedostot" @@ -127,71 +127,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Luo $HOME-kansioon symbolinen linkki jokaisesta tiedostosta, joka on dotfiles-kansiossa" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Valmistele Tailsin pysyvä taltio" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459 msgid "Error" msgstr "Virhe" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:344 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Laitteella %s on jo pysyvä taltio." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:352 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Laitteella %s ei ole tarpeeksi tilaa, jota ei ole varattu." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:360 ../lib/Tails/Persistence/Setup.pm:374 #, perl-format msgid "Device %s has no persistent volume." msgstr "Laitteella %s ei ole pysyvää taltiota." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:366 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Käytössä olevan pysyvän taltion poistaminen epäonnistui. Sinun täytyy käynnistää Tails uudelleen ilman kyseistä taltiota." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not unlocked." msgstr "Pysyvää taltiota ei ole avattu." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not mounted." msgstr "Pysyvää taltiota ei ole liitetty." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Pysyvä taltio ei ole luettavissa. Onko käyttöoikeus- tai omistajuusongelmia?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:400 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Pysyvään taltioon ei voi kirjoittaa. Liitettiinkö se pelkällä lukuoikeudella?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tailsia käytetään laitteelta, joka ei ole USB- tai SDIO-laite (%s)." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s is optical." msgstr "Laite %s on optinen." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:422 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Laitetta %s ei luotu Tails-asennusohjelmalla." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:668 msgid "Persistence wizard - Finished" msgstr "Pysyvyysvelho - Valmis" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:671 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -243,32 +243,33 @@ msgstr "Salalause ei voi olla tyhjä" msgid "Passphrases do not match" msgstr "Salalauseet eivät täsmää" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Epäonnistui" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Liitetään Tailsin pysyvä osio." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Tailsin pysyvä osio liitetään." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Korjataan pysyvän taltion oikeuksia." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Pysyvän taltion oikeudet korjataan." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Luodaan..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Luodaan pysyvä taltio..." @@ -318,10 +319,10 @@ msgstr "Pysyvä taltio %s (%s), joka on laitteessa <b>%s %s</b>, poistetaan." msgid "Delete" msgstr "Poista" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Poistetaan..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Poistetaan pysyvä taltio..."

1 0

[chutney/master] Fix borken print() function calls in lib/chutney/TorNet.py.
by nickm＠torproject.org 18 Feb '16

18 Feb '16

commit 5a63784d408e50924f3c38903fc28ae39bf7e0aa Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 18 17:09:08 2016 +0000 Fix borken print() function calls in lib/chutney/TorNet.py. The `%` operator needs to go inside the call to the `print()` function. Otherwise, the format string operation is being done on the return value of `print()`, which is `None`. * FIXES #18341: https://bugs.torproject.org/18341. --- lib/chutney/TorNet.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index c79f64b..327e1ed 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -252,7 +252,7 @@ class LocalNodeBuilder(NodeBuilder): if e.errno == errno.ENOENT: print ("Cannot find tor binary %r. Use " "CHUTNEY_TOR environment variable to set the " - "path, or put the binary into $PATH.") % tor + "path, or put the binary into $PATH." % tor) sys.exit(0) else: raise @@ -384,7 +384,7 @@ class LocalNodeBuilder(NodeBuilder): if e.errno == errno.ENOENT: print("Cannot find tor-gencert binary %r. Use " "CHUTNEY_TOR_GENCERT environment variable to set the " - "path, or put the binary into $PATH.") % tor_gencert + "path, or put the binary into $PATH." % tor_gencert) sys.exit(0) else: raise @@ -412,7 +412,7 @@ class LocalNodeBuilder(NodeBuilder): if e.errno == errno.ENOENT: print("Cannot find tor binary %r. Use " "CHUTNEY_TOR environment variable to set the " - "path, or put the binary into $PATH.") % tor + "path, or put the binary into $PATH." % tor) sys.exit(0) else: raise @@ -579,7 +579,7 @@ class LocalNodeController(NodeController): if e.errno == errno.ENOENT: print("Cannot find tor binary %r. Use CHUTNEY_TOR " "environment variable to set the path, or put the " - "binary into $PATH.") % tor_path + "binary into $PATH." % tor_path) sys.exit(0) else: raise

1 0

[tor-browser/tor-browser-38.6.1esr-5.5-1] Bug 18170: After update, only changelog tab shown
by gk＠torproject.org 18 Feb '16

18 Feb '16

commit 17015208f6a990a22a89980bf495618009cf1ef8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 3 15:22:12 2016 -0500 Bug 18170: After update, only changelog tab shown When in permanent private browsing mode, always return false for isAutomaticRestoreEnabled. This ensures that there will not be any confusion inside nsBrowserContentHandler.defaultArgs as to whether a one time session restore will occur. Also, for consistency and in case someone looks at the pref, avoid setting browser.sessionstore.resume_session = true during browser shutdown. This bug occurred when staging was not used during the update process. On Windows it always occurred because staging is not used even when it should be (see #18292). --- browser/components/nsBrowserGlue.js | 4 +++- browser/components/sessionstore/SessionStore.jsm | 5 ++++- browser/components/sessionstore/nsSessionStartup.js | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 61e070f..20fefe6 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -226,7 +226,9 @@ BrowserGlue.prototype = { if (!this._saveSession && !aForce) return; - Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true); + if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { + Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true); + } // This method can be called via [NSApplication terminate:] on Mac, which // ends up causing prefs not to be flushed to disk, so we need to do that diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm index 64017f7..3b963bf 100644 --- a/browser/components/sessionstore/SessionStore.jsm +++ b/browser/components/sessionstore/SessionStore.jsm @@ -1165,7 +1165,10 @@ let SessionStoreInternal = { */ onQuitApplication: function ssi_onQuitApplication(aData) { if (aData == "restart") { - this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); + if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { + this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); + } + // The browser:purge-session-history notification fires after the // quit-application notification so unregister the // browser:purge-session-history notification to prevent clearing diff --git a/browser/components/sessionstore/nsSessionStartup.js b/browser/components/sessionstore/nsSessionStartup.js index 7c09a61..faf7863 100644 --- a/browser/components/sessionstore/nsSessionStartup.js +++ b/browser/components/sessionstore/nsSessionStartup.js @@ -291,6 +291,10 @@ SessionStartup.prototype = { * @returns bool */ isAutomaticRestoreEnabled: function () { + if (PrivateBrowsingUtils.permanentPrivateBrowsing) { + return false; + } + return Services.prefs.getBoolPref("browser.sessionstore.resume_session_once") || Services.prefs.getIntPref("browser.startup.page") == BROWSER_STARTUP_RESUME_SESSION; },

1 0

[tor-browser/tor-browser-38.6.1esr-6.0-1] Bug 18170: After update, only changelog tab shown
by gk＠torproject.org 18 Feb '16

18 Feb '16

commit 7c8b836e87bc2e5251ff085d48114d61678544d3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 3 15:22:12 2016 -0500 Bug 18170: After update, only changelog tab shown When in permanent private browsing mode, always return false for isAutomaticRestoreEnabled. This ensures that there will not be any confusion inside nsBrowserContentHandler.defaultArgs as to whether a one time session restore will occur. Also, for consistency and in case someone looks at the pref, avoid setting browser.sessionstore.resume_session = true during browser shutdown. This bug occurred when staging was not used during the update process. On Windows it always occurred because staging is not used even when it should be (see #18292). --- browser/components/nsBrowserGlue.js | 4 +++- browser/components/sessionstore/SessionStore.jsm | 5 ++++- browser/components/sessionstore/nsSessionStartup.js | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 61e070f..20fefe6 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -226,7 +226,9 @@ BrowserGlue.prototype = { if (!this._saveSession && !aForce) return; - Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true); + if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { + Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true); + } // This method can be called via [NSApplication terminate:] on Mac, which // ends up causing prefs not to be flushed to disk, so we need to do that diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm index 64017f7..3b963bf 100644 --- a/browser/components/sessionstore/SessionStore.jsm +++ b/browser/components/sessionstore/SessionStore.jsm @@ -1165,7 +1165,10 @@ let SessionStoreInternal = { */ onQuitApplication: function ssi_onQuitApplication(aData) { if (aData == "restart") { - this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); + if (!PrivateBrowsingUtils.permanentPrivateBrowsing) { + this._prefBranch.setBoolPref("sessionstore.resume_session_once", true); + } + // The browser:purge-session-history notification fires after the // quit-application notification so unregister the // browser:purge-session-history notification to prevent clearing diff --git a/browser/components/sessionstore/nsSessionStartup.js b/browser/components/sessionstore/nsSessionStartup.js index 7c09a61..faf7863 100644 --- a/browser/components/sessionstore/nsSessionStartup.js +++ b/browser/components/sessionstore/nsSessionStartup.js @@ -291,6 +291,10 @@ SessionStartup.prototype = { * @returns bool */ isAutomaticRestoreEnabled: function () { + if (PrivateBrowsingUtils.permanentPrivateBrowsing) { + return false; + } + return Services.prefs.getBoolPref("browser.sessionstore.resume_session_once") || Services.prefs.getIntPref("browser.startup.page") == BROWSER_STARTUP_RESUME_SESSION; },

1 0

[tor-browser/tor-browser-38.6.1esr-6.0-1] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 18 Feb '16

18 Feb '16

commit 222689b3944533ebb97c809b8b6f508975dd45e3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Jan 17 23:32:59 2016 -0800 fixup! Bug #13670.1: Isolate favicon requests by first party Fixes https://bugs.torproject.org/18030, "Favicons loaded via the Page Info dialog are not going over the same circuit as the URL bar domain" --- browser/base/content/pageinfo/pageInfo.js | 2 ++ dom/base/nsContentUtils.cpp | 2 +- dom/base/nsImageLoadingContent.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 4c75d65..6183532 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -970,6 +970,8 @@ function makePreview(row) var newImage = new Image; newImage.id = "thepreviewimage"; + // Ensure "Media" items are fetched over the first-party domain. + newImage.setAttribute("firstparty", gWindow.top.document.location); var physWidth = 0, physHeight = 0; var width = 0, height = 0; diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 5d3dea7..67cd53b 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3000,7 +3000,7 @@ nsContentUtils::LoadImage(nsIURI* aURI, nsINode* aLoadingNode, NS_PRECONDITION(aLoadingPrincipal, "Must have a principal"); NS_PRECONDITION(aRequest, "Null out param"); - nsCOMPtr<nsIDocument> aLoadingDocument(aLoadingNode ? aLoadingNode->GetCurrentDoc() : nullptr); + nsCOMPtr<nsIDocument> aLoadingDocument(aLoadingNode ? aLoadingNode->OwnerDoc() : nullptr); imgLoader* imgLoader = GetImgLoaderForDocument(aLoadingDocument); if (!imgLoader) { diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp index 55c2bd7..64ec1d4 100644 --- a/dom/base/nsImageLoadingContent.cpp +++ b/dom/base/nsImageLoadingContent.cpp @@ -932,7 +932,7 @@ nsImageLoadingContent::LoadImage(nsIURI* aNewURI, nsCOMPtr<nsIContent> content = do_QueryInterface(static_cast<nsIImageLoadingContent*>(this)); nsresult rv; - rv = nsContentUtils::LoadImage(aNewURI, aDocument, + rv = nsContentUtils::LoadImage(aNewURI, content, aDocument->NodePrincipal(), aDocument->GetDocumentURI(), aDocument->GetReferrerPolicy(),

1 0

[tor-browser/tor-browser-38.6.1esr-5.5-1] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 18 Feb '16

18 Feb '16

commit b9e7d044aa52c8cda48c73616d70324f666fe1e7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Jan 17 23:32:59 2016 -0800 fixup! Bug #13670.1: Isolate favicon requests by first party Fixes https://bugs.torproject.org/18030, "Favicons loaded via the Page Info dialog are not going over the same circuit as the URL bar domain" --- browser/base/content/pageinfo/pageInfo.js | 2 ++ dom/base/nsContentUtils.cpp | 2 +- dom/base/nsImageLoadingContent.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 4c75d65..6183532 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -970,6 +970,8 @@ function makePreview(row) var newImage = new Image; newImage.id = "thepreviewimage"; + // Ensure "Media" items are fetched over the first-party domain. + newImage.setAttribute("firstparty", gWindow.top.document.location); var physWidth = 0, physHeight = 0; var width = 0, height = 0; diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 5d3dea7..67cd53b 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3000,7 +3000,7 @@ nsContentUtils::LoadImage(nsIURI* aURI, nsINode* aLoadingNode, NS_PRECONDITION(aLoadingPrincipal, "Must have a principal"); NS_PRECONDITION(aRequest, "Null out param"); - nsCOMPtr<nsIDocument> aLoadingDocument(aLoadingNode ? aLoadingNode->GetCurrentDoc() : nullptr); + nsCOMPtr<nsIDocument> aLoadingDocument(aLoadingNode ? aLoadingNode->OwnerDoc() : nullptr); imgLoader* imgLoader = GetImgLoaderForDocument(aLoadingDocument); if (!imgLoader) { diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp index 55c2bd7..64ec1d4 100644 --- a/dom/base/nsImageLoadingContent.cpp +++ b/dom/base/nsImageLoadingContent.cpp @@ -932,7 +932,7 @@ nsImageLoadingContent::LoadImage(nsIURI* aNewURI, nsCOMPtr<nsIContent> content = do_QueryInterface(static_cast<nsIImageLoadingContent*>(this)); nsresult rv; - rv = nsContentUtils::LoadImage(aNewURI, aDocument, + rv = nsContentUtils::LoadImage(aNewURI, content, aDocument->NodePrincipal(), aDocument->GetDocumentURI(), aDocument->GetReferrerPolicy(),

1 0

[tor-messenger-build/master] Update Tor Messenger version to 0.1.0b5
by sukhbir＠torproject.org 18 Feb '16

18 Feb '16

commit fef32f858926d46cf1539ed2a59a8f57f982f97a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Feb 17 19:00:49 2016 -0500 Update Tor Messenger version to 0.1.0b5 --- ChangeLog | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fbadce..e03f7fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Tor Messenger -- +Tor Messenger 0.1.0b5 -- * All Platforms * Bug 13795: Remove SPI root certificate because Debian no longer ships it * Bug 18094: Remove references to torbutton from start-tor-messenger script diff --git a/rbm.conf b/rbm.conf index a7d1345..30cddb0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,7 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build var: - tormessenger_version: '0.1.0b4' + tormessenger_version: '0.1.0b5' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %]

1 0

[tor-messenger-build/master] Bug 17749: Show version information in the "About" window
by sukhbir＠torproject.org 17 Feb '16

17 Feb '16

commit b85ff7288f0ed54b74cb07571b641f67b8bdb7d9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Feb 17 18:59:27 2016 -0500 Bug 17749: Show version information in the "About" window --- ChangeLog | 1 + projects/instantbird/branding/credits.patch | 36 +++++++++++++++++++++++++---- projects/instantbird/build | 2 ++ projects/tor-messenger/config | 2 +- rbm.conf | 1 + 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37f1c45..1fbadce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Tor Messenger -- * Bug 18094: Remove references to torbutton from start-tor-messenger script * Bug 18235: Disable Facebook as they no longer support XMPP * Bug 17494: Better error reporting for failed outgoing messages + * Bug 17749: Show version information in the "About" window * Mac * Bug 17896: Add Edit menu to the conversation window on OS X * Windows diff --git a/projects/instantbird/branding/credits.patch b/projects/instantbird/branding/credits.patch index a3e7f4a..7b6f509 100644 --- a/projects/instantbird/branding/credits.patch +++ b/projects/instantbird/branding/credits.patch @@ -58,7 +58,16 @@ diff --git a/im/content/aboutDialog.css b/im/content/aboutDialog.css diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul --- a/im/content/aboutDialog.xul +++ b/im/content/aboutDialog.xul -@@ -24,8 +24,7 @@ +@@ -14,7 +14,7 @@ + %brandDTD; + <!ENTITY % aboutDialogDTD SYSTEM "chrome://instantbird/locale/aboutDialog.dtd" > + %aboutDialogDTD; +-<!ENTITY copyrightYear "2015"> ++<!ENTITY copyrightYear "2016"> + #ifdef XP_MACOSX + <!ENTITY % instantbirdDTD SYSTEM "chrome://instantbird/locale/instantbird.dtd"> + %instantbirdDTD; +@@ -24,105 +24,26 @@ <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="aboutDialog" windowtype="Messenger:About" @@ -67,8 +76,10 @@ diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul + buttons="accept" title="&aboutDialog.title;" creditslabel="&credits.label;" creditsaccesskey="&credits.accesskey;" aboutlabel="&aboutLink.label;" aboutaccesskey="&aboutLink.accesskey;" versionlabel="&aboutVersion;" - style="width: 299px; height: 330px;"> -@@ -34,95 +33,12 @@ +- style="width: 299px; height: 330px;"> ++ style="width: 310px; height: 330px;"> + + #ifdef XP_MACOSX #include menus.xul.inc #endif @@ -152,6 +163,11 @@ diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul - <textbox id="libpurpleVersionField" readonly="true" class="plain" - tabindex="4" value="&libpurpleVersion; "/> - </vbox> ++ <vbox id="versionWrapper" align="center" flex="1"> ++ <separator/> ++ <label id="tmLabel" value="&tmText;" /> ++ <label id="imLabel" value="&imText;" /> ++ </vbox> <description id="copyright" flex="1">&copyrightText2;</description> <separator/> - <textbox id="userAgentField" readonly="true" class="plain" @@ -167,9 +183,19 @@ diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd --- a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd +++ b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd -@@ -7,4 +7,4 @@ +@@ -1,4 +1,4 @@ +-<!ENTITY aboutDialog.title "About &brandFullName;"> ++<!ENTITY aboutDialog.title "About &brandShortName;"> + <!ENTITY credits.label "Credits"> + <!ENTITY credits.accesskey "C"> + <!ENTITY aboutLink.label "< About &brandShortName;"> +@@ -6,5 +6,8 @@ + <!ENTITY aboutVersion "version"> <!ENTITY geckoVersion "Gecko"> <!ENTITY libpurpleVersion "libpurple"> ++<!ENTITY ibVersion "Nightly">  -<!ENTITY copyrightText2 "©2007-&copyrightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> -+<!ENTITY copyrightText2 "©&copyrightYear; Contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> ++<!ENTITY tmText "Version &tmVersion;"> ++<!ENTITY imText "(Based on Instantbird IM &ibVersion;)"> ++<!ENTITY copyrightText2 "©&copyrightYear; The Tor Project, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU GPL license version 2.0 or later."> diff --git a/projects/instantbird/build b/projects/instantbird/build index 1828857..01d3ada 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -71,6 +71,8 @@ cp $rootdir/branding/instantbird.icns im/branding/messenger/ cp $rootdir/branding/about.png im/branding/messenger/content/ +echo '<!ENTITY tmVersion "[% c('var/tormessenger_version') %]">' >> im/locales/en-US/chrome/instantbird/aboutDialog.dtd + cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 1a3430f..19e98b6 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.1.0b4 +version: '[% c("var/tormessenger_version") %]' filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]' input_files: - name: instantbird diff --git a/rbm.conf b/rbm.conf index a842453..a7d1345 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,6 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build var: + tormessenger_version: '0.1.0b4' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %]

1 0

[tor-messenger-build/master] Update to Tor Browser 5.5.2
by sukhbir＠torproject.org 17 Feb '16

17 Feb '16

commit 653e525cc9c47b98b906dd239cd9198de5693b20 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Feb 17 16:11:55 2016 -0500 Update to Tor Browser 5.5.2 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 2712b90..be9e1eb 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.5 +version: 5.5.2 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 16 Feb '16

16 Feb '16

commit 6d2355681593bef745121a84f7f7555a7f46e14f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 16 21:45:23 2016 +0000 Update translations for https_everywhere_completed --- fil/https-everywhere.dtd | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/fil/https-everywhere.dtd b/fil/https-everywhere.dtd new file mode 100644 index 0000000..091fadc --- /dev/null +++ b/fil/https-everywhere.dtd @@ -0,0 +1,43 @@ +<!ENTITY https-everywhere.about.title "Tungkol sa HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_description "I-encrypt ang Web! Awtomatikong gamitin ang HTTPS security sa maraming sites."> +<!ENTITY https-everywhere.about.version "Bersyon"> +<!ENTITY https-everywhere.about.created_by "Ginawa nina"> +<!ENTITY https-everywhere.about.and "at"> +<!ENTITY https-everywhere.about.librarians "Mga Ruleset Librarian"> +<!ENTITY https-everywhere.about.thanks "Salamat sa"> +<!ENTITY https-everywhere.about.many_contributors "Maraming maraming contributor, kasama sina"> +<!ENTITY https-everywhere.about.noscript "Gayundin, ang ilang bahagi ng HTTPS Everywhere ay batay sa code mula sa NoScript nina Giorgio Maone at marami pang iba. Lubos kaming nagpapasalamat sa kanilang mahusay na trabaho!"> +<!ENTITY https-everywhere.about.contribute "Kung nagustuhan mo ang HTTPS Everywhere, baka magustuhan mo ring"> +<!ENTITY https-everywhere.about.donate_tor "Mag-donate sa Tor"> +<!ENTITY https-everywhere.about.tor_lang_code "fil"> +<!ENTITY https-everywhere.about.or "o"> +<!ENTITY https-everywhere.about.donate_eff "Mag-donate sa EFF"> + +<!ENTITY https-everywhere.menu.about "Tungkol sa HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.observatory "Mga Preference sa SSL Observatory"> +<!ENTITY https-everywhere.menu.globalEnable "I-enable ang HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.globalDisable "I-disable ang HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.blockHttpRequests "I-block ang lahat ng HTTP requests"> +<!ENTITY https-everywhere.menu.showCounter "Ipakita ang Counter"> +<!ENTITY https-everywhere.menu.viewAllRules "Tingnan ang Lahat ng Rules"> + +<!ENTITY https-everywhere.prefs.title "Mga Preference sa HTTPS Everywhere"> +<!ENTITY https-everywhere.prefs.enable_all "I-enable Lahat"> +<!ENTITY https-everywhere.prefs.disable_all "I-disable Lahat"> +<!ENTITY https-everywhere.prefs.reset_defaults "Ibalik sa Defaults"> +<!ENTITY https-everywhere.prefs.search "Maghanap"> +<!ENTITY https-everywhere.prefs.site "Site"> +<!ENTITY https-everywhere.prefs.notes "Mga Paunawa"> +<!ENTITY https-everywhere.prefs.list_caption "Aling HTTPS redirection rules ang dapat gamitin?"> +<!ENTITY https-everywhere.prefs.enabled "Naka-enable"> +<!ENTITY https-everywhere.prefs.ruleset_howto "Puwede kang matuto kung paano magsulat ng sarili mong rulesets (para magdagdag ng support para sa iba pang web sites)"> +<!ENTITY https-everywhere.prefs.here_link "dito"> +<!ENTITY https-everywhere.prefs.toggle "I-toggle"> +<!ENTITY https-everywhere.prefs.reset_default "Ibalik sa Default"> +<!ENTITY https-everywhere.prefs.view_xml_source "Tingnan ang XML Source"> + +<!ENTITY https-everywhere.chrome.stable_rules "Mga stable na rules"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Puwersahin ang mga naka-encrypt na koneksyon sa mga website na ito:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Mga experimental na rules"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Maaaring hindi gumana o magkaroon ng mga babala. Default na naka-disable.">

1 0