Merge branch 'master' into stable

a2da0b1a · bertagaz · 8e3b83ed · a1d8c390 · a2da0b1a · a2da0b1a
Commit a2da0b1a authored May 10, 2018 by bertagaz
--- a/debian/changelog
+++ b/debian/changelog
 tails (3.7) unstable; urgency=medium

  * Security fixes
-    - Upgrade Tor Browser to 7.5.4 (MFSA 2018-11, Closes: #15588).
+    - Upgrade Tor Browser to 7.5.4 (MFSA 2018-12, Closes: #15588).
    - Upgrade OpenSSL to 1.1.0f-3+deb9u2 (DSA-4157).
    - Upgrade Perl to 5.24.1-3+deb9u3 (DSA-4172).
    - Upgrade Libre Office to 1:5.2.7-1+deb9u4 (DSA-4178).

--- a/wiki/src/.htaccess
+++ b/wiki/src/.htaccess
@@ -16,6 +16,7 @@ RewriteRule ^found_a_problem/?$ support/found_a_problem [R]
 RewriteRule ^gdm/?$ support/known_issues/graphics [R,NE]
 RewriteRule ^git/?$ contribute/git [R]
 RewriteRule ^GnuPG_key/?$ doc/about/openpgp_keys [R]
+RewriteRule ^install/os/?$ install [R]
 RewriteRule ^license/?$ doc/about/license [R]
 RewriteRule ^talk-dev/?$ about/contact#tails-dev [R,NE]
 RewriteRule ^talk-users/?$ support/talk [R]

--- a/wiki/src/contribute/l10n_tricks/core_po_files.txt
+++ b/wiki/src/contribute/l10n_tricks/core_po_files.txt
@@ -82,7 +82,6 @@
 ./install/mac/usb
 ./install/mac/usb-overview
 ./install/mac/usb-download
-./install/os
 ./install/vm-download
 ./install/win/clone-overview
 ./install/win

--- a/wiki/src/contribute/release_process/tails-installer.mdwn
+++ b/wiki/src/contribute/release_process/tails-installer.mdwn
@@ -16,19 +16,19 @@ tails-installer.

 The `master` branch must always be the one that targets current Tails
 and possibly *also* earlier Debian releases. At the moment it supports
-Debian Jessie, Stretch, Buster and Sid.
+Debian Stretch, Buster and Sid.

 But that's not enough, since we also need to put releases out with code
 that works on current Debian testing/unstable. Thus, we maintain several upstream
 release branches in parallel, each with their own major version number:

- * for work and releases that target Jessie and Stretch (and, as long
+ * for work and releases that target Stretch (and, as long
   as compatible, that target Debian testing/unstable as well):
   * branch = `master`
   * version = `5.*`
   * tag = `tails-installer_5.*`

-Once we can't support both Jessie, Stretch and Debian testing/unstable
+Once we can't support both Stretch and Debian testing/unstable
 with the same codebase anymore, we'll fork a new upstream release
 branch that targets Debian testing, it'll be called
 `feature/$codename`, use version `6.*`, etc.

--- a/wiki/src/doc/about/finances.de.po
+++ b/wiki/src/doc/about/finances.de.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2017-10-24 17:50+0300\n"
+"POT-Creation-Date: 2018-05-09 16:20+0200\n"
 "PO-Revision-Date: 2018-04-07 21:36+0200\n"
+"Last-Translator: Tails translators\n"
+"Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Tails translators\n"
-"Language-Team: \n"
 "X-Generator: Poedit 1.8.11\n"

 #. type: Plain text
@@ -43,8 +43,8 @@ msgid ""
 "partners]]."
 msgstr ""
 "Zuschüsse, Auszeichnungen, Firmenspenden sowie reichliche Spenden von "
-"Einzelpersonen sind visuell ansprechender auf unserer [[Partner|"
-"partners]]-Seite dargestellt."
+"Einzelpersonen sind visuell ansprechender auf unserer [[Partner|partners]]-"
+"Seite dargestellt."

 #. type: Plain text
 #, no-wrap
@@ -552,8 +552,8 @@ msgid ""
 "In addition, one developer was paid full-time by the Tor Project, and NDI "
 "sponsored 40 days of development work."
 msgstr ""
-"Zusätzlich wurde ein Entwickler in Vollzeit durch das Tor Project "
-"bezahlt, zudem hat NDI 40 Tage Entwicklungsarbeit finanziert."
+"Zusätzlich wurde ein Entwickler in Vollzeit durch das Tor Project bezahlt, "
+"zudem hat NDI 40 Tage Entwicklungsarbeit finanziert."

 #. type: Title =
 #, no-wrap

--- a/wiki/src/doc/about/requirements.pt.po
+++ b/wiki/src/doc/about/requirements.pt.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2017-07-31 23:59+0300\n"
+"POT-Creation-Date: 2018-05-09 16:20+0200\n"
 "PO-Revision-Date: 2018-04-09 04:48-0300\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
+"Language-Team: \n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language-Team: \n"
 "X-Generator: Poedit 1.8.11\n"

 #. type: Plain text

--- a/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po
+++ b/wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-01-29 14:25+0100\n"
+"POT-Creation-Date: 2018-05-09 16:20+0200\n"
 "PO-Revision-Date: 2018-04-06 15:15+0200\n"
+"Last-Translator: Tails translators\n"
+"Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Tails translators\n"
-"Language-Team: \n"
 "X-Generator: Poedit 1.8.11\n"

 #. type: Bullet: '1. '

--- a/wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
+++ b/wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-01-29 14:25+0100\n"
+"POT-Creation-Date: 2018-05-09 16:20+0200\n"
 "PO-Revision-Date: 2018-04-06 12:36+0200\n"
 "Last-Translator: Tails translators\n"
+"Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.11\n"
-"Language-Team: \n"

 #. type: Plain text
 #, no-wrap

--- a/wiki/src/doc/sensitive_documents/metadata.fr.po
+++ b/wiki/src/doc/sensitive_documents/metadata.fr.po
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-03-02 00:59+0100\n"
+"POT-Creation-Date: 2018-05-09 16:21+0200\n"
 "PO-Revision-Date: 2018-04-12 14:17+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.11\n"
-"Last-Translator: \n"
-"Language-Team: \n"

 #. type: Plain text
 #, no-wrap

--- a/wiki/src/inc/stable_amd64_gpg_signature_output.html
+++ b/wiki/src/inc/stable_amd64_gpg_signature_output.html
-gpg:&nbsp;Signature&nbsp;made&nbsp;2018-03-29T16:28:05&nbsp;UTC<br/>
-gpg:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;using&nbsp;RSA&nbsp;key&nbsp;05469FB85EAD6589B43D41D3D21DAD38AF281C0B<br/>
+gpg:&nbsp;Signature&nbsp;made&nbsp;2018-05-08T01:18:06&nbsp;UTC<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;Good&nbsp;signature&nbsp;from&nbsp;"Tails&nbsp;developers&nbsp;&lt;tails@boum.org&gt;"&nbsp;[undefined]<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/>
--- a/wiki/src/inc/trace
+++ b/wiki/src/inc/trace
-1522425764
+1525769578
--- a/wiki/src/install/debian/usb.de.po
+++ b/wiki/src/install/debian/usb.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-05-08 15:49+0300\n"
 "PO-Revision-Date: 2016-02-14 21:18+0100\n"
 "Last-Translator: Tails translators <tails@boum.org>\n"
 "Language-Team: \n"
@@ -143,16 +143,9 @@ msgstr "Öffnen Sie den Reiter <span class=\"guilabel\">Andere Software</span> u
 msgid "      In the <span class=\"guilabel\">APT line</span> field, specify:\n"
 msgstr "Schließen Sie das Fenster <span class=\"guilabel\">Anwendungen & Aktualisierungen</span>."

-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
-"debian/ jessie-backports main`"
-msgstr ""
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/"
-"debian/ stretch-backports main`"
+#. type: Plain text
+#, no-wrap
+msgid "      `deb http://http.debian.net/debian/ stretch-backports main`\n"
 msgstr ""

 #. type: Plain text
@@ -178,17 +171,7 @@ msgstr ""
 #. type: Bullet: '      * '
 #, fuzzy
 #| msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
-msgid ""
-"If you are running Debian 8 (Jessie), <span class=\"guilabel\">Distribution</"
-"span>: `jessie-backports`"
-msgstr "<span class=\"guilabel\">Distribution</span>: *jessie-backports*"
-
-#. type: Bullet: '      * '
-#, fuzzy
-#| msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
-msgid ""
-"If you are running Debian 9 (Stretch), <span class=\"guilabel"
-"\">Distribution</span>: `stretch-backports`"
+msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
 msgstr "<span class=\"guilabel\">Distribution</span>: *jessie-backports*"

 #. type: Bullet: '      * '
@@ -475,6 +458,13 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.de\" raw=\
 msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.de\" raw=\"yes\" sort=\"age\"]]\n"

+#, fuzzy
+#~| msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
+#~ msgid ""
+#~ "If you are running Debian 8 (Jessie), <span class=\"guilabel"
+#~ "\">Distribution</span>: `jessie-backports`"
+#~ msgstr "<span class=\"guilabel\">Distribution</span>: *jessie-backports*"
+
 #~ msgid ""
 #~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
 #~ "\"yes\" sort=\"age\"]]\n"

--- a/wiki/src/install/debian/usb.es.po
+++ b/wiki/src/install/debian/usb.es.po
@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-05-08 15:49+0300\n"
 "PO-Revision-Date: 2018-04-27 12:24+0000\n"
 "Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails"
-"/install-debian-usb/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"install-debian-usb/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -142,21 +142,11 @@ msgstr ""
 msgid "      In the <span class=\"guilabel\">APT line</span> field, specify:\n"
 msgstr "      En el campo <span class=\"guilabel\">APT line</span>, especifica:\n"

-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
-"debian/ jessie-backports main`"
-msgstr ""
-"Si estás corriendo Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
-"debian/ jessie-backports main`"
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/"
-"debian/ stretch-backports main`"
-msgstr ""
-"Si estás corriendo Debian 9 (Stretch):<br/>`deb http://http.debian.net/"
-"debian/ stretch-backports main`"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/debian/ stretch-backports main`"
+msgid "      `deb http://http.debian.net/debian/ stretch-backports main`\n"
+msgstr "Si estás corriendo Debian 9 (Stretch):<br/>`deb http://http.debian.net/debian/ stretch-backports main`"

 #. type: Plain text
 #, no-wrap
@@ -173,17 +163,11 @@ msgid "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`"
 msgstr "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`"

 #. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie), <span class=\"guilabel\">Distribution</"
-"span>: `jessie-backports`"
-msgstr ""
-"Si estás corriendo Debian 8 (Jessie), <span class=\"guilabel\">Distribución</"
-"span>: `jessie-backports`"
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch), <span class=\"guilabel"
-"\">Distribution</span>: `stretch-backports`"
+#, fuzzy
+#| msgid ""
+#| "If you are running Debian 9 (Stretch), <span class=\"guilabel"
+#| "\">Distribution</span>: `stretch-backports`"
+msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
 msgstr ""
 "Si estás corriendo Debian 9 (Stretch), <span class=\"guilabel"
 "\">Distribución</span>: `stretch-backports`"
@@ -306,6 +290,7 @@ msgstr ""
 "comando para instalar el paquete <span class=\"code\">tails-installer</span>:"

 #. type: Plain text
+#, no-wrap
 msgid "       sudo apt install tails-installer\n"
 msgstr "       sudo apt install tails-installer\n"

@@ -422,6 +407,20 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.es\" raw=\
 msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.es\" raw=\"yes\" sort=\"age\"]]\n"

+#~ msgid ""
+#~ "If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
+#~ "debian/ jessie-backports main`"
+#~ msgstr ""
+#~ "Si estás corriendo Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
+#~ "debian/ jessie-backports main`"
+
+#~ msgid ""
+#~ "If you are running Debian 8 (Jessie), <span class=\"guilabel"
+#~ "\">Distribution</span>: `jessie-backports`"
+#~ msgstr ""
+#~ "Si estás corriendo Debian 8 (Jessie), <span class=\"guilabel"
+#~ "\">Distribución</span>: `jessie-backports`"
+
 #~ msgid ""
 #~ "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title="
 #~ "\"\"]]\n"

--- a/wiki/src/install/debian/usb.fa.po
+++ b/wiki/src/install/debian/usb.fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-05-08 15:49+0300\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"
@@ -131,16 +131,9 @@ msgstr ""
 msgid "      In the <span class=\"guilabel\">APT line</span> field, specify:\n"
 msgstr ""

-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
-"debian/ jessie-backports main`"
-msgstr ""
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/"
-"debian/ stretch-backports main`"
+#. type: Plain text
+#, no-wrap
+msgid "      `deb http://http.debian.net/debian/ stretch-backports main`\n"
 msgstr ""

 #. type: Plain text
@@ -158,15 +151,7 @@ msgid "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`"
 msgstr ""

 #. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie), <span class=\"guilabel\">Distribution</"
-"span>: `jessie-backports`"
-msgstr ""
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch), <span class=\"guilabel"
-"\">Distribution</span>: `stretch-backports`"
+msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
 msgstr ""

 #. type: Bullet: '      * '

--- a/wiki/src/install/debian/usb.fr.po
+++ b/wiki/src/install/debian/usb.fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-05-08 15:49+0300\n"
 "PO-Revision-Date: 2017-10-29 12:34+0000\n"
 "Last-Translator: AtomiKe <tails@atomike.ninja>\n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -144,21 +144,11 @@ msgstr ""
 msgid "      In the <span class=\"guilabel\">APT line</span> field, specify:\n"
 msgstr "      Dans le champ <span class=\"guilabel\">Ligne APT</span>, spécifiez :\n"

-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
-"debian/ jessie-backports main`"
-msgstr ""
-"Si vous utilisez Debian 8 (Jessie) :<br/> `deb http://http.debian.net/"
-"debian/ jessie-backports main`"
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/"
-"debian/ stretch-backports main`"
-msgstr ""
-"Si vous utilisez Debian 9 (Stretch) :<br/> `deb http://http.debian.net/"
-"debian/ stretch-backports main`"
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/debian/ stretch-backports main`"
+msgid "      `deb http://http.debian.net/debian/ stretch-backports main`\n"
+msgstr "Si vous utilisez Debian 9 (Stretch) :<br/> `deb http://http.debian.net/debian/ stretch-backports main`"

 #. type: Plain text
 #, no-wrap
@@ -175,17 +165,11 @@ msgid "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`"
 msgstr "<span class=\"guilabel\">URI</span> : `http://http.debian.net/debian/`"

 #. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie), <span class=\"guilabel\">Distribution</"
-"span>: `jessie-backports`"
-msgstr ""
-"Si vous utilisez Debian 8 (Jessie), <span class=\"guilabel\">Distribution</"
-"span> : `jessie-backports`"
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch), <span class=\"guilabel"
-"\">Distribution</span>: `stretch-backports`"
+#, fuzzy
+#| msgid ""
+#| "If you are running Debian 9 (Stretch), <span class=\"guilabel"
+#| "\">Distribution</span>: `stretch-backports`"
+msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
 msgstr ""
 "Si vous utilisez Debian 9 (Stretch), <span class=\"guilabel\">Distribution</"
 "span> : `stretch-backports`"
