Commit 694210bc authored by elouann's avatar elouann

Merge branch 'master' of https://git-tails.immerda.ch/tails into from-atomike-test_2.0-beta1

Conflicts:
	wiki/src/news/test_2.0-beta1.fr.po
parents 8d2b2815 f44e6e58
[[!meta title="About possible derivatives"]]
What for:
- Include additional features that we are not ready to add to Tails (for example
to include GNUnet or Namecoin).
- Have custom branding or configuration.
- Provide ISO images with less or different features (for example to
have VPN instead of Tor).
Why is it complicated:
- Release every 6 weeks, plus the occasional unscheduled emergency
security release
- Heavy quality assurance process (automated builds and tests)
- Complex infrastructure (upgrades)
- User trust (authenticated downloads, OpenPGP Web-of-Trust)
- Fingerprinting & partitioning users into a anonymity subset
- For features that are not in Tails because there has been no time or
solution for doing them correctly, the temptation to just shove them
in hastily and call it done
Good ways of doing it:
- Don't build your own ISO images.
- Package your specific applications in Debian to make them easier to
use in Tails.
- Document how to use your specific applications in Tails.
- Rely on the mechanisms already available in Tails to adapt it to your
needs (additional software packages, persistent storage).
- Help us build in Tails other mechanisms that you might need to adapt
it to your needs (for example to have persistent DConf settings or APT
sources).
- Talk with us to see how we can adapt our ISO images and source code to make them
easier for your to reuse.
- If you want to include a piece of software into Tails, talk to us as
early as possible so we can provide feedback on how to integrate it.
Open questions:
- Trademark aspects. Will derivatives appear as being "Tails" to their
users while having different security features than Tails? Shall we
review ourselves the work of derivatives and "endorse" them? How could
crappy derivatives impact negatively the name and reputation of Tails?
This is about [[!tails_ticket 7642]], [[!tails_ticket 7675]],
and friends.
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-10 15:30+0100\n"
"POT-Creation-Date: 2015-12-26 01:20+0100\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"
......@@ -454,8 +454,9 @@ msgid "<a id=\"upstream\"></a>\n"
msgstr "<a id=\"upstream\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Relationship with upstream\n"
#, fuzzy, no-wrap
#| msgid "Relationship with upstream\n"
msgid "Relationship with upstream and derivatives\n"
msgstr "Verhältnis zum Upstream\n"
#. type: Bullet: ' - '
......@@ -467,6 +468,10 @@ msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
msgstr ""
"[[Tails verbessern, indem Sie an Debian mitarbeiten|contribute/how/help]]"
#. type: Bullet: ' - '
msgid "[[About creating Tails derivatives|contribute/derivatives]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"collective-process\"></a>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2015-12-24 15:03+0100\n"
"POT-Creation-Date: 2015-12-26 01:20+0100\n"
"PO-Revision-Date: 2015-10-15 15:23+0000\n"
"Last-Translator: sprint5 <translation5@451f.org>\n"
"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
......@@ -449,7 +449,7 @@ msgstr "<a id=\"upstream\"></a>\n"
#. type: Title =
#, fuzzy, no-wrap
msgid "Relationship with upstream\n"
msgid "Relationship with upstream and derivatives\n"
msgstr "رابطه با آپ‌استریم\n"
#. type: Bullet: ' - '
......@@ -460,6 +460,10 @@ msgstr "[[رابطه با آپ‌استریم|contribute/relationship_with_upstr
msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
msgstr "[[بهبود تیلز با کار کردن روی دبیان|contribute/how/debian]]"
#. type: Bullet: ' - '
msgid "[[About creating Tails derivatives|contribute/derivatives]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"collective-process\"></a>\n"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2015-12-10 15:30+0100\n"
"POT-Creation-Date: 2015-12-26 01:20+0100\n"
"PO-Revision-Date: 2014-03-26 10:50+0100\n"
"Last-Translator: MR\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -418,7 +418,7 @@ msgstr ""
#. type: Title =
#, no-wrap
msgid "Relationship with upstream\n"
msgid "Relationship with upstream and derivatives\n"
msgstr ""
#. type: Bullet: ' - '
......@@ -429,6 +429,10 @@ msgstr ""
msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
msgstr ""
#. type: Bullet: ' - '
msgid "[[About creating Tails derivatives|contribute/derivatives]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"collective-process\"></a>\n"
......
......@@ -153,11 +153,12 @@ Release cycle
<a id="upstream"></a>
Relationship with upstream
==========================
Relationship with upstream and derivatives
==========================================
- [[Relationship with upstream|contribute/relationship_with_upstream]]
- [[Improve Tails by working on Debian|contribute/how/debian]]
- [[About creating Tails derivatives|contribute/derivatives]]
<a id="collective-process"></a>
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-12-10 15:30+0100\n"
"POT-Creation-Date: 2015-12-26 01:20+0100\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"
......@@ -458,8 +458,9 @@ msgid "<a id=\"upstream\"></a>\n"
msgstr "<a id=\"upstream\"></a>\n"
#. type: Title =
#, no-wrap
msgid "Relationship with upstream\n"
#, fuzzy, no-wrap
#| msgid "Relationship with upstream\n"
msgid "Relationship with upstream and derivatives\n"
msgstr "Relacionamento com upstream\n"
#. type: Bullet: ' - '
......@@ -470,6 +471,10 @@ msgstr "[[Relacionamento com upstream|contribute/relationship_with_upstream]]"
msgid "[[Improve Tails by working on Debian|contribute/how/debian]]"
msgstr "[[Melhore o Tails trabalhando no Debian|contribute/how/debian]]"
#. type: Bullet: ' - '
msgid "[[About creating Tails derivatives|contribute/derivatives]]"
msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"collective-process\"></a>\n"
......
[[!meta title="Calendar"]]
* between 2015-11-30 and 2015-12-26: release Tails 2.0~beta1
* 2015-12-11: feature freeze of Tails 2.0
* 2015-12-14:
- All branches targeting Tails 1.8 *must* be merged into the `stable`
branch by noon, CET.
- The upcoming Tor Browser is hopefully out so we can import it.
- Build and upload Tails 1.8 ISO image and IUKs.
- Hopefully start testing Tails 1.8.
* 2015-12-15:
- Finish testing Tails 1.8 by the afternoon, CET.
- Release Tails 1.8 during late CET.
* 2016-01-11:
- Build and upload Tails 2.0~rc1.
- Start testing Tails 2.0~rc1 during late CET if building the image
......
[[!meta title="About creating Tails derivatives"]]
Several projects expressed interest in reusing Tails to build different
live distributions, also called *derivatives*, to fulfill slightly
different goals.
Tails being Free Software this is not only possible but encouraged,
because the more people look at our code and work on it, the better it gets.
Still, at this time we don't know of any Tails derivative.
Derivatives have been imagined to:
- Include additional features or software that we are not ready to add to Tails (for example
to include different pluggable transports or cryptocurrencies).
- Have custom branding or configuration (for example to provide default
bridges).
- Provide ISO images with less or different features (for example to
have a VPN instead of Tor or a smaller ISO image).
While creating custom ISO images of Tails is relatively easy, we believe
that maintaining custom ISO images on the long run is very complicated,
and for the following reasons:
- We release a new version every 6 weeks which fixes numerous security
issues. We also release unscheduled security releases quite often (3-4
times per year).
A derivative with custom ISO images would have to follow the same
release schedule to provide ISO images that fix these issues as well.
- Before we release them, our ISO images follow a complex quality
assurance process involving systematic peer review of the code,
[[manual|contribute/release_process/test]] and
[[automated|contribute/release_process/test/automated_tests]] tests
which are particularly heavy to run.
A derivative with custom ISO images would have to duplicate our
quality assurance process and adapt it to its specificities to make
sure that it doesn't break any security feature.
- We offer automatic upgrades which are binary diffs from one ISO image
to the other.
A derivative with custom ISO images would need a similar process and
infrastructure or otherwise disable the automatic upgrades mechanism.
- We provide authenticated downloads through a custom browser extension
and an OpenPGP signing key well connected to the web-of-trust.
It would be hard for a derivative with custom ISO images to provide
similar mechanisms.
- The anonymity provided by Tor and Tails works by making everybody
look the same, especially on the network. Derivatives should be
careful about not breaking this anonymity set or they will provide
less anonymity to both its users and Tails users.
- Derivatives could be tempted to implement some of the features Tails
is missing too quickly and hastily.
Still, some of the reasons to create Tails derivatives could be solved
by **relying on our official ISO images** and customizing them at run time.
For example, derivatives could:
- Package specific applications in Debian to make them easier to use in
Tails.
- Document how to use specific applications in Tails.
- Rely on the customizations mechanisms already available in Tails
(additional software packages and persistent storage).
- Help us build in Tails other mechanisms that derivatives might need to
adapt Tails to their needs (for example to have persistent DConf
settings or additional APT sources).
- Talk with us to see how we can adapt our ISO images and source code to
make them easier to reuse for derivatives.
- To include a piece of software into Tails, talk to us as early as
possible so we can provide feedback on how to integrate it.
Some other non-technical questions remain open:
- Will derivatives appear as being "Tails" to their users while having
different security features than Tails?
- Shall Tails review ourselves the work of derivatives and "endorse"
them officially?
- How would the work or reputation of derivatives impact the reputation
of Tails?
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-09-16 17:02+0300\n"
"POT-Creation-Date: 2015-12-30 15:53+0100\n"
"PO-Revision-Date: 2015-03-16 22:03+0100\n"
"Last-Translator: Tails developers <tails@boum.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -197,11 +197,60 @@ msgid "Set up a recurring donation"
msgstr "Eine Spende per Dauerauftrag einrichten"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| "<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"
#| "\t\t\t<option value='EUR'>EUR</option>\n"
#| "\t\t\t<option value='USD'>USD</option>\n"
#| "\t\t\t<option value='GBP'>GBP</option>\n"
#| "\t\t\t<option value='CAD'>CAD</option>\n"
#| "\t\t\t<option value='AUD'>AUD</option>\n"
#| "\t\t\t<option value='NZD'>NZD</option>\n"
#| "\t\t\t<option value='SEK'>SEK</option>\n"
#| "\t\t\t<option value='CZK'>CZK</option>\n"
#| "\t\t\t<option value='PLN'>PLN</option>\n"
#| "\t\t\t<option value='DKK'>DKK</option>\n"
#| "\t\t\t<option value='NOK'>NOK</option>\n"
#| "\t\t\t<option value='MXN'>MXN</option>\n"
#| "\t\t\t<option value='CHF'>CHF</option>\n"
#| "\t\t\t<option value='HKD'>HKD</option>\n"
#| "\t\t\t<option value='HUF'>HUF</option>\n"
#| "\t\t\t<option value='ILS'>ILS</option>\n"
#| "\t\t\t<option value='BRL'>BRL</option>\n"
#| "\t\t\t<option value='JPY'>JPY</option>\n"
#| "\t\t\t<option value='MYR'>MYR</option>\n"
#| "\t\t\t<option value='PHP'>PHP</option>\n"
#| "\t\t\t<option value='SGD'>SGD</option>\n"
#| "\t\t\t<option value='TWD'>TWD</option>\n"
#| "\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<br/>\n"
#| "\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
#| "</form>\n"
msgid ""
"<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=\"business\" value=\"tails@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"
......@@ -303,11 +352,52 @@ msgid "Make a one-time donation"
msgstr "Eine einmalige Spende tätigen"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| "<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<select name=\"currency_code\">\n"
#| "\t\t<option value='EUR'>EUR</option>\n"
#| "\t\t<option value='USD'>USD</option>\n"
#| "\t\t<option value='GBP'>GBP</option>\n"
#| "\t\t<option value='CAD'>CAD</option>\n"
#| "\t\t<option value='AUD'>AUD</option>\n"
#| "\t\t<option value='NZD'>NZD</option>\n"
#| "\t\t<option value='SEK'>SEK</option>\n"
#| "\t\t<option value='CZK'>CZK</option>\n"
#| "\t\t<option value='PLN'>PLN</option>\n"
#| "\t\t<option value='DKK'>DKK</option>\n"
#| "\t\t<option value='NOK'>NOK</option>\n"
#| "\t\t<option value='MXN'>MXN</option>\n"
#| "\t\t<option value='CHF'>CHF</option>\n"
#| "\t\t<option value='HKD'>HKD</option>\n"
#| "\t\t<option value='HUF'>HUF</option>\n"
#| "\t\t<option value='ILS'>ILS</option>\n"
#| "\t\t<option value='BRL'>BRL</option>\n"
#| "\t\t<option value='JPY'>JPY</option>\n"
#| "\t\t<option value='MYR'>MYR</option>\n"
#| "\t\t<option value='PHP'>PHP</option>\n"
#| "\t\t<option value='SGD'>SGD</option>\n"
#| "\t\t<option value='TWD'>TWD</option>\n"
#| "\t\t<option value='THB'>THB</option>\n"
#| "\t</select>\n"
#| "\t<br/>\n"
#| "\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
#| "</form>\n"
msgid ""
"<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='business' type='hidden' value='tails@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"
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-09-26 10:31+0200\n"
"POT-Creation-Date: 2015-12-30 15:53+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"
......@@ -173,7 +173,7 @@ msgstr ""
msgid ""
"<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=\"business\" value=\"tails@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"
......@@ -231,7 +231,7 @@ msgstr ""
msgid ""
"<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='business' type='hidden' value='tails@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"
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-09-16 17:02+0300\n"
"POT-Creation-Date: 2015-12-30 15:53+0100\n"
"PO-Revision-Date: 2015-03-16 22:03+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
......@@ -197,11 +197,60 @@ msgid "Set up a recurring donation"
msgstr "Faire un don régulier"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| "<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"
#| "\t\t\t<option value='EUR'>EUR</option>\n"
#| "\t\t\t<option value='USD'>USD</option>\n"
#| "\t\t\t<option value='GBP'>GBP</option>\n"
#| "\t\t\t<option value='CAD'>CAD</option>\n"
#| "\t\t\t<option value='AUD'>AUD</option>\n"
#| "\t\t\t<option value='NZD'>NZD</option>\n"
#| "\t\t\t<option value='SEK'>SEK</option>\n"
#| "\t\t\t<option value='CZK'>CZK</option>\n"
#| "\t\t\t<option value='PLN'>PLN</option>\n"
#| "\t\t\t<option value='DKK'>DKK</option>\n"
#| "\t\t\t<option value='NOK'>NOK</option>\n"
#| "\t\t\t<option value='MXN'>MXN</option>\n"
#| "\t\t\t<option value='CHF'>CHF</option>\n"
#| "\t\t\t<option value='HKD'>HKD</option>\n"
#| "\t\t\t<option value='HUF'>HUF</option>\n"
#| "\t\t\t<option value='ILS'>ILS</option>\n"
#| "\t\t\t<option value='BRL'>BRL</option>\n"
#| "\t\t\t<option value='JPY'>JPY</option>\n"
#| "\t\t\t<option value='MYR'>MYR</option>\n"
#| "\t\t\t<option value='PHP'>PHP</option>\n"
#| "\t\t\t<option value='SGD'>SGD</option>\n"
#| "\t\t\t<option value='TWD'>TWD</option>\n"
#| "\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<br/>\n"
#| "\t<input type=\"submit\" value=\"Subscribe\" class=\"button\" />\n"
#| "</form>\n"
msgid ""
"<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=\"business\" value=\"tails@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"
......@@ -303,11 +352,52 @@ msgid "Make a one-time donation"
msgstr "Faire un don ponctuel"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| "<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<select name=\"currency_code\">\n"
#| "\t\t<option value='EUR'>EUR</option>\n"
#| "\t\t<option value='USD'>USD</option>\n"
#| "\t\t<option value='GBP'>GBP</option>\n"
#| "\t\t<option value='CAD'>CAD</option>\n"
#| "\t\t<option value='AUD'>AUD</option>\n"
#| "\t\t<option value='NZD'>NZD</option>\n"
#| "\t\t<option value='SEK'>SEK</option>\n"
#| "\t\t<option value='CZK'>CZK</option>\n"
#| "\t\t<option value='PLN'>PLN</option>\n"
#| "\t\t<option value='DKK'>DKK</option>\n"
#| "\t\t<option value='NOK'>NOK</option>\n"
#| "\t\t<option value='MXN'>MXN</option>\n"
#| "\t\t<option value='CHF'>CHF</option>\n"
#| "\t\t<option value='HKD'>HKD</option>\n"
#| "\t\t<option value='HUF'>HUF</option>\n"
#| "\t\t<option value='ILS'>ILS</option>\n"
#| "\t\t<option value='BRL'>BRL</option>\n"
#| "\t\t<option value='JPY'>JPY</option>\n"
#| "\t\t<option value='MYR'>MYR</option>\n"
#| "\t\t<option value='PHP'>PHP</option>\n"
#| "\t\t<option value='SGD'>SGD</option>\n"
#| "\t\t<option value='TWD'>TWD</option>\n"
#| "\t\t<option value='THB'>THB</option>\n"
#| "\t</select>\n"
#| "\t<br/>\n"
#| "\t<input type=\"submit\" value=\"Donate\" class=\"button\" />\n"
#| "</form>\n"
msgid ""
"<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='business' type='hidden' value='tails@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"
......
......@@ -72,7 +72,7 @@ automatically converts it to your local currency.
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target='_blank' class='donation'>
<input type="hidden" name="cmd" value="_xclick-subscriptions"/>
<input type="hidden" name="business" value="donate@torservers.net"/>
<input type="hidden" name="business" value="tails@torservers.net"/>
<input type="hidden" name="item_name" value="Tails recurring donation"/>
<input type="hidden" name="no_note" value="1"/>
<input type="hidden" name="src" value="1"/>
......@@ -123,7 +123,7 @@ automatically converts it to your local currency.
<form action='https://www.paypal.com/cgi-bin/webscr' id='paypalForm' method='post' target='_blank' class='donation'>
<input name='cmd' type='hidden' value='_donations' />
<input name='business' type='hidden' value='donate@torservers.net' />
<input name='business' type='hidden' value='tails@torservers.net' />
<input name='item_name' type='hidden' value='Tails one-time donation' />
<input type="hidden" name="no_shipping" value="1"/>
<input name="lc" type="hidden" value="US" />
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-09-16 17:02+0300\n"
"POT-Creation-Date: 2015-12-30 15:53+0100\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"
......@@ -192,11 +192,60 @@ msgid "Set up a recurring donation"
msgstr "Configure uma doação periódica"
#. type: Plain text
#, no-wrap
#, fuzzy, no-wrap
#| msgid ""
#| "<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"
#| "\t\t\t<option value='EUR'>EUR</option>\n"
#| "\t\t\t<option value='USD'>USD</option>\n"
#| "\t\t\t<option value='GBP'>GBP</option>\n"
#| "\t\t\t<option value='CAD'>CAD</option>\n"
#| "\t\t\t<option value='AUD'>AUD</option>\n"
#| "\t\t\t<option value='NZD'>NZD</option>\n"
#| "\t\t\t<option value='SEK'>SEK</option>\n"