Commit 25a7f040 authored by bertagaz's avatar bertagaz
Browse files

Merge branch 'stable' into devel

parents 40537d9b 88d7f65b
......@@ -34,7 +34,6 @@ exec_firefox_helper() {
# From start-tor-browser:
unset SESSION_MANAGER
export SELFRANDO_write_layout_file=
exec "${TBB_INSTALL}"/"${binary}" "${@}"
}
......
http://torbrowser-archive.tails.boum.org/7.5.1/
http://torbrowser-archive.tails.boum.org/7.5.2-build1/
9f28b5dabe8defeace4aeea9ebbba775b41111d13007a199d5a20297d3de8159 tor-browser-linux64-7.5.1_ar.tar.xz
d1837b9d831eb2a75e37a191f107b9d92446d570d6c544ad64e014eaf2cea008 tor-browser-linux64-7.5.1_de.tar.xz
4087c5e18f6290296d7f343d5286193be496e979d4f19f239db6d40702cbb5b0 tor-browser-linux64-7.5.1_en-US.tar.xz
aae404d2c24dc0e971b13b396a9749a0cb7b8c364e23955aba09a8a503d969c1 tor-browser-linux64-7.5.1_es-ES.tar.xz
60c4c5d67abe552cf22f3144c4dc2e169d5ffab03503b86836d8f0108cb206dc tor-browser-linux64-7.5.1_fa.tar.xz
a2487b8154b54d6f8cd8a64fad3573a2f5763bcf43fde8473b8e27633645a524 tor-browser-linux64-7.5.1_fr.tar.xz
e73ed0c75150a6aa9089d97012e60184fa161e0c6e6bdaee449f7a5a8e55b3cd tor-browser-linux64-7.5.1_it.tar.xz
ff47bc0c4c630543a44b5dbdf34538c4f240d5119a53f29dfbf635e43ec6dcf7 tor-browser-linux64-7.5.1_ja.tar.xz
9a9b1c6c96c57f210f616b91b88323deeb0fd664582e8a4794aef412d52ddaec tor-browser-linux64-7.5.1_ko.tar.xz
7bfa535c561696f35d03d3ded3ee5d43df3e2fd957a070fa015e2e95132b1166 tor-browser-linux64-7.5.1_nl.tar.xz
9ec490326e5933f1e5e053ec5d6e3f809350f73c36f1f1900fe20e5c6145764a tor-browser-linux64-7.5.1_pl.tar.xz
4381942df132429238f60f57a67f121437db67120f9774787866b5a85f0e14ca tor-browser-linux64-7.5.1_pt-BR.tar.xz
e1ed474c41c3bcd77825e6e9323ecfb56294ae9aa600e2ebead97dbb00a1f6c1 tor-browser-linux64-7.5.1_ru.tar.xz
18cd674dd414af998ef6638fabf9988d20001071a87e5a54b5249f1c7768b988 tor-browser-linux64-7.5.1_tr.tar.xz
ba9a5f34fbbe8f02f22e4aee652e01fcbaba231372265626c5c71ca53791dd21 tor-browser-linux64-7.5.1_vi.tar.xz
b0b539a28e6f0e7a4d1e11c6aca6f04ca87625553d5c0ab77aef0037ec577e44 tor-browser-linux64-7.5.1_zh-CN.tar.xz
a34469433e144e9b48b968487500364a94edacb8b7736fa9a12102c343124cf7 tor-browser-linux64-7.5.2_ar.tar.xz
51922785e447ba1636d3ec6f47b89390520aae611bb57b777a23c61a801e294d tor-browser-linux64-7.5.2_de.tar.xz
542cb965e08dbd31f0b63c19d599094d77d0b7b5c56ff2ab40d6fcf955b0ee3b tor-browser-linux64-7.5.2_en-US.tar.xz
03deee775103716b4b8b0bcd653700bf5b9d91c71406c9dfedefc4981a242105 tor-browser-linux64-7.5.2_es-ES.tar.xz
adbae3a4fc42a486e992a678c554f519e388f4a267df33b127fd9082d848c250 tor-browser-linux64-7.5.2_fa.tar.xz
15b8cadfe2f8cc54c8699901e1e2cafcf6adcaab777d2b8439959510f6464447 tor-browser-linux64-7.5.2_fr.tar.xz
880c1ba684ed15ff779bce773ec7cd9568d6ed3a114f70e89a00d51f6f26cbb4 tor-browser-linux64-7.5.2_it.tar.xz
933cea8541b7c96b266baf7a5a030c23c4060b520ebed2c08e536b4f49689e3e tor-browser-linux64-7.5.2_ja.tar.xz
99982e3b71128bbe617ddafa72adc07a9e8c1722549da4966f3e0d989fae6047 tor-browser-linux64-7.5.2_ko.tar.xz
8122df5066875ec2650fc5c23f25871ecdcc4892c84a9a29d551c18c1270c0fb tor-browser-linux64-7.5.2_nl.tar.xz
86e186467ff502df9df5c8002c3ca9b402db60748db59d4d53a7c37e1b9f0c64 tor-browser-linux64-7.5.2_pl.tar.xz
b30db9c5b6dd9f8c76a507a2c9cd3200ed8515459114587e83c70cdf2cfa3a0e tor-browser-linux64-7.5.2_pt-BR.tar.xz
d906bb406d5fc5c01788ec23f84f730291baba48bbf7cdde193de1da9104d76a tor-browser-linux64-7.5.2_ru.tar.xz
a6e07977b945489fa3e26abed48cda3caab64af00011c2d0e99c31747e71c261 tor-browser-linux64-7.5.2_tr.tar.xz
83dd2a0673b5ea3d0628812004630bc5be2a3093088a5f2ca98aa404acf10b1d tor-browser-linux64-7.5.2_vi.tar.xz
57546564b5cde1191f39f42273db313a59d4c201d2262cf42bac089a2584c71e tor-browser-linux64-7.5.2_zh-CN.tar.xz
......@@ -4,6 +4,22 @@ tails (3.9) UNRELEASED; urgency=medium
-- Tails developers <tails@boum.org> Wed, 14 Mar 2018 11:44:10 +0100
tails (3.6.1) unstable; urgency=medium
* Security fixes
- Upgrade Tor Browser to 7.5.2 (MFSA 2018-08 i.e. CVE-2018-5146).
- Upgrade libvorbis to 1.3.5-4+deb9u2 (DSA 4140-1 aka. CVE-2018-5146).
- Upgrade curl to 7.52.1-5+deb9u5 (DSA 4136-1).
- Upgrade samba to 2:4.5.12+dfsg-2+deb9u2 (DSA 4135-1).
* Bugfixes
- Fix ISO build reproducibility (Closes: #15400)
- Disable Selfrando: Tor Browser upstream currently enables it only
in non-release builds
(https://trac.torproject.org/projects/tor/ticket/24912#comment:8).
-- Tails developers <tails@boum.org> Fri, 16 Mar 2018 22:42:00 +0000
tails (3.6) unstable; urgency=medium
* Major changes
......
......@@ -105,6 +105,12 @@ installing.
XXX: the configure button here is tricky to implement. Can we live without it?
> People who see this notification already configured additional
> software. It's here as a reminder of where the configuration that
> triggers this notification is stored (and also as a shortcut).
>
> So yes, we can live without it.
Notifications of failures
-------------------------
......@@ -120,6 +126,25 @@ Notifications of failures
XXX: please define
> I would need to understand better how and why it could fail... Is it
> something that people can fix by themselves or merely revealing a bug
> that we will have to fix in Tails?
>
> If it's about helping people to report bugs that we will have to fix
> in Tails, then we could display:
<pre>
**Adding Mumble to your additional software failed**
Please [[report an error to our help desk|doc/first_steps/bug_reporting]].
</pre>
<pre>
**Removing Mumble from your additional software failed**
Please [[report an error to our help desk|doc/first_steps/bug_reporting]].
</pre>
### When the *Additional Software* configuration GUI fails to do its work
* started standalone (from the Applications menu or Overview)
......@@ -152,6 +177,9 @@ Software** feature in the persistent storage settings.
XXX: please define what happens when clicking on the links "Synaptic Package Manager" or "APT on the command line".
> Clicking "Synaptic Package Manager" opens Synaptic.
> Clicking "APT on the command line" opens Terminal.
### When removing a package
By clicking on the delete cross.
......
[[!meta date="Tue, $DAY $MONTH $YEAR 12:34:56 +0000"]]
[[!meta date="Tue, $DAY $MON $YEAR 12:34:56 +0000"]]
[[!meta title="Tails $VERSION is out"]]
[[!tag announce]]
......
......@@ -130,7 +130,7 @@ If we are at freeze time for a point-release:
1. Merge the `master` Git branch into `stable`:
git checkout stable && git merge --no-ff origin/master
git checkout stable && git fetch && git merge --no-ff origin/master
2. [[Merge each APT overlay suite|APT_repository/custom#workflow-merge-overlays]]
listed in the `stable` branch's `config/APT_overlays.d/` into the `stable`
......@@ -1002,7 +1002,7 @@ and on the live wiki (even for a release candidate):
| ssh bittorrent.lizard gpg --import
scp \
"${ISOS:?}/tails-amd64-${VERSION:?}.torrent" \
"${ISOS_PATH:?}.sig" \
"${ISO_PATH:?}.sig" \
bittorrent.lizard: && \
ssh bittorrent.lizard << EOF
mkdir --mode 0755 "tails-amd64-${VERSION:?}" && \
......
......@@ -66,8 +66,9 @@ with GnuPG:
Filter the tarballs we want and make them available at build time,
when the tarballs are fetched:
grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt > \
config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
grep --color=never "\<tor-browser-linux64-.*\.tar.xz$" sha256sums-unsigned-build.txt \
| grep -v '\<tor-browser-linux64-debug\.tar\.xz$' \
> config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
Then update the URL to the one chosen above:
......
2018-03-13
\ No newline at end of file
2018-03-17
\ No newline at end of file
gpg:&nbsp;Signature&nbsp;made&nbsp;Tue&nbsp;Mar&nbsp;13&nbsp;01:41:20&nbsp;2018&nbsp;CET<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;RSA&nbsp;key&nbsp;2FAF9BA0D65BB371F0BC2D463020A7A9C2B72733<br/>
gpg:&nbsp;Signature&nbsp;made&nbsp;Sat&nbsp;17&nbsp;Mar&nbsp;2018&nbsp;12:08:42&nbsp;AM&nbsp;UTC<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;EDDSA&nbsp;key&nbsp;CD4D4351AFA6933F574A9AFB90B2B4BD7AED235F<br/>
gpg:&nbsp;Good&nbsp;signature&nbsp;from&nbsp;"Tails&nbsp;developers&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;aka&nbsp;"Tails&nbsp;developers&nbsp;(offline&nbsp;long-term&nbsp;identity&nbsp;key)&nbsp;&lt;tails@boum.org&gt;"&nbsp;[full]<br/>
gpg --keyid-format 0xlong --verify tails-amd64-3.6.iso.sig tails-amd64-3.6.iso
gpg --keyid-format 0xlong --verify tails-amd64-3.6.1.iso.sig tails-amd64-3.6.1.iso
https://tails.boum.org/torrents/files/tails-amd64-3.6.iso.sig
https://tails.boum.org/torrents/files/tails-amd64-3.6.1.iso.sig
http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.6/tails-amd64-3.6.iso
http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.6.1/tails-amd64-3.6.1.iso
https://tails.boum.org/torrents/files/tails-amd64-3.6.torrent
https://tails.boum.org/torrents/files/tails-amd64-3.6.1.torrent
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: tails-index-pt\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-03-12 14:36+0100\n"
"PO-Revision-Date: 2018-02-21 10:55+0000\n"
"POT-Creation-Date: 2018-03-16 22:43+0100\n"
"PO-Revision-Date: 2018-03-14 01:08-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: Portuguese <LL@li.org>\n"
"Language: pt\n"
......@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.10.1\n"
"X-Generator: Poedit 1.8.11\n"
#. type: Content of: outside any tag (error?)
msgid ""
......@@ -56,8 +56,8 @@ msgid ""
"all connections to the Internet are forced to go through [[the Tor network|"
"https://www.torproject.org/]];"
msgstr ""
"todas as conexões feitas à Internet são passam necessariamente [[pela rede "
"Tor|https://www.torproject.org/]];"
"todas as conexões feitas à Internet passam necessariamente [[pela rede Tor|"
"https://www.torproject.org/]];"
#. type: Content of: <div><ul><li>
msgid ""
......@@ -73,7 +73,7 @@ msgid ""
"files, emails and instant messaging."
msgstr ""
"<strong>usar ferramentas criptográficas do estado da arte</strong> para "
"criptografar seus arquivos, email e mensagens instantâneas."
"criptografar seus arquivos, emails e mensagens instantâneas."
#. type: Content of: <div><p>
msgid "[[Learn more about Tails.|about]]"
......@@ -87,13 +87,13 @@ msgstr "Notícias"
msgid ""
"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
"(currentlang() or news/report_2* or news/test_*-rc? or news/test_*beta? or "
"news/test_*alpha?)\" show=\"2\" feeds=\"no\" archive=\"yes\" sort=\"-meta"
"(date) age -path\"]]"
"news/test_*alpha?)\" show=\"2\" feeds=\"no\" archive=\"yes\" sort=\"-"
"meta(date) age -path\"]]"
msgstr ""
"[[!inline pages=\"page(news/*) and !news/*/* and !news/discussion and "
"(currentlang() or news/report_2* or news/test_*-rc? or news/test_*beta? or "
"news/test_*alpha?)\" show=\"2\" feeds=\"no\" archive=\"yes\" sort=\"-meta"
"(date) age -path\"]]"
"news/test_*alpha?)\" show=\"2\" feeds=\"no\" archive=\"yes\" sort=\"-"
"meta(date) age -path\"]]"
#. type: Content of: <div><p>
msgid "See [[News]] for more."
......@@ -162,13 +162,9 @@ msgstr "<span class=\"clearfix\"></span>"
#. type: Content of: <div><h1>
msgid "Awards"
msgstr "Prêmios"
msgstr "Premiações"
#. type: Content of: <div><p>
#, fuzzy
#| msgid ""
#| "Tails has received the Mozilla Open Source Support Award (2016), the "
#| "Access Innovation Prize (2014) and the OpenITP award (2013)."
msgid ""
"Tails has received the Mozilla Open Source Support Award (2016), the Access "
"Innovation Prize (2014), the APC FLOSS prize (2014) and the OpenITP award "
......
......@@ -2,8 +2,8 @@
build-target: amd64
channel: stable
product-name: Tails
version: '3.6'
version: '3.6.1'
target-files:
- sha256: b7037aa98e16510023a473c60e7c4b53d569cf81cbfd3b05280ab096ac8a66b7
- sha256: 826c8fc05a7fb04962c6a45350648fc9273bf98f8b19b2d5a491b440d78ecbf6
size: 1225568256
url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.6/tails-amd64-3.6.iso
url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.6.1/tails-amd64-3.6.1.iso
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-16 13:21+0000\n"
"POT-Creation-Date: 2018-03-17 00:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -19,8 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p>If you are upgrading from Tails 3.5, it is only possible to select "
"an\n"
" <p>If you are doing a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, it is only possible to select an\n"
" ISO image when running Tails in English. For other languages, the\n"
" file chooser button remains inactive:</p>\n"
msgstr ""
......@@ -32,14 +31,14 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
msgid " <p>To do a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, you can either:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <ul>\n"
" <li>Restart Tails 3.5 in English</li>\n"
" <li>Restart Tails in English</li>\n"
msgstr ""
#. type: Plain text
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-16 13:21+0000\n"
"POT-Creation-Date: 2018-03-17 00:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -19,8 +19,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p>If you are upgrading from Tails 3.5, it is only possible to select "
"an\n"
" <p>If you are doing a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, it is only possible to select an\n"
" ISO image when running Tails in English. For other languages, the\n"
" file chooser button remains inactive:</p>\n"
msgstr ""
......@@ -32,14 +31,14 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
msgid " <p>To do a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, you can either:</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <ul>\n"
" <li>Restart Tails 3.5 in English</li>\n"
" <li>Restart Tails in English</li>\n"
msgstr ""
#. type: Plain text
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment