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

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

parents e824f882 8e207c5e
......@@ -17,3 +17,6 @@ Random notes:
* Michael Prokop [gives
pointers](http://michael-prokop.at/blog/2014/07/23/book-review-the-docker-book/)
about Docker integration with Jenkins.
* As far as our build system is concerned, we don't care much to
protect the host system from the build container. The main goal is
to produce a reliable build environment.
......@@ -2,7 +2,7 @@
**Ticket**: [[!tails_ticket 5464 desc="#5464"]]
[[!toc levels=2]]
[[!toc levels=3]]
Rationale
=========
......@@ -37,18 +37,24 @@ Flow
1st screen
----------
### First-time use
When started from DVD or freshly installed media:
[[!img greeter-1st-screen-dvd.png size="" alt=""]]
<a href="greeter-1st-screen-dvd.svg">source</a>
### Persistence
On a media with a persistent volume:
[[!img greeter-1st-screen-persistence.png size="" alt=""]]
<a href="greeter-1st-screen-persistence.svg">source</a>
### Saved localization
On a media with saved language and a persistent volume:
[[!img greeter-1st-screen-langsaved.png size="" alt=""]]
......@@ -77,6 +83,11 @@ Guided configuration
<a href="greeter-guided-check.svg">source</a>
### Resources
- [Smashing magazine: Progress Trackers in Web Design: Examples and Best
Practices](http://www.smashingmagazine.com/2010/01/15/progress-trackers-in-web-design-examples-and-best-design-practices/)
Advanced configuration
----------------------
......
......@@ -93,6 +93,8 @@ network. It looks doable given it's a separate process: we may run it
as a dedicated user, and reuse the `clearnet` infrastructure
implemented for the Unsafe Browser.
[[!tails_ticket 7878]]
### "Retry with new circuit" button
Circuit throughput varies wildly, and since this is a large download,
......
[[!meta title="Next monthly meeting: September 2014"]]
[[!meta title="Next monthly meeting: October 2014"]]
[[Official place and date are in the calendar.|contribute/calendar]]
......@@ -8,10 +8,13 @@ Agenda
Availability and plans for the next weeks
-----------------------------------------
- Volunteers to handle broken windows this month?
- Monthly low-hanging fruits meeting?
- Volunteers to handle "[Hole in the roof](https://labs.riseup.net/code/versions/198)" tickets this month
- Availability and plans for monthly low-hanging fruits meeting
Discussions
-----------
- Adopt the Hackfest'policy as Code of Conduct? See https://mailman.boum.org/pipermail/tails-project/2014-August/000013.html
- [Roadmap amendments proposal](https://mailman.boum.org/pipermail/tails-dev/2014-September/006867.html)
- [[!tails_ticket 6051 desc="Migrate master Git repository to immerda"]]
- [[!tails_ticket 7778 desc="Have an easy way to use or discover Tails OpenPGP Applet from Iceweasel"]]
- [[!tails_ticket 7887 desc="Use Iceweasel as the default PDF reader"]]
[[!meta title="Calendar"]]
* 2014-09-02: Release Tails 1.1.1. intrigeri does the first ~half of
the RM duty, anonym takes over around 2014-08-20.
* 2014-09-28: Feature freeze for Tails 1.2.
* 2014-09-03, 7pm UTC (9pm CEST): Tails contributors meeting
(`#tails-meeting` on `irc.indymedia.org` / `h7gf2ha3hefoj5ls.onion`)
* 2014-09-29:
- Tag Tails 1.2-rc1 in Git.
- Build and upload Tails 1.2-rc1 ISO/IUKs.
* 2014-09-30: Test Tails 1.2-rc1.
* 2014-10-01: Release Tails 1.2-rc1.
* 2014-10-03: [[Monthly meeting|contribute/meetings]]
* 2014-10-12:
- Firefox 31.2.0 ESR sources are available.
- Package and upload Firefox 31.2.0 ESR? Or use TBB?
- Tag Tails 1.2 in Git.
- Build and upload Tails 1.2 ISO and IUKs,
* 2014-10-13: Test Tails 1.2,
* 2014-10-14: Release Tails 1.2. anonym is RM.
* 2014-11-03: [[Monthly meeting|contribute/meetings]]
* 2014-11-25: Release 1.2.1. anonym is RM.
* 2014-12-03: [[Monthly meeting|contribute/meetings]]
* 2015-01-03: [[Monthly meeting|contribute/meetings]]
* 2015-01-06: Release 1.2.2. anonym is RM. If Mozilla decides to send
their employees on vacation, delaying the Firefox ESR release for a
week or two, anonym can still be RM.
* 2015-02-03: [[Monthly meeting|contribute/meetings]]
* 2015-02-17: Release 1.3. Still undecided who will be RM, but anonym
probably can do it.
* 2015-03-03: [[Monthly meeting|contribute/meetings]]
......@@ -2,7 +2,7 @@ One serious security issue is that we don't know what software will
attempt to contact the network and whether their proxy settings are
set up to use the Tor SOCKS proxy or polipo HTTP(s) proxy correctly.
This is solved by blocking all outbound Internet traffic except Tor
and I2P, and explicitly configure all applications to use either of
(and I2P when enabled), and explicitly configure all applications to use either of
these.
- [[!tails_gitweb config/chroot_local-includes/etc/ferm/ferm.conf]]
......
......@@ -3,11 +3,10 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-08-12 22:33+0200\n"
"POT-Creation-Date: 2014-09-22 12:27+0300\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"
......@@ -42,7 +41,8 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
"Crowdfunding campaign run by the American organization [Freedom of the Press "
"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-journalists)."
"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
"journalists)."
msgstr ""
#. type: Plain text
......@@ -59,11 +59,9 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
" If you live in Europe, your donation might be tax-deductible. Check what "
"are\n"
" If you live in Europe, your donation might be tax-deductible. Check what are\n"
" the precise conditions in your country, and [ask\n"
" Zwiebelfreunde](https://www.torservers.net/contact.html) for a "
"donation\n"
" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
" receipt if you need one.\n"
msgstr ""
......@@ -73,9 +71,9 @@ msgstr ""
#. type: Bullet: ' * '
msgid ""
"If none of these methods suit you, consider [donating to the Tor "
"Project](https://www.torproject.org/donate/). They do great work, and also "
"support us financially."
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
msgstr ""
#. type: Plain text
......@@ -94,9 +92,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"You can send Bitcoins to **<a "
"href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
msgstr ""
#. type: Plain text
......@@ -107,8 +103,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<p>Bitcoin is <a "
"href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
"anonymous</a>.</p>\n"
msgstr ""
......@@ -149,8 +144,8 @@ msgstr ""
#. type: Plain text
msgid ""
"Please, use the euro (EUR) as currency as this makes accounting "
"easier. However, Paypal automatically converts it to your local currency."
"Please, use the euro (EUR) as currency as this makes accounting easier. "
"However, Paypal automatically converts it to your local currency."
msgstr ""
#. type: Title ###
......@@ -161,32 +156,22 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
"target='_blank' class='donation'>\n"
"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
"\t<input type=\"hidden\" name=\"business\" "
"value=\"donate@torservers.net\"/>\n"
"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring "
"donation\"/>\n"
"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" "
"checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label "
"for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label "
"for=\"sub20\">20</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label "
"for=\"sub10\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label "
"for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label "
"for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label "
"for=\"sub500\">500</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
"\t<select name=\"currency_code\">\n"
"\t\t\t<option value='EUR'>EUR</option>\n"
"\t\t\t<option value='USD'>USD</option>\n"
......@@ -213,12 +198,9 @@ msgid ""
"\t\t\t<option value='THB'>THB</option>\n"
"\t</select>\n"
"\t<br/>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" "
"checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label "
"for=\"sub_q\">quarterly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label "
"for=\"sub_y\">yearly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
"\t<br/>\n"
"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
"</form>\n"
......@@ -232,25 +214,18 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' "
"method='post' target='_blank' class='donation'>\n"
"<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>\n"
"\t<input name='cmd' type='hidden' value='_donations' />\n"
"\t<input name='business' type='hidden' value='donate@torservers.net' />\n"
"\t<input name='item_name' type='hidden' value='Tails one-time donation' />\n"
"\t<input type=\"hidden\" name=\"no_shipping\" value=\"1\"/>\n"
"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label "
"for=\"pp_5\">5</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label "
"for=\"pp_10\">10</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label "
"for=\"pp_20\">20</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label "
"for=\"pp_50\">50</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
"for=\"pp_100\">100</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" "
"checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"5\" id=\"pp_5\" /><label for=\"pp_5\">5</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">10</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">20</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">50</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label for=\"pp_100\">100</label>\n"
"\t<input type=\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\" checked=\"checked\"/><label for=\"pp_cust\">custom amount</label>\n"
"\t<select name=\"currency_code\">\n"
"\t\t<option value='EUR'>EUR</option>\n"
"\t\t<option value='USD'>USD</option>\n"
......@@ -288,6 +263,5 @@ msgstr ""
#. type: Plain text
msgid ""
"Our [[financial documents|doc/about/finances]] are available for your "
"review."
"Our [[financial documents|doc/about/finances]] are available for your review."
msgstr ""
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-08-26 15:53-0300\n"
"POT-Creation-Date: 2014-09-22 12:27+0300\n"
"PO-Revision-Date: 2014-08-14 10:59+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -194,7 +194,7 @@ msgid ""
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub10\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
......@@ -243,7 +243,7 @@ msgstr ""
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub10\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
......
......@@ -76,7 +76,7 @@ automatically converts it to your local currency.
<input type="radio" name="a3" value="5" id="sub5" checked="checked" /><label for="sub5">5</label>
<input type="radio" name="a3" value="10" id="sub10"/><label for="sub10">10</label>
<input type="radio" name="a3" value="20" id="sub20"/><label for="sub20">20</label>
<input type="radio" name="a3" value="50" id="sub50"/><label for="sub10">50</label>
<input type="radio" name="a3" value="50" id="sub50"/><label for="sub50">50</label>
<input type="radio" name="a3" value="100" id="sub100"/><label for="sub100">100</label>
<input type="radio" name="a3" value="250" id="sub250"/><label for="sub250">250</label>
<input type="radio" name="a3" value="500" id="sub500"/><label for="sub500">500</label>
......
......@@ -3,13 +3,12 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2014-08-12 22:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-09-22 12:27+0300\n"
"PO-Revision-Date: 2014-09-15 12:30-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
......@@ -19,7 +18,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!meta title=\"Make a donation\"]]\n"
msgstr ""
msgstr "[[!meta title=\"Faça uma doação\"]]\n"
#. type: Plain text
#, no-wrap
......@@ -27,105 +26,119 @@ msgid ""
"**Your support is critical to our success.** Consider making\n"
"a donation to Tails.\n"
msgstr ""
"**Seu apoio é crítico para nosso sucesso.** Considere fazer\n"
"uma doação para o Tails.\n"
#. type: Plain text
msgid ""
"Note that Tails is a project mainly run by volunteers. There are [[many "
"other ways to contribute|contribute]]!"
msgstr ""
"Note que Tails é um projeto executado principalmente por voluntários/as. "
"Existem [[muitas outras formas de contribuir|contribute]]!"
#. type: Title =
#, no-wrap
msgid "Ways to donate\n"
msgstr ""
msgstr "Formas de doação\n"
#. type: Bullet: ' * '
msgid ""
"Crowdfunding campaign run by the American organization [Freedom of the Press "
"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-journalists)."
"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
"journalists)."
msgstr ""
"Campanha de financiamento coletivo coordenada pela organização americana "
"[Freedom of the Press Foundation](https://pressfreedomfoundation.org/bundle/"
"encryption-tools-journalists)."
#. type: Plain text
#, no-wrap
msgid " If you live in the US, your donation will be tax-deductible.\n"
msgstr ""
msgstr " Se você vive nos Estados Unidos da América, sua doação será dedutível de impostos.\n"
#. type: Bullet: ' * '
msgid ""
"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
msgstr ""
"[[Transferência bancária|donate#swift]] ou [[Paypal|donate#paypal]] através "
"da organização alemã [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
#. type: Plain text
#, no-wrap
msgid ""
" If you live in Europe, your donation might be tax-deductible. Check what "
"are\n"
" If you live in Europe, your donation might be tax-deductible. Check what are\n"
" the precise conditions in your country, and [ask\n"
" Zwiebelfreunde](https://www.torservers.net/contact.html) for a "
"donation\n"
" Zwiebelfreunde](https://www.torservers.net/contact.html) for a donation\n"
" receipt if you need one.\n"
msgstr ""
" Se você vive na Europa, é possível que sua doação seja dedutível de impostos. Verifique\n"
" quais são exatamente as condições no seu país, e [peça à\n"
" Zwiebelfreunde](https://www.torservers.net/contact.html) um recibo\n"
" caso você precise de um.\n"
#. type: Bullet: ' * '
msgid "[[Bitcoin|donate#bitcoin]]"
msgstr ""
msgstr "[[Bitcoin|donate#bitcoin]]"
#. type: Bullet: ' * '
msgid ""
"If none of these methods suit you, consider [donating to the Tor "
"Project](https://www.torproject.org/donate/). They do great work, and also "
"support us financially."
"If none of these methods suit you, consider [donating to the Tor Project]"
"(https://www.torproject.org/donate/). They do great work, and also support "
"us financially."
msgstr ""
"Se nenhum destes métodos são bons pra você, considere [fazer uma doação para "
"o Projeto Tor](https://www.torproject.org/donate/). Eles fazem um ótimo "
"trabalho, e também nos apoiam financeiramente."
#. type: Plain text
msgid "Thank you for your donation!"
msgstr ""
msgstr "Obrigado por sua doação!"
#. type: Plain text
#, no-wrap
msgid "<a id=\"bitcoin\"></a>\n"
msgstr ""
msgstr "<a id=\"bitcoin\"></a>\n"
#. type: Title -
#, no-wrap
msgid "Bitcoin\n"
msgstr ""
msgstr "Bitcoin\n"
#. type: Plain text
#, no-wrap
msgid ""
"You can send Bitcoins to **<a "
"href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
msgstr ""
msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
msgstr "Você pode enviar Bitcoins para **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
#. type: Plain text
#, no-wrap
msgid "<div class=\"caution\">\n"
msgstr ""
msgstr "<div class=\"caution\">\n"
#. type: Plain text
#, no-wrap
msgid ""
"<p>Bitcoin is <a "
"href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
"anonymous</a>.</p>\n"
msgstr ""
"<p>Bitcoin <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">não\n"
"é anônimo</a>.</p>\n"
#. type: Plain text
#, no-wrap
msgid "</div>\n"
msgstr ""
msgstr "</div>\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"swift\"></a>\n"
msgstr ""
msgstr "<a id=\"swift\"></a>\n"
#. type: Title -
#, no-wrap
msgid "Bank wire transfer\n"
msgstr ""
msgstr "Transferência bancária\n"
#. type: Plain text
#, no-wrap
......@@ -136,57 +149,55 @@ msgid ""
" BIC: GENODEM1GLS\n"
" Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
msgstr ""
" Titular da conta: Zwiebelfreunde e.V.\n"
" Nome do banco: GLS Gemeinschaftsbank eG\n"
" IBAN: DE25430609671126825603\n"
" BIC: GENODEM1GLS\n"
" Endereço do banco: Christstrasse 9, 44789 Bochum, Alemanha\n"
#. type: Plain text
#, no-wrap
msgid "<a id=\"paypal\"></a>\n"
msgstr ""
msgstr "<a id=\"paypal\"></a>\n"
#. type: Title -
#, no-wrap
msgid "Paypal\n"
msgstr ""
msgstr "Paypal\n"
#. type: Plain text
msgid ""
"Please, use the euro (EUR) as currency as this makes accounting "
"easier. However, Paypal automatically converts it to your local currency."
"Please, use the euro (EUR) as currency as this makes accounting easier. "
"However, Paypal automatically converts it to your local currency."
msgstr ""
"Por favor, use euros (EUR) como moeda pois isto facilita nossa "
"contabilidade. De qualquer forma, o Paypal converte automaticamente para sua "
"moeda local."
#. type: Title ###
#, no-wrap
msgid "Set up a recurring donation"
msgstr ""
msgstr "Configure uma doação periódica"
#. type: Plain text
#, no-wrap
msgid ""
"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
"target='_blank' class='donation'>\n"
"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
"\t<input type=\"hidden\" name=\"business\" "
"value=\"donate@torservers.net\"/>\n"
"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring "
"donation\"/>\n"
"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" "
"checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label "
"for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label "
"for=\"sub20\">20</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label "
"for=\"sub10\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label "
"for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label "
"for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label "
"for=\"sub500\">500</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
"\t<select name=\"currency_code\">\n"
"\t\t\t<option value='EUR'>EUR</option>\n"
"\t\t\t<option value='USD'>USD</option>\n"
......@@ -213,44 +224,82 @@ msgid ""
"\t\t\t<option value='THB'>THB</option>\n"
"\t</select>\n"
"\t<br/>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" "
"checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label "
"for=\"sub_q\">quarterly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label "
"for=\"sub_y\">yearly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"1\" id=\"sub_m\" checked=\"checked\" /><label for=\"sub_m\">monthly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"3\" id=\"sub_q\"/><label for=\"sub_q\">quarterly</label>\n"
"\t<input type=\"radio\" name=\"p3\" value=\"12\" id=\"sub_y\"/><label for=\"sub_y\">yearly</label>\n"
"\t<br/>\n"
"\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
"</form>\n"
msgstr ""
"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target='_blank' class='donation'>\n"
"\t<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/>\n"
"\t<input type=\"hidden\" name=\"business\" value=\"donate@torservers.net\"/>\n"
"\t<input type=\"hidden\" name=\"item_name\" value=\"Tails recurring donation\"/>\n"
"\t<input type=\"hidden\" name=\"no_note\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"src\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"modify\" value=\"1\"/>\n"
"\t<input type=\"hidden\" name=\"t3\" value=\"M\"/>\n"
"\t<input name=\"lc\" type=\"hidden\" value=\"US\" />\n"
"\t<input type=\"radio\" name=\"a3\" value=\"5\" id=\"sub5\" checked=\"checked\" /><label for=\"sub5\">5</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"10\" id=\"sub10\"/><label for=\"sub10\">10</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"20\" id=\"sub20\"/><label for=\"sub20\">20</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"50\" id=\"sub50\"/><label for=\"sub50\">50</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"100\" id=\"sub100\"/><label for=\"sub100\">100</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"250\" id=\"sub250\"/><label for=\"sub250\">250</label>\n"
"\t<input type=\"radio\" name=\"a3\" value=\"500\" id=\"sub500\"/><label for=\"sub500\">500</label>\n"
"\t<select name=\"currency_code\">\n"