Commit a2da0b1a authored by bertagaz's avatar bertagaz
Browse files

Merge branch 'master' into stable

parents 8e3b83ed a1d8c390
tails (3.7) unstable; urgency=medium tails (3.7) unstable; urgency=medium
* Security fixes * 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 OpenSSL to 1.1.0f-3+deb9u2 (DSA-4157).
- Upgrade Perl to 5.24.1-3+deb9u3 (DSA-4172). - Upgrade Perl to 5.24.1-3+deb9u3 (DSA-4172).
- Upgrade Libre Office to 1:5.2.7-1+deb9u4 (DSA-4178). - Upgrade Libre Office to 1:5.2.7-1+deb9u4 (DSA-4178).
......
...@@ -16,6 +16,7 @@ RewriteRule ^found_a_problem/?$ support/found_a_problem [R] ...@@ -16,6 +16,7 @@ RewriteRule ^found_a_problem/?$ support/found_a_problem [R]
RewriteRule ^gdm/?$ support/known_issues/graphics [R,NE] RewriteRule ^gdm/?$ support/known_issues/graphics [R,NE]
RewriteRule ^git/?$ contribute/git [R] RewriteRule ^git/?$ contribute/git [R]
RewriteRule ^GnuPG_key/?$ doc/about/openpgp_keys [R] RewriteRule ^GnuPG_key/?$ doc/about/openpgp_keys [R]
RewriteRule ^install/os/?$ install [R]
RewriteRule ^license/?$ doc/about/license [R] RewriteRule ^license/?$ doc/about/license [R]
RewriteRule ^talk-dev/?$ about/contact#tails-dev [R,NE] RewriteRule ^talk-dev/?$ about/contact#tails-dev [R,NE]
RewriteRule ^talk-users/?$ support/talk [R] RewriteRule ^talk-users/?$ support/talk [R]
......
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
./install/mac/usb ./install/mac/usb
./install/mac/usb-overview ./install/mac/usb-overview
./install/mac/usb-download ./install/mac/usb-download
./install/os
./install/vm-download ./install/vm-download
./install/win/clone-overview ./install/win/clone-overview
./install/win ./install/win
......
...@@ -16,19 +16,19 @@ tails-installer. ...@@ -16,19 +16,19 @@ tails-installer.
The `master` branch must always be the one that targets current Tails The `master` branch must always be the one that targets current Tails
and possibly *also* earlier Debian releases. At the moment it supports 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 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 that works on current Debian testing/unstable. Thus, we maintain several upstream
release branches in parallel, each with their own major version number: 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): as compatible, that target Debian testing/unstable as well):
* branch = `master` * branch = `master`
* version = `5.*` * version = `5.*`
* tag = `tails-installer_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 with the same codebase anymore, we'll fork a new upstream release
branch that targets Debian testing, it'll be called branch that targets Debian testing, it'll be called
`feature/$codename`, use version `6.*`, etc. `feature/$codename`, use version `6.*`, etc.
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "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" "PO-Revision-Date: 2018-04-07 21:36+0200\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
"X-Generator: Poedit 1.8.11\n" "X-Generator: Poedit 1.8.11\n"
#. type: Plain text #. type: Plain text
...@@ -43,8 +43,8 @@ msgid "" ...@@ -43,8 +43,8 @@ msgid ""
"partners]]." "partners]]."
msgstr "" msgstr ""
"Zuschüsse, Auszeichnungen, Firmenspenden sowie reichliche Spenden von " "Zuschüsse, Auszeichnungen, Firmenspenden sowie reichliche Spenden von "
"Einzelpersonen sind visuell ansprechender auf unserer [[Partner|" "Einzelpersonen sind visuell ansprechender auf unserer [[Partner|partners]]-"
"partners]]-Seite dargestellt." "Seite dargestellt."
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
...@@ -552,8 +552,8 @@ msgid "" ...@@ -552,8 +552,8 @@ msgid ""
"In addition, one developer was paid full-time by the Tor Project, and NDI " "In addition, one developer was paid full-time by the Tor Project, and NDI "
"sponsored 40 days of development work." "sponsored 40 days of development work."
msgstr "" msgstr ""
"Zusätzlich wurde ein Entwickler in Vollzeit durch das Tor Project " "Zusätzlich wurde ein Entwickler in Vollzeit durch das Tor Project bezahlt, "
"bezahlt, zudem hat NDI 40 Tage Entwicklungsarbeit finanziert." "zudem hat NDI 40 Tage Entwicklungsarbeit finanziert."
#. type: Title = #. type: Title =
#, no-wrap #, no-wrap
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "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" "PO-Revision-Date: 2018-04-09 04:48-0300\n"
"Last-Translator: Tails translators <tails@boum.org>\n" "Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
"Language: pt\n" "Language: pt\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language-Team: \n"
"X-Generator: Poedit 1.8.11\n" "X-Generator: Poedit 1.8.11\n"
#. type: Plain text #. type: Plain text
......
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "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" "PO-Revision-Date: 2018-04-06 15:15+0200\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
"X-Generator: Poedit 1.8.11\n" "X-Generator: Poedit 1.8.11\n"
#. type: Bullet: '1. ' #. type: Bullet: '1. '
......
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "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" "PO-Revision-Date: 2018-04-06 12:36+0200\n"
"Last-Translator: Tails translators\n" "Last-Translator: Tails translators\n"
"Language-Team: \n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n" "X-Generator: Poedit 1.8.11\n"
"Language-Team: \n"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
......
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "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" "PO-Revision-Date: 2018-04-12 14:17+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr\n" "Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n" "X-Generator: Poedit 1.8.11\n"
"Last-Translator: \n"
"Language-Team: \n"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
......
gpg:&nbsp;Signature&nbsp;made&nbsp;2018-03-29T16:28:05&nbsp;UTC<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;05469FB85EAD6589B43D41D3D21DAD38AF281C0B<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;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/> 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/>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "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" "PO-Revision-Date: 2016-02-14 21:18+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n" "Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n" "Language-Team: \n"
...@@ -143,16 +143,9 @@ msgstr "Öffnen Sie den Reiter <span class=\"guilabel\">Andere Software</span> u ...@@ -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" msgid " In the <span class=\"guilabel\">APT line</span> field, specify:\n"
msgstr "Schließen Sie das Fenster <span class=\"guilabel\">Anwendungen & Aktualisierungen</span>." msgstr "Schließen Sie das Fenster <span class=\"guilabel\">Anwendungen & Aktualisierungen</span>."
#. type: Bullet: ' * ' #. type: Plain text
msgid "" #, no-wrap
"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/" msgid " `deb http://http.debian.net/debian/ stretch-backports main`\n"
"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`"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
...@@ -178,17 +171,7 @@ msgstr "" ...@@ -178,17 +171,7 @@ msgstr ""
#. type: Bullet: ' * ' #. type: Bullet: ' * '
#, fuzzy #, fuzzy
#| msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*" #| msgid "<span class=\"guilabel\">Distributions</span>: *jessie-backports*"
msgid "" msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
"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`"
msgstr "<span class=\"guilabel\">Distribution</span>: *jessie-backports*" msgstr "<span class=\"guilabel\">Distribution</span>: *jessie-backports*"
#. type: Bullet: ' * ' #. type: Bullet: ' * '
...@@ -475,6 +458,13 @@ msgstr "[[!inline pages=\"install/inc/steps/restart_first_time.inline.de\" raw=\ ...@@ -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" 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" 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 "" #~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=" #~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
#~ "\"yes\" sort=\"age\"]]\n" #~ "\"yes\" sort=\"age\"]]\n"
......
...@@ -6,11 +6,11 @@ msgid "" ...@@ -6,11 +6,11 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\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" "PO-Revision-Date: 2018-04-27 12:24+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n" "Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails" "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"/install-debian-usb/es/>\n" "install-debian-usb/es/>\n"
"Language: es\n" "Language: es\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
...@@ -142,21 +142,11 @@ msgstr "" ...@@ -142,21 +142,11 @@ msgstr ""
msgid " In the <span class=\"guilabel\">APT line</span> field, specify:\n" msgid " In the <span class=\"guilabel\">APT line</span> field, specify:\n"
msgstr " En el campo <span class=\"guilabel\">APT line</span>, especifica:\n" msgstr " En el campo <span class=\"guilabel\">APT line</span>, especifica:\n"
#. type: Bullet: ' * ' #. type: Plain text
msgid "" #, fuzzy, no-wrap
"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/" #| msgid "If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/debian/ stretch-backports main`"
"debian/ jessie-backports main`" msgid " `deb http://http.debian.net/debian/ stretch-backports main`\n"
msgstr "" msgstr "Si estás corriendo Debian 9 (Stretch):<br/>`deb http://http.debian.net/debian/ stretch-backports main`"
"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 #. type: Plain text
#, no-wrap #, no-wrap
...@@ -173,17 +163,11 @@ msgid "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`" ...@@ -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/`" msgstr "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`"
#. type: Bullet: ' * ' #. type: Bullet: ' * '
msgid "" #, fuzzy
"If you are running Debian 8 (Jessie), <span class=\"guilabel\">Distribution</" #| msgid ""
"span>: `jessie-backports`" #| "If you are running Debian 9 (Stretch), <span class=\"guilabel"
msgstr "" #| "\">Distribution</span>: `stretch-backports`"
"Si estás corriendo Debian 8 (Jessie), <span class=\"guilabel\">Distribución</" msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
"span>: `jessie-backports`"
#. type: Bullet: ' * '
msgid ""
"If you are running Debian 9 (Stretch), <span class=\"guilabel"
"\">Distribution</span>: `stretch-backports`"
msgstr "" msgstr ""
"Si estás corriendo Debian 9 (Stretch), <span class=\"guilabel" "Si estás corriendo Debian 9 (Stretch), <span class=\"guilabel"
"\">Distribución</span>: `stretch-backports`" "\">Distribución</span>: `stretch-backports`"
...@@ -306,6 +290,7 @@ msgstr "" ...@@ -306,6 +290,7 @@ msgstr ""
"comando para instalar el paquete <span class=\"code\">tails-installer</span>:" "comando para instalar el paquete <span class=\"code\">tails-installer</span>:"
#. type: Plain text #. type: Plain text
#, no-wrap
msgid " sudo apt install tails-installer\n" msgid " sudo apt install tails-installer\n"
msgstr " 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=\ ...@@ -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" 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" 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 "" #~ msgid ""
#~ "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title=" #~ "[[!meta stylesheet=\"inc/stylesheets/dave\" rel=\"stylesheet\" title="
#~ "\"\"]]\n" #~ "\"\"]]\n"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -131,16 +131,9 @@ msgstr "" ...@@ -131,16 +131,9 @@ msgstr ""
msgid " In the <span class=\"guilabel\">APT line</span> field, specify:\n" msgid " In the <span class=\"guilabel\">APT line</span> field, specify:\n"
msgstr "" msgstr ""
#. type: Bullet: ' * ' #. type: Plain text
msgid "" #, no-wrap
"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/" msgid " `deb http://http.debian.net/debian/ stretch-backports main`\n"
"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`"
msgstr "" msgstr ""
#. type: Plain text #. type: Plain text
...@@ -158,15 +151,7 @@ msgid "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`" ...@@ -158,15 +151,7 @@ msgid "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`"
msgstr "" msgstr ""
#. type: Bullet: ' * ' #. type: Bullet: ' * '
msgid "" msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
"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`"
msgstr "" msgstr ""
#. type: Bullet: ' * ' #. type: Bullet: ' * '
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Tails\n" "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" "PO-Revision-Date: 2017-10-29 12:34+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n" "Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n" "Language-Team: Tails translators <tails@boum.org>\n"
...@@ -144,21 +144,11 @@ msgstr "" ...@@ -144,21 +144,11 @@ msgstr ""
msgid " In the <span class=\"guilabel\">APT line</span> field, specify:\n" 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" msgstr " Dans le champ <span class=\"guilabel\">Ligne APT</span>, spécifiez :\n"
#. type: Bullet: ' * ' #. type: Plain text
msgid "" #, fuzzy, no-wrap
"If you are running Debian 8 (Jessie):<br/> `deb http://http.debian.net/" #| msgid "If you are running Debian 9 (Stretch):<br/> `deb http://http.debian.net/debian/ stretch-backports main`"
"debian/ jessie-backports main`" msgid " `deb http://http.debian.net/debian/ stretch-backports main`\n"
msgstr "" msgstr "Si vous utilisez Debian 9 (Stretch) :<br/> `deb http://http.debian.net/debian/ stretch-backports main`"
"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 #. type: Plain text
#, no-wrap #, no-wrap
...@@ -175,17 +165,11 @@ msgid "<span class=\"guilabel\">URI</span>: `http://http.debian.net/debian/`" ...@@ -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/`" msgstr "<span class=\"guilabel\">URI</span> : `http://http.debian.net/debian/`"
#. type: Bullet: ' * ' #. type: Bullet: ' * '
msgid "" #, fuzzy
"If you are running Debian 8 (Jessie), <span class=\"guilabel\">Distribution</" #| msgid ""
"span>: `jessie-backports`" #| "If you are running Debian 9 (Stretch), <span class=\"guilabel"
msgstr "" #| "\">Distribution</span>: `stretch-backports`"
"Si vous utilisez Debian 8 (Jessie), <span class=\"guilabel\">Distribution</" msgid "<span class=\"guilabel\">Distribution</span>: `stretch-backports`"
"span> : `jessie-backports`"
#. type: Bullet: ' * '
msgid ""
"If you are running Debian 9 (Stretch), <span class=\"guilabel"
"\">Distribution</span>: `stretch-backports`"
msgstr "" msgstr ""
"Si vous utilisez Debian 9 (Stretch), <span class=\"guilabel\">Distribution</" "Si vous utilisez Debian 9 (Stretch), <span class=\"guilabel\">Distribution</"
"span> : `stretch-backports`" "span> : `stretch-backports`"
...@@ -310,6 +294,7 @@ msgstr "" ...@@ -310,6 +294,7 @@ msgstr ""
"span> :" "span> :"
#. type: Plain text #. type: Plain text
#, no-wrap
msgid " sudo apt install tails-installer\n" msgid " sudo apt install tails-installer\n"
msgstr " 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=\ ...@@ -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" 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" 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 "" #~ msgid ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw=" #~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline\" raw="
#~ "\"yes\" sort=\"age\"]]\n" #~ "\"yes\" sort=\"age\"]]\n"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""