Commit 49cb3776 authored by Tails translators's avatar Tails translators
Browse files

Merge remote-tracking branch 'tails/master'

parents 057d6b9e 5a2def6f
......@@ -160,11 +160,11 @@ e.g. after we release Tails based on a new Debian, we need to stop
including it in new snapshots, and to remove all corresponding
time-based snapshots and the packages that are not referenced anymore.
1. In puppet-tails, remove the bits about the distribution you want to
1. In `puppet-tails`, remove the bits about the distribution you want to
stop tracking from the reprepro configuration templates:
`templates/reprepro/snapshots/time_based/*/*`.
2. In puppet-tails, remove references to the distribution you want to
2. In `puppet-tails`, remove references to the distribution you want to
stop tracking from the `tails::reprepro::params` class.
3. Commit, push and deploy on the system that hosts our time-based
......@@ -276,18 +276,17 @@ having to deal with 80GB+ Berkeley DB databases.
## Garbage collection and Valid-Until
We expire snapshots older than 10 days in order to save disk space,
and to avoid the reprepro database to grow too much.
and to prevent the reprepro database from growing too much.
To ensure that garbage collection doesn't delete a snapshot we still
need, e.g. the one currently referenced in the frozen `testing`
branch, we rely on the `Valid-Until` field found in `Release` files:
the way to express "I want to keep a given snapshot around" is to
the way to express "I want to keep this specific snapshot around" is to
postpone its expiration date; i.e. we don't differentiate "keep
a given snapshot around" from "keep a given snapshot usable", which
seems to make sense.
a given snapshot around" from "keep a given snapshot usable".
See [[above|time-based_snapshots#bump-expiration-date]] for how we
can manage `Valid-Until` manually, whenever needed.
manage `Valid-Until` manually.
One advantage of this design is that we don't have to regularly update
`Valid-Until` fields, and the corresponding signatures: we only do
......@@ -300,12 +299,11 @@ In practice, the main use case for keeping a given time-based APT
repository snapshot around and valid is when it's being used by
a release branch:
- `testing`: while it's frozen, that is during 5-10 days most of the
time;
- `testing`: while it's frozen, that is for 5-10 days generally;
- `stable`: that's a corner case, since `stable` generally uses the
set of tagged snapshots of the latest Tails release; if and when we
set of snapshots frozen during the last Tails freeze; if and when we
decide to manually point `stable` to a different set of snapshots,
then we can as well deal with `Valid-Until` manually.
then we bump `Valid-Until` manually.
In passing, note that we ship an empty `/var/cache/apt/lists/` in the
ISO ⇒ modifying `Release` and `Release.gpg` files on our APT
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-07-10 17:29+0200\n"
"POT-Creation-Date: 2018-09-28 00:23+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"
......@@ -129,6 +129,15 @@ msgid ""
" - Email: <contact@montpel-libre.fr>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"* [Nothing2Hide](https://nothing2hide.org/)\n"
" - Location: Paris, France\n"
" - We provide digital safety trainings for journalists and human right defenders.\n"
" - [Contact page](https://nothing2hide.org/en/contact/)\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<!--\n"
......
......@@ -5,12 +5,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2018-07-10 17:29+0200\n"
"PO-Revision-Date: 2018-07-18 22:26+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Spanish "
"<http://translate.tails.boum.org/projects/tails/support_learn/es/>\n"
"POT-Creation-Date: 2018-09-28 00:23+0200\n"
"PO-Revision-Date: 2018-04-17 09:19+0000\n"
"Last-Translator: cacukin <cacukin@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"support_learn/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -185,6 +184,26 @@ msgstr ""
" individuos que valoran su privacidad en linea y offline.\n"
" - Email: <contact@montpel-libre.fr>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "* [Front Line Defenders](https://www.frontlinedefenders.org/)\n"
#| " - Location: International\n"
#| " - Provides digital security trainings (including Tails) for human\n"
#| " rights defenders.\n"
#| " - [Contact page](https://www.frontlinedefenders.org/emergency-support)\n"
msgid ""
"* [Nothing2Hide](https://nothing2hide.org/)\n"
" - Location: Paris, France\n"
" - We provide digital safety trainings for journalists and human right defenders.\n"
" - [Contact page](https://nothing2hide.org/en/contact/)\n"
msgstr ""
"* [Front Line Defenders](https://www.frontlinedefenders.org/)\n"
" - Ubicación: Internacional\n"
" - Provee entrenamiento en seguridad digital (incluyendo Tails) para defensores de \n"
" derechos humanos.\n"
" - [Página de contacto](https://www.frontlinedefenders.org/emergency-support)\n"
#. type: Plain text
#, no-wrap
msgid "<!--\n"
......
......@@ -6,12 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-08-20 08:52+0300\n"
"PO-Revision-Date: 2018-02-05 19:07+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Persian "
"<http://translate.tails.boum.org/projects/tails/support_learn/fa/>\n"
"Language: fa\n"
"POT-Creation-Date: 2018-09-28 00:23+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"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -133,6 +132,15 @@ msgid ""
" - Email: <contact@montpel-libre.fr>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"* [Nothing2Hide](https://nothing2hide.org/)\n"
" - Location: Paris, France\n"
" - We provide digital safety trainings for journalists and human right defenders.\n"
" - [Contact page](https://nothing2hide.org/en/contact/)\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<!--\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
"POT-Creation-Date: 2018-07-10 17:29+0200\n"
"POT-Creation-Date: 2018-09-28 00:23+0200\n"
"PO-Revision-Date: 2016-08-20 14:59+0100\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -183,6 +183,26 @@ msgstr ""
" voulant protéger la confidentialité de leurs documents et de leurs communications en ligne et hors-ligne.\n"
" - Email : <contact@montpel-libre.fr>\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid ""
#| "* [Front Line Defenders](https://www.frontlinedefenders.org/)\n"
#| " - Location: International\n"
#| " - Provides digital security trainings (including Tails) for human\n"
#| " rights defenders.\n"
#| " - [Contact page](https://www.frontlinedefenders.org/emergency-support)\n"
msgid ""
"* [Nothing2Hide](https://nothing2hide.org/)\n"
" - Location: Paris, France\n"
" - We provide digital safety trainings for journalists and human right defenders.\n"
" - [Contact page](https://nothing2hide.org/en/contact/)\n"
msgstr ""
"* [Front Line Defenders](https://www.frontlinedefenders.org/fr)\n"
" - Localisation : International\n"
" - Fournit des formations de sécurité numérique (dont Tails) pour\n"
" les personnes défendant les droits humains.\n"
" - [Page de contact](https://www.frontlinedefenders.org/fr/emergency-support)\n"
#. type: Plain text
#, no-wrap
msgid "<!--\n"
......
......@@ -6,12 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-08-20 08:52+0300\n"
"PO-Revision-Date: 2018-02-05 19:07+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
"Language-Team: Italian "
"<http://translate.tails.boum.org/projects/tails/support_learn/it/>\n"
"Language: it\n"
"POT-Creation-Date: 2018-09-28 00:23+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"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
......@@ -133,6 +132,15 @@ msgid ""
" - Email: <contact@montpel-libre.fr>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"* [Nothing2Hide](https://nothing2hide.org/)\n"
" - Location: Paris, France\n"
" - We provide digital safety trainings for journalists and human right defenders.\n"
" - [Contact page](https://nothing2hide.org/en/contact/)\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<!--\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2018-07-10 17:29+0200\n"
"POT-Creation-Date: 2018-09-28 00:23+0200\n"
"PO-Revision-Date: 2018-02-05 19:08+0000\n"
"Last-Translator: Tails translators <amnesia@boum.org\n"
"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
......@@ -131,6 +131,15 @@ msgid ""
" - Email: <contact@montpel-libre.fr>\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"* [Nothing2Hide](https://nothing2hide.org/)\n"
" - Location: Paris, France\n"
" - We provide digital safety trainings for journalists and human right defenders.\n"
" - [Contact page](https://nothing2hide.org/en/contact/)\n"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<!--\n"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment