Merge remote-tracking branch 'origin/master' into stable

Conflicts:
	wiki/src/doc/first_steps/startup_options/bridge_mode.de.po
	wiki/src/doc/first_steps/startup_options/bridge_mode.fr.po
	wiki/src/doc/first_steps/startup_options/network_configuration.fr.po

features/build.feature

@@ -147,15 +147,6 @@ Feature: custom APT sources to build branches
     Then I should see the 'feature-jessie' suite
     And I should see the 'feature-7756-reintroduce-whisperback' suite
 
-  Scenario: build from the experimental branch
-    Given I am working on the experimental branch based on devel
-    And config/APT_overlays.d contains 'feature-foo'
-    And config/APT_overlays.d contains 'bugfix-bar'
-    When I successfully run tails-custom-apt-sources
-    Then I should see the 'devel' suite
-    And I should see the 'feature-foo' suite
-    And I should see the 'bugfix-bar' suite
-
   Scenario: build from a feature branch with overlays based on devel
     Given I am working on the feature/icedove branch based on devel
     And config/APT_overlays.d contains 'feature-icedove'

wiki/src/.htaccess

@@ -925,3 +925,9 @@ RewriteRule ^todo/fix_documentation_for_ISO_verification_on_Windows https://labs
 RewriteRule ^todo/think_about_tordate_htpdate_changes https://labs.riseup.net/code/issues/5424 [R]
 RewriteRule ^todo/include_arm https://labs.riseup.net/code/issues/5884 [R]
 RewriteRule ^todo/add_virtualbox_host_software https://labs.riseup.net/code/issues/5606 [R]
+
+<FilesMatch "^(latest|upgrade)\.yml(\.pgp)?$">
+  ExpiresActive On
+  ExpiresDefault "access plus 2 hours"
+  Header append Cache-Control must-revalidate
+</FilesMatch>

wiki/src/about.fr.po

@@ -121,31 +121,18 @@ msgstr ""
 "connexion est automatiquement bloquée pour des raisons de sécurité."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tor is free software and an open network that helps you defend against a "
-#| "form of network surveillance that threatens personal freedom and privacy, "
-#| "confidential business activities and relationships, and state security "
-#| "known as traffic analysis."
 msgid ""
 "Tor is an open and distributed network that helps defend against traffic "
 "analysis, a form of network surveillance that threatens personal freedom and "
 "privacy, confidential business activities and relationships, and state "
 "security."
 msgstr ""
-"Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre "
-"contre une forme de surveillance qui menace les libertés individuelles et la "
-"vie privée, les activités et relations professionnelles confidentielles, et "
-"la sécurité d'État connue sous le nom d'analyse de trafic"
+"Tor est un réseau ouvert et distribué qui aide à se défendre contre "
+"l'analyse de trafic, une forme de surveillance qui menace les libertés "
+"individuelles et la vie privée, les activités et relations professionnelles "
+"confidentielles et la sécurité d'État."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tor protects you by bouncing your communications around a distributed "
-#| "network of relays run by volunteers all around the world: it prevents "
-#| "somebody watching your Internet connection from learning what sites you "
-#| "visit, and it prevents the sites you visit from learning your physical "
-#| "location."
 msgid ""
 "Tor protects you by bouncing your communications around a network of relays "
 "run by volunteers all around the world: it prevents somebody watching your "
@@ -153,9 +140,9 @@ msgid ""
 "sites you visit from learning your physical location."
 msgstr ""
 "Tor vous protège en faisant transiter vos communications au sein d'un réseau "
-"distribué de relais hébergés par des volontaires partout dans le monde : il "
-"empêche quiconque observant votre connexion Internet de savoir quels sites "
-"vous visitez, et il empêche le site que vous visitez de savoir où vous vous "
+"de relais hébergés par des volontaires partout dans le monde : il empêche "
+"quiconque observant votre connexion Internet de savoir quels sites vous "
+"visitez, et il empêche le site que vous visitez de savoir où vous vous "
 "trouvez."
 
 #. type: Plain text
@@ -180,16 +167,12 @@ msgstr ""
 "startup_options/bridge_mode]]."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "To learn more about Tor, see the official [Tor website](https://www."
