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

5b991627 · intrigeri · 05f2cf66 · 0637932b · 5b991627 · 5b991627
Commit 5b991627 authored Dec 31, 2015 by intrigeri
--- a/ikiwiki-cgi.setup
+++ b/ikiwiki-cgi.setup
@@ -222,10 +222,11 @@ po_master_language: en|English
 # slave languages (translated via PO files) format: ll|Langname
 po_slave_languages:
  - de|Deutsch
+  - fa|Farsi
  - fr|Français
  - pt|Português
 # PageSpec controlling which pages are translatable
-po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_date or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
+po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
 # internal linking behavior (default/current/negotiated)
 po_link_to: current


--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -199,10 +199,11 @@ po_master_language: en|English
 # slave languages (translated via PO files) format: ll|Langname
 po_slave_languages:
  - de|Deutsch
+  - fa|Farsi
  - fr|Français
  - pt|Português
 # PageSpec controlling which pages are translatable
-po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_date or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
+po_translatable_pages: '!security/audits and !security/audits/* and (about or bugs or chat or contribute or contribute/how/donate or doc or doc/* or download or download.inline or getting_started or inc/release_notes/* or inc/stable_i386_release_notes or index or news or news/* or press or press/* or security or security/* or sidebar or support or support/* or todo or torrents or wishlist or misc or misc/* or install or install/* or upgrade or upgrade/*)'
 # internal linking behavior (default/current/negotiated)
 po_link_to: current


--- a/wiki/src/about.fa.po
+++ b/wiki/src/about.fa.po
--- a/wiki/src/blueprint/derivatives.mdwn
+++ b/wiki/src/blueprint/derivatives.mdwn
-[[!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?
--- a/wiki/src/bugs.fa.po
+++ b/wiki/src/bugs.fa.po
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
+"POT-Creation-Date: 2015-07-28 09:53+0200\n"
+"PO-Revision-Date: 2015-09-29 14:14+0000\n"
+"Last-Translator: Sprint 1 <translation1@451f.org>\n"
+"Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/bugs/fa/>"
+"\n"
+"Language: fa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 2.4-dev\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Bugs\"]]\n"
+msgstr "[[!meta title=\"ایراد\"]]\n"
+
+#. type: Plain text
+msgid ""
+"If you've found a bug in Tails, please read "
+"[[doc/first_steps/bug_reporting]]."
+msgstr ""
+"اگر ایرادی در تیلز پیدا کرده‌اید، این صفحه را بخوانید "
+"[[doc/first_steps/bug_reporting]]."
+
+#. type: Plain text
+msgid ""
+"We don't use this section anymore, see "
+"[[contribute/working_together/Redmine]] instead."
+msgstr ""
+"ما دیگر از این صفحه استفاده می‌کنیم, به جای آن به صفحه‌ی "
+"[[contribute/working_together/Redmine]] بروید."
--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.po
@@ -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"

--- a/wiki/src/contribute.fa.po
+++ b/wiki/src/contribute.fa.po
--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -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"

--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -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>


--- a/wiki/src/contribute.pt.po
+++ b/wiki/src/contribute.pt.po
@@ -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"

--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -265,7 +265,7 @@ The following Debian packages need to be installed:
  just like `live-build`
 * `eatmydata` 82 or newer, available in wheezy-backports.
 * `time` and `whois` (for `/usr/bin/mkpasswd`)
-* `ikiwiki` 3.20120725 or newer, available in wheezy-backports.
+* `ikiwiki` 3.20150107 or newer, available in stretch.
 * `apt-get install libyaml-perl libyaml-libyaml-perl po4a perlmagick
  libyaml-syck-perl` so that the wiki builds smoothly.
 * `dpkg-dev`

--- a/wiki/src/contribute/build/website.mdwn
+++ b/wiki/src/contribute/build/website.mdwn
@@ -24,6 +24,10 @@ Build the website in Linux
       sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
        perlmagick libyaml-syck-perl ikiwiki

+   Note that in order to enable Ikiwiki with RTL language support,
+   you'll need to install ikiwiki version 3.20140227 or newer.
+   In Debian this version is currently available in Jessie.
+
 3. Clone our main [[Git repository|git]]:

       git clone https://git-tails.immerda.ch/tails

--- a/wiki/src/contribute/derivatives.mdwn
+++ b/wiki/src/contribute/derivatives.mdwn
+[[!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?
--- a/wiki/src/contribute/design/I2P_Browser.mdwn
+++ b/wiki/src/contribute/design/I2P_Browser.mdwn
@@ -4,7 +4,7 @@ Allowed Access

 The HTTP Proxy is set to 127.0.0.1 on port 4444 with an exception made for
 http://127.0.0.1 which does not go through the proxy. With this set-up, only eepsites (`.i2p`
-TLD), offline Tails documentation, and the router console are acessible from I2P Browser.
+TLD), offline Tails documentation, and the router console are accessible from I2P Browser.

 Also, do note that Tails' [[netfilter-based
 blocking|Tor_enforcement/Network_filter]] ensures that no Internet