@@ -310,6 +294,7 @@ msgstr ""
 "span> :"

 #. type: Plain text
+#, no-wrap
 msgid "       sudo apt install tails-installer\n"
 msgstr "       sudo apt install tails-installer\n"

@@ -424,6 +409,20 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.fr\" raw=\
 msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"

+#~ msgid ""
+#~ "If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
+#~ "debian/ jessie-backports main`"
+#~ msgstr ""
+#~ "Si vous utilisez Debian 8 (Jessie) :<br/> `deb http://http.debian.net/"
+#~ "debian/ jessie-backports main`"
+
+#~ msgid ""
+#~ "If you are running Debian 8 (Jessie), <span class=\"guilabel"
+#~ "\">Distribution</span>: `jessie-backports`"
+#~ msgstr ""
+#~ "Si vous utilisez Debian 8 (Jessie), <span class=\"guilabel"
+#~ "\">Distribution</span> : `jessie-backports`"
+
 #~ msgid ""
 #~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
 #~ "\"yes\" sort=\"age\"]]\n"

--- a/wiki/src/install/debian/usb.it.po
+++ b/wiki/src/install/debian/usb.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-24 16:42+0300\n"
+"POT-Creation-Date: 2018-05-08 15:49+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: \n"
 "Language-Team: ita <transitails@inventati.org>\n"
