Commit 4ff69ac3 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/master' into doc/17227-letterboxing-tor-browser

parents f8a5cd82 defbe104
......@@ -197,7 +197,7 @@ Use `cron` or equivalent to schedule the same `rsync` command
as above. For example, you can create a file in `/etc/cron.d/` with
this content:
0 * * * * root sleep $(perl -E 'print int(rand(2400))') && flock -n /var/run/lock/tails-mirror-rsync rsync -rt --delete mirrors.rsync.tails.boum.org::amnesia-archive /var/www/YOUR_PATH/
0 * * * * root sleep $(shuf --input-range=0-2400 --head-count=1) && flock -n /var/run/lock/tails-mirror-rsync rsync -rt --delete mirrors.rsync.tails.boum.org::amnesia-archive /var/www/YOUR_PATH/
You can now [[ask for your mirror to be added to the pool|mirror#http-pool]].
......
......@@ -1663,11 +1663,15 @@ Bug tracker
Skip this part if preparing a release candidate.
Sign in on GitLab as the `role-release-automation` user (credentials are
in `rm.git`'s keyringer).
Postpone to next release any remaining open issue for the version
you've just released:
1. Create a new `missed:$VERSION` label
on [[!tails_gitlab groups/tails/-/labels]]
1. Verify there's a `missed:$VERSION` label
on [[!tails_gitlab groups/tails/-/labels]]; if there's none,
ask sysadmins to create one via `gitlab-config.git`.
2. Visit the [[!tails_gitlab groups/tails/-/milestones desc="milestone"]]
for the version you've just released.
3. In the right side bar, in the _Issues_ section, click on the _Open: NN_
......@@ -1691,6 +1695,8 @@ Ideally we would [[!tails_ticket 17589 desc="automate this"]].
Then, close the just-released [[!tails_gitlab groups/tails/-/milestones
desc="milestone"]].
Finally, sign out from the `role-release-automation` GitLab user.
### Tickets linked from the website
Go through the issues linked from the documentation and support sections of the
......@@ -1701,7 +1707,7 @@ be resolved in this release.
find wiki/src/{doc,support} ! -path wiki/src/support/known_issues/graphics.mdwn -name "*.mdwn" -o -name "*.html" | xargs cat | \
ruby -e 'puts STDIN.read.scan(/\[\[!tails_ticket\s+(\d+)[^\]]*\]\]/)' | \
while read ticket; do
ticket_status="$(python-gitlab --gitlab Tails -o json --fields state project-issue get --project-id 1 --iid "$ticket" | jq --raw-output .state)"
ticket_status="$(python-gitlab --gitlab Tails -o json --fields state project-issue get --project-id 2 --iid "$ticket" | jq --raw-output .state)"
if [ -z "${ticket_status:-}" ]; then
echo "Failed to find the status of #${ticket:?}" >&2
continue
......@@ -1873,11 +1879,10 @@ If you just released a final release
<https://jenkins.tails.boum.org/>.
1. Make sure you pushed all changes in every of our Git repo (including our
Debian packages ones).
1. Ensure the next two releases have their own _Release Manager View_.
1. Set the *Due date* for the [[!tails_gitlab
1. Ask sysadmins to set the *Due date* for the [[!tails_gitlab
groups/tails/-/milestones
desc="*Holes in the Roof* milestone"]] to a date between
the next 2 releases.
the next 2 releases, via `gitlab-config.git`.
1. In [[contribute/calendar]], remove the entries about the version that you've
just released.
1. Check the Mozilla release calendars:
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-04-14 00:30+0000\n"
"POT-Creation-Date: 2020-06-03 06:18+0000\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"
......@@ -23,83 +23,28 @@ msgid ""
msgstr ""
#. type: Plain text
msgid "Do so on the command line instead:"
msgid "Do so from the *Files* browser instead:"
msgstr ""
#. type: Bullet: '1. '
msgid "Download the OpenPGP public key that you want to import."
msgid "Choose **Applications**&nbsp;▸ **Files** to open the *Files* browser."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Choose **Applications**&nbsp;▸ **System Tools**&nbsp;▸ **Terminal** to open "
"a *Terminal*."
"Double-click on the OpenPGP public key that you downloaded. The key must be "
"in the *armored* format, usually with a `.asc` extension."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Execute the following command to import the OpenPGP public key that you "
"downloaded. Replace:"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"<span class=\"command-placeholder\">openpgp-public-key.asc</span> with the "
"path to the OpenPGP public key."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
" <p>If you are unsure about the path to the OpenPGP public key, you can "
"insert the\n"
" correct path by dragging and dropping the OpenPGP public key from the\n"
" <span class=\"application\">Files</span> browser onto the\n"
" <span class=\"application\"> Terminal</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command\">gpg --import <span "
"class=\"command-placeholder\">openpgp-public-key.asc</span></p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " You should get something like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command-example\">gpg --import '/home/amnesia/Tor "
"Browser/0x1DCBDC01B44427C7.asc'</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " The output of this command should look like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>\n"
" gpg: key 0x1DCBDC01B44427C7: public key \"Robert J. Hansen "
"<rjh@sixdemonbag.org>\" imported\n"
" gpg: Total number processed: 1\n"
" gpg: imported: 1\n"
" </pre>\n"
msgid "Choose **Open With Import Key**."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"The imported OpenPGP public key does not appear in the *Passwords and Keys* "
"utility. But, the key should appear in the list of keys available for "
"encryption when [[encrypting text with a public "
"key|doc/encryption_and_privacy/gpgapplet/public-key_cryptography]] using "
"*OpenPGP Applet*."
"encryption when [[encrypting text with a public key|doc/"
"encryption_and_privacy/gpgapplet/public-key_cryptography]] using *OpenPGP "
"Applet*."
msgstr ""
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-04-14 00:30+0000\n"
"POT-Creation-Date: 2020-06-03 06:18+0000\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"
......@@ -23,83 +23,28 @@ msgid ""
msgstr ""
#. type: Plain text
msgid "Do so on the command line instead:"
msgid "Do so from the *Files* browser instead:"
msgstr ""
#. type: Bullet: '1. '
msgid "Download the OpenPGP public key that you want to import."
msgid "Choose **Applications**&nbsp;▸ **Files** to open the *Files* browser."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Choose **Applications**&nbsp;▸ **System Tools**&nbsp;▸ **Terminal** to open "
"a *Terminal*."
"Double-click on the OpenPGP public key that you downloaded. The key must be "
"in the *armored* format, usually with a `.asc` extension."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Execute the following command to import the OpenPGP public key that you "
"downloaded. Replace:"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"<span class=\"command-placeholder\">openpgp-public-key.asc</span> with the "
"path to the OpenPGP public key."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
" <p>If you are unsure about the path to the OpenPGP public key, you can "
"insert the\n"
" correct path by dragging and dropping the OpenPGP public key from the\n"
" <span class=\"application\">Files</span> browser onto the\n"
" <span class=\"application\"> Terminal</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command\">gpg --import <span "
"class=\"command-placeholder\">openpgp-public-key.asc</span></p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " You should get something like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command-example\">gpg --import '/home/amnesia/Tor "
"Browser/0x1DCBDC01B44427C7.asc'</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " The output of this command should look like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>\n"
" gpg: key 0x1DCBDC01B44427C7: public key \"Robert J. Hansen "
"<rjh@sixdemonbag.org>\" imported\n"
" gpg: Total number processed: 1\n"
" gpg: imported: 1\n"
" </pre>\n"
msgid "Choose **Open With Import Key**."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"The imported OpenPGP public key does not appear in the *Passwords and Keys* "
"utility. But, the key should appear in the list of keys available for "
"encryption when [[encrypting text with a public "
"key|doc/encryption_and_privacy/gpgapplet/public-key_cryptography]] using "
"*OpenPGP Applet*."
"encryption when [[encrypting text with a public key|doc/"
"encryption_and_privacy/gpgapplet/public-key_cryptography]] using *OpenPGP "
"Applet*."
msgstr ""
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-04-14 00:30+0000\n"
"POT-Creation-Date: 2020-06-03 06:18+0000\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"
......@@ -23,83 +23,28 @@ msgid ""
msgstr ""
#. type: Plain text
msgid "Do so on the command line instead:"
msgid "Do so from the *Files* browser instead:"
msgstr ""
#. type: Bullet: '1. '
msgid "Download the OpenPGP public key that you want to import."
msgid "Choose **Applications**&nbsp;▸ **Files** to open the *Files* browser."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Choose **Applications**&nbsp;▸ **System Tools**&nbsp;▸ **Terminal** to open "
"a *Terminal*."
"Double-click on the OpenPGP public key that you downloaded. The key must be "
"in the *armored* format, usually with a `.asc` extension."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Execute the following command to import the OpenPGP public key that you "
"downloaded. Replace:"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"<span class=\"command-placeholder\">openpgp-public-key.asc</span> with the "
"path to the OpenPGP public key."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
" <p>If you are unsure about the path to the OpenPGP public key, you can "
"insert the\n"
" correct path by dragging and dropping the OpenPGP public key from the\n"
" <span class=\"application\">Files</span> browser onto the\n"
" <span class=\"application\"> Terminal</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command\">gpg --import <span "
"class=\"command-placeholder\">openpgp-public-key.asc</span></p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " You should get something like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command-example\">gpg --import '/home/amnesia/Tor "
"Browser/0x1DCBDC01B44427C7.asc'</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " The output of this command should look like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>\n"
" gpg: key 0x1DCBDC01B44427C7: public key \"Robert J. Hansen "
"<rjh@sixdemonbag.org>\" imported\n"
" gpg: Total number processed: 1\n"
" gpg: imported: 1\n"
" </pre>\n"
msgid "Choose **Open With Import Key**."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"The imported OpenPGP public key does not appear in the *Passwords and Keys* "
"utility. But, the key should appear in the list of keys available for "
"encryption when [[encrypting text with a public "
"key|doc/encryption_and_privacy/gpgapplet/public-key_cryptography]] using "
"*OpenPGP Applet*."
"encryption when [[encrypting text with a public key|doc/"
"encryption_and_privacy/gpgapplet/public-key_cryptography]] using *OpenPGP "
"Applet*."
msgstr ""
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-04-14 00:30+0000\n"
"POT-Creation-Date: 2020-06-03 06:18+0000\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"
......@@ -23,83 +23,28 @@ msgid ""
msgstr ""
#. type: Plain text
msgid "Do so on the command line instead:"
msgid "Do so from the *Files* browser instead:"
msgstr ""
#. type: Bullet: '1. '
msgid "Download the OpenPGP public key that you want to import."
msgid "Choose **Applications**&nbsp;▸ **Files** to open the *Files* browser."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Choose **Applications**&nbsp;▸ **System Tools**&nbsp;▸ **Terminal** to open "
"a *Terminal*."
"Double-click on the OpenPGP public key that you downloaded. The key must be "
"in the *armored* format, usually with a `.asc` extension."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Execute the following command to import the OpenPGP public key that you "
"downloaded. Replace:"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"<span class=\"command-placeholder\">openpgp-public-key.asc</span> with the "
"path to the OpenPGP public key."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
" <p>If you are unsure about the path to the OpenPGP public key, you can "
"insert the\n"
" correct path by dragging and dropping the OpenPGP public key from the\n"
" <span class=\"application\">Files</span> browser onto the\n"
" <span class=\"application\"> Terminal</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command\">gpg --import <span "
"class=\"command-placeholder\">openpgp-public-key.asc</span></p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " You should get something like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command-example\">gpg --import '/home/amnesia/Tor "
"Browser/0x1DCBDC01B44427C7.asc'</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " The output of this command should look like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>\n"
" gpg: key 0x1DCBDC01B44427C7: public key \"Robert J. Hansen "
"<rjh@sixdemonbag.org>\" imported\n"
" gpg: Total number processed: 1\n"
" gpg: imported: 1\n"
" </pre>\n"
msgid "Choose **Open With Import Key**."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"The imported OpenPGP public key does not appear in the *Passwords and Keys* "
"utility. But, the key should appear in the list of keys available for "
"encryption when [[encrypting text with a public "
"key|doc/encryption_and_privacy/gpgapplet/public-key_cryptography]] using "
"*OpenPGP Applet*."
"encryption when [[encrypting text with a public key|doc/"
"encryption_and_privacy/gpgapplet/public-key_cryptography]] using *OpenPGP "
"Applet*."
msgstr ""
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-04-14 00:30+0000\n"
"POT-Creation-Date: 2020-06-03 06:18+0000\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"
......@@ -23,83 +23,28 @@ msgid ""
msgstr ""
#. type: Plain text
msgid "Do so on the command line instead:"
msgid "Do so from the *Files* browser instead:"
msgstr ""
#. type: Bullet: '1. '
msgid "Download the OpenPGP public key that you want to import."
msgid "Choose **Applications**&nbsp;▸ **Files** to open the *Files* browser."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Choose **Applications**&nbsp;▸ **System Tools**&nbsp;▸ **Terminal** to open "
"a *Terminal*."
"Double-click on the OpenPGP public key that you downloaded. The key must be "
"in the *armored* format, usually with a `.asc` extension."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Execute the following command to import the OpenPGP public key that you "
"downloaded. Replace:"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"<span class=\"command-placeholder\">openpgp-public-key.asc</span> with the "
"path to the OpenPGP public key."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
" <p>If you are unsure about the path to the OpenPGP public key, you can "
"insert the\n"
" correct path by dragging and dropping the OpenPGP public key from the\n"
" <span class=\"application\">Files</span> browser onto the\n"
" <span class=\"application\"> Terminal</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command\">gpg --import <span "
"class=\"command-placeholder\">openpgp-public-key.asc</span></p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " You should get something like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command-example\">gpg --import '/home/amnesia/Tor "
"Browser/0x1DCBDC01B44427C7.asc'</p>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid " The output of this command should look like this:\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <pre>\n"
" gpg: key 0x1DCBDC01B44427C7: public key \"Robert J. Hansen "
"<rjh@sixdemonbag.org>\" imported\n"
" gpg: Total number processed: 1\n"
" gpg: imported: 1\n"
" </pre>\n"
msgid "Choose **Open With Import Key**."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"The imported OpenPGP public key does not appear in the *Passwords and Keys* "
"utility. But, the key should appear in the list of keys available for "
"encryption when [[encrypting text with a public "
"key|doc/encryption_and_privacy/gpgapplet/public-key_cryptography]] using "
"*OpenPGP Applet*."
"encryption when [[encrypting text with a public key|doc/"
"encryption_and_privacy/gpgapplet/public-key_cryptography]] using *OpenPGP "
"Applet*."
msgstr ""
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-04-14 00:30+0000\n"
"POT-Creation-Date: 2020-06-03 06:18+0000\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"
......@@ -23,83 +23,28 @@ msgid ""
msgstr ""
#. type: Plain text
msgid "Do so on the command line instead:"
msgid "Do so from the *Files* browser instead:"
msgstr ""
#. type: Bullet: '1. '
msgid "Download the OpenPGP public key that you want to import."
msgid "Choose **Applications**&nbsp;▸ **Files** to open the *Files* browser."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Choose **Applications**&nbsp;▸ **System Tools**&nbsp;▸ **Terminal** to open "
"a *Terminal*."
"Double-click on the OpenPGP public key that you downloaded. The key must be "
"in the *armored* format, usually with a `.asc` extension."
msgstr ""
#. type: Bullet: '1. '
msgid ""
"Execute the following command to import the OpenPGP public key that you "
"downloaded. Replace:"
msgstr ""
#. type: Bullet: ' - '
msgid ""
"<span class=\"command-placeholder\">openpgp-public-key.asc</span> with the "
"path to the OpenPGP public key."
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <div class=\"tip\">\n"
" <p>If you are unsure about the path to the OpenPGP public key, you can "
"insert the\n"
" correct path by dragging and dropping the OpenPGP public key from the\n"
" <span class=\"application\">Files</span> browser onto the\n"
" <span class=\"application\"> Terminal</span>.</p>\n"
" </div>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" <p class=\"pre command\">gpg --import <span "
"class=\"command-placeholder\">openpgp-public-key.asc</span></p>\n"