Commit a52d83dd authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' of https://git-tails.immerda.ch/tails into doc/unfuzz

parents a6ad5df5 5e556166
...@@ -87,8 +87,7 @@ Workshops ...@@ -87,8 +87,7 @@ Workshops
- What are the problems with the current homepage? - What are the problems with the current homepage?
- What do we want to achieve with this new homepage? - What do we want to achieve with this new homepage?
* **Restructuring our sidebar**: this session will take over the work on the * **Restructuring our sidebar**: this session will take over the work of the [[previous session|HackFest_2014_Paris#website_strategy]] to
work of the [[previous session|HackFest_2014_Paris#website_strategy]] to
restructure our sidebar. Maybe using [[!wikipedia card sorting]]? restructure our sidebar. Maybe using [[!wikipedia card sorting]]?
Discussions Discussions
......
[[!meta title="Linux kernel hardening"]]
The GNU/Linux kernel is currently a stock Debian GNU/Linux kernel. Using the paxtest tool, we can test techniques for exploitation. The default kernel without grsec is less than secure but we should never do worse than what is currently documented on this page. With each release of Tails, we should update this page.
The Amnesic Incognito Live System
Build information:
1.0 - 20140427
2cb0ccacbf3cffde533cb09699b6b8e916b89c2d
live-build: 2.0.12-2
live-boot: 3.0.1-1
live-config: 3.0.23-1
uname -a;paxtest kiddie
Linux amnesia 3.12-1-amd64 #1 SMP Debian 3.12.9-1 (2014-02-01) x86_64 GNU/Linux
PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
Released under the GNU Public Licence version 2 or later
Writing output to paxtest.log
It may take a while for the tests to complete
Test results:
PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
Released under the GNU Public Licence version 2 or later
Mode: kiddie
Linux amnesia 3.12-1-amd64 #1 SMP Debian 3.12.9-1 (2014-02-01) x86_64 GNU/Linux
Executable anonymous mapping : Killed
Executable bss : Killed
Executable data : Killed
Executable heap : Killed
Executable stack : Killed
Executable anonymous mapping (mprotect) : Vulnerable
Executable bss (mprotect) : Vulnerable
Executable data (mprotect) : Vulnerable
Executable heap (mprotect) : Vulnerable
Executable shared library bss (mprotect) : Vulnerable
Executable shared library data (mprotect): Vulnerable
Executable stack (mprotect) : Vulnerable
Anonymous mapping randomisation test : 9 bits (guessed)
Heap randomisation test (ET_EXEC) : 13 bits (guessed)
Heap randomisation test (ET_DYN) : 16 bits (guessed)
Main executable randomisation (ET_EXEC) : 10 bits (guessed)
Main executable randomisation (ET_DYN) : 10 bits (guessed)
Shared library randomisation test : 10 bits (guessed)
Stack randomisation test (SEGMEXEC) : 19 bits (guessed)
Stack randomisation test (PAGEEXEC) : 19 bits (guessed)
Return to function (strcpy) : Vulnerable
Return to function (strcpy, RANDEXEC) : Vulnerable
Return to function (memcpy) : Vulnerable
Return to function (memcpy, RANDEXEC) : Vulnerable
Executable shared library bss : Killed
Executable shared library data : Killed
Writable text segments : Vulnerable
amnesia@amnesia:~$ uname -a;paxtest blackhat
Linux amnesia 3.12-1-amd64 #1 SMP Debian 3.12.9-1 (2014-02-01) x86_64 GNU/Linux
PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
Released under the GNU Public Licence version 2 or later
Writing output to paxtest.log
It may take a while for the tests to complete
Test results:
PaXtest - Copyright(c) 2003,2004 by Peter Busser <peter@adamantix.org>
Released under the GNU Public Licence version 2 or later
Mode: blackhat
Linux amnesia 3.12-1-amd64 #1 SMP Debian 3.12.9-1 (2014-02-01) x86_64 GNU/Linux
Executable anonymous mapping : Killed
Executable bss : Killed
Executable data : Killed
Executable heap : Killed
Executable stack : Killed
Executable anonymous mapping (mprotect) : Vulnerable
Executable bss (mprotect) : Vulnerable
Executable data (mprotect) : Vulnerable
Executable heap (mprotect) : Vulnerable
Executable shared library bss (mprotect) : Vulnerable
Executable shared library data (mprotect): Vulnerable
Executable stack (mprotect) : Vulnerable
Anonymous mapping randomisation test : 9 bits (guessed)
Heap randomisation test (ET_EXEC) : 13 bits (guessed)
Heap randomisation test (ET_DYN) : 16 bits (guessed)
Main executable randomisation (ET_EXEC) : 10 bits (guessed)
Main executable randomisation (ET_DYN) : 10 bits (guessed)
Shared library randomisation test : 10 bits (guessed)
Stack randomisation test (SEGMEXEC) : 20 bits (guessed)
Stack randomisation test (PAGEEXEC) : 19 bits (guessed)
Return to function (strcpy) : Vulnerable
Return to function (strcpy, RANDEXEC) : Vulnerable
Return to function (memcpy) : Vulnerable
Return to function (memcpy, RANDEXEC) : Vulnerable
Executable shared library bss : Killed
Executable shared library data : Killed
Writable text segments : Vulnerable
[[!meta title="Calendar"]] [[!meta title="Calendar"]]
* 2014-06-08: * 2014-07-01: Feature freeze for 1.1. Tag, build and upload 1.1~rc1
- Firefox 24.6.0 ESR sources are available. ISO.
- Package and upload Firefox 24.6.0 ESR.
- Tag 1.1 in Git.
- Start building and uploading 1.1 ISO/IUKs...
* 2014-06-09: * 2014-07-02: Test Tails 1.1~rc1.
- Finish building by 12:00 (CEST)
- Start testing Tails 1.1 at 12:00 (CEST)...
* 2014-06-10: * 2014-07-03: Officially release Tails 1.1~rc1.
- ... and finish it by 12:00 (CEST) on the 10th.
- Officially release [Tails 1.1](https://labs.riseup.net/code/projects/tails/roadmap#Tails_1.1)
* 2014-06-11 - [Tails contributors meeting](https://mailman.boum.org/pipermail/tails-dev/2014-May/005818.html)
* 2014-07-05--2014-07-06 - Tails hackfest at * 2014-07-05--2014-07-06 - Tails hackfest at
[IRILL](http://www.irill.org/) (Paris, France) [IRILL](http://www.irill.org/) (Paris, France)
* 2014-07-08--2014-07-11 - Tails contributors meeting * 2014-07-08--2014-07-11 - Tails contributors meeting
* 2014-07-20: Package and upload Firefox 24.7.0 ESR. Tag, build and
upload 1.1 ISO.
* 2014-07-21: Test Tails 1.1.
* 2014-07-22: Officially release Tails 1.1.
[[!meta title="June 2014 online meeting"]]
[[!toc levels=1]]
# #7356: Enable formatting toolbars in Pidgin
We'll re-add it, as we could not find a reason not too, and there's
a good reason to do so.
# #7123: Find a meaningful name for the "bridge, firewall, or proxy settings" option
"Additional Tor configuration" almost reached a consensus, then "Tor
configuration" was proposed, and it did reach a consensus: while it
sounds like tor isn't configured if you don't open the option.
This which would be critical if it were in the first greeter screen,
but it's in "More options", which mitigates this problem somewhat.
Then "Specific Tor configuration" was proposed, which reached
a stronger consensus.
# #7128: Include oathtool package
We failed to see how this would be usable, in its current shape, for
non-geeks. Add to that the fact there's likely no broad audience for
it among the Tails userbase, and that nothing prevents anyone from
using the "Additional software packages" persistence feature for it,
and we agreed to reject this ticket.
# #7165: NetworkManager autoconnects to persistent wireless networks in Wheezy
We noticed we had discussed this last month already, so adding the
minutes from last discussion to the ticket.
# #7219: Having a disable Wi-Fi option at Greeter
Let's try to group related options under a single user-visible toggle
one. So, let's focus on "offline mode" (#6811) to start with, have it
rfkill the Wi-Fi down, and see if it covers enough.
# #7282: Tor Launcher: Don't relabel finish button when not owning Tor
We agreed that "Connect" is fine, and didn't see what good "Finish" does. sajolida?
# #7011: Create Tails stickers
We gave a go ahead. Go!
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-05-25 21:10+0300\n" "POT-Creation-Date: 2014-05-25 21:10+0300\n"
"PO-Revision-Date: 2014-05-23 14:20-0300\n" "PO-Revision-Date: 2014-06-13 17:36-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n" "Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -16,21 +16,15 @@ msgstr "" ...@@ -16,21 +16,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. type: Bullet: ' - ' #. type: Bullet: ' - '
msgid "" msgid "[[!traillink Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|first_steps/media]]"
"[[!traillink " msgstr "[[!traillink Escolhendo_entre_gravar_um_DVD_e_instalar_em_uma_memória_USB_ou_cartão_SD|first_steps/media]]"
"Choosing_between_burning_a_DVD_and_installing_onto_a_USB_stick_or_SD_card|"
"first_steps/media]]"
msgstr ""
"[[!traillink "
"Escolhendo_entre_gravar_um_DVD_e_instalar_em_uma_memória_USB_ou_cartão_SD|"
"first_steps/media]]"
#. type: Bullet: ' - ' #. type: Bullet: ' - '
msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]" msgid "[[!traillink Burning_a_DVD|first_steps/dvd]]"
msgstr "[[!traillink Gravando_um_DVD|first_steps/dvd]]" msgstr "[[!traillink Gravando_um_DVD|first_steps/dvd]]"
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "" #| msgid ""
#| " - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n" #| " - [[!traillink Installing_onto_a_USB_stick_or_SD_card|first_steps/installation]] (recommended)\n"
#| " - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n" #| " - [[!traillink Manually_Installing_onto_a_USB_stick_or_SD_card|first_steps/installation/manual]],\n"
...@@ -91,11 +85,11 @@ msgid "" ...@@ -91,11 +85,11 @@ msgid ""
" - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n" " - [[!traillink Shutting_down_Tails|first_steps/shutdown]]\n"
msgstr "" msgstr ""
" - [[!traillink Instalando_em_uma_memória_USB_ou_cartão_SD|first_steps/installation]] (recomendado)\n" " - [[!traillink Instalando_em_uma_memória_USB_ou_cartão_SD|first_steps/installation]] (recomendado)\n"
" - [[!traillink Instalando_manualmente_em_uma memória_USB|first_steps/installation/manual]],\n" " - [[!traillink Instalando_manualmente_em_uma memória_USB_ou_cartão_SD|first_steps/installation/manual]],\n"
" em [[!traillink Linux|first_steps/installation/manual/linux]],\n" " em [[!traillink Linux|first_steps/installation/manual/linux]],\n"
" em [[!traillink Windows|first_steps/installation/manual/windows]],\n" " em [[!traillink Windows|first_steps/installation/manual/windows]],\n"
" em [[!traillink Mac|first_steps/installation/manual/mac]]\n" " em [[!traillink Mac|first_steps/installation/manual/mac]]\n"
" - Desinstalando Tails ou Resetando uma memória USB,\n" " - Desinstalando Tails ou Resetando uma memória USB ou cartão SD,\n"
" em [[!traillink Linux|first_steps/reset/linux]],\n" " em [[!traillink Linux|first_steps/reset/linux]],\n"
" em [[!traillink Windows|first_steps/reset/windows]]\n" " em [[!traillink Windows|first_steps/reset/windows]]\n"
" - [[!traillink Atualizando_uma_memória_USB_ou_cartão_SD_com_Tails|first_steps/upgrade]]\n" " - [[!traillink Atualizando_uma_memória_USB_ou_cartão_SD_com_Tails|first_steps/upgrade]]\n"
...@@ -118,3 +112,4 @@ msgstr "" ...@@ -118,3 +112,4 @@ msgstr ""
" - [[!traillink Relate_um_erro|first_steps/bug_reporting]]\n" " - [[!traillink Relate_um_erro|first_steps/bug_reporting]]\n"
" - [[!traillink O_Tails_não_inicia|first_steps/bug_reporting/tails_does_not_start]]\n" " - [[!traillink O_Tails_não_inicia|first_steps/bug_reporting/tails_does_not_start]]\n"
" - [[!traillink Desligando_o_Tails|first_steps/shutdown]]\n" " - [[!traillink Desligando_o_Tails|first_steps/shutdown]]\n"
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-04-13 20:59+0300\n" "POT-Creation-Date: 2014-04-13 20:59+0300\n"
"PO-Revision-Date: 2012-09-28 10:44-0300\n" "PO-Revision-Date: 2014-06-13 17:44-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n" "Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -16,34 +16,38 @@ msgstr "" ...@@ -16,34 +16,38 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n" #| msgid "[[!meta title=\"Installing onto a USB Stick\"]]\n"
msgid "[[!meta title=\"Installing onto a USB stick or SD card\"]]\n" msgid "[[!meta title=\"Installing onto a USB stick or SD card\"]]\n"
msgstr "[[!meta title=\"Instalando em uma memória USB\"]]\n" msgstr "[[!meta title=\"Instalando em uma memória USB ou cartão SD\"]]\n"
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "Tails, version 0.11 or later, includes a custom USB installer." #| msgid "Tails, version 0.11 or later, includes a custom USB installer."
msgid "" msgid ""
"Tails includes <span class=\"application\">Tails Installer</span> a custom\n" "Tails includes <span class=\"application\">Tails Installer</span> a custom\n"
"installer for USB sticks and SD cards.\n" "installer for USB sticks and SD cards.\n"
msgstr "Tails, versão 0.11 ou superior, inclui um instalador USB personalizado." msgstr ""
"Tails inclui o <span class=\"application\">Tails Installer</span> um instalador\n"
"personalizado para memórias USB e cartões SD.\n"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "<div class=\"note\">\n" msgid "<div class=\"note\">\n"
msgstr "" msgstr "<div class=\"note\">\n"
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "Tails, version 0.11 or later, includes a custom USB installer." #| msgid "Tails, version 0.11 or later, includes a custom USB installer."
msgid "" msgid ""
"<p><span class=\"application\">Tails Installer</span> can only install Tails on a\n" "<p><span class=\"application\">Tails Installer</span> can only install Tails on a\n"
"USB stick or SD card of <strong>at least 4 GB</strong>.</p>\n" "USB stick or SD card of <strong>at least 4 GB</strong>.</p>\n"
msgstr "Tails, versão 0.11 ou superior, inclui um instalador USB personalizado." msgstr ""
"<p>O <span class=\"application\">Tails Installer</span> somente pode instalar o Tails\n"
"em uma memória USB ou cartão SD com <strong>ao menos 4 GB</strong>.</p>\n"
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "" #| msgid ""
#| "In order to use <span class=\"application\">Tails USB installer</span>, you need\n" #| "In order to use <span class=\"application\">Tails USB installer</span>, you need\n"
#| "to start Tails from another media, and clone it onto the USB stick that you want\n" #| "to start Tails from another media, and clone it onto the USB stick that you want\n"
...@@ -54,40 +58,32 @@ msgid "" ...@@ -54,40 +58,32 @@ msgid ""
"to start Tails from another media, and clone it onto the device of your\n" "to start Tails from another media, and clone it onto the device of your\n"
"choice, USB stick or SD card. To do that, you can either:\n" "choice, USB stick or SD card. To do that, you can either:\n"
msgstr "" msgstr ""
"Para poder utilizar o <span class=\"application\">Tails USB installer</span>, você precisa\n" "</div>\n"
"iniciar o Tails a partir de uma outra mídia, e cloná-lo para a memória USB na qual você quer\n" "Para poder utilizar o <span class=\"application\">Tails installer</span>, você precisa\n"
"instalá-lo. As opções são:\n" "iniciar o Tails a partir de uma outra mídia, e cloná-lo para o dispositivo de sua escolha\n"
"memória USB ou cartão SD. Para fazer isto, você pode:\n"
#. type: Bullet: ' - ' #. type: Bullet: ' - '
#, fuzzy
#| msgid "**[[Burn a Tails DVD|download#support]]** (recommended)." #| msgid "**[[Burn a Tails DVD|download#support]]** (recommended)."
msgid "**[[Burn a Tails DVD|dvd]]** (recommended)." msgid "**[[Burn a Tails DVD|dvd]]** (recommended)."
msgstr "**[[Gravar um DVD do Tails|download#support]]** (recomendado)." msgstr "**[[Gravar um DVD do Tails|dvd]]** (recomendado)."
#. type: Bullet: ' - ' #. type: Bullet: ' - '
#, fuzzy
#| msgid "" #| msgid ""
#| "**Use another Tails USB stick**, version 0.11 or later, for example from " #| "**Use another Tails USB stick**, version 0.11 or later, for example from "
#| "a friend." #| "a friend."
msgid "**Use another Tails USB stick or SD card**, for example from a friend." msgid "**Use another Tails USB stick or SD card**, for example from a friend."
msgstr "" msgstr "**Usar uma outra memória USB ou cartão SD**, com Tails, por exemplo o de um amigo."
"**Usar uma outra memória USB**, com a versão 0.11 ou maior, por exemplo a de "
"uma amiga."
#. type: Bullet: ' - ' #. type: Bullet: ' - '
#, fuzzy
#| msgid "" #| msgid ""
#| "**[[Manually install Tails onto another USB stick|installation/manual]]" #| "**[[Manually install Tails onto another USB stick|installation/manual]]"
#| "**, if you can't use a DVD." #| "**, if you can't use a DVD."
msgid "" msgid "**[[Manually install Tails onto another USB stick or SD card|installation/manual]]**, if you cannot use a DVD."
"**[[Manually install Tails onto another USB stick or SD card|installation/" msgstr "**[[Instalar manualmente o Tails em outra memória USB ou cartão SD|installation/manual]]**, se você não puder utilizar um DVD."
"manual]]**, if you cannot use a DVD."
msgstr ""
"**[[Instalar manualmente o Tails em outra memória USB|installation/manual]]"
"**, se você não puder utilizar um DVD."
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "" #| msgid ""
#| "Using <span class=\"application\">Tails USB installer</span> allows you to\n" #| "Using <span class=\"application\">Tails USB installer</span> allows you to\n"
#| "later **[[create a persistent volume|persistence]]** in the free space\n" #| "later **[[create a persistent volume|persistence]]** in the free space\n"
...@@ -97,22 +93,21 @@ msgid "" ...@@ -97,22 +93,21 @@ msgid ""
"later **[[create a persistent volume|persistence]]** in the free space\n" "later **[[create a persistent volume|persistence]]** in the free space\n"
"left on the device.\n" "left on the device.\n"
msgstr "" msgstr ""
"O <span class=\"application\">Tails Usb installer</span> te permite **[[criar um\n" "O <span class=\"application\">Tails installer</span> te permite **[[criar um\n"
"volume persistente|persistence]]** no espaço livre da sua memória USB. Isto requer\n" "volume persistente|persistence]]** no espaço livre do seu dispositivo.\n"
"uma memória USB de **ao menos 2 GB**.\n"
#. type: Title = #. type: Title =
#, no-wrap #, no-wrap
msgid "Using Tails Installer\n" msgid "Using Tails Installer\n"
msgstr "" msgstr "Usando o Tails Installer\n"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "<div class=\"caution\">\n" msgid "<div class=\"caution\">\n"
msgstr "" msgstr "<div class=\"caution\">\n"
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "" #| msgid ""
#| "<p><strong>All the content of the destination USB stick will be lost in the operation.</strong></p>\n" #| "<p><strong>All the content of the destination USB stick will be lost in the operation.</strong></p>\n"
#| "<p><strong>This operation will not clone the persistent volume of the USB stick which is being cloned.</strong></p>\n" #| "<p><strong>This operation will not clone the persistent volume of the USB stick which is being cloned.</strong></p>\n"
...@@ -127,28 +122,30 @@ msgid "" ...@@ -127,28 +122,30 @@ msgid ""
"device which is being cloned.</strong></li>\n" "device which is being cloned.</strong></li>\n"
"</ul>\n" "</ul>\n"
msgstr "" msgstr ""
"<p><strong>O conteúdo da memória USB será perdido nesta operação.</strong></p>\n" "<ul>\n"
"<p><strong>Esta operação não irá clonar o volume persistente da memória USB que está sendo clonada.</strong><p>\n" "<li><strong>Todos os dados no dispositivo instalado serão\n"
"perdidos.</strong></li>\n"
"<li><strong>Esta operaçãonão [[apaga\n"
"de forma segura|encryption_and_privacy/secure_deletion]] os dados perdidos\n"
"no dispositivo instalado.</strong></li>\n"
"<li><strong>Esta operação não copia o volume persistente do\n"
"dispositivo que está sendo clonado.</strong></li>\n"
"</ul>\n"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "</div>\n" msgid "</div>\n"
msgstr "" msgstr "</div>\n"
#. type: Bullet: '1. ' #. type: Bullet: '1. '
#, fuzzy
#| msgid "" #| msgid ""
#| "Start Tails, version 0.11 or later, from another media than the USB stick " #| "Start Tails, version 0.11 or later, from another media than the USB stick "
#| "onto which you want to install Tails." #| "onto which you want to install Tails."
msgid "" msgid "Start Tails from another media than the device, USB stick or SD card, onto which you want to install Tails."
"Start Tails from another media than the device, USB stick or SD card, onto " msgstr "Inicie o Tails a partir de uma outra mídia que não seja a memória USB ou cartão SD no qual você quer instalar o Tails."
"which you want to install Tails."
msgstr ""
"Inicie o Tails, versão 0.11 ou superior, a partir de uma outra mídia que não "
"seja a memória USB na qual você quer instalar o Tails."
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "" #| msgid ""
#| "2. Choose\n" #| "2. Choose\n"
#| " <span class=\"menuchoice\">\n" #| " <span class=\"menuchoice\">\n"
...@@ -168,32 +165,26 @@ msgid "" ...@@ -168,32 +165,26 @@ msgid ""
msgstr "" msgstr ""
"2. Escolha\n" "2. Escolha\n"
" <span class=\"menuchoice\">\n" " <span class=\"menuchoice\">\n"
" <span class=\"guimenu\">Aplicativos</span>&nbsp;▸\n" " <span class=\"guimenu\">Aplicativos (Applications)</span>&nbsp;▸\n"
" <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n" " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
" <span class=\"guimenuitem\">Tails USB installer</span>\n" " <span class=\"guimenuitem\">Tails installer</span>\n"
" </span>\n" " </span>\n"
" para iniciar o <span class=\"application\">Tails USB installer</span>.\n" " para iniciar o <span class=\"application\">Tails installer</span>.\n"
#. type: Bullet: '3. ' #. type: Bullet: '3. '
#, fuzzy
#| msgid "" #| msgid ""
#| "To install onto a new USB stick, click on the <span class=\"button" #| "To install onto a new USB stick, click on the <span class=\"button"
#| "\">Clone & Install</span> button." #| "\">Clone & Install</span> button."
msgid "" msgid "To install onto a new device, click on the <span class=\"button\">Clone & Install</span> button."
"To install onto a new device, click on the <span class=\"button\">Clone & " msgstr "Para instalar em um novo dispositivo, clique no botão <span class=\"button\">Clonar & Instalar (Clone & Install)</span>."
"Install</span> button."
msgstr ""
"Para instalar em uma nova memória USB, clique no botão <span class=\"button"
"\">Clone & Install</span>."
#. type: Bullet: '4. ' #. type: Bullet: '4. '
#, fuzzy
#| msgid "Plug the USB stick onto which you want to install Tails." #| msgid "Plug the USB stick onto which you want to install Tails."
msgid "Plug the device onto which you want to install Tails." msgid "Plug the device onto which you want to install Tails."
msgstr "Conecte a memória USB na qual você quer instalar o Tails." msgstr "Conecte o dispositivo no qual você quer instalar o Tails."
#. type: Plain text #. type: Plain text
#, fuzzy, no-wrap #, no-wrap
#| msgid "" #| msgid ""
#| " A new device, which corresponds to the USB stick, appears in the\n" #| " A new device, which corresponds to the USB stick, appears in the\n"
#| " <span class=\"guilabel\">Target Device</span> drop-down list.\n" #| " <span class=\"guilabel\">Target Device</span> drop-down list.\n"
...@@ -201,54 +192,38 @@ msgid "" ...@@ -201,54 +192,38 @@ msgid ""
" A new device, which corresponds to the USB stick or SD card, appears in the\n" " A new device, which corresponds to the USB stick or SD card, appears in the\n"
" <span class=\"guilabel\">Target Device</span> drop-down list.\n" " <span class=\"guilabel\">Target Device</span> drop-down list.\n"
msgstr "" msgstr ""
" Um novo dispositivo, que corresponde à memória USB, aparece na\n" " Um novo dispositivo, que corresponde à memória USB ou ao cartão SD, aparece na\n"
" lista <span class=\"guilabel\">Dispositivo de Destino</span>.\n" " lista <span class=\"guilabel\">Dispositivo de Destino (Target Device)</span>.\n"
#. type: Bullet: '5. ' #. type: Bullet: '5. '
#, fuzzy
#| msgid "" #| msgid ""
#| "Choose the USB stick from the <span class=\"guilabel\">Target Device</" #| "Choose the USB stick from the <span class=\"guilabel\">Target Device</"
#| "span> drop-down list." #| "span> drop-down list."
msgid "" msgid "Choose this new device from the <span class=\"guilabel\">Target Device</span> drop-down list."
"Choose this new device from the <span class=\"guilabel\">Target Device</" msgstr "Escolha este novo dispositivo na lista <span class=\"guilabel\">Dispositivo de Destino</span>."
"span> drop-down list."
msgstr ""
"Escolha a memória USB na lista <span class=\"guilabel\">Dispositivo de "
"Destino</span>."
#. type: Bullet: '6. ' #. type: Bullet: '6. '
#, fuzzy
#| msgid "" #| msgid ""
#| "6. To start the installation, click on the <span class=\"button\">Create " #| "6. To start the installation, click on the <span class=\"button\">Create "
#| "Live\n" #| "Live\n"
#| "USB</span> button.\n" #| "USB</span> button.\n"
msgid "" msgid "To start the installation, click on the <span class=\"button\">Install Tails</span> button."
"To start the installation, click on the <span class=\"button\">Install " msgstr "Para iniciar a instalação, clique no botão <span class=\"button\">Instalar Tails (Install Tails)</span>."
"Tails</span> button."
msgstr ""
"6. Para iniciar a instalação, clique no botão <span class=\"button\">Create "
"Live USB\n"
"</span>.\n"
#. type: Bullet: '7. ' #. type: Bullet: '7. '
#, fuzzy
#| msgid "" #| msgid ""
#| "Read the warning message in the text area. Click on the <span class=" #| "Read the warning message in the text area. Click on the <span class="
#| "\"button\">Next</span> button to confirm." #| "\"button\">Next</span> button to confirm."
msgid "" msgid "Read the warning message in the pop-up window. Click on the <span class=\"button\">Yes</span> button to confirm."
"Read the warning message in the pop-up window. Click on the <span class=" msgstr "Leia a mensagem de advertência na janel que se abrirá. Clique no botão <span class=\"button\">Sim (Yes)</span> para confirmar."
"\"button\">Yes</span> button to confirm."
msgstr ""
"Leia a mensagem de advertência na área de texto. Clique no botão <span class="
"\"button\">Next</span> para confirmar."