@@ -139,16 +139,9 @@ msgstr "Apri la scheda <span class=\"guilabel\">Other Software</span> e clicca s
 msgid "      In the <span class=\"guilabel\">APT line</span> field, specify:\n"
 msgstr ""

-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
-"debian/ jessie-backports main`"
-msgstr ""
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/"
-"debian/ stretch-backports main`"
+#. type: Plain text
+#, no-wrap
+msgid "      `deb http://http.debian.net/debian/ stretch-backports main`\n"
 msgstr ""

 #. type: Plain text
@@ -172,17 +165,7 @@ msgstr "<span class=\"guilabel\">URI</span>: *http://http.debian.net/debian/*"
 #. type: Bullet: '      * '
 #, fuzzy
 #| msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
-msgid ""
-"If you are running Debian 8 (Jessie), <span class=\"guilabel\">Distribution</"
-"span>: `jessie-backports`"
-msgstr "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
-
-#. type: Bullet: '      * '
-#, fuzzy
-#| msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
-msgid ""
-"If you are running Debian 9 (Stretch), <span class=\"guilabel"
-"\">Distribution</span>: `stretch-backports`"
+msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
 msgstr "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"

 #. type: Bullet: '      * '
@@ -401,6 +384,13 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline\" raw=\"ye
 msgid "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"
 msgstr "[[!inline pages=\"install/inc/steps/create_persistence.inline\" raw=\"yes\" sort=\"age\"]]\n"

