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

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

parents 4c4be10b a18835e2
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-03-08 12:49+0100\n"
"POT-Creation-Date: 2014-05-11 17:38+0200\n"
"PO-Revision-Date: 2014-01-06 23:22+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -56,13 +56,13 @@ msgstr ""
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://"
"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|https://"
"www.debian.org/]]."
msgstr ""
"Tails ist ein vollständiges Betriebssystem, das direkt von einer DVD, einem "
"USB-Stick oder einer SD-Karte aus genutzt wird, unabhängig von dem auf dem "
"Computer installierten Betriebssystem. Tails ist [[Freie Software|doc/about/"
"license]] und basiert auf [[Debian GNU/Linux|http://www.debian.org/]]."
"license]] und basiert auf [[Debian GNU/Linux|https://www.debian.org/]]."
#. type: Plain text
msgid ""
......@@ -402,11 +402,11 @@ msgstr "Danksagungen\n"
#. type: Bullet: ' - '
msgid ""
"Tails could not exist without [[Debian|http://www.debian.org/]], [[Debian "
"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
"Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
"our [[contribute/relationship with upstream]] document for details."
msgstr ""
"Tails wäre ohne [[Debian|http://www.debian.org/]], [[Debian Live|http://live."
"Tails wäre ohne [[Debian|https://www.debian.org/]], [[Debian Live|http://live."
"debian.net]], und [[Tor|https://www.torproject.org/]] nicht möglich; siehe "
"unsere [[Beziehungen zum Upstream|contribute/relationship_with_upstream]] "
"für Details."
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tails-about-fr\n"
"POT-Creation-Date: 2014-03-08 12:49+0100\n"
"POT-Creation-Date: 2014-05-11 17:38+0200\n"
"PO-Revision-Date: 2013-10-13 17:08-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
......@@ -56,13 +56,13 @@ msgstr ""
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://"
"[[Free Software|doc/about/license]] and based on [[Debian GNU/Linux|https://"
"www.debian.org/]]."
msgstr ""
"Tails est un système d'exploitation complet destiné à être utilisé depuis un "
"DVD, une clef USB ou une carte SD indépendamment du système installé sur "
"l'ordinateur. C'est un [[logiciel libre|doc/about/license]] basé sur "
"[[Debian GNU/Linux|http://www.debian.org/]]."
"[[Debian GNU/Linux|https://www.debian.org/]]."
#. type: Plain text
msgid ""
......@@ -395,11 +395,11 @@ msgstr "Remerciements\n"
#. type: Bullet: ' - '
msgid ""
"Tails could not exist without [[Debian|http://www.debian.org/]], [[Debian "
"Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian "
"Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see "
"our [[contribute/relationship with upstream]] document for details."
msgstr ""
"Tails ne pourrait exister sans [[Debian|http://www.debian.org/]], [[Debian "
"Tails ne pourrait exister sans [[Debian|https://www.debian.org/]], [[Debian "
"Live|http://live.debian.net]], et [[Tor|https://www.torproject.org/]]; pour "
"en savoir plus, consultez [[cette page|contribute/relationship with "
"upstream]]."
......
......@@ -12,7 +12,7 @@ computer but leaving no trace unless you ask it to explicitly.
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/]].
Software|doc/about/license]] and based on [[Debian GNU/Linux|https://www.debian.org/]].
Tails comes with several built-in applications pre-configured with security in
mind: web browser, instant messaging client, email client, office suite, image
......@@ -136,7 +136,7 @@ See the [[Press and media information|press]].
Acknowledgements
================
- Tails could not exist without [[Debian|http://www.debian.org/]], [[Debian Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see our [[contribute/relationship with upstream]] document for details.
- Tails could not exist without [[Debian|https://www.debian.org/]], [[Debian Live|http://live.debian.net]], and [[Tor|https://www.torproject.org/]]; see our [[contribute/relationship with upstream]] document for details.
- Tails was inspired by the [[Incognito LiveCD|http://web.archive.org/web/20090220133020/http://anonymityanywhere.com/]]. The Incognito author declared it to be dead on March 23rd, 2010, and wrote that Tails "should be considered as its spiritual successor".
- The [[Privatix Live-System|http://mandalka.name/privatix/]] an early source of inspiration, too.
- Some ideas (in particular [[tordate|contribute/design/Time_syncing]] and
......
This diff is collapsed.
**Ticket:**: [[!tails_ticket 7161]]
The idea I had was to let the server(s) send a reduced list of hosts. Not
only it would allow to work-around Tor DNS limitations, but also to have
some weighted round robin, in order to prioritize some high bandwidth
mirrors, if we choose to.
If I had to mention the ideal design goals for such changes, I would say
that the more straightforward would be the better for implementation and
also for maintainability.
[[!toc levels=2]]
# Using DNS
Using DNS seems to be an easy way to do some round robin in low level. It
allows some kind of transparency to the upper layers protocols and
distribute the load and to avoid having a single server that can became a
SPOF.
The following ways are available to implement it:
* CNAME Hacks
* NS Hacks
* Modified DNS servers
## CNAME Hacks
As mention by ToBeFree something that can be done is to have different
pools of servers like:
a.dl.amnesia.boum.org A $MIRROR1
a.dl.amnesia.boum.org A $MIRROR2
a.dl.amnesia.boum.org A $MIRROR3
a.dl.amnesia.boum.org A $MIRROR4
a.dl.amnesia.boum.org A $MIRROR5
b.dl.amnesia.boum.org A $MIRROR6
b.dl.amnesia.boum.org A $MIRROR7
dl.amnedia.boum.org CNAME a.dl.amnesia.boum.org
dl.amnedia.boum.org CNAME b.dl.amnesia.boum.org
Interestingly the requests would be equally distributed betwen a.dl and
b.dl, thus if their is more mirrors in one name than one other some
servers would be somehow prioritized. For example: here "a" mirrors will
share 50% of requests, giving 10% for every host where "b" mirrors will
share the other 50% of requests betwen two host giving them 25% of
requests each.
However this kind of CNAME hack is not supported by current DNS
Servers. Bind 8 used to support it with a [configuration
option](http://docstore.mik.ua/orelly/networking_2ndEd/dns/ch10_07.htm)
that has not been ported to bind 9. Neither NSD nor PowerDNS seem to
support it, and their is no actual data about how resolvers would
handle this case, so I don't think it is the best option.
## NS Hacks
Following the same idea the dl amnesia.boum.org could be delegated to a
few different DNS servers, and those servers may have different versions
of the zone. For example:
dl.amnesia.boum.org NS $DNS1
dl.amnesia.boum.org NS $DNS2
DNS1 would have a zone similar to a.dl.amnesia.boum.org:
dl.amnesia.boum.org A $MIRROR1
dl.amnesia.boum.org A $MIRROR2
dl.amnesia.boum.org A $MIRROR3
dl.amnesia.boum.org A $MIRROR4
dl.amnesia.boum.org A $MIRROR5
And DNS2 would have a zone similar to b.dl.amnesia.boum.org:
dl.amnesia.boum.org A $MIRROR6
dl.amnesia.boum.org A $MIRROR7
In theory it should work (and give almost the same load distribution as
CNAME hacks, almost as the NS servers will not receive 50% of requests
because of [[!rfc 5452]]). However, I am not sure that playing with DNS
inconsistency will be a so good idea, for example for maintainability :)
## Using modified DNS servers
Interestingly Tails is not the first project to be looking how to use DNS
for load distribution. People already wrote some DNS software designed to
handle those usecases and return the visitor a reduced list of servers
according to some rules like weights or geolocalisation. They work by
delegating a subzone (like dl.amnesia.boum.org) to those servers and with
zone files containing additionals fields. There is two main softwares for
those usecases:
* <http://gdnsd.org/> which is available on debian and used for
example for wikipedia.
* <https://github.com/abh/geodns> that requires manual installation
and is used for example by pool.ntp.org.
Deploying such software would solve the problem in a more elegant way than
CNAME or NS hacks. It would require a bit of system administration that
maybe can be done using some puppet templates in a few Virtal Machines.
# Using HTTP(s)
DNS is not the only way to do some load balancing. It is mostly used for
low level protocols that don't allow redirects (for example: NTP). As
content download is already done using HTTP(s). HTTP(s) can be leveraged
to do this kind of load balancing. It is what is done by sourceforge.net
as pointed by ToBeFree and by many Linux distributions.
For example using a PHP script (or more complete options such as
mirrorbrain, thanks Sagi!) that would redirect requests to
`dl.amnesia.boum.org/$file to $mirror.dl.amnesia.boum.org/$file`
randomly or according to some additional rules (weights,
geolocalisation, SSL availability ...).
There is a few drawbacks on this approach:
* It would increase a bit the load on boum.org's server.
* It would increase the dependency on this server, meaning that it is
unavailable (down, blocked...), downloads will be blocked (but in this
case the site will be too).
* It would require to develop the script or to install one such as
mirrorbrain.
On the other side it has a few advantage:
* It will only require a few ~20 lines of PHP script when DNS based
solutions require to install and maintain additional software and servers.
* It can allow the script to be personnalised to add some additional rules
if necessary.
* As boum.org server will see every requests, it would allow to do some
stats.
* It can allow to use $mirror.dl.amnesia.boum.org URLs, allowing to deploy
SSL certificates easier that if all mirrors use dl.amnesia.boum.org.
* As ToBeFree mentionned (thanks!) it is also possible to use some client
side scripts to select the mirror. I would not recommend to rely only on
this option as it would not work for browsers without scripts, but it can
be done as a complementary approach, it order to reduce the load and
dependency to dl.amnesia.boum.org's server.
Thus, if I may, I would like to recommend considering the HTTP(s) option,
even if it means that I have to write the PHP script by myself or to create
an easy task entry on the ticket tracker and follow it :)
......@@ -429,6 +429,7 @@ Resources
`ovmf` package): `qemu-system-x86_64 -bios /usr/share/ovmf/OVMF.fd`
* Ubuntu's Firmware Test Suite
- [homepage](https://wiki.ubuntu.com/FirmwareTestSuite)
- [[!debbugs 748783 desc="Debian ITP"]]
- [live version](https://wiki.ubuntu.com/HardwareEnablementTeam/Documentation/FirmwareTestSuiteLive)
- [reference guide](https://wiki.ubuntu.com/Kernel/Reference/fwts)
* Peter Jones' [The EFI System Partition and the Default Boot
......
......@@ -6,11 +6,33 @@ Known issues
============
* Mac: *some* Mac need rEFInd installed to boot Tails in UEFI mode.
* ThinkPad X230: when booting in UEFI mode, the syslinux boot menu is
not displayed properly, and one cannot see the kernel command-line
when editing it.
* VirtualBox: at least one version of VirtualBox cannot boot Tails
in UEFI mode.
* Mac: *some* Mac fail to shutdown properly when booted in UEFI mode.
* Boot menu display issues (ThinkPad X230, MacBookPro8,1): when
booting in UEFI mode, the syslinux boot menu is not displayed
properly, and one cannot see the kernel command-line when
editing it.
* VirtualBox 4.1.18-dfsg-2+deb7u3: doesn't boot at all from DVD (EFI mode
doesn't help): [[!tails_ticket 7173]]
* Apple MacBookPro5,5 does not boot with Tails in UEFI mode. We are told it
is due to missing native USB drivers, and the Plop boot-manager can
fix it, as it has this drivers.
* Apple MacBook Air 3,2 A1369 EMC 2392
- with rEFInd 0.7.8, USB stick installed with Tails Installer: fails
to boot most of the times. Failure modes:
* blank gray screen (frozen)
* gray screen with strings of seemingly random characters (frozen)
* black rEFInd screen with an empty list of boot options (frozen)
* black rEFInd screen with a working prompt asking for a boot file
- bypassing rEFInd (alt key): system freezes
* Fails to boot from DVD on early 2011 MacBook pro, while 0.23
boots fine.
* Apple MacBookAir5,1 fails to shutdown after booting from a UEFI
Tails USB stick. Works fine when booted from DVD.
* Fails to boot from a USB stick created by Tails Installer, on Mac
Pro Tower from Early 2008: "showed up as an orange 'EFI device' with
the USB logo on it. Clicking on that icon froze the machine and
nothing else happened." Works with grub-efi 2.00-22 on the
same hardware.
Miscellaneous test results
==========================
......@@ -26,7 +48,8 @@ Miscellaneous test results
have to do it blindly
- boots fine in Legacy BIOS mode, so at least we have no hardware
support regression here
* boots on ThinkPenguin Royal (syslinux 6.02+dfsg-1 and 6.03~pre1+dfsg-1)
* boots on ThinkPenguin Royal (syslinux 6.02+dfsg-1 and
6.03~pre1+dfsg-1)
* boots on MacBook Pro 13-inch Mid 2012 9,2 (EFI 2.9), and MacBook Pro
13-inch Late 2011 8,1 (EFI 2.7), both with and without rEFInd *if*
`menu background splash.png` is removed from `stdmenu.cfg`; adding
......@@ -66,6 +89,32 @@ Miscellaneous test results
* Boots fine on ThinkPad W520 (tails-i386-feature_uefi-1.0-20140324T1026Z-dd350d4.iso).
* Boots fine on Lenovo ThinkPad E320 (tails-i386-feature_uefi-1.1-20140407T1357Z-02a2adf)
* Boots fine on Macbook Pro 11,3 (15 Inch Retina-Late 2013)
* Boots fine on Late 2013 Macbook Pro 13" Retina
* Boots fine on Macbook Air 3,1 in UEFI mode
* Boots fine on HP/Compaq 6330s in UEFI mode
* ThinkCentre M82 boots fine with:
- an alpha generation (isohybrid + dd) USB stick
- a beta generation (prepared with Tails Installer) USB stick in
both UEFI and "legacy" BIOS mode
* Boots fine on ASUS 701 (eeepc).
* Boots fine on Acer Aspire E1-531 (V2.09, EFI v2.31) in UEFI mode.
* Boots fine on MacBookPro8,1 (Early 2011, Model A1278).
* Boots fine on Gateway NE56R w/ Bios V2.13 in UEFI mode, with Secure
Boot disabled. Doesn't boot (as expected) with Secure Boot enabled.
* Boots fine on Hewlett-Packard Presario CQ57
* Boots fine on Apple MacBook Air 3,2 A1369 EMC 2392, with rEFInd
0.7.8 installed, when installed with isohybrid + dd.
* Boots fine on ASUS ux31a
- in CSM mode, when installed with isohybrid + dd
- in UEFI mode, when installed with Tails Installer
* Boots fine on Lenovo Thinkpad T400.
* Boots fine on Mac Mini 2.3 Ghz Intel Core i7 from DVD, and from USB
stick created with Tails Installer.
* Boots fine on MacBookAir5,1 from DVD, and from USB stick created
with Tails Installer on the same machine.
* Boots fine from DVD on VirtualBox 4.3.10-dfsg-1~bpo70+1 (as of commit e0a3c64
in `feature/uefi`).
* Boots fine on Lenovo G700.
* Boots fine from DVD on Lenovo B570.
* Boots fine from DVD on Lenovo Z61t.
* Boots fine from DVD on HP Pavilion dm4-1150ca.
[[!meta title="Replace TrueCrypt"]]
Due to various concerns, Trecrypt is about to be replaced in Tails,
either by tcplay or cryptsetup.
......@@ -12,6 +14,12 @@ of TrueCrypt based on dm-crypt, licensed under the 2-clause BSD license.
It is in Debian sid ([[!debpts tcplay]]), and would serve as a full
replacement of TrueCrypt... once a proper GUI available.
tc-play allows to create TrueCrypt volumes.
version 2 added an ability to save and restore TrueCrypt volume headers to
external header files.This feature can be used to change a TrueCrypt volume
password.
## Cryptsetup
[Cryptsetup 1.6 supports reading the TrueCrypt
......@@ -27,9 +35,23 @@ the user to graphically activate a TC volume.
Upstream (udisks) feature request:
<https://bugs.freedesktop.org/show_bug.cgi?id=70164>
cryptsetup 1.6.4 does not support creating TrueCrypt volumes.
## Zulucrypt
[zuluCrypt](https://code.google.com/p/zulucrypt) is a front end to cryptsetup
and tcplay, it make easy to manage Truecrypt
volumes through a GUI, but it's not packaged in Debian yet
([[!debbug 703911 desc="RFP #703911"]]).
- It uses cryptsetup to unlock TrueCrypt volumes and LUKS volumes.
- It uses cryptsetup to backup and restore LUKS volume headers.
- It uses cryptsetup to add and remove keys in LUKS volumes.
- It uses tcplay to create TrueCrypt volumes.
- It uses tcplay to backup and restore TrueCrypt volume headers
zuluCrypt now has a [hidden volume like functionality using
cryptsetup](https://code.google.com/p/cryptsetup/issues/detail?id=7#c28).
zuluCrypt can open [LUKS volumes with a detached
header](https://code.google.com/p/cryptsetup/wiki/Cryptsetup140).
......@@ -6,10 +6,11 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2013-10-08 19:51+0300\n"
"POT-Creation-Date: 2014-04-29 20:22+0300\n"
"PO-Revision-Date: 2014-04-17 21:07+0100\n"
"Last-Translator: Tails developers <amnesia@boum.org>\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"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-04-27 20:08+0300\n"
"POT-Creation-Date: 2014-05-01 10:40+0300\n"
"PO-Revision-Date: 2014-04-18 23:25+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -356,6 +356,10 @@ msgstr "[[Entwürfe|blueprint]]"
msgid "[[Merge policy|contribute/merge_policy]]"
msgstr "[[Merge policy|contribute/merge_policy]]"
#. type: Bullet: ' - '
msgid "[[Logo|promote/logo]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"tools\"></a>\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2014-04-14 16:28+0300\n"
"POT-Creation-Date: 2014-05-01 10:40+0300\n"
"PO-Revision-Date: 2014-03-26 10:50+0100\n"
"Last-Translator: MR\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -317,6 +317,10 @@ msgstr ""
msgid "[[Merge policy|contribute/merge_policy]]"
msgstr ""
#. type: Bullet: ' - '
msgid "[[Logo|promote/logo]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"tools\"></a>\n"
......
......@@ -120,6 +120,7 @@ Reference documents
- [[Design documents|contribute/design]]
- [[Blueprints|blueprint]]
- [[Merge policy|contribute/merge_policy]]
- [[Logo|promote/logo]]
<a id="tools"></a>
......
......@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-04-14 16:28+0300\n"
"PO-Revision-Date: 2013-04-05 14:08+0200\n"
"POT-Creation-Date: 2014-05-13 14:35+0300\n"
"PO-Revision-Date: 2014-05-23 14:56-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Portuguese <LL@li.org>\n"
"Language: \n"
......@@ -19,17 +19,13 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
#. type: Plain text
#, fuzzy, no-wrap
#| msgid "[[!meta title=\"Contributing to Tails\"]]"
#, no-wrap
msgid "[[!meta title=\"Contributing to Tails\"]]\n"
msgstr "[[!meta title=\"Contribuindo com o Tails\"]]"
msgstr "[[!meta title=\"Contribuindo com o Tails\"]]\n"
#. type: Plain text
msgid ""
"There are many ways you can contribute to Tails. No effort is too small and "
"whatever you bring to this community will be appreciated. So read on to "
"find out how you can make a difference in Tails."
msgstr ""
msgid "There are many ways you can contribute to Tails. No effort is too small and whatever you bring to this community will be appreciated. So read on to find out how you can make a difference in Tails."
msgstr "Há muitas maneiras de contribuir com o Tails. Nenhum esforço é pequeno demais e qualquer coisa que você traga para esta comunidade será apreciada. Então, continue lendo para descobrir como você pode fazer a diferença no Tails."
#. type: Plain text
#, no-wrap
......@@ -38,11 +34,14 @@ msgid ""
"<h2>Share your experience</h2>\n"
"<div class=\"contribute-role\" id=\"user\">\n"
msgstr ""
"<div class=\"contribute-roles-1\">\n"
"<h2>Compartilhe sua experiência</h2>\n"
"<div class=\"contribute-role\" id=\"user\">\n"
#. type: Plain text
#, no-wrap
msgid " [[!img user.png link=no]]\n"
msgstr ""
msgstr " [[!img user.png link=no]]\n"
#. type: Plain text
#, no-wrap
......@@ -57,6 +56,15 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
" <p>Todo usuário/a pode ajudar os/as outros/as ou dar aos/às desenvolvedores/as informação útil.</p>\n"
" <ul>\n"
" <li>[[Relate bugs|doc/first_steps/bug_reporting]]</li>\n"
" <li>[[Teste imagens ISO experimentais|contribute/how/testing]]</li>\n"
" <li>[[Dê informações aos desenvolvedores|contribute/how/input]]</li>\n"
" <li>[[Ajude outros/as usuários/as do Tails|contribute/how/help]]</li>\n"
" </ul>\n"
"</div>\n"
"</div>\n"
#. type: Plain text
#, no-wrap
......@@ -65,11 +73,14 @@ msgid ""
"<h2>Donate</h2>\n"
"<div class=\"contribute-role\" id=\"donate\">\n"
msgstr ""
"<div class=\"contribute-roles-1\">\n"
"<h2>Faça uma doação</h2>\n"
"<div class=\"contribute-role\" id=\"donate\">\n"
#. type: Plain text
#, no-wrap
msgid " [[!img donate.png link=no]]\n"
msgstr ""
msgstr " [[!img donate.png link=no]]\n"
#. type: Plain text
#, no-wrap
......@@ -81,6 +92,12 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
" <p>Fazer doações acelera o desenvolvimento do Tails.</p>\n"
" <ul>\n"
" <li>[[Faça uma doação|contribute/how/donate]]</li>\n"
" </ul>\n"
"</div>\n"
"</div>\n"
#. type: Plain text
#, no-wrap
......@@ -90,11 +107,15 @@ msgid ""
"<div class=\"contribute-role\" id=\"content-writer\">\n"
" <h3>Writer</h3>\n"
msgstr ""
"<div class=\"contribute-roles-3\">\n"
"<h2>Contribua com suas habilidades em línguas</h2>\n"
"<div class=\"contribute-role\" id=\"content-writer\">\n"
" <h3>Writer</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img writer.png link=no]]\n"
msgstr ""
msgstr " [[!img writer.png link=no]]\n"
#. type: Plain text
#, no-wrap
......@@ -108,11 +129,19 @@ msgid ""
"<div class=\"contribute-role\" id=\"translator\">\n"
" <h3>Translator</h3>\n"
msgstr ""
" <p>Bons escritores podem fazer com que o Tails seja acessível a mais pessoas.</p>\n"
" <ul>\n"
" <li>[[Melhore a documentação|contribute/how/documentation]]</li>\n"
" <li>[[Escreva notas para a imprensa|contribute/how/promote]]</li>\n"
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"translator\">\n"
" <h3>Traduza</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img translator.png link=no]]\n"
msgstr ""
msgstr " [[!img translator.png link=no]]\n"
#. type: Plain text
#, no-wrap
......@@ -125,11 +154,18 @@ msgid ""
"<div class=\"contribute-role\" id=\"speaker\">\n"
" <h3>Speaker</h3>\n"
msgstr ""
" <p>Tradutores podem permitir que mais pessoas ao redor do mundo usem o Tails.</p>\n"
" <ul>\n"
" <li>[[Melhore o Tails em sua própria língua|contribute/how/translate]]</li>\n"
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"speaker\">\n"
" <h3>Fale</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img speaker.png link=no]]\n"
msgstr ""
msgstr " [[!img speaker.png link=no]]\n"
#. type: Plain text
#, no-wrap
......@@ -141,6 +177,12 @@ msgid ""
"</div>\n"
"</div>\n"
msgstr ""
" <p>Porta-vozed podem advogar o Tails para todos os tipos de público.</p>\n"
" <ul>\n"
" <li>[[Fale em eventos|contribute/how/promote]]</li>\n"
" </ul>\n"
"</div>\n"
"</div>\n"
#. type: Plain text
#, no-wrap
......@@ -150,11 +192,15 @@ msgid ""
"<div class=\"contribute-role\" id=\"developer\">\n"
" <h3>Developer or maintainer</h3>\n"
msgstr ""
"<div class=\"contribute-roles-3\">\n"
"<h2>Contribua com suas habilidades computacionais</h2>\n"
"<div class=\"contribute-role\" id=\"developer\">\n"
" <h3>Desenvolvedor ou mantenedor</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img software_developer.png link=no]]\n"
msgstr ""
msgstr " [[!img software_developer.png link=no]]\n"
#. type: Plain text
#, no-wrap
......@@ -168,11 +214,19 @@ msgid ""
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
" <h3>System administrator</h3>\n"
msgstr ""
" <p>Pessoas de software com as mais diversas habilidades podem melhorar o Tails.</p>\n"
" <ul>\n"
" <li>[[Trabalhe no código fonte|contribute/how/code]]</li>\n"
" <li>[[Melhore o Tails trabalhando no Debian|contribute/how/debian]]</li>\n"
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"sysadmin\">\n"
" <h3>Administrador de sistemas</h3>\n"
#. type: Plain text
#, no-wrap
msgid " [[!img system_administrator.png link=no]]\n"
msgstr ""
msgstr " [[!img system_administrator.png link=no]]\n"
#. type: Plain text
#, no-wrap
......@@ -186,11 +240,19 @@ msgid ""
"<div class=\"contribute-role\" id=\"designer\">\n"
" <h3>Designer</h3>\n"
msgstr ""
" <p>Administradores de sistemas podem contribuir com a infraestrutura por trás do Tails.</p>\n"
" <ul>\n"
" <li>[[Mantenha um espelho HTTP|contribute/how/mirror]]</li>\n"
" <li>[[Melhore a infraestrutura do Tails|contribute/how/sysadmin]]</li>\n"
" </ul>\n"
"</div>\n"
"<div class=\"contribute-role\" id=\"designer\">\n"