-#| "torproject.org/):"
 msgid ""
 "To learn more about Tor, see the official [Tor website](https://www."
 "torproject.org/), particularly the following pages:"
 msgstr ""
 "Pour en savoir plus sur Tor, visitez le [site officiel de Tor](https://www."
-"torproject.org/):"
+"torproject.org/) et en particulier les pages suivantes :"
 
 #. type: Bullet: '- '
 msgid ""
@@ -204,7 +187,7 @@ msgid ""
 "[Tor overview: How does Tor work](https://www.torproject.org/about/overview."
 "html.en#thesolution)"
 msgstr ""
-"[Un aperçu de Tor: comment Tor fonctionne (en anglais)](https://www."
+"[Un aperçu de Tor : comment Tor fonctionne (en anglais)](https://www."
 "torproject.org/about/overview.html.en#thesolution)"
 
 #. type: Bullet: '- '
@@ -218,19 +201,16 @@ msgid ""
 "[Understanding and Using Tor — An Introduction for the Layman](https://trac."
 "torproject.org/projects/tor/wiki/doc/TorALaymansGuide)"
 msgstr ""
-"[Comprendre et utilisez Tor — Une introduction aux novices (en anglais)]"
+"[Comprendre et utiliser Tor — Une introduction pour les novices (en anglais)]"
 "(https://trac.torproject.org/projects/tor/wiki/doc/TorALaymansGuide)"
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "To learn more about how the usage of Tor is enforced, see our [[design "
-#| "document|contribute/design/Tor_enforcement]]."
 msgid ""
 "To learn more about how Tails ensures all its network connections use Tor, "
 "see our [[design document|contribute/design/Tor_enforcement]]."
 msgstr ""
-"Pour en savoir plus sur comment l'utilisation de Tor est imposée, voir la\n"
+"Pour en savoir plus sur comment Tails s'assure que toutes les connexions "
+"utilisent Tor, voir la\n"
 "[[documentation de conception|contribute/design/Tor_enforcement]]."
 
 #. type: Plain text
@@ -248,7 +228,7 @@ msgid ""
 "anonymity network different from Tor."
 msgstr ""
 "Vous pouvez aussi utiliser Tails pour accéder au réseau [I2P](https://geti2p."
-"net), qui est un réseau d'anonymisation différent de Tor."
+"net/fr/), qui est un réseau d'anonymisation différent de Tor."
 
 #. type: Plain text
 msgid ""
@@ -275,32 +255,19 @@ msgid "Use anywhere but leave no trace\n"
 msgstr "Utilisez le partout, ne laissez pas de traces\n"
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Using Tails on a computer doesn't alter or depend on the operating system "
-#| "installed on it. So you can use it in the same way on your computer, a "
-#| "friend's or one at your local library. After shutting down Tails, the "
-#| "computer can start again on its usual operating system."
 msgid ""
 "Using Tails on a computer doesn't alter or depend on the operating system "
 "installed on it. So you can use it in the same way on your computer, a "
 "friend's computer, or one at your local library. After shutting down Tails, "
 "the computer will start again with its usual operating system."
 msgstr ""
-"L'utilisation de Tails ne modifie pas le système d'exploitation installé sur "
-"l'ordinateur. Vous pouvez donc l'utiliser que vous soyez chez vous, chez un "
-"ami ou à la bibliothèque du coin. Une fois votre DVD, clef USB ou carte SD "
-"Tails retirée de l'ordinateur, celui-ci peut redémarrer sur le système "
+"Utiliser Tails ne modifie pas le système d'exploitation installé sur "
+"l'ordinateur. Vous pouvez donc l'utiliser de la même façon que vous soyez "
+"sur votre ordinateur, sur celui d'un ami ou à la bibliothèque du coin. Une "
+"fois Tails éteint, l'ordinateur peut redémarrer sur le système "
 "d'exploitation habituel."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tails is configured with special care to not use the computer's hard-"
-#| "disks, even if there is some swap space on them. The only storage space "
-#| "used by Tails is the RAM, which is automatically erased when the computer "
-#| "shuts down. So you won't leave any trace neither of the Tails system nor "
-#| "of what you did on the computer. That's why we call it \"amnesic\"."
 msgid ""
 "Tails is configured with special care to not use the computer's hard-disks, "
 "even if there is some swap space on them. The only storage space used by "
@@ -311,29 +278,22 @@ msgstr ""
 "Tails est spécialement configuré pour ne pas utiliser le disque dur de "
 "l'ordinateur, pas même l'espace swap. Le seul espace de stockage utilisé par "
 "Tails est la mémoire RAM, qui est effacée automatiquement à l'extinction de "
-"l'ordinateur. Vous ne laisserez donc aucune trace, que ce soit du système "
-"Tails ou de ce que vous avez fait, sur l'ordinateur. C'est pourquoi nous le "
-"qualifions d'\"amnésique\"."
+"l'ordinateur. Vous ne laisserez donc aucune trace sur l'ordinateur ni sur le "
+"système Tails quelque soit ce pourquoi vous l'avez utilisé. C'est pourquoi "
+"nous le qualifions d'\"amnésique\"."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This allows you to work on sensitive documents on any computer and "
-#| "protect you from data recovery after shutdown. Of course, you can still "
-#| "explicitly save some documents to another USB or external hard-disk and "
-#| "take them away for future use."
 msgid ""
 "This allows you to work with sensitive documents on any computer and "
 "protects you from data recovery after shutdown. Of course, you can still "
 "explicitly save specific documents to another USB stick or external hard-"
 "disk and take them away for future use."
 msgstr ""
-"Cela vous permet de travailler sur un document sensible sur n'importe quel\n"
-"ordinateur tout en empêchant la récupération de ces données une fois\n"
+"Cela vous permet de travailler avec des documents sensibles sur n'importe "
+"quel ordinateur tout en empêchant la récupération de ces données une fois "
 "l'ordinateur éteint. Bien sûr, vous pouvez toujours sauvegarder vos "
-"documents\n"
-"sur une clef USB ou un disque dur externe afin de les garder pour une "
-"prochaine utilisation."
+"documents sur une autre clef USB ou un disque dur externe afin de les garder "
+"pour une prochaine utilisation."
 
 #. type: Plain text
 #, no-wrap
@@ -351,7 +311,7 @@ msgid ""
 "encryption:"
 msgstr ""
 "Tails comprend également une sélection d'outils de protection de données "
-"utilisant un chiffrement robuste:"
+"utilisant un chiffrement robuste :"
 
 #. type: Bullet: '  - '
 msgid ""
@@ -360,27 +320,21 @@ msgid ""
 "span>, the Linux standard for disk-encryption."
 msgstr ""
 "[[Chiffrez votre clé USB ou votre disque dur externe|doc/"
-"encryption_and_privacy/encrypted_volumes]] avec <span class=\"definition\">"
-"[[!wikipedia Linux_Unified_Key_Setup desc=\"LUKS\"]]</span>, le standard de "
-"Linux en matière de chiffrement de volume."
+"encryption_and_privacy/encrypted_volumes]] avec <span class=\"definition"
+"\">[[!wikipedia_fr LUKS]]</span>, le standard de Linux en matière de "
+"chiffrement de volume."
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "Automatically encrypt with HTTPS all your communications to a number of "
-#| "major websites using [HTTPS Everywhere](https://www.eff.org/https-"
-#| "everywhere), a Firefox extension developed by the [Electronic Frontier "
-#| "Foundation](https://www.eff.org)."
 msgid ""
 "Automatically use HTTPS to encrypt all your communications to a number of "
 "major websites using [HTTPS Everywhere](https://www.eff.org/https-"
 "everywhere), a Firefox extension developed by the [Electronic Frontier "
 "Foundation](https://www.eff.org)."
 msgstr ""
-"Chiffrez automatiquement en HTTPS toutes vos communications vers de nombreux "
-"sites web en utilisant [HTTPS Everywhere](https://www.eff.org/https-"
-"everywhere), une extension Firefox développée par la [Electronic Frontier "
-"Foundation](https://www.eff.org)."
+"Utilisez automatiquement HTTPS pour chiffrer toutes vos communications vers "
+"de nombreux sites web en utilisant [HTTPS Everywhere](https://www.eff.org/"
+"https-everywhere), une extension Firefox développée par la [Electronic "
+"Frontier Foundation](https://www.eff.org)."
 
 #. type: Bullet: '  - '
 msgid ""
@@ -399,9 +353,9 @@ msgid ""
 "cryptographic tool that provides encryption, authentication and deniability."
 msgstr ""
 "Protégez vos conversations par messagerie instantanée en utilisant <span "
-"class=\"definition\">[[!wikipedia Off-the-Record_Messaging desc=\"OTR\"]]</"
-"span>, un outil cryptographique qui fournit chiffrement, authentification "
-"ainsi que la possibilité du déni plausible."
+"class=\"definition\">[[!wikipedia_fr Off-the-Record Messaging desc=\"OTR"
+"\"]]</span>, un outil cryptographique qui fournit chiffrement, "
+"authentification ainsi que la possibilité du déni plausible."
 
 #. type: Bullet: '  - '
 msgid ""
@@ -432,10 +386,6 @@ msgstr ""
 "Pour aller plus loin dans votre découverte de Tails, vous pouvez lire :"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "the [[warning page|doc/about/warning]] to understand better the security "
-#| "limitations of Tails and Tor,"
 msgid ""
 "the [[warning page|doc/about/warning]] to better understand the security "
 "limitations of Tails and Tor,"
@@ -457,16 +407,10 @@ msgstr ""
 "notre [[documentation|doc]] qui explique en détails comment utiliser Tails,"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid "some hints on why [[should you trust Tails|doc/about/trust]],"
 msgid "some hints on why [[you should trust Tails|doc/about/trust]],"
 msgstr "pourquoi [[faire confiance à Tails ?|doc/about/trust]]"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "our [[design document|contribute/design]] about Tails specification, "
-#| "threat model and implementation,"
 msgid ""
 "our [[design document|contribute/design]] laying out Tails specification, "
 "threat model and implementation,"
@@ -475,10 +419,6 @@ msgstr ""
 "spécifications, modèle de menace et implémentation."
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "the [[calendar|contribute/calendar]] holds the release dates, meetings "
-#| "and other events."
 msgid ""
 "the [[calendar|contribute/calendar]] that holds our release dates, meetings "
 "and other events."
@@ -511,8 +451,8 @@ msgstr ""
 #. type: Title =
 #, no-wrap
 msgid "Contact\n"
-msgstr ""
+msgstr "Contact\n"
 
 #. type: Plain text
 msgid "See the [[contact page|about/contact]]."
-msgstr ""
+msgstr "Voir la [[page de contact|about/contact]]."

wiki/src/about.pt.po

@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "POT-Creation-Date: 2016-03-21 18:14+0100\n"
-"PO-Revision-Date: 2014-04-30 20:00-0300\n"
+"PO-Revision-Date: 2016-03-28 09:14-0300\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: Portuguese <LL@li.org>\n"
-"Language: \n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Portugues\n"
-"X-Poedit-Country: BRASIL\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.6.10\n"
+"X-Poedit-Bookmarks: -1,-1,-1,50,-1,-1,-1,-1,-1,-1\n"
 
 #. type: Plain text
 #, no-wrap
@@ -54,12 +54,6 @@ msgstr ""
 "rastros, a não ser que você explicitamente peça que ele o faça."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "It is a complete operating system designed to be used from a DVD, USB "
-#| "stick, or SD card independently of the computer's original operating "
-#| "system. It is [[Free Software|doc/about/license]] and based on [[Debian "
-#| "GNU/Linux|http://www.debian.org/]]."
 msgid ""
 "It is a complete operating system designed to be used from a DVD, USB stick, "
 "or SD card independently of the computer's original operating system. It is "
@@ -82,10 +76,9 @@ msgstr ""
 "correio eletrônico, suíte de escritório, editor de imagens e som, etc."
 
 #. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!toc levels=1]]\n"
+#, no-wrap
 msgid "[[!toc levels=2]]\n"
-msgstr "[[!toc levels=1]]\n"
+msgstr "[[!toc levels=2]]\n"
 
 #. type: Plain text
 #, no-wrap
@@ -93,10 +86,9 @@ msgid "<a id=\"tor\"></a>\n"
 msgstr "<a id=\"tor\"></a>\n"
 
 #. type: Title =
-#, fuzzy, no-wrap
-#| msgid "Online anonymity and censorship circumvention with Tor\n"
+#, no-wrap
 msgid "Online anonymity and censorship circumvention\n"
-msgstr "Anonimato online e quebra de censura com Tor\n"
+msgstr "Anonimato online e quebra de censura\n"
 
 #. type: Plain text
 #, no-wrap
@@ -104,6 +96,8 @@ msgid ""
 "Tor\n"
 "---\n"
 msgstr ""
+"Tor\n"
+"---\n"
 
 #. type: Plain text
 msgid ""
@@ -125,42 +119,28 @@ msgstr ""
 "automaticamente bloqueada por segurança."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tor is free software and an open network that helps you defend against a "
-#| "form of network surveillance that threatens personal freedom and privacy, "
-#| "confidential business activities and relationships, and state security "
-#| "known as traffic analysis."
 msgid ""
 "Tor is an open and distributed network that helps defend against traffic "
 "analysis, a form of network surveillance that threatens personal freedom and "
 "privacy, confidential business activities and relationships, and state "
 "security."
 msgstr ""
-"Tor é um Software Livre e uma rede aberta que ajuda você a se defender "
-"contra formas de vigilância na rede que ameaçam sua liberdade e privacidade, "
-"atividades comerciais e relações pessoais confidenciais, e contra medidas de "
-"segurança estatais conhecidas como análise de tráfego."
+"Tor é uma rede aberta e distribuída que ajuda na defesa contra análise de "
+"tráfego, uma forma de de vigilância da rede que ameaça a liberdade, a "
+"privacidade, negócios confidenciais, relacionamentos e segurança de Estado."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tor protects you by bouncing your communications around a distributed "
-#| "network of relays run by volunteers all around the world: it prevents "
-#| "somebody watching your Internet connection from learning what sites you "
-#| "visit, and it prevents the sites you visit from learning your physical "
-#| "location."
 msgid ""
 "Tor protects you by bouncing your communications around a network of relays "
 "run by volunteers all around the world: it prevents somebody watching your "
 "Internet connection from learning what sites you visit, and it prevents the "
 "sites you visit from learning your physical location."
 msgstr ""
-"Tor lhe protege redirecionando suas comunicações ao redor de uma rede "
-"distribuída de repetidoras mantidas por voluntários/as ao redor do mundo: "
-"isto evita que alguém que esteja observando suas comunicações saiba quais "
-"sítios você visita, além de evitar também que os sítios que você navega "
-"saibam da sua localização física."
+"Tor lhe protege redirecionando suas comunicações ao redor de uma rede de "
+"repetidores mantidos por voluntários/as ao redor do mundo: isto evita que "
+"alguém que esteja observando suas comunicações saiba quais sites você "
+"visita, além de evitar também que os sites que você navega saibam da sua "
+"localização física."
 
 #. type: Plain text
 msgid "Using Tor you can:"
@@ -184,16 +164,12 @@ msgstr ""
 "bridge_mode]]."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "To learn more about Tor, see the official [Tor website](https://www."
-#| "torproject.org/):"
 msgid ""
 "To learn more about Tor, see the official [Tor website](https://www."
 "torproject.org/), particularly the following pages:"
 msgstr ""
-"Para conhecer mais sobre o Tor, veja o [Sítio oficial do Tor](https://www."
-"torproject.org/) (em inglês):"
+"Para aprender mais sobre o Tor, veja o [website oficial do Tor](https://www."
+"torproject.org/), especialmente as seguintes páginas:"
 
 #. type: Bullet: '- '
 msgid ""
@@ -226,16 +202,13 @@ msgstr ""
 "torproject.org/projects/tor/wiki/doc/TorALaymansGuide) (em inglês)."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "To learn more about how the usage of Tor is enforced, see our [[design "
-#| "document|contribute/design/Tor_enforcement]]."
 msgid ""
 "To learn more about how Tails ensures all its network connections use Tor, "
 "see our [[design document|contribute/design/Tor_enforcement]]."
 msgstr ""
-"Para saber mais sobre como o uso do Tor é imposto, veja nosso [[documento de "
-"projeto|contribute/design/Tor_enforcement]]."
+"Para aprender mais sobre como o Tails garante que todas suas conexões de "
+"rede usem o Tor, veja o nosso [[documento do projeto|contribute/design/"
+"Tor_enforcement]]."
 
 #. type: Plain text
 #, no-wrap
@@ -243,36 +216,32 @@ msgid ""
 "I2P\n"
 "---\n"
 msgstr ""