@@ -21,7 +21,7 @@ exceptions added to ferm. The ports accessible by the i2pbrowser user include:
 * 7657, I2P router console: The router console is accessible in the web browser at <http://127.0.0.1:7657>
 * 7658, local 'eepsite': Each I2P installation is configured out of the box
  with the possibility to host one's own website (or *eepsite*) on the I2P
-  network. The eepsite will not be acessible remotely unless its
+  network. The eepsite will not be accessible remotely unless its
  [tunnel](http://127.0.0.1:7657/i2ptunnel#localServerTunnelList) is started.

 Note: These ports will only be opened if the user explicitly requests I2P at the boot prompt.

--- a/wiki/src/contribute/how/donate.de.po
+++ b/wiki/src/contribute/how/donate.de.po
@@ -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"

--- a/wiki/src/contribute/how/donate.fa.po
+++ b/wiki/src/contribute/how/donate.fa.po
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 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: 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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"Make a donation\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Tails is free because <strong>nobody should have to pay to be safe\n"
+"while using computers</strong>. But Tails cannot stay alive without\n"
+"money and <strong>we need your help</strong>!\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<strong>[[Discover who you are helping around the world when\n"
+"donating to Tails.|news/who_are_you_helping]]</strong>\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note that Tails is a project mainly run by volunteers. There are [[many "
+"other ways to contribute|contribute]]!"
+msgstr ""
+
+#. type: Title =
+#, no-wrap
+msgid "Ways to donate\n"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid ""
+"Crowdfunding campaign run by the American organization [Freedom of the Press "
+"Foundation](https://pressfreedomfoundation.org/bundle/encryption-tools-"
+"journalists)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "    If you live in the US, your donation will be tax-deductible.\n"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid ""
+"[[Bank wire transfer|donate#swift]] or [[Paypal|donate#paypal]] through the "
+"German organization [Zwiebelfreunde e.V.](https://www.zwiebelfreunde.de/)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    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"
+"    receipt if you need one.\n"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid "[[Bitcoin|donate#bitcoin]]"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid ""
+"[Flattr](https://flattr.com/submit/auto?user_id=tails_live&url=https://tails."
+"boum.org&title=Tails)"
+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."
+msgstr ""
+
+#. type: Plain text
+msgid "Thank you for your donation!"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"bitcoin\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Bitcoin\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "You can send Bitcoins to **<a href=\"bitcoin:1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2\">1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2</a>**.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"caution\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<p>Bitcoin is <a href=\"https://bitcoin.org/en/faq#is-bitcoin-anonymous\">not\n"
+"anonymous</a>.</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"swift\"></a>\n"
+msgstr ""
+
+#. type: Title -
+#, no-wrap
+msgid "Bank wire transfer\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    Account holder: Zwiebelfreunde e.V.\n"
+"    Name of bank: GLS Gemeinschaftsbank eG\n"
+"    IBAN: DE25430609671126825603\n"
+"    BIC: GENODEM1GLS\n"
+"    Address of bank: Christstrasse 9, 44789 Bochum, Germany\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap