Commit 9d5700d6 authored by intrigeri's avatar intrigeri

Merge remote-tracking branch 'origin/master' into web/release-3.8

parents ab3cb026 1d9444de
......@@ -256,6 +256,26 @@ partition if the destination USB is already a Tails USB stick.
* No option to do incremental backups.
* People need a dedicated USB stick.
Duplicati
---------
- Mono application (.NET).
- Unofficial Debian package. I found no reference to "duplicati" on bugs.debian.org.
- The client side has both:
- a command-line interface
- a web server interface running on localhost:8200:
https://duplicati.readthedocs.io/en/latest/03-using-the-graphical-user-interface/.
I could pierce a hole in our firewall to access this from Firefox
ESR in Tails but then I couldn't make it connect to an SSH server.
I'm not sure how this would integrate with Tails in general but it
doesn't seem the right user interface for our users.
- Backend supports for many types of remote storage: https://duplicati.readthedocs.io/en/latest/05-storage-providers/.
- Backend supports incremental backups and deduplication.
- I didn't manage to make the SSH backend work from the command line
(tried `torsocks`) but while doing so I can see in Onion Circuits that
Duplicati is calling back home in several ways: checking for update
and reporting usage stats.
Other solutions
---------------
......
[[!meta title="Preparing video clips"]]
Rencode the video
-----------------
It makes it lighter and easier to view with *VLC* (but not with *Totem*):
ffmpeg -i [input.ogv] [output.webm]
For example:
ffmpeg -i P1.ogv P1.webm
Cut out a video clip from a longer recording
--------------------------------------------
......
......@@ -399,7 +399,7 @@ translators|contribute/how/translate]].
To get a list of changes on the website:
git diff --stat ${PREVIOUS_VERSION:?}.. -- \
git diff --stat ${PREVIOUS_TAG:?}.. -- \
wiki/src/'*'.{mdwn,html} \
':!wiki/src/blueprint*' \
':!wiki/src/contribute*' \
......@@ -515,7 +515,7 @@ SquashFS file order
1. Add `profile` to the kernel command-line.
1. Login.
1. Wait for the "Tor is ready" notification.
1. Start the web browser.
1. Start *Tor Browser*.
1. A few minutes later, once the `boot-profile` process has been
killed, retrieve the new sort file from `/var/log/boot-profile`.
1. Copy the new sort file to `config/binary_rootfs/squashfs.sort`.
......@@ -543,7 +543,7 @@ suite should be ready, so it is time to:
1. Mark the version as "released" in the changelog:
dch --release --no-force-save-on-release --maintmaint
dch --release --no-force-save-on-release --maintmaint && \
git commit -m "Mark Tails ${VERSION:?} as released." debian/changelog
1. Export `SOURCE_DATE_EPOCH`:
......@@ -658,26 +658,19 @@ suite should be ready, so it is time to:
Generate the OpenPGP signatures and Torrents
============================================
First, create a directory with a suitable name and go there:
Create a directory with a suitable name, go there, move the built
image to this brand new directory, generate detached OpenPGP
signatures for the image to be published (in the same directory as the
image and with a `.sig` extension), then go up to the parent
directory, create a `.torrent` file and check the generated `.torrent`
files metadata:
mkdir "${ISOS:?}/tails-amd64-${VERSION:?}" && \
cd "${ISOS:?}/tails-amd64-${VERSION:?}"
Second, move the built image to this brand new directory:
cd "${ISOS:?}/tails-amd64-${VERSION:?}" && \
mv "${ARTIFACTS:?}/tails-amd64-${VERSION:?}.iso" \
"${ISOS:?}/tails-amd64-${VERSION:?}/"
Third, generate detached OpenPGP signatures for the image to be
published, in the same directory as the image and with a `.sig`
extension; e.g.
gpg --armor --default-key "${TAILS_SIGNATURE_KEY:?}" --detach-sign *.iso
rename 's,\.asc$,.sig,' *.asc
Fourth, go up to the parent directory, create a `.torrent` file and
check the generated `.torrent` files metainfo:
"${ISOS:?}/tails-amd64-${VERSION:?}/" && \
gpg --armor --default-key "${TAILS_SIGNATURE_KEY:?}" --detach-sign *.iso && \
rename 's,\.asc$,.sig,' *.asc && \
cd .. && \
mktorrent \
-a 'udp://tracker.torrent.eu.org:451' \
......@@ -923,7 +916,7 @@ above).
Publish the ISO and IUKs over HTTP
----------------------------------
Upload the IUKs to the primary rsync mirror:
Upload the IUKs to our rsync server:
for source_version in ${IUK_SOURCE_VERSIONS}; do
rsync --partial --inplace --progress -v \
......@@ -931,7 +924,7 @@ Upload the IUKs to the primary rsync mirror:
rsync.lizard:
done
Upload the ISO signature to the primary rsync mirror:
Upload the ISO signature to our rsync server:
scp "${ISO_PATH:?}.sig" rsync.lizard:
......@@ -941,7 +934,7 @@ an integer):
MATCHING_JENKINS_BUILD_ID=XXX
Copy the ISO to the primary rsync mirror and verify the signature:
Copy the ISO to our rsync server and verify the signature:
cat "${RELEASE_CHECKOUT:?}/wiki/src/tails-signing.key" \
| ssh rsync.lizard gpg --import
......@@ -968,7 +961,7 @@ Move files in place with proper ownership and permissions:
/srv/rsync/tails/tails/${DIST:?}/iuk/
EOF
Update the time in `project/trace` file on the primary rsync mirror
Update the time in `project/trace` file on our rsync server
and on the live wiki (even for a release candidate):
TRACE_TIME=$(date +%s) &&
......@@ -1081,7 +1074,8 @@ Rename, copy, garbage collect and update various files:
LC_NUMERIC=C ls -l -h ${ISO_PATH:?} | \
cut -f 5 -d ' ' | sed -r 's/(.+)([MG])/\1 \2B/' \
> "${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_iso_size.html" && \
LANG=C TZ=UTC gpg --no-options --keyid-format 0xlong --verify "${ISO_PATH:?}.sig" "${ISO_PATH:?}" 2>&1 | \
gpg --check-trustdb && \
LANG=C TZ=UTC gpg --no-options --keyid-format 0xlong --verify "${ISO_PATH:?}.sig" "${ISO_PATH:?}" 2>&1 | \
sed 's/ /\&nbsp;/g;s/</\&lt;/;s/>/\&gt;/;s/$/<br\/>/g' > \
"${RELEASE_CHECKOUT:?}/wiki/src/inc/stable_amd64_gpg_signature_output.html"
......
......@@ -196,15 +196,18 @@ tracked by tickets prefixed with `todo/test_suite:`.
# Incremental upgrades
* List the versions from which an upgrade paths to this one is described.
In the `stable` or `testing` branch:
* List the versions from which an upgrade path to this one is described.
On the `master` branch:
git grep -l " version: '\?0.23'\?" wiki/src/upgrade/
git grep -E -l " version: '?0.23'?" \
wiki/src/upgrade/v1/Tails/*/*/test/upgrades.yml
… replacing "0.23" with the version you are testing.
* For each description file, open it and verify if it allows incremental upgrade
or only full upgrade.
* For each previous version from which an upgrade paths is described, install it
* For each previous version from which an upgrade path is described, install it
and try to upgrade:
* For every incremental upgrade path: make sure the resulting updated
system "works fine" (boots, pretends to be the correct version,
......@@ -271,20 +274,29 @@ tracked by tickets prefixed with `todo/test_suite:`.
# Tails Verification
* Verify the ISO image of the current release (for example $N=3.7)
using *Tails Verification* from Tor Browser in the version that you
are testing (for example $N+1=3.8):
* The goal is is to check that *Tails Verification* works in *Tor
Browser* in the version of Tails we are testing here. *Tails
Verification* only supports verifying the current release so for
example, when doing tests for the Tails 3.9 release, we use it in
the tentative Tails 3.9 to verify the Tails 3.8 ISO image.
1. Start the Tails that you are testing.
2. Start *Tor Browser*.
1. Visit <https://tails.boum.org/install/download/>.
3. Visit <https://tails.boum.org/install/download/>.
1. Download the ISO image of the current release (or click "*I already
downloaded Tails $N*").
4. If you already have the ISO image for the last, already released
version of Tails, i.e. the one that's advertised in the sidebar
of our production website, then click "*I already downloaded Tails $N*".
Otherwise follow the instructions on that web page to download
the ISO image.
1. Install *Tails Verification*.
5. Install *Tails Verification*.
1. Click the **Verify Tails $N** button.
6. Click the **Verify Tails $N** button.
1. The verification should be successful.
7. The verification should be successful.
# Real (non-VM) hardware
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-04-06 21:40+0300\n"
"POT-Creation-Date: 2018-06-25 18:11+0200\n"
"PO-Revision-Date: 2015-11-21 20:44+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -96,6 +96,13 @@ msgstr ""
"Um zu lernen, wie *Electrum* benutzt wird, lesen Sie die [Dokumentation im "
"*Electrum*-Wiki](http://docs.electrum.org)."
#. type: Plain text
msgid ""
"For an explanation of how Bitcoin works in simple terms, read [The In-Depth "
"Guide to Bitcoin That Won’t Leave You Frustrated](https://www.vpnmentor.com/"
"blog/ultimate-guide-bitcoin/)."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
......
......@@ -6,11 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-04-06 21:40+0300\n"
"POT-Creation-Date: 2018-06-25 18:11+0200\n"
"PO-Revision-Date: 2018-04-08 10:56+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Spanish "
"<http://translate.tails.boum.org/projects/tails/electrum/es/>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"electrum/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -70,6 +70,13 @@ msgid ""
"wiki](http://docs.electrum.org)."
msgstr ""
#. type: Plain text
msgid ""
"For an explanation of how Bitcoin works in simple terms, read [The In-Depth "
"Guide to Bitcoin That Won’t Leave You Frustrated](https://www.vpnmentor.com/"
"blog/ultimate-guide-bitcoin/)."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-04-06 21:40+0300\n"
"POT-Creation-Date: 2018-06-25 18:11+0200\n"
"PO-Revision-Date: 2015-10-14 20:04+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/electrum/"
......@@ -98,6 +98,13 @@ msgstr ""
"برای یادگیری نحوهٔ استفاده از *الکترام*، [سند ویکی *الکترام*](http://docs."
"electrum.org) را بخوانید."
#. type: Plain text
msgid ""
"For an explanation of how Bitcoin works in simple terms, read [The In-Depth "
"Guide to Bitcoin That Won’t Leave You Frustrated](https://www.vpnmentor.com/"
"blog/ultimate-guide-bitcoin/)."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-04-06 21:40+0300\n"
"POT-Creation-Date: 2018-06-25 18:11+0200\n"
"PO-Revision-Date: 2018-04-12 14:13+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -85,6 +85,13 @@ msgstr ""
"Pour apprendre à utiliser *Electrum*, consultez la [documentation du wiki "
"d'*Electrum*](http://docs.electrum.org) (en anglais)."
#. type: Plain text
msgid ""
"For an explanation of how Bitcoin works in simple terms, read [The In-Depth "
"Guide to Bitcoin That Won’t Leave You Frustrated](https://www.vpnmentor.com/"
"blog/ultimate-guide-bitcoin/)."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-04-06 21:40+0300\n"
"POT-Creation-Date: 2018-06-25 18:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: ita <transitails@inventati.org>\n"
......@@ -68,6 +68,13 @@ msgid ""
"wiki](http://docs.electrum.org)."
msgstr ""
#. type: Plain text
msgid ""
"For an explanation of how Bitcoin works in simple terms, read [The In-Depth "
"Guide to Bitcoin That Won’t Leave You Frustrated](https://www.vpnmentor.com/"
"blog/ultimate-guide-bitcoin/)."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
......
......@@ -22,6 +22,10 @@ To start <span class="application">Electrum</span> choose
To learn how to use *Electrum*, read the [documentation on the
*Electrum* wiki](http://docs.electrum.org).
For an explanation of how Bitcoin works in simple terms, read
[The In-Depth Guide to Bitcoin That Won’t Leave You
Frustrated](https://www.vpnmentor.com/blog/ultimate-guide-bitcoin/).
<div class="caution">
<p>Bitcoin is <a href="https://bitcoin.org/en/faq#is-bitcoin-anonymous">not
......
......@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-04-06 21:40+0300\n"
"POT-Creation-Date: 2018-06-25 18:11+0200\n"
"PO-Revision-Date: 2018-04-09 07:32+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Portuguese "
"<http://translate.tails.boum.org/projects/tails/electrum/pt/>\n"
"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
"electrum/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -71,6 +71,13 @@ msgid ""
"wiki](http://docs.electrum.org)."
msgstr ""
#. type: Plain text
msgid ""
"For an explanation of how Bitcoin works in simple terms, read [The In-Depth "
"Guide to Bitcoin That Won’t Leave You Frustrated](https://www.vpnmentor.com/"
"blog/ultimate-guide-bitcoin/)."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
......
......@@ -132,9 +132,6 @@ document.addEventListener("DOMContentLoaded", function() {
toggleDisplay(document.getElementsByClassName("no-js"), "hide");
if (browser === "Firefox") {
if (version === 52) {
show(document.getElementById("broken-in-3-6"));
}
if (version >= minVersion.firefox) {
// Supported Firefox
toggleDisplay(document.getElementsByClassName("supported-browser"), "show");
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-27 17:06+0300\n"
"POT-Creation-Date: 2018-06-25 17:35+0200\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"
......@@ -50,10 +50,10 @@ msgid ""
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
"</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-retry btn btn-"
"primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
"\" sort=\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-retry btn "
"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image (<span class="
"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
"\"yes\" sort=\"age\"]]</span>)</a>"
......@@ -146,12 +146,6 @@ msgstr ""
msgid "Our browser extension makes it quick and easy."
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid ""
"Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it from "
"Firefox, Chrome, or Tor Browser outside of Tails."
msgstr ""
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
......@@ -324,11 +318,11 @@ msgstr ""
msgid ""
"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
"download|upgrade/tails]]</span>"
"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-03-27 17:06+0300\n"
"POT-Creation-Date: 2018-06-25 17:35+0200\n"
"PO-Revision-Date: 2018-05-09 18:54+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
......@@ -164,14 +164,6 @@ msgstr "\"\"\"]]"
msgid "Our browser extension makes it quick and easy."
msgstr "Nuestra extensión de navegador vuelve esto rápido y fácil."
#. type: Content of: <div><div><div><div><div><p>
msgid ""
"Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it from "
"Firefox, Chrome, or Tor Browser outside of Tails."
msgstr ""
"Nuestra extensión no funciona en Tails 3.6 y 3.6.1. Puedes usarla con "
"Firefox, Chrome, y Tor Browser fuera de Tails."
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
......@@ -1122,6 +1114,13 @@ msgid ""
"verification process."
msgstr ""
#~ msgid ""
#~ "Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it "
#~ "from Firefox, Chrome, or Tor Browser outside of Tails."
#~ msgstr ""
#~ "Nuestra extensión no funciona en Tails 3.6 y 3.6.1. Puedes usarla con "
#~ "Firefox, Chrome, y Tor Browser fuera de Tails."
#~ msgid "0.95"
#~ msgstr "0.95"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-27 17:06+0300\n"
"POT-Creation-Date: 2018-06-25 17:35+0200\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"
......@@ -42,10 +42,10 @@ msgid ""
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
"</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-retry btn btn-"
"primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
"\" sort=\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-retry btn "
"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image (<span class="
"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
"\"yes\" sort=\"age\"]]</span>)</a>"
......@@ -129,12 +129,6 @@ msgstr ""
msgid "Our browser extension makes it quick and easy."
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid ""
"Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it from "
"Firefox, Chrome, or Tor Browser outside of Tails."
msgstr ""
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
......@@ -288,11 +282,11 @@ msgstr ""
msgid ""
"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
"download|upgrade/tails]]</span>"
"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2018-03-27 17:06+0300\n"
"POT-Creation-Date: 2018-06-25 17:35+0200\n"
"PO-Revision-Date: 2018-03-29 10:46+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
......@@ -163,14 +163,6 @@ msgstr "\"\"\"]]"
msgid "Our browser extension makes it quick and easy."
msgstr "Notre extension de navigateur fait cela rapidement et facilement."
#. type: Content of: <div><div><div><div><div><p>
msgid ""
"Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it from "
"Firefox, Chrome, or Tor Browser outside of Tails."
msgstr ""
"Notre extension de navigateur est cassée dans Tails 3.6 et 3.6.1. Veuillez "
"l'utiliser dans Firefox, Chrome ou le Navigateur Tor en dehors de Tails."
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
......@@ -1176,6 +1168,14 @@ msgstr ""
"de signature Tails en la signant avec votre propre clé pour vous débarrasser "
"des avertissements durant le processus de vérification."
#~ msgid ""
#~ "Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it "
#~ "from Firefox, Chrome, or Tor Browser outside of Tails."
#~ msgstr ""
#~ "Notre extension de navigateur est cassée dans Tails 3.6 et 3.6.1. "
#~ "Veuillez l'utiliser dans Firefox, Chrome ou le Navigateur Tor en dehors "
#~ "de Tails."
#~ msgid ""
#~ "Verifying using OpenPGP but without authenticating our signing key "
#~ "through the OpenPGP Web of Trust is equivalent in terms of security to "
......
......@@ -38,11 +38,6 @@
</div>
<p>Our browser extension makes it quick and easy.</p>
</div>
<div id="broken-in-3-6" class="bug indent inline-block">
<p>Our browser extension is broken in Tails 3.6 and 3.6.1.
Please use it from Firefox, Chrome, or Tor Browser outside
of Tails.</p>
</div>
<div id="install-extension" class="indent">
<a href="https://addons.mozilla.org/firefox/downloads/latest/tails-verification/addon-tails-verification-latest.xpi" class="install-extension-btn supported-browser firefox btn btn-primary inline-block">Install <u>Tails Verification</u> extension</a>
<a class="install-extension-btn supported-browser chrome btn btn-primary inline-block">Install <u>Tails Verification</u> extension</a>
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-27 17:06+0300\n"
"POT-Creation-Date: 2018-06-25 17:35+0200\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"
......@@ -49,10 +49,10 @@ msgid ""
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
"</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-retry btn btn-"
"primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
"\" sort=\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-retry btn "
"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image (<span class="
"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
"\"yes\" sort=\"age\"]]</span>)</a>"
......@@ -145,12 +145,6 @@ msgstr ""
msgid "Our browser extension makes it quick and easy."
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid ""
"Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it from "
"Firefox, Chrome, or Tor Browser outside of Tails."
msgstr ""
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
......@@ -323,11 +317,11 @@ msgstr ""
msgid ""
"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
"download|upgrade/tails]]</span>"
"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-28 08:20+0000\n"
"POT-Creation-Date: 2018-06-25 17:35+0200\n"
"PO-Revision-Date: 2018-02-09 11:58+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -43,10 +43,10 @@ msgid ""
"\"]]\" id=\"download-iso\" class=\"use-mirror-pool btn btn-primary inline-"
"block indent\">Download Tails [[!inline pages=\"inc/stable_amd64_version\" "
"raw=\"yes\" sort=\"age\"]] ISO image (<span class=\"remove-extra-space\">[[!"
"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</span>)"
"</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes\" sort="
"\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-retry btn btn-"
"primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
"inline pages=\"inc/stable_amd64_iso_size\" raw=\"yes\" sort=\"age\"]]</"
"span>)</a> <a href=\"[[!inline pages=\"inc/stable_amd64_iso_url\" raw=\"yes"
"\" sort=\"age\"]]\" id=\"download-iso\" class=\"use-mirror-pool-on-retry btn "
"btn-primary inline-block indent\">Download Tails [[!inline pages=\"inc/"
"stable_amd64_version\" raw=\"yes\" sort=\"age\"]] ISO image (<span class="
"\"remove-extra-space\">[[!inline pages=\"inc/stable_amd64_iso_size\" raw="
"\"yes\" sort=\"age\"]]</span>)</a>"
......@@ -130,12 +130,6 @@ msgstr ""
msgid "Our browser extension makes it quick and easy."
msgstr ""
#. type: Content of: <div><div><div><div><div><p>
msgid ""
"Our browser extension is broken in Tails 3.6 and 3.6.1. Please use it from "
"Firefox, Chrome, or Tor Browser outside of Tails."
msgstr ""
#. type: Content of: <div><div><div><div><div>
msgid ""
"<a href=\"https://addons.mozilla.org/firefox/downloads/latest/tails-"
......@@ -289,11 +283,11 @@ msgstr ""
msgid ""
"<span class=\"debian\">[[Skip download|debian/usb]]</span> <span class="
"\"windows\">[[Skip download|win/usb]]</span> <span class=\"linux\">[[Skip "
"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/usb]]"
"</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span class="
"\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip download|doc/"
"advanced_topics/virtualization]]</span> <span class=\"upgrade-tails\">[[Skip "
"download|upgrade/tails]]</span>"
"download|linux/usb]]</span> <span class=\"mac-usb\">[[Skip download|mac/"
"usb]]</span> <span class=\"mac-dvd\">[[Skip download|mac/dvd]]</span> <span "
"class=\"dvd\">[[Skip download|dvd]]</span> <span class=\"vm\">[[Skip "
"download|doc/advanced_topics/virtualization]]</span> <span class=\"upgrade-"
"tails\">[[Skip download|upgrade/tails]]</span>"
msgstr ""
#. type: Content of: <div><div><div><div><div><div>
......
......@@ -24,7 +24,6 @@ h1 {
#skip-download-direct,
#skip-download-bittorrent,
#extension-version,
#broken-in-3-6,
.use-mirror-pool-on-retry {
display: none;
}
......
......@@ -4,17 +4,17 @@ channel: test
product-name: Tails
product-version: 3.6.1
upgrades:
- details-url: https://tails.boum.org/news/version_3.7.1/
- details-url: https://tails.boum.org/news/version_3.8/
type: major
upgrade-paths:
- target-files:
- sha256: 579f2f1de0a09f1dd15037e1e989b059ee21c7376fca0c6235e5453ee281933a
- sha256: f3d6a40bc18af3e99a3b361dc3bf1d00db0f09c4272bc5df1330e4d230648aa2
size: 1217341440
url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.7.1/tails-amd64-3.7.1.iso
url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.8/tails-amd64-3.8.iso
type: full
- target-files:
- sha256: 87c2267e1e788c41406619a2d087dda78e882003dd741bb77a9e0e07afe3ba21
size: 328192000
url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_amd64_3.6.1_to_3.7.1.iuk
- sha256: 48b9c8099005dd76ab7635f44955ad4a5e1b45d9f82edd83f177d07ce3afbb02
size: 331806720
url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_amd64_3.6.1_to_3.8.iuk
type: incremental
version: 3.7.1
version: '3.8'
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQTNTUNRr6aTP1dKmvuQsrS9eu0jXwUCWxxPlgAKCRCQsrS9eu0j
X3rCAP9eCO035KJ52QwRyOvP0el+6MrZvcEaf51VSRqH+97GCwEAkTtgcr1btVa7
kRCEArhbW8t2F5Zz7Nii2N/XVMGmcgs=
=YffY
iHUEABYKAB0WIQTNTUNRr6aTP1dKmvuQsrS9eu0jXwUCWzDctAAKCRCQsrS9eu0j
XxraAQCrugDl9hyixQRVRcWBa0GIYf6RyaUr2GVktnHtAXQwCwD+K9AYncq+muVD
IYTUkUQX+Y8D+EmrZyPdbXWCfASl0QI=
=3lDK
-----END PGP SIGNATURE-----
......@@ -4,17 +4,17 @@ channel: test
product-name: Tails
product-version: 3.6.2
upgrades: