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

Merge branch 'testing' into devel

parents 69c40117 ee9d359c
......@@ -4,5 +4,5 @@ Encoding=UTF-8
_Name=Report an error
Type=Application
Terminal=false
Exec=/usr/local/bin/tails-documentation support/troubleshooting
Exec=/usr/local/bin/tails-documentation support
Icon=/usr/share/pixmaps/whisperback.svg
......@@ -188,9 +188,9 @@ Given /^I set sudo password "([^"]*)"$/ do |password|
@sudo_password = password
next if @skip_steps_while_restoring_background
@screen.wait("TailsGreeterAdminPassword.png", 20)
match = @screen.find('TailsGreeterPassword.png')
@screen.click(match.getCenter.offset(match.w*3, match.h/2))
@screen.type(@sudo_password + Sikuli::Key.TAB + @sudo_password)
@screen.type(@sudo_password)
@screen.type(Sikuli::Key.TAB)
@screen.type(@sudo_password)
end
Given /^Tails Greeter has dealt with the sudo password$/ do
......
......@@ -32,7 +32,7 @@ elif [ -f 'po/tails-iuk.pot' ]; then
BRANCH='tails-iuk_completed'
AFTER_IMPORT='make -C po pot && make -C po update-po'
elif [ -f 'po/tails-perl5lib.pot' ]; then
BRANCH='tails-iuk_completed'
BRANCH='tails-perl5lib_completed'
AFTER_IMPORT='make -C po pot && make -C po update-po'
elif [ -f 'po/liveusb-creator.pot' ]; then
BRANCH='liveusb-creator_completed'
......
......@@ -371,6 +371,7 @@ Prepare upgrade-description files
./bin/tails-iuk-generate-upgrade-description-files \
--version "$VERSION" \
--next-version "$NEXT_VERSION" \
--next-version "${NEXT_VERSION}~rc1" \
--iso "$ISOS/tails-i386-$VERSION/tails-i386-$VERSION.iso" \
--previous-version "$PREVIOUS_VERSION" \
--previous-version "${VERSION}~rc1" \
......@@ -389,6 +390,8 @@ Prepare upgrade-description files
`--previous-version`, so that users who skipped a release or two
are directly informed of the new one.
* If preparing a release candidate, add `--channel alpha`
* If preparing a release candidate, do not pass
`--next-version "${NEXT_VERSION}~rc1"`
1. Create an armoured detached signature for each created or modified
upgrade-description file.
......@@ -594,7 +597,7 @@ Copy the `.iso.sig` file into the website repository:
"$MASTER_CHECKOUT/wiki/src/torrents/files/"
Write the announcement for the release in
`$MASTER_CHECKOUT/wiki/src/news/test_$TAG.html`, including:
`$MASTER_CHECKOUT/wiki/src/news/test_$TAG.mdwn`, including:
- Update the `meta title` directive.
- Update the `meta date` directive.
......
......@@ -2,10 +2,17 @@
[[!toc levels=1]]
If running Wheezy or older, you will have to do the upstream part of
the work in a Jessie chroot (e.g. with pbuilder).
Install build and test dependencies
===================================
Required dependencies on Debian:
Install build-dependencies listed in `debian/control`:
mk-build-deps -i -r
Install build-dependencies from Debian:
libdist-zilla-perl libdist-zilla-plugins-cjm-perl \
libdist-zilla-plugin-changelogfromgit-perl \
......@@ -16,7 +23,7 @@ Required dependencies on Debian:
liblocale-msgfmt-perl libmoosex-has-sugar-perl \
dh-make-perl
Install the dependencies:
Install build-dependencies that are not in Debian yet:
DEB_BUILD_OPTIONS=nocheck dh-make-perl --build --install --cpan Dist::Zilla::Plugin::LocaleMsgfmt
......
......@@ -2,10 +2,17 @@
[[!toc levels=1]]
If running Wheezy or older, you will have to do the upstream part of
the work in a Jessie chroot (e.g. with pbuilder).
Install build and test dependencies
===================================
Required dependencies on Debian:
Install build-dependencies listed in `debian/control`:
mk-build-deps -i -r
Install build-dependencies from Debian:
libdist-zilla-perl libdist-zilla-plugins-cjm-perl
libdist-zilla-plugin-installguide-perl
......@@ -15,11 +22,10 @@ Required dependencies on Debian:
liblocale-msgfmt-perl libmoosex-has-sugar-perl
dh-make-perl
Install the dependencies:
Install build-dependencies that are not in Debian yet:
DEB_BUILD_OPTIONS=nocheck dh-make-perl --build --install --cpan Dist::Zilla::Plugin::LocaleMsgfmt
Make an upstream release
========================
......
......@@ -2,6 +2,31 @@
[[!toc levels=1]]
If running Wheezy or older, you will have to do the upstream part of
the work in a Jessie chroot (e.g. with pbuilder).
Install build and test dependencies
===================================
Install build-dependencies listed in `debian/control`:
mk-build-deps -i -r
Install build-dependencies from Debian:
libdist-zilla-perl libdist-zilla-plugins-cjm-perl \
libdist-zilla-plugin-changelogfromgit-perl \
libdist-zilla-plugin-installguide-perl \
libdist-zilla-plugin-test-perl-critic-perl \
libdist-zilla-plugin-test-notabs-perl \
libdist-zilla-plugin-git-perl \
liblocale-msgfmt-perl libmoosex-has-sugar-perl \
dh-make-perl
Install build-dependencies that are not in Debian yet:
DEB_BUILD_OPTIONS=nocheck dh-make-perl --build --install --cpan Dist::Zilla::Plugin::LocaleMsgfmt
Update POT and PO files
=======================
......
......@@ -44,6 +44,10 @@ Check the output for:
Check the image size has not changed much since the last release.
In a directory with many Tails ISO images:
find -iname "tails*.iso" -exec ls -lh '{}' \; | sort -rhk 8
# Automated test suite
Our long term goal is to eliminate the manual test suite (except the
......@@ -65,20 +69,19 @@ tracked by tickets prefixed with `todo/test_suite:`.
# Iceweasel
* does the exposed User-Agent match the TBB's one?
(connect to a website you can check the access logs for)
* Compare the fingerprint of Tails and the latest TBB using at least
<https://panopticlick.eff.org/> and <http://ip-check.info/>
- Update the [[fingerprint section|support/known_issues#fingerprint]] of the
known issues page if needed.
- Does the exposed User-Agent match the TBB's one?
* Running `getTorBrowserUserAgent` should produce the useragent set by the
Torbutton version installed and used in Iceweasel.
* Browsing (by IP) a HTTP or HTTPS server on the LAN should be possible.
* Browsing (by IP) a FTP server on the LAN should be possible.
* Does playing HTML5 videos work? In particular, (due to its popularity)
do [youtube](http://www.youtube.com) videos work (once
[[!tails_todo easier YouTube]] is fixed -- currently object unblocking in
[[!tails_ticket 5476]] is fixed -- currently object unblocking in
NoScript is required)?
* Compare the fingerprint of Tails and the latest TBB using at least
<https://panopticlick.eff.org/> and <http://ip-check.info/>, and
update the [[fingerprint section|support/known_issues#fingerprint]] of
the known issues page.
* Verify that WebRTC is disabled (compare with another Tails that has
the `media.peerconnection.enabled` pref set to *true*):
- <http://mozilla.github.io/webrtc-landing/> (it's expected that the
......@@ -89,6 +92,7 @@ tracked by tickets prefixed with `todo/test_suite:`.
visit this website so that it installs its crap, close the browser,
re-open the browser, visit this website again. The cookie should not
be present anymore.
* One should be able to switch identities from the web browser.
# Pidgin
......@@ -101,16 +105,23 @@ tracked by tickets prefixed with `todo/test_suite:`.
* Check that XMPP is working with a new test profile.
* Check if pidgin doesn't leak too many informations on replying to different
CTCP requests:
* Start Tails and launch pidgin once done. Connect to an IRC server where you're already on
* try to `/ctcp <Tails_account_nick> COMMAND`
with a client that supports sending CTCP commands properly --
Pidgin does not, apparently
(for a list of commands, see [this page](http://www.wikkedwire.com/irccommands)).
See the [[!tails_ticket 5823 desc="current known-broken state"]].
* Start Tails, launch pidgin, and join #tails.
* Also join #tails from the webchat of OFTC on <https://webchat.oftc.net/>
using another nickname.
* Try to send `/ctcp <Tails_account_nick> COMMAND` from the webchat to pidgin:
- See the [[!tails_ticket 5823 desc="current known-broken state"]].
- List of `/ctcp` commands, see [this page](http://www.wikkedwire.com/irccommands):
- PING
- VERSION
- FINGER
- USERINFO
- CLIENTINFO
- TIME
# Tor
* The version of Tor should be the latest stable one.
* The version of Tor should be the latest stable one, which is the highest version number
before alpha releases on <http://deb.torproject.org/torproject.org/pool/main/t/tor/>.
* firewall: is the Tor-enforcement effective?
- check output of `iptables -L -n -v`
- check output of `iptables -t nat -L -n -v`
......@@ -126,22 +137,26 @@ tracked by tickets prefixed with `todo/test_suite:`.
* is `/etc/resolv.conf` OK both before/after DHCP has been set up? it should
*always* read `nameserver 127.0.0.1`
* [[doc/first_steps/startup_options/bridge_mode]] should work:
1. Boot with the `bridge` option.
1. Set up an administrator password.
1. Enter a bridge or a few.
1. Enable network configuration in Tails Greeter.
1. Configure a bridge or a few in Tor Launcher:
- `bridge 198.252.153.59:9001`
- `obfs2 198.252.153.59:16492`
- `obfs3 198.252.153.59:16493`
1. Use the Internet.
1. Check from time to time with `netstat` that the only outgoing
direct network connections go to the configured bridge(s).
1. Check with `sudo watch "netstat -taupen | grep ESTABLISHED"` that the only outgoing
direct network connections go to the configured bridges.
* Verify that all destinations reached from an intensive Tails session
are tor routers or
authorities:
1. Boot Tails without the network in.
1. Set up an administration password.
1. Start dumping your whole session's network activity with `sudo
tcpdump -n -i any -w dump` (or better, do the dump on another machine,
or on the host OS if Tails is running in a VM).
1. Plug the network.
1. Wait for Tor to be functional.
1. Save the `cached-microdesc-consensus` out of the VM (it's needed
1. Save `/var/lib/tor/cached-microdesc-consensus` out of the VM (it's needed
to analyze the network dump later on).
1. Do *a lot* of network stuff (why not run do this while doing all
the other tests **but** I2P and the unsafe browser, which would
......@@ -302,7 +317,7 @@ the appropriate tcpdump or tshark filters.
* Check mail over IMAP using:
- a "clearnet" IMAP server.
- a hidden service IMAP server (e.g. TorMail, jhiwjjlqpyawmpjx.onion, or
RiseUp, xyvp43vrggckj427.onion).
Riseup, xyvp43vrggckj427.onion with SSL).
* Send an email using:
- a "clearnet" SMTP server.
- a hidden service SMTP server (see above).
......@@ -344,22 +359,18 @@ correctly.
# Erase memory on shutdown
- check that `memlockd` is running
- check that `udev-watchdog` monitors the right device
([[!tails_todo test_suite:_udev-watchdog_device]])
- check that `udev-watchdog` monitors the right device ([[!tails_ticket 5560]])
* on USB
* on DVD
- After booting from DVD, remove Tails boot medium and check that the
memory erasure process is started (`Loading new kernel`, at least).
The USB tests are bellow, in the Tails Installer section.
Testing that the needed files are really mapped in memory, and the
erasing process actually works, involves a more complicated
process that is worth [[a dedicated page|test/erase_memory_on_shutdown]].
`[needs-fix: erase_memory]` ([[!tails_ticket 5959]])
[[!tails_ticket 5472]]
- After booting from USB, remove Tails boot medium and check that the
memory erasure process is started (`Loading new kernel`, at least).
# Root access control
* Check you can login as root neither with the `amnesia` password nor
* Check you can login as root with `su` neither with the `amnesia` password nor
with the `live` one.
* Check that the `$TAILS_USER_PASSWORD` variable, if still existing in the system
environment after the boot has finished, does not contain the clear text
......@@ -413,48 +424,21 @@ process that is worth [[a dedicated page|test/erase_memory_on_shutdown]].
# Incremental upgrades
The following should be tested once incremental upgrades are ready for
real-world deployment.
Try every upgrade path supported by the generated upgrade-description
files:
* the resulting incrementally upgraded system must boot and *About
Tails* must pretend it has indeed been upgraded
* for upgrades that only propose a non-incremental paths: make sure the
user is guided just fine to the download web page
Given these are not published yet, a local test setup is needed:
* a web server
* a replacement for the Tails website's `/upgrade/` tree with
upgrade-description files in there, e.g.
`/var/www/tails/upgrade/v1/Tails/0.14~rc2/i386/stable/upgrades.yml`
* a replacement for the Tails HTTP mirrors' `iuk` directories,
e.g. `/var/www/tails/stable/iuk/Tails_i386_0.14-rc2_to_0.14.iuk`
* patch /etc/hosts on Tails to include
10.36.24.33 dl.amnesia.boum.org
Also, the upgrader must be called, from inside the system to upgrade,
with every needed option to use the local web server rather than the
online one, e.g.:
DISABLE_PROXY=1 SSL_NO_VERIFY=1 \
tails-upgrade-frontend-wrapper --override-baseurl http://10.36.24.33/tails
# Incremental updates
Try every update path supported by the generated update-description
files:
* for every incremental update paths: make sure the resulting updated
system "works fine" (what does that mean? do we want to run the full
test suite on these? **FIXME**)
system "works fine" (boots and pretends to be the correct version)
* for updates that only propose a non-incremental paths: make sure the
user is guided just fine (that is? **FIXME**)
user is told to do a manual upgrade
Given these are not published yet, a local test setup is needed:
If the IUKs and update-description files have been published on the
*alpha* channel already:
echo 'TAILS_CHANNEL="alpha"' | sudo tee --append /etc/os-release && \
tails-upgrade-frontend-wrapper
Else, use a local test setup:
* a web server
* a replacement for the Tails website's `/update/` tree with
......@@ -513,24 +497,40 @@ Boot and check basic functionality is working for every supported
language.
* The chosen keyboard layout must be applied.
* The virtual keyboard must work and be auto-configured to
use the same keyboard layout as the X session.
* Once [[!tails_todo fix_localized_iceweasel_search_engine]] is fixed, the
iceweasel search engine must be localized (for languages we ship
a localized searchplugin for).
* Once [[!tails_ticket 5962]] is fixed, the browser spelling
dictionary must be localized (for languages that are supported by
our branding extension). In the meantime, it must at least work for
French, German, Italian, Portuguese and Spanish.
* The virtual keyboard must work and be auto-configured to use the same keyboard
layout as the X session.
* The Startpage search engine must be localized for the languages we ship a
searchplug for:
find /etc/iceweasel/searchplugins/locale/ -iname startpage-*.html
* The Wikipedia search engine must be localized for all languages.
## Spellchecking
* Check that every supported language is listed in the list of languages for
spell checking.
- Visit <https://translate.google.com/>.
- Right-click and choose "Check spelling".
- Right-click and check the list of available languages.
* For a few languages, check the spell checking:
- Type something in the textarea.
- Right-click and select a language.
- Verify that the spelling suggestion are from that language.
* Once [[!tails_ticket 5962]] is fixed, the browser spelling dictionary must be
localized (for languages that are supported by our branding extension).
# Misc
* Check that Tails Greeter's "more options" screen displays properly
on a display with 600 px height.
* Check that all seems well during init (mostly that all services
start without errors), and that dmesg seems ok.
* MAT should be able to clean a PDF file.
* MAT should be able to clean a PDF file, such as:
<http://examples.itextpdf.com/results/part3/chapter12/pdf_metadata.pdf>
* Browsing (by hostname) a FTP server on the Internet should be
possible using GNOME's *Connect to server* feature
(once [[!tails_todo fix Internet FTP support]] is fixed)
* The Tails signing key in `/usr/share/keyrings/tails-keyring.gpg`
should be up-to-date (that is, neither it nor one its subkeys must
have expired, or be about to expire any time soon).
(once [[!tails_ticket 6096]] is fixed)
* The Tails signing key shipped should be up-to-date (that is, neither it nor
one its subkeys must have expired, or be about to expire any time soon).
- `gpg --list-keys 1202821CBE2CD9C1`
......@@ -191,6 +191,8 @@ This step:
This is required for steps enabling Tails Greeter options, like the
next one, or the `I enable Microsoft Windows XP camouflage` step.
Note that the "I set sudo password ..." step has to be run before the
other Tails Greeter option steps as it relies on keyboard navigation.
And I set sudo password "asdf"
......
Memory erasure
==============
0.23~rc1
--------
### Iceweasel WebRTC
- getUserMedia → Video + Picture
- on Tails 0.22.1: NO_DEVICES_FOUND
- on Tails 0.23: Stop - Pause/Play - Snapshot
- getUserMedia → Audio + Audio/Video
- on Tails 0.22.1: dialog to share a microphone + Stop - Pause/Play - Snapshot
- on Tails 0.23: Stop - Pause/Play - Snapshot
intrigeri: I see nothing working for real, and the landing page says
"mozRTCPeerConnection is missing!", so perhaps that's OK-ish. I can't
find any related change in the patches we apply, strange.
0.21
----
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-03-05 01:07+0100\n"
"POT-Creation-Date: 2014-03-11 16:41+0100\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"
......@@ -67,11 +67,11 @@ msgid ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
" Messaging\n"
"* [Claws Mail](http://www.claws-mail.org/) e-mail client, with\n"
" user-friendly GnuPG support\n"
" GnuPG support\n"
"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
"* [Aircrack-ng](http://aircrack-ng.org/) for wireless networks auditing\n"
"* [I2P](http://www.i2p2.de/) an anonymizing network\n"
"* [I2P](https://geti2p.net/) an anonymizing network\n"
msgstr ""
#. type: Title -
......@@ -153,6 +153,12 @@ msgid ""
"data encyption and signing"
msgstr ""
#. type: Bullet: '* '
msgid ""
"[Monkeysign](http://web.monkeysphere.info/monkeysign), a tool for OpenPGP "
"key signing and exchange"
msgstr ""
#. type: Bullet: '* '
msgid ""
"[[TrueCrypt|encryption_and_privacy/truecrypt]] a disk encryption software"
......@@ -224,7 +230,8 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
"PAE-enabled kernel with NX-bit and SMP support on hardware that supports it"
"64-bit PAE-enabled kernel with NX-bit and SMP support on hardware that "
"supports it"
msgstr ""
#. type: Bullet: '* '
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-03-05 01:07+0100\n"
"POT-Creation-Date: 2014-03-11 16:41+0100\n"
"PO-Revision-Date: 2013-12-17 11:58+0100\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -44,7 +44,34 @@ msgid "Networking\n"
msgstr "Réseau\n"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| "* [Tor](https://www.torproject.org) with:\n"
#| " - [[stream isolation|contribute/design/stream_isolation]]\n"
#| " - regular and obfsproxy bridges support\n"
#| " - the [Vidalia](https://www.torproject.org/projects/vidalia) graphical frontend\n"
#| "* [NetworkManager](http://projects.gnome.org/NetworkManager/) for easy\n"
#| " network configuration\n"
#| "* [Firefox](http://getfirefox.com) preconfigured with:\n"
#| " - TorBrowser patches\n"
#| " - [Torbutton](https://www.torproject.org/torbutton) for anonymity\n"
#| " and protection against evil JavaScript\n"
#| " - all cookies are treated as session cookies by default;\n"
#| " the [CS Lite](https://addons.mozilla.org/fr/firefox/addon/5207/)\n"
#| " extension provides more fine-grained cookie control for those who\n"
#| " need it\n"
#| " - [HTTPS Everywhere](https://www.eff.org/https-everywhere)\n"
#| " transparently enables SSL-encrypted connections to a great number\n"
#| " of major websites\n"
#| "* [Pidgin](http://www.pidgin.im/) preconfigured with\n"
#| " [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
#| " Messaging\n"
#| "* [Claws Mail](http://www.claws-mail.org/) e-mail client, with\n"
#| " user-friendly GnuPG support\n"
#| "* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
#| "* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
#| "* [Aircrack-ng](http://aircrack-ng.org/) for wireless networks auditing\n"
#| "* [I2P](http://www.i2p2.de/) an anonymizing network\n"
msgid ""
"* [Tor](https://www.torproject.org) with:\n"
" - [[stream isolation|contribute/design/stream_isolation]]\n"
......@@ -67,11 +94,11 @@ msgid ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
" Messaging\n"
"* [Claws Mail](http://www.claws-mail.org/) e-mail client, with\n"
" user-friendly GnuPG support\n"
" GnuPG support\n"
"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
"* [Aircrack-ng](http://aircrack-ng.org/) for wireless networks auditing\n"
"* [I2P](http://www.i2p2.de/) an anonymizing network\n"
"* [I2P](https://geti2p.net/) an anonymizing network\n"
msgstr ""
"* [Tor](https://www.torproject.org) avec [[isolation\n"
" de flux|contribute/design/stream_isolation]] et son\n"
......@@ -178,6 +205,12 @@ msgstr ""
"[GnuPG](http://gnupg.org/), l'implémentation d'OpenPGP par GNU adaptée aux "
"courriers électroniques, au chiffrement des données et à leur signature"
#. type: Bullet: '* '
msgid ""
"[Monkeysign](http://web.monkeysphere.info/monkeysign), a tool for OpenPGP "
"key signing and exchange"
msgstr ""
#. type: Bullet: '* '
msgid ""
"[[TrueCrypt|encryption_and_privacy/truecrypt]] a disk encryption software"
......@@ -260,8 +293,13 @@ msgstr ""
"sur un ordinateur de bureau récent"
#. type: Bullet: '* '
#, fuzzy
#| msgid ""
#| "PAE-enabled kernel with NX-bit and SMP support on hardware that supports "
#| "it"
msgid ""
"PAE-enabled kernel with NX-bit and SMP support on hardware that supports it"
"64-bit PAE-enabled kernel with NX-bit and SMP support on hardware that "
"supports it"
msgstr ""
"noyau PAE avec NX-bit et prise en charge du SMP pour le matériel qui le "
"supporte"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-03-05 01:07+0100\n"
"POT-Creation-Date: 2014-03-11 16:41+0100\n"
"PO-Revision-Date: 2012-07-08 23:08-0300\n"
"Last-Translator: drebs <drebs@riseup.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -92,11 +92,11 @@ msgid ""
" [OTR](http://www.cypherpunks.ca/otr/index.php) for Off-the-Record\n"
" Messaging\n"
"* [Claws Mail](http://www.claws-mail.org/) e-mail client, with\n"
" user-friendly GnuPG support\n"
" GnuPG support\n"
"* [Liferea](http://liferea.sourceforge.net/) feed aggregator\n"
"* [Gobby](http://gobby.0x539.de/trac/) for collaborative text writing\n"
"* [Aircrack-ng](http://aircrack-ng.org/) for wireless networks auditing\n"
"* [I2P](http://www.i2p2.de/) an anonymizing network\n"
"* [I2P](https://geti2p.net/) an anonymizing network\n"
msgstr ""
"* [Tor](https://www.torproject.org) e seu gerenciador gráfico\n"
" [Vidalia](https://www.torproject.org/projects/vidalia).\n"
......@@ -200,6 +200,12 @@ msgstr ""
"[GnuPG](http://gnupg.org/), a implementação GNU do OpenPGP para email, "
"criptografia e assinaturas digitais"
#. type: Bullet: '* '
msgid ""
"[Monkeysign](http://web.monkeysphere.info/monkeysign), a tool for OpenPGP "
"key signing and exchange"
msgstr ""
#. type: Bullet: '* '
msgid ""
"[[TrueCrypt|encryption_and_privacy/truecrypt]] a disk encryption software"
......@@ -278,7 +284,8 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
"PAE-enabled kernel with NX-bit and SMP support on hardware that supports it"
"64-bit PAE-enabled kernel with NX-bit and SMP support on hardware that "
"supports it"
msgstr ""
#. type: Bullet: '* '
......
......@@ -51,6 +51,12 @@ You must have at hand at least one bridge address before
starting Tails. For example, you can write it down on a piece of paper
or store it in the [[persistent volume|doc/first_steps/persistence]].
Tails allows you to use bridges of the following types:
- `bridge`
- `obfs2`
- `obfs3`
To use bridges, choose to configure bridge settings from [[<span
class="application">Tails Greeter</span>|startup_options#tails_greeter]] as
explained in the [[network configuration|network_configuration]] documentation.
......
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.