+#, fuzzy
+#~| msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
+#~ msgid ""
+#~ "If you are running Debian 8 (Jessie), <span class=\"guilabel"
+#~ "\">Distribution</span>: `jessie-backports`"
+#~ msgstr "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
+
 #~ msgid ""
 #~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
 #~ "\"yes\" sort=\"age\"]]\n"

--- a/wiki/src/install/debian/usb.mdwn
+++ b/wiki/src/install/debian/usb.mdwn
@@ -46,19 +46,14 @@ If you are running Debian

      In the <span class="guilabel">APT line</span> field, specify:

-      * If you are running Debian 8 (Jessie):<br/>
-        `deb http://http.debian.net/debian/ jessie-backports main`
-
-      * If you are running Debian 9 (Stretch):<br/>
-        `deb http://http.debian.net/debian/ stretch-backports main`
+      `deb http://http.debian.net/debian/ stretch-backports main`

   a. If the dialog is titled <span class="guilabel">Repositories</span> and has no tabs:

      Click <span class="button">New</span> and specify:

      * <span class="guilabel">URI</span>: `http://http.debian.net/debian/`
-      * If you are running Debian 8 (Jessie), <span class="guilabel">Distribution</span>: `jessie-backports`
-      * If you are running Debian 9 (Stretch), <span class="guilabel">Distribution</span>: `stretch-backports`
+      * <span class="guilabel">Distribution</span>: `stretch-backports`
      * <span class="guilabel">Section(s)</span>: `main`

 1. Click the <span class="button">Add Source</span> button.