+"I2P\n"
+"---\n"
 
 #. type: Plain text
 msgid ""
 "You can also use Tails to access [I2P](https://geti2p.net) which is an "
 "anonymity network different from Tor."
 msgstr ""
+"Você também pode usar o Tails para acessar [I2P](https://geti2p.net) que é "
+"uma rede de anonimato diferente do Tor."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "[[Read more about those tools in the documentation.|doc/"
-#| "encryption_and_privacy]]"
 msgid ""
 "[[Learn how to use I2P in Tails in the documentation.|doc/anonymous_internet/"
 "i2p]]"
 msgstr ""
-"[[Leia mais sobre estas ferramentas na documentação.|doc/"
-"encryption_and_privacy]]"
+"[[Aprenda como usar o I2P com Tails na documentação.|doc/anonymous_internet/"
+"i2p]]"
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "To learn more about how the usage of Tor is enforced, see our [[design "
-#| "document|contribute/design/Tor_enforcement]]."
 msgid ""
 "To know how I2P is implemented in Tails, see our [[design document|"
 "contribute/design/I2P]]."
 msgstr ""
-"Para saber mais sobre como o uso do Tor é imposto, veja nosso [[documento de "
-"projeto|contribute/design/Tor_enforcement]]."
+"Para saber como o I2P é implementado no Tails, veja o nosso [[documento de "
+"projeto|contribute/design/I2P]]."
 
 #. type: Plain text
 #, no-wrap
@@ -285,12 +254,6 @@ msgid "Use anywhere but leave no trace\n"
 msgstr "Use em qualquer lugar sem deixar rastros\n"
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Using Tails on a computer doesn't alter or depend on the operating system "
-#| "installed on it. So you can use it in the same way on your computer, a "
-#| "friend's or one at your local library. After shutting down Tails, the "
-#| "computer can start again on its usual operating system."
 msgid ""
 "Using Tails on a computer doesn't alter or depend on the operating system "
 "installed on it. So you can use it in the same way on your computer, a "
@@ -298,19 +261,12 @@ msgid ""
 "the computer will start again with its usual operating system."
 msgstr ""
 "O uso do Tails em um computador não altera e nem depende do sistema "
-"operacional atualmente instalado. Assim, você pode usá-lo da mesma maneira "
-"no seu computador, no de um/a amigo/a ou no de uma biblioteca. Após desligar "
-"o Tails, o computador pode ser reiniciado normalmente no sistema operacional "
+"operacional instalado nele. Assim, você pode usá-lo da mesma maneira no seu "
+"computador, no de um/a amigo/a ou no de uma biblioteca. Após desligar o "
+"Tails, o computador será reiniciado normalmente no sistema operacional "
 "instalado."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Tails is configured with special care to not use the computer's hard-"
-#| "disks, even if there is some swap space on them. The only storage space "
-#| "used by Tails is the RAM, which is automatically erased when the computer "
-#| "shuts down. So you won't leave any trace neither of the Tails system nor "
-#| "of what you did on the computer. That's why we call it \"amnesic\"."
 msgid ""
 "Tails is configured with special care to not use the computer's hard-disks, "
 "even if there is some swap space on them. The only storage space used by "
@@ -323,15 +279,9 @@ msgstr ""
 "espaço de armazenamento usado pelo Tails é a memória RAM, que é "
 "automaticamente apagada quando o computador é desligado. Desse modo você não "
 "deixa rastros do sistema Tails nem do que você fez naquele computador. É por "
-"este motivo que costumamos chamá-lo de \"amnésico\"."
+"isso que chamamos o Tails de \"amnésico\"."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "This allows you to work on sensitive documents on any computer and "
-#| "protect you from data recovery after shutdown. Of course, you can still "
-#| "explicitly save some documents to another USB or external hard-disk and "
-#| "take them away for future use."
 msgid ""
 "This allows you to work with sensitive documents on any computer and "
 "protects you from data recovery after shutdown. Of course, you can still "
@@ -340,9 +290,9 @@ msgid ""
 msgstr ""
 "Isso permite que você trabalhe em documentos sensíveis em qualquer "
 "computador e te protege de tentativas de recuperação de dados após o "
-"desligamento. É claro que você pode explicitamente salvar documentos em "
-"outros dispositivos USB ou em um disco rígido externo e levá-los embora para "
-"uso futuro."
+"desligamento. É claro que você ainda pode explicitamente salvar documentos "
+"específicos em outro dispositivo USB ou em um disco rígido externo e levá-"
+"los embora para uso futuro."
 
 #. type: Plain text
 #, no-wrap
