Commit 975a9079 authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/master'

parents f2a8c765 c4d27248
......@@ -213,13 +213,23 @@ affect reproducibility of the images:
* **keeprunning**: do not clean up the builder VM on build
success.
* **rescue**: implies **keeprunning** and will also not clean up the
build directory, which is useful for investigating build failures and as
gateway for useful development tricks. For example, if you have failures in
the build process, you might want to enter the chroot at the stage where the
build failed.
This can be done with:
```
rake vm:ssh
# inside the vm
sudo chroot "$(ls /tmp/tails-build.* -dt|head -n1)/chroot/"
```
* **forcecleanup**: ensure a new builder VM is used for `rake build`,
and also clean up this VM after the build, no matter if it
succeeded or not.
* **rescue**: implies **keeprunning** and will also not clean up the
build directory, which is useful for investigating build failures.
* **cachewebsite=**:
- If set to "yes" (the default, unless building from a tag), enable caching
of the built website. The cache is keyed on the input parameters that
......
......@@ -6,8 +6,6 @@ All times are referenced to Berlin and Paris time.
* 2020-07-28: **Release 4.9** (Firefox 68.11, kibi is the RM)
* 2020-08-03, 16:00: Foundations Team meeting
* 2020-08-25: **Release 4.10** (Firefox 68.12)
* 2020-09-03, 16:00: Foundations Team meeting
......
......@@ -92,7 +92,7 @@ in your opinion:
2. Close the issues fixed by this MR.
You don't need to do this if the destination branch of the MR
is `master`: these issues will be closed automatically.
is `stable`: these issues will be closed automatically.
3. If the destination branch of the MR was `stable`, then
pull `stable` locally, merge it into `devel`, and push `devel`.
......
......@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-04-12 16:10+0200\n"
"PO-Revision-Date: 2020-04-30 21:35+0000\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"PO-Revision-Date: 2020-07-24 07:28+0200\n"
"Last-Translator: violeta <violetacunha@riseup.net>\n"
"Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
"reset_mac/pt/>\n"
"Language: pt\n"
......@@ -22,7 +22,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Resetting a USB stick using macOS\"]]\n"
msgstr ""
msgstr "[[!meta title=\"Como resetar um pendrive USB usando macOS\"]]\n"
#. type: Plain text
#, no-wrap
......@@ -56,7 +56,7 @@ msgstr ""
#. type: Bullet: '2. '
msgid "Start <span class=\"application\">Disk Utility</span>."
msgstr ""
msgstr "Inicie o <span class=\"application\">Utilitário de Disco</span>."
#. type: Plain text
#, no-wrap
......@@ -69,7 +69,7 @@ msgstr ""
#. type: Bullet: '3. '
msgid "Plug the USB stick that you want to reset."
msgstr ""
msgstr "Conecte o pen drive que você quer resetar"
#. type: Plain text
#, no-wrap
......@@ -77,6 +77,8 @@ msgid ""
" A new device appears in the list of storage devices. This new device\n"
" corresponds to the USB stick that you plugged in. Click on it.\n"
msgstr ""
" Um novo dispositivo aparece na lista de dispositivos de armazenamento. Este novo dispositivo\n"
" corresponde ao pen drive que você conectou. Clique nele.\n"
#. type: Bullet: '4. '
msgid ""
......
Supports Markdown
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