--- a/wiki/src/install/debian/usb.pt.po
+++ b/wiki/src/install/debian/usb.pt.po
@@ -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-24 16:42+0300\n"
+"POT-Creation-Date: 2018-05-08 15:49+0300\n"
 "PO-Revision-Date: 2018-04-27 10:45+0000\n"
 "Last-Translator: Tails translators <tails-l10n@boum.org>\n"
-"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails"
-"/install-debian-usb/pt/>\n"
+"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
+"install-debian-usb/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -134,16 +134,9 @@ msgstr ""
 msgid "      In the <span class=\"guilabel\">APT line</span> field, specify:\n"
 msgstr ""

-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/"
-"debian/ jessie-backports main`"
-msgstr ""
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/"
-"debian/ stretch-backports main`"
+#. type: Plain text
+#, no-wrap
+msgid "      `deb http://http.debian.net/debian/ stretch-backports main`\n"
 msgstr ""

 #. type: Plain text
@@ -161,15 +154,7 @@ msgid "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`"
 msgstr ""

 #. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 8 (Jessie), <span class=\"guilabel\">Distribution</"
-"span>: `jessie-backports`"
-msgstr ""
-
-#. type: Bullet: '      * '
-msgid ""
-"If you are running Debian 9 (Stretch), <span class=\"guilabel"
-"\">Distribution</span>: `stretch-backports`"
+msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
 msgstr ""

 #. type: Bullet: '      * '

--- a/wiki/src/install/inc/steps/debian_requirements.inline.de.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-11-09 18:59+0000\n"
+"POT-Creation-Date: 2018-05-08 15:49+0300\n"
 "PO-Revision-Date: 2016-07-12 18:42+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,9 @@ msgid "These instructions require:"
 msgstr ""

 #. type: Bullet: '  - '
-msgid "Debian 8 (Jessie) or later"
+#, fuzzy
+#| msgid "Debian 8 (Jessie) or later"
+msgid "Debian 9 (Stretch) or later"
 msgstr "Debian 8 (Jessie) oder neuer"

 #. type: Bullet: '  - '

--- a/wiki/src/install/inc/steps/debian_requirements.inline.es.po
+++ b/wiki/src/install/inc/steps/debian_requirements.inline.es.po
@@ -5,11 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-01-30 12:40+0000\n"
+"POT-Creation-Date: 2018-05-08 15:49+0300\n"
 "PO-Revision-Date: 2018-01-30 18:23+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
-"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/debian"
-"_requirementsinline/es/>\n"
+"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
+"debian_requirementsinline/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,9 @@ msgid "These instructions require:"
 msgstr "Estas instrucciones requieren:"