Skip to content
GitLab
Commit 88d7f65b authored by bertagaz's avatar bertagaz
Browse files

Merge branch 'master' into stable

parents dad3ad3b f6f27ce6
Hide whitespace changes
Inline Side-by-side
wiki/src/contribute/how/documentation/release_notes/template.mdwn
View file @ 88d7f65b
[[!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]]
......
wiki/src/contribute/release_process.mdwn
View file @ 88d7f65b
......@@ -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:?}" && \
......
wiki/src/inc/stable_amd64_gpg_signature_output.html
View file @ 88d7f65b
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/>
wiki/src/install/v1/Tails/amd64/stable/latest.yml
View file @ 88d7f65b
......@@ -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
wiki/src/news/version_3.5/manual_upgrade.inline.de.po
View file @ 88d7f65b
......@@ -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
......
wiki/src/news/version_3.5/manual_upgrade.inline.es.po
View file @ 88d7f65b
......@@ -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
......
wiki/src/news/version_3.5/manual_upgrade.inline.fa.po
View file @ 88d7f65b
......@@ -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
......
wiki/src/news/version_3.5/manual_upgrade.inline.fr.po
View file @ 88d7f65b
......@@ -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
......
wiki/src/news/version_3.5/manual_upgrade.inline.it.po
View file @ 88d7f65b
......@@ -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
......
wiki/src/news/version_3.5/manual_upgrade.inline.mdwn
View file @ 88d7f65b
<p>If you are upgrading from Tails 3.5, it is only possible to select an
<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
ISO image when running Tails in English. For other languages, the
file chooser button remains inactive:</p>
[[!img news/version_3.5/broken-file-chooser.png link="no"]]
<p>To do a manual upgrade from Tails 3.5, you can either:</p>
<p>To do a manual upgrade from Tails 3.2, 3.3, 3.4, or 3.5, you can either:</p>
<ul>
<li>Restart Tails 3.5 in English</li>
<li>Restart Tails in English</li>
<li>Start <span class="application">Tails Installer</span> in
English from the command line:
......
wiki/src/news/version_3.5/manual_upgrade.inline.pt.po
View file @ 88d7f65b
......@@ -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
......
wiki/src/news/version_3.6.1.de.po 0 → 100644
View file @ 88d7f65b
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-18 15:32+0100\n"
"PO-Revision-Date: 2018-03-18 18:08+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Sat, 17 Mar 2018 12:34:56 +0000\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Tails 3.6.1 is out\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
msgstr ""
#. type: Plain text
msgid ""
"This release fixes [[several security "
"issues|security/Numerous_security_holes_in_3.6]] and users should upgrade as "
"soon as possible."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
msgstr ""
#. type: Title #
#, no-wrap
msgid "Changes"
msgstr ""
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
msgstr ""
#. type: Plain text
msgid "- Update *Tor Browser* to 7.5.2."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" This fixes a [critical issue in\n"
" Firefox](https://www.mozilla.org/en-US/security/advisories/mfsa2018-08/)\n"
" announced on March 16.\n"
msgstr ""
#. type: Title ##
#, no-wrap
msgid "Fixed problems"
msgstr ""
#. type: Bullet: '- '
msgid ""
"This release is [[reproducible|contribute/build/reproducible]], unlike Tails "
"3.6. ([[!tails_ticket 15400]])"
msgstr ""
#. type: Plain text
msgid ""
"For more details, read our [[!tails_gitweb debian/changelog "
"desc=\"changelog\"]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"known-issues\"></a>\n"
msgstr ""
#. type: Title #
#, no-wrap
msgid "Known issues"
msgstr ""
#. type: Plain text
msgid "None specific to this release."
msgstr ""
#. type: Plain text
msgid "See the list of [[long-standing issues|support/known_issues]]."
msgstr ""
#. type: Title #
#, no-wrap
msgid "Get Tails 3.6.1"
msgstr ""
#. type: Plain text
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
msgid "- To upgrade, automatic upgrades are available from 3.6 to 3.6.1."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" If you cannot do an automatic upgrade or if you fail to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" "
"sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
msgid "- [[Download Tails 3.6.1.|install/download]]"
msgstr ""
#. type: Title #
#, no-wrap
msgid "What's coming up?"
msgstr ""
#. type: Plain text
msgid "Tails 3.7 is [[scheduled|contribute/calendar]] for May 8."
msgstr ""
#. type: Plain text
msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
"Tails|contribute]] (<a "
"href=\"https://tails.boum.org/donate?r=3.6.1\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
msgstr ""
wiki/src/news/version_3.6.1.es.po 0 → 100644
View file @ 88d7f65b
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-18 15:32+0100\n"
"PO-Revision-Date: 2018-03-18 18:08+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Sat, 17 Mar 2018 12:34:56 +0000\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Tails 3.6.1 is out\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
msgstr ""
#. type: Plain text
msgid ""
"This release fixes [[several security "
"issues|security/Numerous_security_holes_in_3.6]] and users should upgrade as "
"soon as possible."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
msgstr ""
#. type: Title #
#, no-wrap
msgid "Changes"
msgstr ""
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
msgstr ""
#. type: Plain text
msgid "- Update *Tor Browser* to 7.5.2."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" This fixes a [critical issue in\n"
" Firefox](https://www.mozilla.org/en-US/security/advisories/mfsa2018-08/)\n"
" announced on March 16.\n"
msgstr ""
#. type: Title ##
#, no-wrap
msgid "Fixed problems"
msgstr ""
#. type: Bullet: '- '
msgid ""
"This release is [[reproducible|contribute/build/reproducible]], unlike Tails "
"3.6. ([[!tails_ticket 15400]])"
msgstr ""
#. type: Plain text
msgid ""
"For more details, read our [[!tails_gitweb debian/changelog "
"desc=\"changelog\"]]."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"known-issues\"></a>\n"
msgstr ""
#. type: Title #
#, no-wrap
msgid "Known issues"
msgstr ""
#. type: Plain text
msgid "None specific to this release."
msgstr ""
#. type: Plain text
msgid "See the list of [[long-standing issues|support/known_issues]]."
msgstr ""
#. type: Title #
#, no-wrap
msgid "Get Tails 3.6.1"
msgstr ""
#. type: Plain text
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
#. type: Plain text
msgid "- To upgrade, automatic upgrades are available from 3.6 to 3.6.1."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" If you cannot do an automatic upgrade or if you fail to start after an\n"
" automatic upgrade, please try to do a [[manual upgrade|upgrade]].\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" "
"sort=\"age\"]]\n"
msgstr ""
#. type: Plain text
msgid "- [[Download Tails 3.6.1.|install/download]]"
msgstr ""
#. type: Title #
#, no-wrap
msgid "What's coming up?"
msgstr ""
#. type: Plain text
msgid "Tails 3.7 is [[scheduled|contribute/calendar]] for May 8."
msgstr ""
#. type: Plain text
msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"We need your help and there are many ways to [[contribute to\n"
"Tails|contribute]] (<a "
"href=\"https://tails.boum.org/donate?r=3.6.1\">donating</a> is only one of\n"
"them). Come [[talk to us|about/contact#tails-dev]]!\n"
msgstr ""
wiki/src/news/version_3.6.1.fa.po 0 → 100644
View file @ 88d7f65b
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-03-18 15:32+0100\n"
"PO-Revision-Date: 2018-03-18 18:08+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
#, no-wrap
msgid "[[!meta date=\"Sat, 17 Mar 2018 12:34:56 +0000\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Tails 3.6.1 is out\"]]\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
msgstr ""
#. type: Plain text
msgid ""
"This release fixes [[several security "
"issues|security/Numerous_security_holes_in_3.6]] and users should upgrade as "
"soon as possible."
msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
msgstr ""
#. type: Title #
#, no-wrap
msgid "Changes"
msgstr ""
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
msgstr ""
#. type: Plain text
msgid "- Update *Tor Browser* to 7.5.2."