@@ -369,27 +319,21 @@ msgid ""
 "span>, the Linux standard for disk-encryption."
 msgstr ""
 "[[Criptografe sua memória USB ou disco rígido externo|doc/"
-"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition\">"
-"[[!wikipedia LUKS]]</span>, a ferramenta padrão do Linux para criptografia "
-"de disco."
+"encryption_and_privacy/encrypted_volumes]] usando <span class=\"definition"
+"\">[[!wikipedia LUKS]]</span>, a ferramenta padrão do Linux para "
+"criptografia de disco."
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "Automatically encrypt with HTTPS all your communications to a number of "
-#| "major websites using [HTTPS Everywhere](https://www.eff.org/https-"
-#| "everywhere), a Firefox extension developed by the [Electronic Frontier "
-#| "Foundation](https://www.eff.org)."
 msgid ""
 "Automatically use HTTPS to encrypt all your communications to a number of "
 "major websites using [HTTPS Everywhere](https://www.eff.org/https-"
 "everywhere), a Firefox extension developed by the [Electronic Frontier "
 "Foundation](https://www.eff.org)."
 msgstr ""
-"Criptografa automaticamente com HTTPS todas as suas conexões com um grande "
-"número de sítios web usando [HTTPS Everywhere](https://www.eff.org/https-"
-"everywhere), um complemento de Firefox desenvolvido pela [Electronic "
-"Frontier Foundation](https://www.eff.org)."
+"Use automaticamente HTTPS para encriptar todas as suas comunicações para um "
+"número maior de websites usando [HTTPS Everywhere](https://www.eff.org/https-"
+"everywhere), uma extensão do Firefox desenvolvida pela [Electronic Frontier "
+"Foundation](https://www.eff.org)."
 
 #. type: Bullet: '  - '
 msgid ""
@@ -398,9 +342,8 @@ msgid ""
 "email client, text editor or file browser."
 msgstr ""
 "Criptografe e assine seus emails e documentos, usando o padrão *de facto* "
-"<span class=\"definition\">[[!wikipedia_en Pretty_Good_Privacy desc=\"OpenPGP"
-"\"]]</span> a partir do cliente de emails do Tails, do editor de texto ou do "
-"navegador de arquivos."
+"<span class=\"definition\">[[!wikipedia OpenPGP]]</span> a partir do cliente "
+"de emails do Tails, do editor de texto ou do navegador de arquivos."
 
 #. type: Bullet: '  - '
 msgid ""
@@ -441,10 +384,6 @@ msgid "To continue discovering Tails, you can now read:"
 msgstr "Para continuar descobrindo o Tails, você pode ler:"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "the [[warning page|doc/about/warning]] to understand better the security "
-#| "limitations of Tails and Tor,"
 msgid ""
 "the [[warning page|doc/about/warning]] to better understand the security "
 "limitations of Tails and Tor,"
@@ -465,30 +404,25 @@ msgid "our [[documentation|doc]] explaining in detail how to use Tails,"
 msgstr "nossa [[documentação|doc]] explicando em detalhes como usar o Tails,"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid "some hints on why [[should you trust Tails|doc/about/trust]],"
 msgid "some hints on why [[you should trust Tails|doc/about/trust]],"
 msgstr ""
-"alguns conselhos de por que [[você deveria confiar no Tails|doc/about/"
-"trust]],"
+"algumas dicas de por que [[você deveria confiar no Tails|doc/about/trust]],"
 
 #. type: Bullet: '  - '
-#, fuzzy
-#| msgid ""
-#| "our [[design document|contribute/design]] about Tails specification, "
-#| "threat model and implementation."
 msgid ""
 "our [[design document|contribute/design]] laying out Tails specification, "
 "threat model and implementation,"
 msgstr ""
 "nosso [[documento de projeto|contribute/design]] sobre as especificações do "
-"Tails, modelo de ameaça e implementação."
+"Tails, modelo de ameaça e implementação,"
 
 #. type: Bullet: '  - '
 msgid ""
 "the [[calendar|contribute/calendar]] that holds our release dates, meetings "
 "and other events."