summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-03-16 16:58:50 +0000
committerintrigeri <intrigeri@boum.org>2018-03-16 16:58:50 +0000
commitd4526936575047936240edc0258931e52b6c8b6a (patch)
tree1417ee9b3f34a6b296f3deacc214cbfc2b826cfe
parentf0c48189b09f4ae679354363e43250296da28d75 (diff)
parent158b83c284d8a2489efd993527eec5eff3360348 (diff)
Merge branch 'stable' into devel
-rwxr-xr-xconfig/chroot_local-hooks/00-install-tailslib9
-rw-r--r--wiki/src/blueprint/explain_tails.mdwn56
-rw-r--r--wiki/src/blueprint/l10n_Portuguese.mdwn14
-rw-r--r--wiki/src/blueprint/l10n_Spanish.mdwn11
-rw-r--r--wiki/src/blueprint/replace_ikiwiki.mdwn10
-rw-r--r--wiki/src/blueprint/what_tails_is.mdwn3
-rw-r--r--wiki/src/contribute/calendar.mdwn11
-rw-r--r--wiki/src/contribute/release_process.mdwn8
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn2
-rw-r--r--wiki/src/contribute/working_together/roles/release_manager.mdwn5
-rw-r--r--wiki/src/donate.css18
-rw-r--r--wiki/src/donate.de.po621
-rwxr-xr-xwiki/src/donate.es.po301
-rw-r--r--wiki/src/donate.fa.po215
-rw-r--r--wiki/src/donate.fr.po622
-rw-r--r--wiki/src/donate.html308
-rw-r--r--wiki/src/donate.it.po715
-rw-r--r--wiki/src/donate.pt.po215
-rw-r--r--wiki/src/donate/donate_ddg.pngbin0 -> 37800 bytes
-rw-r--r--wiki/src/news/version_3.5/manual_upgrade.inline.de.po58
-rw-r--r--wiki/src/news/version_3.5/manual_upgrade.inline.es.po58
-rw-r--r--wiki/src/news/version_3.5/manual_upgrade.inline.fa.po58
-rw-r--r--wiki/src/news/version_3.5/manual_upgrade.inline.fr.po58
-rw-r--r--wiki/src/news/version_3.5/manual_upgrade.inline.it.po58
-rw-r--r--wiki/src/news/version_3.5/manual_upgrade.inline.mdwn17
-rw-r--r--wiki/src/news/version_3.5/manual_upgrade.inline.pt.po58
-rw-r--r--wiki/src/news/version_3.6.de.po48
-rw-r--r--wiki/src/news/version_3.6.es.po35
-rw-r--r--wiki/src/news/version_3.6.fa.po29
-rw-r--r--wiki/src/news/version_3.6.fr.po46
-rw-r--r--wiki/src/news/version_3.6.it.po42
-rw-r--r--wiki/src/news/version_3.6.mdwn4
-rw-r--r--wiki/src/news/version_3.6.pt.po23
-rw-r--r--wiki/src/upgrade/tails.de.po58
-rwxr-xr-xwiki/src/upgrade/tails.es.po54
-rw-r--r--wiki/src/upgrade/tails.fa.po34
-rw-r--r--wiki/src/upgrade/tails.fr.po56
-rw-r--r--wiki/src/upgrade/tails.it.po48
-rw-r--r--wiki/src/upgrade/tails.mdwn8
-rw-r--r--wiki/src/upgrade/tails.pt.po44
40 files changed, 1957 insertions, 2081 deletions
diff --git a/config/chroot_local-hooks/00-install-tailslib b/config/chroot_local-hooks/00-install-tailslib
index 4be37e0..00f15d0 100755
--- a/config/chroot_local-hooks/00-install-tailslib
+++ b/config/chroot_local-hooks/00-install-tailslib
@@ -5,7 +5,7 @@ set -u
echo "Installing the tailslib python library"
-# Import ensure_hook_dependency_is_installed()
+# Import ensure_hook_dependency_is_installed() and strip_nondeterminism_wrapper()
. /usr/local/lib/tails-shell-library/build.sh
ensure_hook_dependency_is_installed python3-setuptools
@@ -14,5 +14,12 @@ ensure_hook_dependency_is_installed python3-setuptools
cd /tmp/pythonlib
python3 setup.py clean
python3 setup.py install
+
+ package_glob_pattern="/usr/local/lib/python3.*/dist-packages/Tailslib*.egg"
+ if [ ! -f ${package_glob_pattern} ]; then
+ echo "Cannot find Tailslib Python package \"${package_glob_pattern}\"" >&2
+ exit 1
+ fi
+ strip_nondeterminism_wrapper --type zip "$(realpath ${package_glob_pattern})" 2>/dev/null
)
rm -rf /tmp/pythonlib
diff --git a/wiki/src/blueprint/explain_tails.mdwn b/wiki/src/blueprint/explain_tails.mdwn
new file mode 100644
index 0000000..22841e7
--- /dev/null
+++ b/wiki/src/blueprint/explain_tails.mdwn
@@ -0,0 +1,56 @@
+[[!meta title="Explain Tails"]]
+
+From "[Writing good documentation](https://platform.internetfreedomfestival.org/en/IFF2018/public/schedule/custom/426)" at the IFF 2018
+---------------------------------------------------------------------------------------------------------------------------------------
+
+### Sheet 1
+
+- [Drawing of an unfolded tent] portable, set up anywhere in the world or your own backyard
+- [Drawing of a circus tent]
+- [Drawing of a magic hat] make things magically disappear
+- [Drawing of two similar tents]
+- [Drawing of a tent in a bag] small portable tent fits in backpack, with your belongings.
+
+### Sheet 2
+
+Tents, The Everyperson's
+
+- Amnesic
+ - Empty every time its setup
+ - Stored in backpack ("USB stick") along with "stuff" which can be
+ moved into the tent ("persistence") or not.
+- Incognito
+ - Can move around (change "address")
+ - Many tents look alike
+ - Works best among other tents (not in a library)
+- Live
+ - Can carry around in backpack
+ - Can set up in backyard (own laptop) or away from home
+
+### Sheet 3
+
+- clean every time where work (normal is really customized)
+- common visual aspect
+- decide what keep
+- [Drawing of a tent city of similar tents]
+
+### Sheet 4
+
+- Doesn't leave a trace -- invisibility cloak
+- Tent - put it away when its finished
+- New wig every morning
+- Incognito mode for your computer
+- A caravan -- you're the owner, you can move it anywhere
+- Like a bicycle
+ - You can take it anywhere
+ - They don't have a registration plate
+ - No trace where you've been on the environment
+ - Using a bike lock
+ - Helmet with shades so you're unknown
+
+From the user testing of Additional Software in January 2018 in Berlin
+----------------------------------------------------------------------
+
+- Additional Software P1 talking about how everything we do on the
+ Internet is tracked: "With Tails I can create that image for myself".
+- Additional Software P4: "bullet proof".
diff --git a/wiki/src/blueprint/l10n_Portuguese.mdwn b/wiki/src/blueprint/l10n_Portuguese.mdwn
index 478905b..d8cd543 100644
--- a/wiki/src/blueprint/l10n_Portuguese.mdwn
+++ b/wiki/src/blueprint/l10n_Portuguese.mdwn
@@ -112,11 +112,13 @@ Apague o ramo de trabalho. O comando a seguir apaga o ramo de trabalho, só faç
# Enviando traduções para a lista principal de traduções
-Uma vez que traduções tenham sido propostas e revisadas (seja via Weblate ou via Git), elas devem ser enviadas para a lista principal de traduções: `tails-l10n@boum.org`.
+Uma vez que traduções tenham sido propostas e revisadas (seja via Weblate ou via Git), elas devem ser enviadas para a lista principal de traduções (`tails-l10n@boum.org`).
-Antes de enviar, tenha certeza de que:
+Antes de enviar, tenha certeza do seguinte:
-- As traduções tenham sido revisadas por uma pessoa diferente da que fez a tradução.
-- A wiki possa ser construída com sucesso com as modificações propostas.
-- As modificações tenham como base o commit mais novo do repositório principal e não produzam conflitos.
-- A mensagem enviada para a lista principal tenha sido assinada com OpenPGP.
+- As traduções foram revisadas por uma pessoa diferente da que fez a tradução.
+- Não são inclusas modificações de formatação dos arquivos `.po` (por exemplo, mudanças de limite de caracteres por linha que reorganizam as linhas mas mantém o mesmo conteúdo).
+- A wiki pode ser construída com sucesso com as modificações propostas.
+- As modificações têm como base o commit mais novo do repositório principal e não produzem conflitos.
+- A mensagem enviada para a lista principal está assinada com OpenPGP.
+- A mensagem enviada para a lista possui "`[pull]`" no começo do assunto, para indicar que as modificações já foram revisadas e que se trata de um pedido de inclusão no repositório principal.
diff --git a/wiki/src/blueprint/l10n_Spanish.mdwn b/wiki/src/blueprint/l10n_Spanish.mdwn
index 7a79a4a..d1bbd21 100644
--- a/wiki/src/blueprint/l10n_Spanish.mdwn
+++ b/wiki/src/blueprint/l10n_Spanish.mdwn
@@ -14,6 +14,17 @@ Si quiero traducir al español ¿cómo puedo empezar?
<a name="decisiones">
+Decisiones a tomar
+------------------
+
+Tenemos que aclarar algunas dudas entre todos. Las vamos poniendo
+aquí con la esperanza de ir organizando debates en torno a ellas:
+
+* ¿Computadora, ordenador, computador?
+* ¿Cómo podemos hacer un texto neutral e igualitario con respecto al género?
+ usuarixs, usuari@s, usuarios y usuarias, etc.
+
+
Estilo y decisiones anteriores
------------------------------
diff --git a/wiki/src/blueprint/replace_ikiwiki.mdwn b/wiki/src/blueprint/replace_ikiwiki.mdwn
index bafb9ac..1f315a0 100644
--- a/wiki/src/blueprint/replace_ikiwiki.mdwn
+++ b/wiki/src/blueprint/replace_ikiwiki.mdwn
@@ -8,10 +8,10 @@ http://www.sphinx-doc.org/en/stable/intl.html?highlight=gettext
Lektor
======
-Tor is considering using Lektor for their website:
+The upcoming new Tor website uses [Lektor](https://www.getlektor.com/).
-https://www.getlektor.com/
+There's
+a [PO plugin](https://github.com/numericube/lektor-i18n-plugin) for
+Lektor but Tor does not use it. Ask hiro for details.
-There's a PO plugin for Lektor:
-
-https://github.com/numericube/lektor-i18n-plugin
+Lektor will soon [[!debbug 892901 desc="be in Debian"]].
diff --git a/wiki/src/blueprint/what_tails_is.mdwn b/wiki/src/blueprint/what_tails_is.mdwn
deleted file mode 100644
index 10db1b6..0000000
--- a/wiki/src/blueprint/what_tails_is.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-- Additional Software P1 talking about how everything we do on the
- Internet is tracked: "With Tails I can create that image for myself".
-- Additional Software P4: "bullet proof".
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index ea092dd..5743379 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -4,17 +4,6 @@ All times are referenced to Berlin and Paris time.
## 2018Q1
-* 2018-03-12:
- - All branches targeting Tails 3.6 *must* be merged into the
- `testing` branch by noon, CET.
- - The upcoming Tor Browser is hopefully out so we can import it.
- - Build and upload Tails 3.6 ISO image and IUKs.
- - Hopefully start testing Tails 3.6.
-
-* 2018-03-13:
- - Finish testing Tails 3.6 by the afternoon, CET.
- - **Release Tails 3.6** (major release) during late CET.
-
* 2018-03-19, 16:00: VeraCrypt team meeting
## 2018Q2
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index b8975cc..5d6a0cf 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -10,7 +10,7 @@ Requirements
To release Tails you'll need some packages installed:
* `tidy mktorrent transmission-cli`
-* Aufs DKMS module for your running kernel.
+* aufs DKMS module for your running kernel.
* [[!debpts squashfs-tools]] that honors `$SOURCE_DATE_EPOCH`.
Install it from our custom `devel` APT suite.
* `tails-iuk` dependencies, including suggested packages (see
@@ -80,6 +80,12 @@ be `testing` for major releases, and `stable` for point-releases.
Read the remainder of this document from the branch used to prepare the release!
</div>
+Sanity check
+============
+
+Visit the [Jenkins RM view](https://jenkins.tails.boum.org/view/RM/)
+and check that the jobs for the release branch have good enough results.
+
Freeze
======
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index b946615..81b7cee 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -187,7 +187,7 @@ Import a new set of Tor Browser tarballs
)
done
-3. Move the tarballs into your local Git annex:
+2. Move the tarballs into your local Git annex:
cd "$TBB_ARCHIVE" && \
mkdir "$TBB_VERSION" && cd "$TBB_VERSION" && \
diff --git a/wiki/src/contribute/working_together/roles/release_manager.mdwn b/wiki/src/contribute/working_together/roles/release_manager.mdwn
index 4e38fae..3342922 100644
--- a/wiki/src/contribute/working_together/roles/release_manager.mdwn
+++ b/wiki/src/contribute/working_together/roles/release_manager.mdwn
@@ -2,6 +2,11 @@
# Tasks
+## Continuously
+
+Stay on top of email received on the Release Managers mailing list.
+This includes for example failure notifications for Jenkins jobs.
+
## In the beginning of your shift
- Check the Mozilla release calendars:
diff --git a/wiki/src/donate.css b/wiki/src/donate.css
index 7eb3ae5..9112192 100644
--- a/wiki/src/donate.css
+++ b/wiki/src/donate.css
@@ -137,6 +137,24 @@ span.title {
}
#duckduckgo {
+ background: #b49cd3;
+ padding: 2em;
+}
+
+#duckduckgo a {
+ color: #333;
+ font-weight: bold;
+ background-image: none;
+ padding-right: 0 !important;
+}
+
+#duckduckgo img {
+ border: none;
+ max-width: 100%;
+ height: auto;
+}
+
+#paypal {
margin-bottom: 3em;
}
diff --git a/wiki/src/donate.de.po b/wiki/src/donate.de.po
index aaa2ae1..fb51563 100644
--- a/wiki/src/donate.de.po
+++ b/wiki/src/donate.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-03-12 17:43+0100\n"
+"POT-Creation-Date: 2018-03-15 13:20+0100\n"
"PO-Revision-Date: 2017-10-29 15:41+0100\n"
"Last-Translator: Tails translators\n"
"Language-Team: \n"
@@ -84,338 +84,43 @@ msgstr ""
msgid "Thanks!"
msgstr "Danke!"
-#. HTML Variables for PayPal Payments Standard:
-#. https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. For recurring donations only.
-#. For one-time donation only.
-#. type: Content of: <div><div><div><form>
+#. type: Content of: <div><div><div><p><a>
msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
-"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
-"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\">"
msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks/index.de.html\"/> <input type=\"hidden"
-"\" name=\"cancel_return\" class=\"return-url\" value=\"https://tails.boum."
-"org/donate/canceled/index.de.html\"/> <input name=\"lc\" type=\"hidden\" "
-"value=\"DE\"/> <input type=\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> "
-"<input type=\"hidden\" name=\"t3\" value=\"M\" id=\"t3\"/> <input type="
-"\"hidden\" name=\"p3\" value=\"1\"/> <input type=\"hidden\" name=\"src\" "
-"value=\"1\"/> <input type=\"hidden\" name=\"amount\" value=\"5\" id=\"amount"
-"\"/>"
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
-"label>"
-msgstr ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollar </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euro </label>"
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Monthly </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Yearly </label>"
-msgstr ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> Einmalig </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Monatlich </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Jährlich </label>"
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>$100 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>$150 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>$200 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>$100 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>$150 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>$200 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Anderer</span>"
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-msgstr ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-
-#. type: Content of: <div><div><div><form><div>
-msgid "</label>"
-msgstr "</label>"
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Anderer</span>"
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-msgstr ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-
-#. type: Content of: <div><div><div><form><div>
-msgid ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</button>"
-msgstr ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Spenden</button>"
#. type: Content of: <div><div><div><p>
-msgid ""
-"Monthly and yearly donations require a [[!img paypal-inline.png link=\"no\" "
-"class=\"paypal-inline\" alt=\"PayPal\"]] account."
-msgstr ""
-"Monatliche und jährliche Spenden benötigen ein [[!img paypal-inline.png link="
-"\"no\" class=\"paypal-inline\" alt=\"PayPal\"]]-Konto."
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Your donation goes entirely to Tails and will be handled by RiseupLabs which "
-"is a 501(c)(3) non-profit organization in the USA."
+msgid "</a>"
msgstr ""
-"Ihre Spende geht vollständig an Tails und wird durch RiseupLabs, einer "
-"gemeinnützigen Organisation nach 501(c)(3) in den USA, abgewickelt."
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"<strong>Donations are tax-deductible to the full extent permitted by law.</"
-"strong>"
-msgstr ""
-"<strong>Spenden sind bis zu dem vollen gesetzlich festgelegten Rahmen von "
-"der Steuer absetzbar.</strong>"
#. type: Content of: <div><div><div><p>
msgid ""
-"Your donation goes entirely to Tails and will be handled by Zwiebelfreunde "
-"which is a non-profit organization in Germany."
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\"> Donate via the DuckDuckGo donation challenge.</a> (March 13 "
+"&ndash; April 10 2018)"
msgstr ""
-"Ihre Spende geht vollständig an Tails und wird durch Zwiebelfreunde, einer "
-"deutschen gemeinnützigen Organisation, abgewickelt."
-
-#. type: Content of: <div><div><div><div><h2>
-msgid "Donate in dollars"
-msgstr "In Dollar spenden"
-#. type: Content of: <div><div><div><div><h3>
-msgid "Recurring donation"
-msgstr "Wiederkehrende Spenden"
-
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" "
-"value=\"1\"/> <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=\"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>"
-msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks/index.de.html\"/> <input type=\"hidden"
-"\" name=\"cancel_return\" class=\"return-url\" value=\"https://tails.boum."
-"org/donate/canceled/index.de.html\"/> <input name=\"lc\" type=\"hidden\" "
-"value=\"DE\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"p3\" value=\"1\"/> <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=\"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>"
-
-#. type: Content of: <div><div><div><div><form>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
+"<strong>Increase the impact of your donation</strong>: donating via the "
+"challenge helps us win additional prizes from DuckDuckGo."
msgstr ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Monatlich</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Jährlich</label>"
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-inline."
-"png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
-msgstr ""
-"<input type=\"submit\" value=\"Spenden\"/> (Benötigt ein [[!img paypal-"
-"inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]]-Konto.)"
-
-#. type: Content of: <div><div><div><div><h3>
-msgid "One-time donation"
-msgstr "Einmalige Spende"
-
-#. Note for translators: the following parts need to be translated:
-#. - https://tails.boum.org/donate/thanks
-#. - https://tails.boum.org/donate/canceled
-#. - US
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-url"
-"\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc\" "
-"type=\"hidden\" value=\"US\"/> <input type=\"radio\" name=\"amount\" value="
-"\"5\" id=\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input "
-"type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for="
-"\"pp_10\">$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
-"\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
-"\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
-"<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
-"for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value=\"\" "
-"id=\"pp_cust\"/><label for=\"pp_cust\">Custom amount</label>"
+#. type: Content of: <div><div><div><p>
+msgid "Join our fundraising team and reach out to your social circles!"
msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks/index.de.html\"/> <input type=\"hidden\" name=\"cancel_return\" class="
-"\"return-url\" value=\"https://tails.boum.org/donate/canceled/index.de.html"
-"\"/> <input name=\"lc\" type=\"hidden\" value=\"DE\"/> <input type=\"radio\" "
-"name=\"amount\" value=\"5\" id=\"pp_5\" checked=\"checked\"/><label for="
-"\"pp_5\">$5</label> <input type=\"radio\" name=\"amount\" value=\"10\" id="
-"\"pp_10\"/><label for=\"pp_10\">$10</label> <input type=\"radio\" name="
-"\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">$20</label> "
-"<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for="
-"\"pp_50\">$50</label> <input type=\"radio\" name=\"amount\" value=\"100\" id="
-"\"pp_100\"/><label for=\"pp_100\">$100</label> <input type=\"radio\" name="
-"\"amount\" value=\"\" id=\"pp_cust\"/><label for=\"pp_cust\">Anderer Betrag</"
-"label>"
-
-#. type: Content of: <div><div><div><div><form>
-msgid "<input type=\"submit\" value=\"Donate\"/>"
-msgstr "<input type=\"submit\" value=\"Spenden\"/>"
#. type: Content of: <div><h3>
msgid "Other ways to donate"
msgstr "Andere Möglichkeiten zu spenden"
#. type: Content of: <div><div><div><h4>
-msgid "DuckDuckGo"
+msgid "PayPal"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid ""
-"From March 13th 2018 to April 10th 2018 you can donate via the <a href="
-"\"https://www.crowdrise.com/o/en/campaign/tails-live\" target=\"_blank"
-"\">DuckDuckGo donation challenge</a>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Join our fundraising team and reach out to your social circles!"
+msgid "Account: <i>tailsriseuplabs@riseup.net</i>"
msgstr ""
#. type: Content of: <div><div><div><h4>
@@ -558,6 +263,302 @@ msgstr "[[!img expenses.png link=\"no\"]]"
msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr "Unsere Finanzberichte sind [[hier|doc/about/finances]] einsehbar."
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
+#~ "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
+#~ "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
+#~ "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
+#~ "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
+#~ "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
+#~ "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
+#~ "thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-"
+#~ "url\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc"
+#~ "\" type=\"hidden\" value=\"US\"/> <input type=\"hidden\" name=\"a3\" "
+#~ "value=\"5\" id=\"a3\"/> <input type=\"hidden\" name=\"t3\" value=\"M\" id="
+#~ "\"t3\"/> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <input type="
+#~ "\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"amount"
+#~ "\" value=\"5\" id=\"amount\"/>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
+#~ "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
+#~ "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
+#~ "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
+#~ "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
+#~ "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
+#~ "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
+#~ "thanks/index.de.html\"/> <input type=\"hidden\" name=\"cancel_return\" "
+#~ "class=\"return-url\" value=\"https://tails.boum.org/donate/canceled/index."
+#~ "de.html\"/> <input name=\"lc\" type=\"hidden\" value=\"DE\"/> <input type="
+#~ "\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" "
+#~ "name=\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" "
+#~ "value=\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input "
+#~ "type=\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
+#~ "<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
+#~ "complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg "
+#~ "btn-primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
+#~ "autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
+#~ "label>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
+#~ "<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
+#~ "complete-text=\"finished!\"/> Dollar </label> <label class=\"btn btn-lg "
+#~ "btn-primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
+#~ "autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euro </"
+#~ "label>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type="
+#~ "\"radio\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-"
+#~ "lg btn-primary active\" id=\"monthly\"> <input type=\"radio\" "
+#~ "autocomplete=\"off\"/> Monthly </label> <label class=\"btn btn-lg btn-"
+#~ "primary\" id=\"yearly\"> <input type=\"radio\" autocomplete=\"off\" "
+#~ "checked/> Yearly </label>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type="
+#~ "\"radio\" autocomplete=\"off\"/> Einmalig </label> <label class=\"btn btn-"
+#~ "lg btn-primary active\" id=\"monthly\"> <input type=\"radio\" "
+#~ "autocomplete=\"off\"/> Monatlich </label> <label class=\"btn btn-lg btn-"
+#~ "primary\" id=\"yearly\"> <input type=\"radio\" autocomplete=\"off\" "
+#~ "checked/> Jährlich </label>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>$100 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>$150 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>$200 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Other</span>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>$100 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>$150 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>$200 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Anderer</span>"
+
+#~ msgid ""
+#~ "<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern="
+#~ "\"\\d+\" class=\"form-control\" id=\"other-dollar\"/>"
+#~ msgstr ""
+#~ "<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern="
+#~ "\"\\d+\" class=\"form-control\" id=\"other-dollar\"/>"
+
+#~ msgid "</label>"
+#~ msgstr "</label>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>100€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>150€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>200€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Other</span>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>100€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>150€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>200€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Anderer</span>"
+
+#~ msgid ""
+#~ "<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" "
+#~ "id=\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
+#~ msgstr ""
+#~ "<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" "
+#~ "id=\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
+
+#~ msgid ""
+#~ "<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</"
+#~ "button>"
+#~ msgstr ""
+#~ "<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Spenden</"
+#~ "button>"
+
+#~ msgid ""
+#~ "Monthly and yearly donations require a [[!img paypal-inline.png link=\"no"
+#~ "\" class=\"paypal-inline\" alt=\"PayPal\"]] account."
+#~ msgstr ""
+#~ "Monatliche und jährliche Spenden benötigen ein [[!img paypal-inline.png "
+#~ "link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]]-Konto."
+
+#~ msgid ""
+#~ "Your donation goes entirely to Tails and will be handled by RiseupLabs "
+#~ "which is a 501(c)(3) non-profit organization in the USA."
+#~ msgstr ""
+#~ "Ihre Spende geht vollständig an Tails und wird durch RiseupLabs, einer "
+#~ "gemeinnützigen Organisation nach 501(c)(3) in den USA, abgewickelt."
+
+#~ msgid ""
+#~ "<strong>Donations are tax-deductible to the full extent permitted by law."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Spenden sind bis zu dem vollen gesetzlich festgelegten Rahmen von "
+#~ "der Steuer absetzbar.</strong>"
+
+#~ msgid ""
+#~ "Your donation goes entirely to Tails and will be handled by "
+#~ "Zwiebelfreunde which is a non-profit organization in Germany."
+#~ msgstr ""
+#~ "Ihre Spende geht vollständig an Tails und wird durch Zwiebelfreunde, "
+#~ "einer deutschen gemeinnützigen Organisation, abgewickelt."
+
+#~ msgid "Donate in dollars"
+#~ msgstr "In Dollar spenden"
+
+#~ msgid "Recurring donation"
+#~ msgstr "Wiederkehrende Spenden"
+
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> "
+#~ "<input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
+#~ "net\"/> <input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
+#~ "\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
+#~ "\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
+#~ "\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
+#~ "\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
+#~ "\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> "
+#~ "<input type=\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" "
+#~ "name=\"p3\" value=\"1\"/> <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=\"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>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> "
+#~ "<input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
+#~ "net\"/> <input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
+#~ "\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
+#~ "\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
+#~ "\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
+#~ "\"https://tails.boum.org/donate/thanks/index.de.html\"/> <input type="
+#~ "\"hidden\" name=\"cancel_return\" class=\"return-url\" value=\"https://"
+#~ "tails.boum.org/donate/canceled/index.de.html\"/> <input name=\"lc\" type="
+#~ "\"hidden\" value=\"DE\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/"
+#~ "> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <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="
+#~ "\"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>"
+
+#~ msgid ""
+#~ "<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked="
+#~ "\"checked\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" "
+#~ "name=\"t3\" value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
+#~ msgstr ""
+#~ "<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked="
+#~ "\"checked\"/><label for=\"sub_m\">Monatlich</label> <input type=\"radio\" "
+#~ "name=\"t3\" value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Jährlich</"
+#~ "label>"
+
+#~ msgid ""
+#~ "<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-"
+#~ "inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
+#~ msgstr ""
+#~ "<input type=\"submit\" value=\"Spenden\"/> (Benötigt ein [[!img paypal-"
+#~ "inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]]-Konto.)"
+
+#~ msgid "One-time donation"
+#~ msgstr "Einmalige Spende"
+
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
+#~ "\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
+#~ "type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/"
+#~ "> <input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
+#~ "<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden"
+#~ "\" name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class="
+#~ "\"return-url\" value=\"https://tails.boum.org/donate/canceled\"/> <input "
+#~ "name=\"lc\" type=\"hidden\" value=\"US\"/> <input type=\"radio\" name="
+#~ "\"amount\" value=\"5\" id=\"pp_5\" checked=\"checked\"/><label for="
+#~ "\"pp_5\">$5</label> <input type=\"radio\" name=\"amount\" value=\"10\" id="
+#~ "\"pp_10\"/><label for=\"pp_10\">$10</label> <input type=\"radio\" name="
+#~ "\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">$20</label> "
+#~ "<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label "
+#~ "for=\"pp_50\">$50</label> <input type=\"radio\" name=\"amount\" value="
+#~ "\"100\" id=\"pp_100\"/><label for=\"pp_100\">$100</label> <input type="
+#~ "\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\"/><label for=\"pp_cust"
+#~ "\">Custom amount</label>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
+#~ "\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
+#~ "type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/"
+#~ "> <input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
+#~ "<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden"
+#~ "\" name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/thanks/index.de.html\"/> <input type=\"hidden\" name="
+#~ "\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/canceled/index.de.html\"/> <input name=\"lc\" type=\"hidden\" "
+#~ "value=\"DE\"/> <input type=\"radio\" name=\"amount\" value=\"5\" id="
+#~ "\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input type="
+#~ "\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">"
+#~ "$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
+#~ "\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
+#~ "\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
+#~ "<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
+#~ "for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value="
+#~ "\"\" id=\"pp_cust\"/><label for=\"pp_cust\">Anderer Betrag</label>"
+
+#~ msgid "<input type=\"submit\" value=\"Donate\"/>"
+#~ msgstr "<input type=\"submit\" value=\"Spenden\"/>"
+
#, fuzzy
#~| msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
#~ msgid ""
diff --git a/wiki/src/donate.es.po b/wiki/src/donate.es.po
index 7291466..9b3dece 100755
--- a/wiki/src/donate.es.po
+++ b/wiki/src/donate.es.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-03-12 17:43+0100\n"
+"POT-Creation-Date: 2018-03-15 13:20+0100\n"
"PO-Revision-Date: 2016-11-03 19:28+0000\n"
"Last-Translator: Tails developers <amnesiatranslators@boum.org>\n"
"Language-Team: Spanish <https://translate.tails.boum.org/projects/tails/src-"
@@ -68,234 +68,31 @@ msgstr ""
msgid "Thanks!"
msgstr ""
-#. HTML Variables for PayPal Payments Standard:
-#. https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. For recurring donations only.
-#. For one-time donation only.
-#. type: Content of: <div><div><div><form>
+#. type: Content of: <div><div><div><p><a>
msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
-"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
-"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
-msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"ES\"/> <input type="
-"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
-"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
-"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
-"label>"
-msgstr ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dólares </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
-"label>"
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Monthly </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Yearly </label>"
-msgstr ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Mensual </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Anual </label>"
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>$100 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>$150 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>$200 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div>
-msgid "</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div>
-msgid ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</button>"
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\">"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid ""
-"Monthly and yearly donations require a [[!img paypal-inline.png link=\"no\" "
-"class=\"paypal-inline\" alt=\"PayPal\"]] account."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Your donation goes entirely to Tails and will be handled by RiseupLabs which "
-"is a 501(c)(3) non-profit organization in the USA."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"<strong>Donations are tax-deductible to the full extent permitted by law.</"
-"strong>"
+msgid "</a>"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"Your donation goes entirely to Tails and will be handled by Zwiebelfreunde "
-"which is a non-profit organization in Germany."
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\"> Donate via the DuckDuckGo donation challenge.</a> (March 13 "
+"&ndash; April 10 2018)"
msgstr ""
-#. type: Content of: <div><div><div><div><h2>
-msgid "Donate in dollars"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid "Recurring donation"
-msgstr ""
-
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" "
-"value=\"1\"/> <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=\"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>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-inline."
-"png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid "One-time donation"
+"<strong>Increase the impact of your donation</strong>: donating via the "
+"challenge helps us win additional prizes from DuckDuckGo."
msgstr ""
-#
-#. Note for translators: the following parts need to be translated:
-#. - https://tails.boum.org/donate/thanks
-#. - https://tails.boum.org/donate/canceled
-#. - US
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-url"
-"\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc\" "
-"type=\"hidden\" value=\"US\"/> <input type=\"radio\" name=\"amount\" value="
-"\"5\" id=\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input "
-"type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for="
-"\"pp_10\">$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
-"\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
-"\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
-"<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
-"for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value=\"\" "
-"id=\"pp_cust\"/><label for=\"pp_cust\">Custom amount</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
-msgid "<input type=\"submit\" value=\"Donate\"/>"
+#. type: Content of: <div><div><div><p>
+msgid "Join our fundraising team and reach out to your social circles!"
msgstr ""
#. type: Content of: <div><h3>
@@ -303,18 +100,11 @@ msgid "Other ways to donate"
msgstr ""
#. type: Content of: <div><div><div><h4>
-msgid "DuckDuckGo"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"From March 13th 2018 to April 10th 2018 you can donate via the <a href="
-"\"https://www.crowdrise.com/o/en/campaign/tails-live\" target=\"_blank"
-"\">DuckDuckGo donation challenge</a>."
+msgid "PayPal"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "Join our fundraising team and reach out to your social circles!"
+msgid "Account: <i>tailsriseuplabs@riseup.net</i>"
msgstr ""
#. type: Content of: <div><div><div><h4>
@@ -440,3 +230,64 @@ msgstr ""
#. type: Content of: <div><div><p>
msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr ""
+
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
+#~ "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
+#~ "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
+#~ "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
+#~ "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
+#~ "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
+#~ "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
+#~ "thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-"
+#~ "url\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc"
+#~ "\" type=\"hidden\" value=\"US\"/> <input type=\"hidden\" name=\"a3\" "
+#~ "value=\"5\" id=\"a3\"/> <input type=\"hidden\" name=\"t3\" value=\"M\" id="
+#~ "\"t3\"/> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <input type="
+#~ "\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"amount"
+#~ "\" value=\"5\" id=\"amount\"/>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
+#~ "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
+#~ "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
+#~ "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
+#~ "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
+#~ "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
+#~ "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
+#~ "thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-"
+#~ "url\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc"
+#~ "\" type=\"hidden\" value=\"ES\"/> <input type=\"hidden\" name=\"a3\" "
+#~ "value=\"5\" id=\"a3\"/> <input type=\"hidden\" name=\"t3\" value=\"M\" id="
+#~ "\"t3\"/> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <input type="
+#~ "\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"amount"
+#~ "\" value=\"5\" id=\"amount\"/>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
+#~ "<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
+#~ "complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg "
+#~ "btn-primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
+#~ "autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
+#~ "label>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
+#~ "<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
+#~ "complete-text=\"finished!\"/> Dólares </label> <label class=\"btn btn-lg "
+#~ "btn-primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
+#~ "autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
+#~ "label>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type="
+#~ "\"radio\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-"
+#~ "lg btn-primary active\" id=\"monthly\"> <input type=\"radio\" "
+#~ "autocomplete=\"off\"/> Monthly </label> <label class=\"btn btn-lg btn-"
+#~ "primary\" id=\"yearly\"> <input type=\"radio\" autocomplete=\"off\" "
+#~ "checked/> Yearly </label>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type="
+#~ "\"radio\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-"
+#~ "lg btn-primary active\" id=\"monthly\"> <input type=\"radio\" "
+#~ "autocomplete=\"off\"/> Mensual </label> <label class=\"btn btn-lg btn-"
+#~ "primary\" id=\"yearly\"> <input type=\"radio\" autocomplete=\"off\" "
+#~ "checked/> Anual </label>"
diff --git a/wiki/src/donate.fa.po b/wiki/src/donate.fa.po
index e694ec2..89c3c82 100644
--- a/wiki/src/donate.fa.po
+++ b/wiki/src/donate.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-03-12 17:43+0100\n"
+"POT-Creation-Date: 2018-03-15 13:20+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"
@@ -64,209 +64,31 @@ msgstr ""
msgid "Thanks!"
msgstr ""
-#. HTML Variables for PayPal Payments Standard:
-#. https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. For recurring donations only.
-#. For one-time donation only.
-#. type: Content of: <div><div><div><form>
+#. type: Content of: <div><div><div><p><a>
msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
-"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
-"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
-"label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Monthly </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Yearly </label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>$100 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>$150 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>$200 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div>
-msgid "</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div>
-msgid ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</button>"
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\">"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid ""
-"Monthly and yearly donations require a [[!img paypal-inline.png link=\"no\" "
-"class=\"paypal-inline\" alt=\"PayPal\"]] account."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Your donation goes entirely to Tails and will be handled by RiseupLabs which "
-"is a 501(c)(3) non-profit organization in the USA."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"<strong>Donations are tax-deductible to the full extent permitted by law.</"
-"strong>"
+msgid "</a>"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"Your donation goes entirely to Tails and will be handled by Zwiebelfreunde "
-"which is a non-profit organization in Germany."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h2>
-msgid "Donate in dollars"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid "Recurring donation"
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\"> Donate via the DuckDuckGo donation challenge.</a> (March 13 "
+"&ndash; April 10 2018)"
msgstr ""
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" "
-"value=\"1\"/> <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=\"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>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-inline."
-"png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
+"<strong>Increase the impact of your donation</strong>: donating via the "
+"challenge helps us win additional prizes from DuckDuckGo."
msgstr ""
-#. type: Content of: <div><div><div><div><h3>
-msgid "One-time donation"
-msgstr ""
-
-#. Note for translators: the following parts need to be translated:
-#. - https://tails.boum.org/donate/thanks
-#. - https://tails.boum.org/donate/canceled
-#. - US
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-url"
-"\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc\" "
-"type=\"hidden\" value=\"US\"/> <input type=\"radio\" name=\"amount\" value="
-"\"5\" id=\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input "
-"type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for="
-"\"pp_10\">$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
-"\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
-"\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
-"<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
-"for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value=\"\" "
-"id=\"pp_cust\"/><label for=\"pp_cust\">Custom amount</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
-msgid "<input type=\"submit\" value=\"Donate\"/>"
+#. type: Content of: <div><div><div><p>
+msgid "Join our fundraising team and reach out to your social circles!"
msgstr ""
#. type: Content of: <div><h3>
@@ -274,18 +96,11 @@ msgid "Other ways to donate"
msgstr ""
#. type: Content of: <div><div><div><h4>
-msgid "DuckDuckGo"
+msgid "PayPal"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid ""
-"From March 13th 2018 to April 10th 2018 you can donate via the <a href="
-"\"https://www.crowdrise.com/o/en/campaign/tails-live\" target=\"_blank"
-"\">DuckDuckGo donation challenge</a>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Join our fundraising team and reach out to your social circles!"
+msgid "Account: <i>tailsriseuplabs@riseup.net</i>"
msgstr ""
#. type: Content of: <div><div><div><h4>
diff --git a/wiki/src/donate.fr.po b/wiki/src/donate.fr.po
index 277412a..cb486cd 100644
--- a/wiki/src/donate.fr.po
+++ b/wiki/src/donate.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-03-12 17:43+0100\n"
+"POT-Creation-Date: 2018-03-15 13:20+0100\n"
"PO-Revision-Date: 2017-10-25 15:54+0000\n"
"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -84,339 +84,43 @@ msgstr ""
msgid "Thanks!"
msgstr "Merci !"
-#. HTML Variables for PayPal Payments Standard:
-#. https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. For recurring donations only.
-#. For one-time donation only.
-#. type: Content of: <div><div><div><form>
+#. type: Content of: <div><div><div><p><a>
msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
-"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
-"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\">"
msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks/index.fr.html\"/> <input type=\"hidden"
-"\" name=\"cancel_return\" class=\"return-url\" value=\"https://tails.boum."
-"org/donate/canceled/index.fr.html\"/> <input name=\"lc\" type=\"hidden\" "
-"value=\"FR\"/> <input type=\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> "
-"<input type=\"hidden\" name=\"t3\" value=\"M\" id=\"t3\"/> <input type="
-"\"hidden\" name=\"p3\" value=\"1\"/> <input type=\"hidden\" name=\"src\" "
-"value=\"1\"/> <input type=\"hidden\" name=\"amount\" value=\"5\" id=\"amount"
-"\"/>"
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
-"label>"
-msgstr ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
-"label>"
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Monthly </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Yearly </label>"
-msgstr ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> Ponctuel </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Mensuel </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Annuel </label>"
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>$100 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>$150 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>$200 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5$ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10$ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25$ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50$ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100$ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150$ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200$ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Autre</span>"
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-msgstr ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-
-#. type: Content of: <div><div><div><form><div>
-msgid "</label>"
-msgstr "</label>"
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Autre</span>"
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-msgstr ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-
-#. type: Content of: <div><div><div><form><div>
-msgid ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</button>"
-msgstr ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donner</button>"
#. type: Content of: <div><div><div><p>
-msgid ""
-"Monthly and yearly donations require a [[!img paypal-inline.png link=\"no\" "
-"class=\"paypal-inline\" alt=\"PayPal\"]] account."
+msgid "</a>"
msgstr ""
-"Les dons mensuels et annuels nécessitent un compte [[!img paypal-inline.png "
-"link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]]."
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Your donation goes entirely to Tails and will be handled by RiseupLabs which "
-"is a 501(c)(3) non-profit organization in the USA."
-msgstr ""
-"Votre don est entièrement reversé à Tails et va être traité par RiseupLabs, "
-"une organisation 501(c)(3) à but non lucratif basée aux États-Unis."
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"<strong>Donations are tax-deductible to the full extent permitted by law.</"
-"strong>"
-msgstr ""
-"<strong>Les dons sont déductibles des impôts dans les limites prévues par la "
-"loi.</strong>"
#. type: Content of: <div><div><div><p>
msgid ""
-"Your donation goes entirely to Tails and will be handled by Zwiebelfreunde "
-"which is a non-profit organization in Germany."
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\"> Donate via the DuckDuckGo donation challenge.</a> (March 13 "
+"&ndash; April 10 2018)"
msgstr ""
-"Votre don est entièrement reversé à Tails et va être traité par "
-"Zwiebelfreunde, une organisation à but non lucratif basée en Allemagne."
-
-#. type: Content of: <div><div><div><div><h2>
-msgid "Donate in dollars"
-msgstr "Donner en dollars"
-
-#. type: Content of: <div><div><div><div><h3>
-msgid "Recurring donation"
-msgstr "Don régulier"
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" "
-"value=\"1\"/> <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=\"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>"
-msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks/index.fr.html\"/> <input type=\"hidden"
-"\" name=\"cancel_return\" class=\"return-url\" value=\"https://tails.boum."
-"org/donate/canceled/index.fr.html\"/> <input name=\"lc\" type=\"hidden\" "
-"value=\"FR\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"p3\" value=\"1\"/> <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=\"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>"
-
-#. type: Content of: <div><div><div><div><form>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
+"<strong>Increase the impact of your donation</strong>: donating via the "
+"challenge helps us win additional prizes from DuckDuckGo."
msgstr ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Mensuel</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Annuel</label>"
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-inline."
-"png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
-msgstr ""
-"<input type=\"submit\" value=\"Donner\"/> (Nécessite un compte [[!img paypal-"
-"inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]].)"
-
-#. type: Content of: <div><div><div><div><h3>
-msgid "One-time donation"
-msgstr "Don ponctuel"
-
-#. Note for translators: the following parts need to be translated:
-#. - https://tails.boum.org/donate/thanks
-#. - https://tails.boum.org/donate/canceled
-#. - US
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-url"
-"\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc\" "
-"type=\"hidden\" value=\"US\"/> <input type=\"radio\" name=\"amount\" value="
-"\"5\" id=\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input "
-"type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for="
-"\"pp_10\">$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
-"\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
-"\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
-"<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
-"for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value=\"\" "
-"id=\"pp_cust\"/><label for=\"pp_cust\">Custom amount</label>"
+#. type: Content of: <div><div><div><p>
+msgid "Join our fundraising team and reach out to your social circles!"
msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks/index.fr.html\"/> <input type=\"hidden\" name=\"cancel_return\" class="
-"\"return-url\" value=\"https://tails.boum.org/donate/canceled/index.fr.html"
-"\"/> <input name=\"lc\" type=\"hidden\" value=\"FR\"/> <input type=\"radio\" "
-"name=\"amount\" value=\"5\" id=\"pp_5\" checked=\"checked\"/><label for="
-"\"pp_5\">$5</label> <input type=\"radio\" name=\"amount\" value=\"10\" id="
-"\"pp_10\"/><label for=\"pp_10\">$10</label> <input type=\"radio\" name="
-"\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">$20</label> "
-"<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label for="
-"\"pp_50\">$50</label> <input type=\"radio\" name=\"amount\" value=\"100\" id="
-"\"pp_100\"/><label for=\"pp_100\">$100</label> <input type=\"radio\" name="
-"\"amount\" value=\"\" id=\"pp_cust\"/><label for=\"pp_cust\">Custom amount</"
-"label>"
-
-#. type: Content of: <div><div><div><div><form>
-msgid "<input type=\"submit\" value=\"Donate\"/>"
-msgstr "<input type=\"submit\" value=\"Donner\"/>"
#. type: Content of: <div><h3>
msgid "Other ways to donate"
msgstr "Autres moyens de donner"
#. type: Content of: <div><div><div><h4>
-msgid "DuckDuckGo"
+msgid "PayPal"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid ""
-"From March 13th 2018 to April 10th 2018 you can donate via the <a href="
-"\"https://www.crowdrise.com/o/en/campaign/tails-live\" target=\"_blank"
-"\">DuckDuckGo donation challenge</a>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Join our fundraising team and reach out to your social circles!"
+msgid "Account: <i>tailsriseuplabs@riseup.net</i>"
msgstr ""
#. type: Content of: <div><div><div><h4>
@@ -561,6 +265,302 @@ msgstr "[[!img expenses.fr.png link=\"no\"]]"
msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr "Nos rapports financiers sont disponibles [[ici|doc/about/finances]]."
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
+#~ "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
+#~ "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
+#~ "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
+#~ "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
+#~ "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
+#~ "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
+#~ "thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-"
+#~ "url\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc"
+#~ "\" type=\"hidden\" value=\"US\"/> <input type=\"hidden\" name=\"a3\" "
+#~ "value=\"5\" id=\"a3\"/> <input type=\"hidden\" name=\"t3\" value=\"M\" id="
+#~ "\"t3\"/> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <input type="
+#~ "\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"amount"
+#~ "\" value=\"5\" id=\"amount\"/>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
+#~ "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
+#~ "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
+#~ "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
+#~ "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
+#~ "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
+#~ "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
+#~ "thanks/index.fr.html\"/> <input type=\"hidden\" name=\"cancel_return\" "
+#~ "class=\"return-url\" value=\"https://tails.boum.org/donate/canceled/index."
+#~ "fr.html\"/> <input name=\"lc\" type=\"hidden\" value=\"FR\"/> <input type="
+#~ "\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" "
+#~ "name=\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" "
+#~ "value=\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input "
+#~ "type=\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
+#~ "<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
+#~ "complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg "
+#~ "btn-primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
+#~ "autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
+#~ "label>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
+#~ "<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
+#~ "complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg "
+#~ "btn-primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
+#~ "autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
+#~ "label>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type="
+#~ "\"radio\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-"
+#~ "lg btn-primary active\" id=\"monthly\"> <input type=\"radio\" "
+#~ "autocomplete=\"off\"/> Monthly </label> <label class=\"btn btn-lg btn-"
+#~ "primary\" id=\"yearly\"> <input type=\"radio\" autocomplete=\"off\" "
+#~ "checked/> Yearly </label>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type="
+#~ "\"radio\" autocomplete=\"off\"/> Ponctuel </label> <label class=\"btn btn-"
+#~ "lg btn-primary active\" id=\"monthly\"> <input type=\"radio\" "
+#~ "autocomplete=\"off\"/> Mensuel </label> <label class=\"btn btn-lg btn-"
+#~ "primary\" id=\"yearly\"> <input type=\"radio\" autocomplete=\"off\" "
+#~ "checked/> Annuel </label>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>$100 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>$150 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>$200 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Other</span>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5$ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10$ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>25$ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50$ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>100$ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>150$ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>200$ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Autre</span>"
+
+#~ msgid ""
+#~ "<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern="
+#~ "\"\\d+\" class=\"form-control\" id=\"other-dollar\"/>"
+#~ msgstr ""
+#~ "<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern="
+#~ "\"\\d+\" class=\"form-control\" id=\"other-dollar\"/>"
+
+#~ msgid "</label>"
+#~ msgstr "</label>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>100€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>150€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>200€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Other</span>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>100€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>150€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>200€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Autre</span>"
+
+#~ msgid ""
+#~ "<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" "
+#~ "id=\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
+#~ msgstr ""
+#~ "<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" "
+#~ "id=\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
+
+#~ msgid ""
+#~ "<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</"
+#~ "button>"
+#~ msgstr ""
+#~ "<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donner</"
+#~ "button>"
+
+#~ msgid ""
+#~ "Monthly and yearly donations require a [[!img paypal-inline.png link=\"no"
+#~ "\" class=\"paypal-inline\" alt=\"PayPal\"]] account."
+#~ msgstr ""
+#~ "Les dons mensuels et annuels nécessitent un compte [[!img paypal-inline."
+#~ "png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]]."
+
+#~ msgid ""
+#~ "Your donation goes entirely to Tails and will be handled by RiseupLabs "
+#~ "which is a 501(c)(3) non-profit organization in the USA."
+#~ msgstr ""
+#~ "Votre don est entièrement reversé à Tails et va être traité par "
+#~ "RiseupLabs, une organisation 501(c)(3) à but non lucratif basée aux États-"
+#~ "Unis."
+
+#~ msgid ""
+#~ "<strong>Donations are tax-deductible to the full extent permitted by law."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Les dons sont déductibles des impôts dans les limites prévues par "
+#~ "la loi.</strong>"
+
+#~ msgid ""
+#~ "Your donation goes entirely to Tails and will be handled by "
+#~ "Zwiebelfreunde which is a non-profit organization in Germany."
+#~ msgstr ""
+#~ "Votre don est entièrement reversé à Tails et va être traité par "
+#~ "Zwiebelfreunde, une organisation à but non lucratif basée en Allemagne."
+
+#~ msgid "Donate in dollars"
+#~ msgstr "Donner en dollars"
+
+#~ msgid "Recurring donation"
+#~ msgstr "Don régulier"
+
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> "
+#~ "<input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
+#~ "net\"/> <input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
+#~ "\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
+#~ "\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
+#~ "\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
+#~ "\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
+#~ "\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> "
+#~ "<input type=\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" "
+#~ "name=\"p3\" value=\"1\"/> <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=\"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>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> "
+#~ "<input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
+#~ "net\"/> <input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
+#~ "\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
+#~ "\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
+#~ "\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
+#~ "\"https://tails.boum.org/donate/thanks/index.fr.html\"/> <input type="
+#~ "\"hidden\" name=\"cancel_return\" class=\"return-url\" value=\"https://"
+#~ "tails.boum.org/donate/canceled/index.fr.html\"/> <input name=\"lc\" type="
+#~ "\"hidden\" value=\"FR\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/"
+#~ "> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <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="
+#~ "\"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>"
+
+#~ msgid ""
+#~ "<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked="
+#~ "\"checked\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" "
+#~ "name=\"t3\" value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
+#~ msgstr ""
+#~ "<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked="
+#~ "\"checked\"/><label for=\"sub_m\">Mensuel</label> <input type=\"radio\" "
+#~ "name=\"t3\" value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Annuel</label>"
+
+#~ msgid ""
+#~ "<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-"
+#~ "inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
+#~ msgstr ""
+#~ "<input type=\"submit\" value=\"Donner\"/> (Nécessite un compte [[!img "
+#~ "paypal-inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]].)"
+
+#~ msgid "One-time donation"
+#~ msgstr "Don ponctuel"
+
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
+#~ "\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
+#~ "type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/"
+#~ "> <input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
+#~ "<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden"
+#~ "\" name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class="
+#~ "\"return-url\" value=\"https://tails.boum.org/donate/canceled\"/> <input "
+#~ "name=\"lc\" type=\"hidden\" value=\"US\"/> <input type=\"radio\" name="
+#~ "\"amount\" value=\"5\" id=\"pp_5\" checked=\"checked\"/><label for="
+#~ "\"pp_5\">$5</label> <input type=\"radio\" name=\"amount\" value=\"10\" id="
+#~ "\"pp_10\"/><label for=\"pp_10\">$10</label> <input type=\"radio\" name="
+#~ "\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">$20</label> "
+#~ "<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label "
+#~ "for=\"pp_50\">$50</label> <input type=\"radio\" name=\"amount\" value="
+#~ "\"100\" id=\"pp_100\"/><label for=\"pp_100\">$100</label> <input type="
+#~ "\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\"/><label for=\"pp_cust"
+#~ "\">Custom amount</label>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
+#~ "\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
+#~ "type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/"
+#~ "> <input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
+#~ "<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden"
+#~ "\" name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/thanks/index.fr.html\"/> <input type=\"hidden\" name="
+#~ "\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/canceled/index.fr.html\"/> <input name=\"lc\" type=\"hidden\" "
+#~ "value=\"FR\"/> <input type=\"radio\" name=\"amount\" value=\"5\" id="
+#~ "\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input type="
+#~ "\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for=\"pp_10\">"
+#~ "$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
+#~ "\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
+#~ "\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
+#~ "<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
+#~ "for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value="
+#~ "\"\" id=\"pp_cust\"/><label for=\"pp_cust\">Custom amount</label>"
+
+#~ msgid "<input type=\"submit\" value=\"Donate\"/>"
+#~ msgstr "<input type=\"submit\" value=\"Donner\"/>"
+
#, fuzzy
#~| msgid "<em>Purpose of transfer</em>: R43NGFR9 TAILS"
#~ msgid ""
diff --git a/wiki/src/donate.html b/wiki/src/donate.html
index 8f25f72..4a55166 100644
--- a/wiki/src/donate.html
+++ b/wiki/src/donate.html
@@ -38,300 +38,19 @@
<div class="col-md-5">
-<div id="paypal-with-js" class="row">
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <!-- HTML Variables for PayPal Payments Standard:
- https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/ -->
- <input type="hidden" name="cmd" value="_xclick-subscriptions" id="cmd"/>
- <input type="hidden" name="business" value="tailsriseuplabs@riseup.net" id="business"/>
- <input type="hidden" name="currency_code" value="USD" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <!-- Note for translators: adapt the URLs to return to the page in your language. -->
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
-
- <!-- Note for translators: adapt the value of 'lc' to your language. -->
- <input name="lc" type="hidden" value="US"/>
-
- <!-- For recurring donations only. -->
- <input type="hidden" name="a3" value="5" id="a3"/>
- <input type="hidden" name="t3" value="M" id="t3"/>
- <input type="hidden" name="p3" value="1"/>
- <input type="hidden" name="src" value="1"/>
-
- <!-- For one-time donation only. -->
- <input type="hidden" name="amount" value="5" id="amount"/>
-
- <div id="currency">
- <div class="col-md-12 btn-group btn-group-justified" data-toggle="buttons" role="group">
- <label class="btn btn-lg btn-primary active" id="currency-dollar">
- <input type="radio" id="dollars" autocomplete="off" checked data-complete-text="finished!"/> Dollars
- </label>
- <label class="btn btn-lg btn-primary" id="currency-euro">
- <input type="radio" id="euros" autocomplete="off" checked data-complete-text="finished!"/> Euros
- </label>
- </div>
- </div>
+ <div id="duckduckgo">
+ <p><a href="https://www.crowdrise.com/o/en/campaign/tails-live" target="_blank">
+ <img src="./donate_ddg.png" alt="" /></a></p>
+ <p><a href="https://www.crowdrise.com/o/en/campaign/tails-live" target="_blank">
+ Donate via the
+ DuckDuckGo donation challenge.</a> (March 13 &ndash; April 10 2018)</p>
- <div id="frequency">
- <div class="col-md-12 btn-group btn-group-justified" data-toggle="buttons" role="group">
- <label class="btn btn-lg btn-primary" id="one-time">
- <input type="radio" autocomplete="off"/> One-time
- </label>
- <label class="btn btn-lg btn-primary active" id="monthly">
- <input type="radio" autocomplete="off"/> Monthly
- </label>
- <label class="btn btn-lg btn-primary" id="yearly">
- <input type="radio" autocomplete="off" checked/> Yearly
- </label>
- </div>
- </div>
+ <p><strong>Increase the impact of your donation</strong>: donating
+ via the challenge helps us win additional prizes from DuckDuckGo.</p>
- <div id="dollar-amounts" class="amounts donate-dollars" data-toggle="buttons" role="group">
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active">
- <input type="radio" autocomplete="off" value="5"/>$5
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10">
- <input type="radio" autocomplete="off" value="10"/>$10
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25">
- <input type="radio" autocomplete="off" value="25"/>$25
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50">
- <input type="radio" autocomplete="off" value="50"/>$50
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 100">
- <input type="radio" autocomplete="off" value="100"/>$100
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 150">
- <input type="radio" autocomplete="off" value="150"/>$150
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 200">
- <input type="radio" autocomplete="off" value="200"/>$200
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other">
- <span>Other</span>
- <div class="input-group">
- <span class="input-group-addon">$</span>
- <input type="text" pattern="\d+" class="form-control" id="other-dollar"/>
- </div>
- </label>
+ <p>Join our fundraising team and reach out to your social circles!</p>
</div>
- <div id="euro-amounts" class="amounts donate-euros" data-toggle="buttons" role="group">
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active">
- <input type="radio" autocomplete="off" value="5"/>5€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10">
- <input type="radio" autocomplete="off" value="10"/>10€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25">
- <input type="radio" autocomplete="off" value="25"/>25€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50">
- <input type="radio" autocomplete="off" value="50"/>50€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 100">
- <input type="radio" autocomplete="off" value="100"/>100€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 150">
- <input type="radio" autocomplete="off" value="150"/>150€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 200">
- <input type="radio" autocomplete="off" value="200"/>200€
- </label>
- <label class="btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 other">
- <span>Other</span>
- <div class="input-group">
- <input type="text" pattern="\d+" class="form-control text-right" id="other-euro"/>
- <span class="input-group-addon">€</span>
- </div>
- </label>
- </div>
-
- <div id="donate-button">
- <button class="btn btn-primary btn-lg btn-block col-md-12">Donate</button>
- </div>
-
-</form>
-
-<p id="require-paypal">Monthly and yearly donations require
-a [[!img paypal-inline.png link="no" class="paypal-inline" alt="PayPal"]]
-account.</p>
-
-<p id="dollar-tax" class="tax-deducible donate-dollars">Your donation goes entirely to Tails
-and will be handled by RiseupLabs which is a 501(c)(3) non-profit organization
-in the USA.<br/><strong>Donations are tax-deductible to the full extent
-permitted by law.</strong></p>
-
-<p id="euro-tax" class="tax-deducible donate-euros">Your donation goes entirely to Tails
-and will be handled by Zwiebelfreunde which is a non-profit organization
-in Germany.<br/><strong>Donations are tax-deductible to the full extent
-permitted by law.</strong></p>
-
-</div>
-
-<div id="paypal-without-js" class="row">
-
-<div id="dollars-without-js">
-
-<h2>Donate in dollars</h2>
-
-<p id="dollar-tax" class="tax-deducible">Your donation goes entirely to Tails
-and will be handled by RiseupLabs which is a 501(c)(3) non-profit organization
-in the USA.<br/><strong>Donations are tax-deductible to the full extent
-permitted by law.</strong></p>
-
-<h3>Recurring donation</h3>
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <input type="hidden" name="cmd" value="_xclick-subscriptions"/>
- <input type="hidden" name="business" value="tailsriseuplabs@riseup.net"/>
- <input type="hidden" name="currency_code" value="USD" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <!-- Note for translators: adapt the URLs to return to the page in your language. -->
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
-
- <!-- Note for translators: adapt the value of 'lc' to your language. -->
- <input name="lc" type="hidden" value="US"/>
-
- <input type="hidden" name="src" value="1"/>
- <input type="hidden" name="p3" value="1"/>
-
- <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="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>
- <br/>
- <input type="radio" name="t3" value="M" id="sub_m" checked="checked"/><label for="sub_m">Monthly</label>
- <input type="radio" name="t3" value="Y" id="sub_y"/><label for="sub_y">Yearly</label>
- <br/>
- <input type="submit" value="Donate"/> (Requires a [[!img paypal-inline.png link="no" class="paypal-inline" alt="PayPal"]] account.)
-
-</form>
-
-<h3>One-time donation</h3>
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <input type="hidden" name="cmd" value="_donations"/>
- <input type="hidden" name='business' value="tailsriseuplabs@riseup.net"/>
- <input type="hidden" name="currency_code" value="USD" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <!-- Note for translators: the following parts need to be translated:
-
- - https://tails.boum.org/donate/thanks
- - https://tails.boum.org/donate/canceled
- - US -->
-
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
- <input name="lc" type="hidden" value="US"/>
-
- <input type="radio" name="amount" value="5" id="pp_5" checked="checked"/><label for="pp_5">$5</label>
- <input type="radio" name="amount" value="10" id="pp_10"/><label for="pp_10">$10</label>
- <input type="radio" name="amount" value="20" id="pp_20"/><label for="pp_20">$20</label>
- <input type="radio" name="amount" value="50" id="pp_50"/><label for="pp_50">$50</label>
- <input type="radio" name="amount" value="100" id="pp_100"/><label for="pp_100">$100</label>
- <input type="radio" name="amount" value="" id="pp_cust"/><label for="pp_cust">Custom amount</label>
- <br/>
- <input type="submit" value="Donate"/>
-
-</form>
-
-</div>
-<!--
-<p><br/></p>
--->
- <!-- Note for translators: the following parts need to be translated:
- - https://tails.boum.org/donate/thanks
- - https://tails.boum.org/donate/canceled
- - US -->
-<!--
-<div id="euros-without-js">
-
-<h2>Donate in euros</h2>
-
-<p id="euro-tax" class="tax-deducible">Your donation goes entirely to Tails
-and will be handled by Zwiebelfreunde which is a non-profit organization
-in Germany.<br/><strong>Donations are tax-deductible to the full extent
-permitted by law.</strong></p>
-
-<h3>Recurring donation</h3>
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <input type="hidden" name="cmd" value="_xclick-subscriptions"/>
- <input type="hidden" name="business" value="tails@torservers.net"/>
- <input type="hidden" name="currency_code" value="EUR" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
- <input name="lc" type="hidden" value="US"/>
-
- <input type="hidden" name="src" value="1"/>
- <input type="hidden" name="p3" value="1"/>
-
- <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="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>
- <br/>
- <input type="radio" name="t3" value="M" id="sub_m" checked="checked"/><label for="sub_m">Monthly</label>
- <input type="radio" name="t3" value="Y" id="sub_y"/><label for="sub_y">Yearly</label>
- <br/>
- <input type="submit" value="Donate"/> (Requires a [[!img paypal-inline.png link="no" class="paypal-inline" alt="PayPal"]] account.)
-
-</form>
-
-<h3>One-time donation</h3>
-
-<form method="post" action="https://www.paypal.com/cgi-bin/webscr">
-
- <input type="hidden" name="cmd" value="_donations"/>
- <input type="hidden" name='business' value="tails@torservers.net"/>
- <input type="hidden" name="currency_code" value="EUR" id="currency_code"/>
- <input type="hidden" name="item_name" value="Donation to Tails"/>
- <input type="hidden" name="no_note" value="1"/>
-
- <input type="hidden" name="return" class="return-url" value="https://tails.boum.org/donate/thanks"/>
- <input type="hidden" name="cancel_return" class="return-url" value="https://tails.boum.org/donate/canceled"/>
- <input name="lc" type="hidden" value="US"/>
-
- <input type="radio" name="amount" value="5" id="pp_5" checked="checked"/><label for="pp_5">5€</label>
- <input type="radio" name="amount" value="10" id="pp_10"/><label for="pp_10">10€</label>
- <input type="radio" name="amount" value="20" id="pp_20"/><label for="pp_20">20€</label>
- <input type="radio" name="amount" value="50" id="pp_50"/><label for="pp_50">50€</label>
- <input type="radio" name="amount" value="100" id="pp_100"/><label for="pp_100">100€</label>
- <input type="radio" name="amount" value="" id="pp_cust"/><label for="pp_cust">Custom amount</label>
- <br/>
- <input type="submit" value="Donate"/>
-
-</form>
-
-</div>
--->
-
-</div>
-
</div>
</div> <!-- .row -->
@@ -340,12 +59,9 @@ permitted by law.</strong></p>
<h3 class="col-md-12">Other ways to donate</h3>
<div class="col-md-5">
- <div id="duckduckgo">
- <h4>DuckDuckGo</h4>
- <p>From March 13th 2018 to April 10th 2018 you can donate via the <a
- href="https://www.crowdrise.com/o/en/campaign/tails-live"
- target="_blank">DuckDuckGo donation challenge</a>.<br /> Join our
- fundraising team and reach out to your social circles!</p>
+ <div id="paypal">
+ <h4>PayPal</h4>
+ <p>Account: <i>tailsriseuplabs@riseup.net</i></p>
</div>
<div id="bitcoin">
<h4>Bitcoin</h4>
diff --git a/wiki/src/donate.it.po b/wiki/src/donate.it.po
index 8e7c566..7504c74 100644
--- a/wiki/src/donate.it.po
+++ b/wiki/src/donate.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-03-12 17:43+0100\n"
+"POT-Creation-Date: 2018-03-15 13:20+0100\n"
"PO-Revision-Date: 2017-07-21 14:37+0200\n"
"Last-Translator: boyska <piuttosto@logorroici.org>\n"
"Language-Team: \n"
@@ -82,385 +82,43 @@ msgstr ""
msgid "Thanks!"
msgstr "Grazie!"
-#. HTML Variables for PayPal Payments Standard:
-#. https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. For recurring donations only.
-#. For one-time donation only.
-#. type: Content of: <div><div><div><form>
+#. type: Content of: <div><div><div><p><a>
msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
-"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
-"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\">"
msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"IT\"/> <input type="
-"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
-"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
-"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
-"label>"
-msgstr ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollari </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euro </label>"
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Monthly </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Yearly </label>"
-msgstr ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/>Una volta</label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Mensilmente </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly"
-"\"> <input type=\"radio\" autocomplete=\"off\" checked/>Annualmente </label>"
-
-#. type: Content of: <div><div><div><form><div><label>
-#, fuzzy
-#| msgid ""
-#| "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
-#| "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "20\"> <input type=\"radio\" autocomplete=\"off\" value=\"20\"/>$20 </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>$100 </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "250\"> <input type=\"radio\" autocomplete=\"off\" value=\"250\"/>$250 </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "500\"> <input type=\"radio\" autocomplete=\"off\" value=\"500\"/>$500 </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "other\"> <span>Other</span>"
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>$100 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>$150 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>$200 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 20\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"20\"/>$20 </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>$100 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 250\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"250\"/>$250 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 500\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"500\"/>$500 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Altro</span>"
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-msgstr ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-
-#. type: Content of: <div><div><div><form><div>
-msgid "</label>"
-msgstr "</label>"
-
-#. type: Content of: <div><div><div><form><div><label>
-#, fuzzy
-#| msgid ""
-#| "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
-#| "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "20\"> <input type=\"radio\" autocomplete=\"off\" value=\"20\"/>20€ </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>100€ </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "250\"> <input type=\"radio\" autocomplete=\"off\" value=\"250\"/>250€ </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "500\"> <input type=\"radio\" autocomplete=\"off\" value=\"500\"/>500€ </"
-#| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
-#| "other\"> <span>Other</span>"
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 20\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"20\"/>20€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 250\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"250\"/>250€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 500\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"500\"/>500€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Altro</span>"
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-msgstr ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-
-#. type: Content of: <div><div><div><form><div>
-msgid ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</button>"
-msgstr ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Contribuisci</"
-"button>"
#. type: Content of: <div><div><div><p>
-msgid ""
-"Monthly and yearly donations require a [[!img paypal-inline.png link=\"no\" "
-"class=\"paypal-inline\" alt=\"PayPal\"]] account."
+msgid "</a>"
msgstr ""
-"Le donazioni mensili ed annuali necessitano di un account [[!img paypal-"
-"inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]]."
-
-#. type: Content of: <div><div><div><div><p>
-#, fuzzy
-#| msgid ""
-#| "Your donation will be handled by RiseupLabs which is a 501(c)(3) non-"
-#| "profit organization in the USA."
-msgid ""
-"Your donation goes entirely to Tails and will be handled by RiseupLabs which "
-"is a 501(c)(3) non-profit organization in the USA."
-msgstr ""
-"Le tue donazioni saranno maneggiate da RiseupLabs che è una organizzazione "
-"501(c)(3) no-profit in USA."
-
-#. type: Content of: <div><div><div><div><p>
-#, fuzzy
-#| msgid ""
-#| "<strong>All donations are tax-deductible to the full extent permitted by "
-#| "law.</strong>"
-msgid ""
-"<strong>Donations are tax-deductible to the full extent permitted by law.</"
-"strong>"
-msgstr ""
-"<strong>Tutte le donazioni sono interamente scaricabili dalle tasse a norma "
-"di legge.</strong>"
#. type: Content of: <div><div><div><p>
-#, fuzzy
-#| msgid ""
-#| "Your donation will be handled by Zwiebelfreunde which is a non-profit "
-#| "organization in Germany."
msgid ""
-"Your donation goes entirely to Tails and will be handled by Zwiebelfreunde "
-"which is a non-profit organization in Germany."
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\"> Donate via the DuckDuckGo donation challenge.</a> (March 13 "
+"&ndash; April 10 2018)"
msgstr ""
-"Le tue donazioni saranno maneggiate da Zwiebelfreundeche è una "
-"organizzazione no-profit in Germania."
-
-#. type: Content of: <div><div><div><div><h2>
-msgid "Donate in dollars"
-msgstr "Dona in dollari"
-#. type: Content of: <div><div><div><div><h3>
-msgid "Recurring donation"
-msgstr "Donazione ricorrente"
-
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" "
-"value=\"1\"/> <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=\"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>"
-msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" "
-"value=\"1\"/> <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=\"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>"
-
-#. type: Content of: <div><div><div><div><form>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
+"<strong>Increase the impact of your donation</strong>: donating via the "
+"challenge helps us win additional prizes from DuckDuckGo."
msgstr ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Annuale</label>"
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-inline."
-"png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
-msgstr ""
-"<input type=\"submit\" value=\"Donate\"/> (Serve un account [[!img paypal-"
-"inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]].)"
-
-#. type: Content of: <div><div><div><div><h3>
-msgid "One-time donation"
-msgstr "Una singola donazione"
-
-#. Note for translators: the following parts need to be translated:
-#. - https://tails.boum.org/donate/thanks
-#. - https://tails.boum.org/donate/canceled
-#. - US
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-url"
-"\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc\" "
-"type=\"hidden\" value=\"US\"/> <input type=\"radio\" name=\"amount\" value="
-"\"5\" id=\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input "
-"type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for="
-"\"pp_10\">$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
-"\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
-"\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
-"<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
-"for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value=\"\" "
-"id=\"pp_cust\"/><label for=\"pp_cust\">Custom amount</label>"
+#. type: Content of: <div><div><div><p>
+msgid "Join our fundraising team and reach out to your social circles!"
msgstr ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-url"
-"\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc\" "
-"type=\"hidden\" value=\"IT\"/> <input type=\"radio\" name=\"amount\" value="
-"\"5\" id=\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input "
-"type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for="
-"\"pp_10\">$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
-"\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
-"\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
-"<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
-"for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value=\"\" "
-"id=\"pp_cust\"/><label for=\"pp_cust\">Altro importo</label>"
-
-#. type: Content of: <div><div><div><div><form>
-msgid "<input type=\"submit\" value=\"Donate\"/>"
-msgstr "<input type=\"submit\" value=\"Donate\"/>"
#. type: Content of: <div><h3>
msgid "Other ways to donate"
msgstr "Altri modi per contribuire"
#. type: Content of: <div><div><div><h4>
-msgid "DuckDuckGo"
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid ""
-"From March 13th 2018 to April 10th 2018 you can donate via the <a href="
-"\"https://www.crowdrise.com/o/en/campaign/tails-live\" target=\"_blank"
-"\">DuckDuckGo donation challenge</a>."
+msgid "PayPal"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid "Join our fundraising team and reach out to your social circles!"
+msgid "Account: <i>tailsriseuplabs@riseup.net</i>"
msgstr ""
#. type: Content of: <div><div><div><h4>
@@ -615,6 +273,349 @@ msgid "Our financial records are available [[here|doc/about/finances]]."
msgstr ""
"I nostri report finanziari sono consultabili [[qui|doc/about/finances]]."
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
+#~ "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
+#~ "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
+#~ "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
+#~ "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
+#~ "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
+#~ "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
+#~ "thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-"
+#~ "url\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc"
+#~ "\" type=\"hidden\" value=\"US\"/> <input type=\"hidden\" name=\"a3\" "
+#~ "value=\"5\" id=\"a3\"/> <input type=\"hidden\" name=\"t3\" value=\"M\" id="
+#~ "\"t3\"/> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <input type="
+#~ "\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"amount"
+#~ "\" value=\"5\" id=\"amount\"/>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id="
+#~ "\"cmd\"/> <input type=\"hidden\" name=\"business\" value="
+#~ "\"tailsriseuplabs@riseup.net\" id=\"business\"/> <input type=\"hidden\" "
+#~ "name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> <input type="
+#~ "\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> <input type="
+#~ "\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" name="
+#~ "\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
+#~ "thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-"
+#~ "url\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc"
+#~ "\" type=\"hidden\" value=\"IT\"/> <input type=\"hidden\" name=\"a3\" "
+#~ "value=\"5\" id=\"a3\"/> <input type=\"hidden\" name=\"t3\" value=\"M\" id="
+#~ "\"t3\"/> <input type=\"hidden\" name=\"p3\" value=\"1\"/> <input type="
+#~ "\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"amount"
+#~ "\" value=\"5\" id=\"amount\"/>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
+#~ "<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
+#~ "complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg "
+#~ "btn-primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
+#~ "autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
+#~ "label>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
+#~ "<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
+#~ "complete-text=\"finished!\"/> Dollari </label> <label class=\"btn btn-lg "
+#~ "btn-primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
+#~ "autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euro </"
+#~ "label>"
+
+#~ msgid ""
+#~ "<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type="
+#~ "\"radio\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-"
+#~ "lg btn-primary active\" id=\"monthly\"> <input type=\"radio\" "
+#~ "autocomplete=\"off\"/> Monthly </label> <label class=\"btn btn-lg btn-"
+#~ "primary\" id=\"yearly\"> <input type=\"radio\" autocomplete=\"off\" "
+#~ "checked/> Yearly </label>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type="
+#~ "\"radio\" autocomplete=\"off\"/>Una volta</label> <label class=\"btn btn-"
+#~ "lg btn-primary active\" id=\"monthly\"> <input type=\"radio\" "
+#~ "autocomplete=\"off\"/> Mensilmente </label> <label class=\"btn btn-lg btn-"
+#~ "primary\" id=\"yearly\"> <input type=\"radio\" autocomplete=\"off\" "
+#~ "checked/>Annualmente </label>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~| "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </"
+#~| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-"
+#~| "xs-6 10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 "
+#~| "</label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-"
+#~| "xs-6 20\"> <input type=\"radio\" autocomplete=\"off\" value=\"20\"/>$20 "
+#~| "</label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-"
+#~| "xs-6 50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>$50 "
+#~| "</label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-"
+#~| "xs-6 100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>"
+#~| "$100 </label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 "
+#~| "col-xs-6 250\"> <input type=\"radio\" autocomplete=\"off\" value=\"250\"/"
+#~| ">$250 </label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 "
+#~| "col-xs-6 500\"> <input type=\"radio\" autocomplete=\"off\" value=\"500\"/"
+#~| ">$500 </label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 "
+#~| "col-xs-6 other\"> <span>Other</span>"
+#~ msgid ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>$100 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>$150 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>$200 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Other</span>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "20\"> <input type=\"radio\" autocomplete=\"off\" value=\"20\"/>$20 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>$100 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "250\"> <input type=\"radio\" autocomplete=\"off\" value=\"250\"/>$250 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "500\"> <input type=\"radio\" autocomplete=\"off\" value=\"500\"/>$500 </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Altro</span>"
+
+#~ msgid ""
+#~ "<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern="
+#~ "\"\\d+\" class=\"form-control\" id=\"other-dollar\"/>"
+#~ msgstr ""
+#~ "<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern="
+#~ "\"\\d+\" class=\"form-control\" id=\"other-dollar\"/>"
+
+#~ msgid "</label>"
+#~ msgstr "</label>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~| "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </"
+#~| "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-"
+#~| "xs-6 10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ "
+#~| "</label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-"
+#~| "xs-6 20\"> <input type=\"radio\" autocomplete=\"off\" value=\"20\"/>20€ "
+#~| "</label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-"
+#~| "xs-6 50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50€ "
+#~| "</label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-"
+#~| "xs-6 100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/"
+#~| ">100€ </label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 "
+#~| "col-xs-6 250\"> <input type=\"radio\" autocomplete=\"off\" value=\"250\"/"
+#~| ">250€ </label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 "
+#~| "col-xs-6 500\"> <input type=\"radio\" autocomplete=\"off\" value=\"500\"/"
+#~| ">500€ </label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 "
+#~| "col-xs-6 other\"> <span>Other</span>"
+#~ msgid ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "25\"> <input type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>100€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "150\"> <input type=\"radio\" autocomplete=\"off\" value=\"150\"/>150€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "200\"> <input type=\"radio\" autocomplete=\"off\" value=\"200\"/>200€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Other</span>"
+#~ msgstr ""
+#~ "<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 "
+#~ "active\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "10\"> <input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "20\"> <input type=\"radio\" autocomplete=\"off\" value=\"20\"/>20€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "50\"> <input type=\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "100\"> <input type=\"radio\" autocomplete=\"off\" value=\"100\"/>100€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "250\"> <input type=\"radio\" autocomplete=\"off\" value=\"250\"/>250€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "500\"> <input type=\"radio\" autocomplete=\"off\" value=\"500\"/>500€ </"
+#~ "label> <label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 "
+#~ "other\"> <span>Altro</span>"
+
+#~ msgid ""
+#~ "<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" "
+#~ "id=\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
+#~ msgstr ""
+#~ "<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" "
+#~ "id=\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
+
+#~ msgid ""
+#~ "<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</"
+#~ "button>"
+#~ msgstr ""
+#~ "<button class=\"btn btn-primary btn-lg btn-block col-"
+#~ "md-12\">Contribuisci</button>"
+
+#~ msgid ""
+#~ "Monthly and yearly donations require a [[!img paypal-inline.png link=\"no"
+#~ "\" class=\"paypal-inline\" alt=\"PayPal\"]] account."
+#~ msgstr ""
+#~ "Le donazioni mensili ed annuali necessitano di un account [[!img paypal-"
+#~ "inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]]."
+
+#, fuzzy
+#~| msgid ""
+#~| "Your donation will be handled by RiseupLabs which is a 501(c)(3) non-"
+#~| "profit organization in the USA."
+#~ msgid ""
+#~ "Your donation goes entirely to Tails and will be handled by RiseupLabs "
+#~ "which is a 501(c)(3) non-profit organization in the USA."
+#~ msgstr ""
+#~ "Le tue donazioni saranno maneggiate da RiseupLabs che è una "
+#~ "organizzazione 501(c)(3) no-profit in USA."
+
+#, fuzzy
+#~| msgid ""
+#~| "<strong>All donations are tax-deductible to the full extent permitted by "
+#~| "law.</strong>"
+#~ msgid ""
+#~ "<strong>Donations are tax-deductible to the full extent permitted by law."
+#~ "</strong>"
+#~ msgstr ""
+#~ "<strong>Tutte le donazioni sono interamente scaricabili dalle tasse a "
+#~ "norma di legge.</strong>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Your donation will be handled by Zwiebelfreunde which is a non-profit "
+#~| "organization in Germany."
+#~ msgid ""
+#~ "Your donation goes entirely to Tails and will be handled by "
+#~ "Zwiebelfreunde which is a non-profit organization in Germany."
+#~ msgstr ""
+#~ "Le tue donazioni saranno maneggiate da Zwiebelfreundeche è una "
+#~ "organizzazione no-profit in Germania."
+
+#~ msgid "Donate in dollars"
+#~ msgstr "Dona in dollari"
+
+#~ msgid "Recurring donation"
+#~ msgstr "Donazione ricorrente"
+
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> "
+#~ "<input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
+#~ "net\"/> <input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
+#~ "\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
+#~ "\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
+#~ "\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
+#~ "\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
+#~ "\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> "
+#~ "<input type=\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" "
+#~ "name=\"p3\" value=\"1\"/> <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=\"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>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> "
+#~ "<input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
+#~ "net\"/> <input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
+#~ "\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
+#~ "\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
+#~ "\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
+#~ "\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
+#~ "\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> "
+#~ "<input type=\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" "
+#~ "name=\"p3\" value=\"1\"/> <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=\"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>"
+
+#~ msgid ""
+#~ "<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked="
+#~ "\"checked\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" "
+#~ "name=\"t3\" value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
+#~ msgstr ""
+#~ "<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked="
+#~ "\"checked\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" "
+#~ "name=\"t3\" value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Annuale</label>"
+
+#~ msgid ""
+#~ "<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-"
+#~ "inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
+#~ msgstr ""
+#~ "<input type=\"submit\" value=\"Donate\"/> (Serve un account [[!img paypal-"
+#~ "inline.png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]].)"
+
+#~ msgid "One-time donation"
+#~ msgstr "Una singola donazione"
+
+#~ msgid ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
+#~ "\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
+#~ "type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/"
+#~ "> <input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
+#~ "<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden"
+#~ "\" name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class="
+#~ "\"return-url\" value=\"https://tails.boum.org/donate/canceled\"/> <input "
+#~ "name=\"lc\" type=\"hidden\" value=\"US\"/> <input type=\"radio\" name="
+#~ "\"amount\" value=\"5\" id=\"pp_5\" checked=\"checked\"/><label for="
+#~ "\"pp_5\">$5</label> <input type=\"radio\" name=\"amount\" value=\"10\" id="
+#~ "\"pp_10\"/><label for=\"pp_10\">$10</label> <input type=\"radio\" name="
+#~ "\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">$20</label> "
+#~ "<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label "
+#~ "for=\"pp_50\">$50</label> <input type=\"radio\" name=\"amount\" value="
+#~ "\"100\" id=\"pp_100\"/><label for=\"pp_100\">$100</label> <input type="
+#~ "\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\"/><label for=\"pp_cust"
+#~ "\">Custom amount</label>"
+#~ msgstr ""
+#~ "<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
+#~ "\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
+#~ "type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/"
+#~ "> <input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
+#~ "<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden"
+#~ "\" name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/"
+#~ "donate/thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class="
+#~ "\"return-url\" value=\"https://tails.boum.org/donate/canceled\"/> <input "
+#~ "name=\"lc\" type=\"hidden\" value=\"IT\"/> <input type=\"radio\" name="
+#~ "\"amount\" value=\"5\" id=\"pp_5\" checked=\"checked\"/><label for="
+#~ "\"pp_5\">$5</label> <input type=\"radio\" name=\"amount\" value=\"10\" id="
+#~ "\"pp_10\"/><label for=\"pp_10\">$10</label> <input type=\"radio\" name="
+#~ "\"amount\" value=\"20\" id=\"pp_20\"/><label for=\"pp_20\">$20</label> "
+#~ "<input type=\"radio\" name=\"amount\" value=\"50\" id=\"pp_50\"/><label "
+#~ "for=\"pp_50\">$50</label> <input type=\"radio\" name=\"amount\" value="
+#~ "\"100\" id=\"pp_100\"/><label for=\"pp_100\">$100</label> <input type="
+#~ "\"radio\" name=\"amount\" value=\"\" id=\"pp_cust\"/><label for=\"pp_cust"
+#~ "\">Altro importo</label>"
+
+#~ msgid "<input type=\"submit\" value=\"Donate\"/>"
+#~ msgstr "<input type=\"submit\" value=\"Donate\"/>"
+
#, fuzzy
#~| msgid "<em>Purpose of transfer</em>: Donation to Tails"
#~ msgid ""
diff --git a/wiki/src/donate.pt.po b/wiki/src/donate.pt.po
index e694ec2..89c3c82 100644
--- a/wiki/src/donate.pt.po
+++ b/wiki/src/donate.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-03-12 17:43+0100\n"
+"POT-Creation-Date: 2018-03-15 13:20+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"
@@ -64,209 +64,31 @@ msgstr ""
msgid "Thanks!"
msgstr ""
-#. HTML Variables for PayPal Payments Standard:
-#. https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. For recurring donations only.
-#. For one-time donation only.
-#. type: Content of: <div><div><div><form>
+#. type: Content of: <div><div><div><p><a>
msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\" id=\"cmd"
-"\"/> <input type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup."
-"net\" id=\"business\"/> <input type=\"hidden\" name=\"currency_code\" value="
-"\"USD\" id=\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" "
-"value=\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value="
-"\"1\"/> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"a3\" value=\"5\" id=\"a3\"/> <input type=\"hidden\" name="
-"\"t3\" value=\"M\" id=\"t3\"/> <input type=\"hidden\" name=\"p3\" value="
-"\"1\"/> <input type=\"hidden\" name=\"src\" value=\"1\"/> <input type="
-"\"hidden\" name=\"amount\" value=\"5\" id=\"amount\"/>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary active\" id=\"currency-dollar\"> "
-"<input type=\"radio\" id=\"dollars\" autocomplete=\"off\" checked data-"
-"complete-text=\"finished!\"/> Dollars </label> <label class=\"btn btn-lg btn-"
-"primary\" id=\"currency-euro\"> <input type=\"radio\" id=\"euros\" "
-"autocomplete=\"off\" checked data-complete-text=\"finished!\"/> Euros </"
-"label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><div>
-msgid ""
-"<label class=\"btn btn-lg btn-primary\" id=\"one-time\"> <input type=\"radio"
-"\" autocomplete=\"off\"/> One-time </label> <label class=\"btn btn-lg btn-"
-"primary active\" id=\"monthly\"> <input type=\"radio\" autocomplete=\"off\"/"
-"> Monthly </label> <label class=\"btn btn-lg btn-primary\" id=\"yearly\"> "
-"<input type=\"radio\" autocomplete=\"off\" checked/> Yearly </label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>$5 </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>$10 </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>$25 </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>$50 </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>$100 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>$150 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>$200 </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<span class=\"input-group-addon\">$</span> <input type=\"text\" pattern=\"\\d"
-"+\" class=\"form-control\" id=\"other-dollar\"/>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div>
-msgid "</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label>
-msgid ""
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 5 active"
-"\"> <input type=\"radio\" autocomplete=\"off\" value=\"5\"/>5€ </label> "
-"<label class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 10\"> "
-"<input type=\"radio\" autocomplete=\"off\" value=\"10\"/>10€ </label> <label "
-"class=\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 25\"> <input "
-"type=\"radio\" autocomplete=\"off\" value=\"25\"/>25€ </label> <label class="
-"\"btn btn-amount btn-lg btn-primary col-md-3 col-xs-6 50\"> <input type="
-"\"radio\" autocomplete=\"off\" value=\"50\"/>50€ </label> <label class=\"btn "
-"btn-amount btn-lg btn-primary col-md-3 col-xs-6 100\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"100\"/>100€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 150\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"150\"/>150€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 200\"> <input type=\"radio\" "
-"autocomplete=\"off\" value=\"200\"/>200€ </label> <label class=\"btn btn-"
-"amount btn-lg btn-primary col-md-3 col-xs-6 other\"> <span>Other</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div><label><div>
-msgid ""
-"<input type=\"text\" pattern=\"\\d+\" class=\"form-control text-right\" id="
-"\"other-euro\"/> <span class=\"input-group-addon\">€</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><form><div>
-msgid ""
-"<button class=\"btn btn-primary btn-lg btn-block col-md-12\">Donate</button>"
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\">"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid ""
-"Monthly and yearly donations require a [[!img paypal-inline.png link=\"no\" "
-"class=\"paypal-inline\" alt=\"PayPal\"]] account."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"Your donation goes entirely to Tails and will be handled by RiseupLabs which "
-"is a 501(c)(3) non-profit organization in the USA."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><p>
-msgid ""
-"<strong>Donations are tax-deductible to the full extent permitted by law.</"
-"strong>"
+msgid "</a>"
msgstr ""
#. type: Content of: <div><div><div><p>
msgid ""
-"Your donation goes entirely to Tails and will be handled by Zwiebelfreunde "
-"which is a non-profit organization in Germany."
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h2>
-msgid "Donate in dollars"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><h3>
-msgid "Recurring donation"
+"<a href=\"https://www.crowdrise.com/o/en/campaign/tails-live\" target="
+"\"_blank\"> Donate via the DuckDuckGo donation challenge.</a> (March 13 "
+"&ndash; April 10 2018)"
msgstr ""
-#. Note for translators: adapt the URLs to return to the page in your language.
-#. Note for translators: adapt the value of 'lc' to your language.
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_xclick-subscriptions\"/> <input "
-"type=\"hidden\" name=\"business\" value=\"tailsriseuplabs@riseup.net\"/> "
-"<input type=\"hidden\" name=\"currency_code\" value=\"USD\" id="
-"\"currency_code\"/> <input type=\"hidden\" name=\"item_name\" value="
-"\"Donation to Tails\"/> <input type=\"hidden\" name=\"no_note\" value=\"1\"/"
-"> <input type=\"hidden\" name=\"return\" class=\"return-url\" value="
-"\"https://tails.boum.org/donate/thanks\"/> <input type=\"hidden\" name="
-"\"cancel_return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"canceled\"/> <input name=\"lc\" type=\"hidden\" value=\"US\"/> <input type="
-"\"hidden\" name=\"src\" value=\"1\"/> <input type=\"hidden\" name=\"p3\" "
-"value=\"1\"/> <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=\"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>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"radio\" name=\"t3\" value=\"M\" id=\"sub_m\" checked=\"checked"
-"\"/><label for=\"sub_m\">Monthly</label> <input type=\"radio\" name=\"t3\" "
-"value=\"Y\" id=\"sub_y\"/><label for=\"sub_y\">Yearly</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
+#. type: Content of: <div><div><div><p>
msgid ""
-"<input type=\"submit\" value=\"Donate\"/> (Requires a [[!img paypal-inline."
-"png link=\"no\" class=\"paypal-inline\" alt=\"PayPal\"]] account.)"
+"<strong>Increase the impact of your donation</strong>: donating via the "
+"challenge helps us win additional prizes from DuckDuckGo."
msgstr ""
-#. type: Content of: <div><div><div><div><h3>
-msgid "One-time donation"
-msgstr ""
-
-#. Note for translators: the following parts need to be translated:
-#. - https://tails.boum.org/donate/thanks
-#. - https://tails.boum.org/donate/canceled
-#. - US
-#. type: Content of: <div><div><div><div><form>
-msgid ""
-"<input type=\"hidden\" name=\"cmd\" value=\"_donations\"/> <input type="
-"\"hidden\" name='business' value=\"tailsriseuplabs@riseup.net\"/> <input "
-"type=\"hidden\" name=\"currency_code\" value=\"USD\" id=\"currency_code\"/> "
-"<input type=\"hidden\" name=\"item_name\" value=\"Donation to Tails\"/> "
-"<input type=\"hidden\" name=\"no_note\" value=\"1\"/> <input type=\"hidden\" "
-"name=\"return\" class=\"return-url\" value=\"https://tails.boum.org/donate/"
-"thanks\"/> <input type=\"hidden\" name=\"cancel_return\" class=\"return-url"
-"\" value=\"https://tails.boum.org/donate/canceled\"/> <input name=\"lc\" "
-"type=\"hidden\" value=\"US\"/> <input type=\"radio\" name=\"amount\" value="
-"\"5\" id=\"pp_5\" checked=\"checked\"/><label for=\"pp_5\">$5</label> <input "
-"type=\"radio\" name=\"amount\" value=\"10\" id=\"pp_10\"/><label for="
-"\"pp_10\">$10</label> <input type=\"radio\" name=\"amount\" value=\"20\" id="
-"\"pp_20\"/><label for=\"pp_20\">$20</label> <input type=\"radio\" name="
-"\"amount\" value=\"50\" id=\"pp_50\"/><label for=\"pp_50\">$50</label> "
-"<input type=\"radio\" name=\"amount\" value=\"100\" id=\"pp_100\"/><label "
-"for=\"pp_100\">$100</label> <input type=\"radio\" name=\"amount\" value=\"\" "
-"id=\"pp_cust\"/><label for=\"pp_cust\">Custom amount</label>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><form>
-msgid "<input type=\"submit\" value=\"Donate\"/>"
+#. type: Content of: <div><div><div><p>
+msgid "Join our fundraising team and reach out to your social circles!"
msgstr ""
#. type: Content of: <div><h3>
@@ -274,18 +96,11 @@ msgid "Other ways to donate"
msgstr ""
#. type: Content of: <div><div><div><h4>
-msgid "DuckDuckGo"
+msgid "PayPal"
msgstr ""
#. type: Content of: <div><div><div><p>
-msgid ""
-"From March 13th 2018 to April 10th 2018 you can donate via the <a href="
-"\"https://www.crowdrise.com/o/en/campaign/tails-live\" target=\"_blank"
-"\">DuckDuckGo donation challenge</a>."
-msgstr ""
-
-#. type: Content of: <div><div><div><p>
-msgid "Join our fundraising team and reach out to your social circles!"
+msgid "Account: <i>tailsriseuplabs@riseup.net</i>"
msgstr ""
#. type: Content of: <div><div><div><h4>
diff --git a/wiki/src/donate/donate_ddg.png b/wiki/src/donate/donate_ddg.png
new file mode 100644
index 0000000..d553436
--- /dev/null
+++ b/wiki/src/donate/donate_ddg.png
Binary files differ
diff --git a/wiki/src/news/version_3.5/manual_upgrade.inline.de.po b/wiki/src/news/version_3.5/manual_upgrade.inline.de.po
new file mode 100644
index 0000000..165c5e2
--- /dev/null
+++ b/wiki/src/news/version_3.5/manual_upgrade.inline.de.po
@@ -0,0 +1,58 @@
+# 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: 2018-03-16 13:21+0000\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 ""
+" <p>If you are upgrading from Tails 3.5, it is only possible to select "
+"an\n"
+" ISO image when running Tails in English. For other languages, the\n"
+" file chooser button remains inactive:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <ul>\n"
+" <li>Restart Tails 3.5 in English</li>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <li>Start <span class=\"application\">Tails Installer</span> in\n"
+" English from the command line:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <pre>LANG=en_US tails-installer</pre>\n"
+" </li>\n"
+" </ul>\n"
+msgstr ""
diff --git a/wiki/src/news/version_3.5/manual_upgrade.inline.es.po b/wiki/src/news/version_3.5/manual_upgrade.inline.es.po
new file mode 100644
index 0000000..165c5e2
--- /dev/null
+++ b/wiki/src/news/version_3.5/manual_upgrade.inline.es.po
@@ -0,0 +1,58 @@
+# 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: 2018-03-16 13:21+0000\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 ""
+" <p>If you are upgrading from Tails 3.5, it is only possible to select "
+"an\n"
+" ISO image when running Tails in English. For other languages, the\n"
+" file chooser button remains inactive:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <ul>\n"
+" <li>Restart Tails 3.5 in English</li>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <li>Start <span class=\"application\">Tails Installer</span> in\n"
+" English from the command line:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <pre>LANG=en_US tails-installer</pre>\n"
+" </li>\n"
+" </ul>\n"
+msgstr ""
diff --git a/wiki/src/news/version_3.5/manual_upgrade.inline.fa.po b/wiki/src/news/version_3.5/manual_upgrade.inline.fa.po
new file mode 100644
index 0000000..165c5e2
--- /dev/null
+++ b/wiki/src/news/version_3.5/manual_upgrade.inline.fa.po
@@ -0,0 +1,58 @@
+# 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: 2018-03-16 13:21+0000\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 ""
+" <p>If you are upgrading from Tails 3.5, it is only possible to select "
+"an\n"
+" ISO image when running Tails in English. For other languages, the\n"
+" file chooser button remains inactive:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <ul>\n"
+" <li>Restart Tails 3.5 in English</li>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <li>Start <span class=\"application\">Tails Installer</span> in\n"
+" English from the command line:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <pre>LANG=en_US tails-installer</pre>\n"
+" </li>\n"
+" </ul>\n"
+msgstr ""
diff --git a/wiki/src/news/version_3.5/manual_upgrade.inline.fr.po b/wiki/src/news/version_3.5/manual_upgrade.inline.fr.po
new file mode 100644
index 0000000..165c5e2
--- /dev/null
+++ b/wiki/src/news/version_3.5/manual_upgrade.inline.fr.po
@@ -0,0 +1,58 @@
+# 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: 2018-03-16 13:21+0000\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 ""
+" <p>If you are upgrading from Tails 3.5, it is only possible to select "
+"an\n"
+" ISO image when running Tails in English. For other languages, the\n"
+" file chooser button remains inactive:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <ul>\n"
+" <li>Restart Tails 3.5 in English</li>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <li>Start <span class=\"application\">Tails Installer</span> in\n"
+" English from the command line:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <pre>LANG=en_US tails-installer</pre>\n"
+" </li>\n"
+" </ul>\n"
+msgstr ""
diff --git a/wiki/src/news/version_3.5/manual_upgrade.inline.it.po b/wiki/src/news/version_3.5/manual_upgrade.inline.it.po
new file mode 100644
index 0000000..165c5e2
--- /dev/null
+++ b/wiki/src/news/version_3.5/manual_upgrade.inline.it.po
@@ -0,0 +1,58 @@
+# 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: 2018-03-16 13:21+0000\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 ""
+" <p>If you are upgrading from Tails 3.5, it is only possible to select "
+"an\n"
+" ISO image when running Tails in English. For other languages, the\n"
+" file chooser button remains inactive:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <ul>\n"
+" <li>Restart Tails 3.5 in English</li>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <li>Start <span class=\"application\">Tails Installer</span> in\n"
+" English from the command line:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <pre>LANG=en_US tails-installer</pre>\n"
+" </li>\n"
+" </ul>\n"
+msgstr ""
diff --git a/wiki/src/news/version_3.5/manual_upgrade.inline.mdwn b/wiki/src/news/version_3.5/manual_upgrade.inline.mdwn
new file mode 100644
index 0000000..dcfc8c2
--- /dev/null
+++ b/wiki/src/news/version_3.5/manual_upgrade.inline.mdwn
@@ -0,0 +1,17 @@
+ <p>If you are upgrading from Tails 3.5, it is only possible to select an
+ ISO image when running Tails in English. For other languages, the
+ file chooser button remains inactive:</p>
+
+ [[!img news/version_3.5/broken-file-chooser.png link="no"]]
+
+ <p>To do a manual upgrade from Tails 3.5, you can either:</p>
+
+ <ul>
+ <li>Restart Tails 3.5 in English</li>
+
+ <li>Start <span class="application">Tails Installer</span> in
+ English from the command line:
+
+ <pre>LANG=en_US tails-installer</pre>
+ </li>
+ </ul>
diff --git a/wiki/src/news/version_3.5/manual_upgrade.inline.pt.po b/wiki/src/news/version_3.5/manual_upgrade.inline.pt.po
new file mode 100644
index 0000000..165c5e2
--- /dev/null
+++ b/wiki/src/news/version_3.5/manual_upgrade.inline.pt.po
@@ -0,0 +1,58 @@
+# 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: 2018-03-16 13:21+0000\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 ""
+" <p>If you are upgrading from Tails 3.5, it is only possible to select "
+"an\n"
+" ISO image when running Tails in English. For other languages, the\n"
+" file chooser button remains inactive:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!img news/version_3.5/broken-file-chooser.png link=\"no\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <p>To do a manual upgrade from Tails 3.5, you can either:</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <ul>\n"
+" <li>Restart Tails 3.5 in English</li>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <li>Start <span class=\"application\">Tails Installer</span> in\n"
+" English from the command line:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" <pre>LANG=en_US tails-installer</pre>\n"
+" </li>\n"
+" </ul>\n"
+msgstr ""
diff --git a/wiki/src/news/version_3.6.de.po b/wiki/src/news/version_3.6.de.po
index ab4f58a..dbb0c94 100644
--- a/wiki/src/news/version_3.6.de.po
+++ b/wiki/src/news/version_3.6.de.po
@@ -3,18 +3,19 @@
# 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: 2018-03-14 10:19+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"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2018-03-16 13:22+0000\n"
+"PO-Revision-Date: 2018-03-16 13:26+0000\n"
+"Last-Translator: Tails translators <amnesia@boum.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 1.8.11\n"
+"Language-Team: \n"
#. type: Plain text
#, no-wrap
@@ -29,7 +30,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
@@ -41,17 +42,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
msgid "Changes"
-msgstr ""
+msgstr "Änderungen"
#. type: Title ##
#, no-wrap
msgid "New features"
-msgstr ""
+msgstr "Neue Funktionen"
#. type: Bullet: '- '
msgid ""
@@ -116,7 +117,7 @@ msgstr ""
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
-msgstr ""
+msgstr "Aktualisierungen und Änderungen"
#. type: Bullet: '- '
msgid ""
@@ -166,7 +167,7 @@ msgstr ""
#. type: Title ##
#, no-wrap
msgid "Fixed problems"
-msgstr ""
+msgstr "Behobene Probleme"
#. type: Plain text
msgid "- Remove the display of debug and error messages when starting."
@@ -199,6 +200,8 @@ msgid ""
"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
"\"]]."
msgstr ""
+"Lesen Sie für mehr Details unser [[!tails_gitweb debian/changelog desc=\""
+"Änderungsprotokoll\"]]."
#. type: Plain text
#, no-wrap
@@ -208,7 +211,7 @@ msgstr ""
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "Bekannte Probleme"
#. type: Bullet: '- '
msgid ""
@@ -228,6 +231,8 @@ msgstr ""
#. type: Plain text
msgid "See the list of [[long-standing issues|support/known_issues]]."
msgstr ""
+"Lesen Sie sich die Liste der [[längerfristig bekannten "
+"Probleme|support/known_issues]] durch."
#. type: Title #
#, no-wrap
@@ -237,6 +242,12 @@ msgstr ""
#. type: Plain text
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
+"- Befolgen Sie zum Installieren unsere [[Installationsanweisungen|install]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"upgrade\"></a>\n"
+msgstr ""
#. type: Bullet: '- '
msgid ""
@@ -246,13 +257,18 @@ msgid ""
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
#. type: Title #
#, no-wrap
msgid "What's coming up?"
-msgstr ""
+msgstr "Was kommt als Nächstes?"
#. type: Plain text
msgid "Tails 3.7 is [[scheduled|contribute/calendar]] for May 8."
@@ -261,6 +277,8 @@ msgstr ""
#. type: Plain text
msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
msgstr ""
+"Werfen Sie einen Blick auf die [[!tails_roadmap desc=\"Roadmap\"]], um zu "
+"sehen, was wir als Nächstes vorhaben."
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/news/version_3.6.es.po b/wiki/src/news/version_3.6.es.po
index ab4f58a..0cf833b 100644
--- a/wiki/src/news/version_3.6.es.po
+++ b/wiki/src/news/version_3.6.es.po
@@ -3,18 +3,19 @@
# 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: 2018-03-14 10:19+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2018-03-14 08:53+0000\n"
+"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.10.1\n"
#. type: Plain text
#, no-wrap
@@ -29,7 +30,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
@@ -41,17 +42,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
msgid "Changes"
-msgstr ""
+msgstr "Cambios"
#. type: Title ##
#, no-wrap
msgid "New features"
-msgstr ""
+msgstr "Nuevas funcionalidades"
#. type: Bullet: '- '
msgid ""
@@ -116,7 +117,7 @@ msgstr ""
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
-msgstr ""
+msgstr "Actualizaciones y cambios"
#. type: Bullet: '- '
msgid ""
@@ -166,7 +167,7 @@ msgstr ""
#. type: Title ##
#, no-wrap
msgid "Fixed problems"
-msgstr ""
+msgstr "Problemas arreglados"
#. type: Plain text
msgid "- Remove the display of debug and error messages when starting."
@@ -208,7 +209,7 @@ msgstr ""
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "Problemas conocidos"
#. type: Bullet: '- '
msgid ""
@@ -238,6 +239,11 @@ msgstr ""
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"upgrade\"></a>\n"
+msgstr ""
+
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
@@ -246,13 +252,18 @@ msgid ""
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
#. type: Title #
#, no-wrap
msgid "What's coming up?"
-msgstr ""
+msgstr "¿Qué novedades hay?"
#. type: Plain text
msgid "Tails 3.7 is [[scheduled|contribute/calendar]] for May 8."
diff --git a/wiki/src/news/version_3.6.fa.po b/wiki/src/news/version_3.6.fa.po
index ab4f58a..9618d32 100644
--- a/wiki/src/news/version_3.6.fa.po
+++ b/wiki/src/news/version_3.6.fa.po
@@ -3,18 +3,19 @@
# 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: 2018-03-14 10:19+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
+"PO-Revision-Date: 2018-03-14 10:28+0000\n"
+"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \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=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.10.1\n"
#. type: Plain text
#, no-wrap
@@ -29,7 +30,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
@@ -41,7 +42,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
@@ -203,12 +204,12 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "<a id=\"known-issues\"></a>\n"
-msgstr ""
+msgstr "<a id=\"known-issues\"></a>\n"
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "مشکلات شناسایی‌شده"
#. type: Bullet: '- '
msgid ""
@@ -238,6 +239,11 @@ msgstr ""
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"upgrade\"></a>\n"
+msgstr "<a id=\"upgrade\"></a>\n"
+
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
@@ -246,6 +252,11 @@ msgid ""
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fa\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
diff --git a/wiki/src/news/version_3.6.fr.po b/wiki/src/news/version_3.6.fr.po
index ab4f58a..a588c47 100644
--- a/wiki/src/news/version_3.6.fr.po
+++ b/wiki/src/news/version_3.6.fr.po
@@ -3,18 +3,19 @@
# 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: 2018-03-14 10:19+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2018-03-14 09:22+0000\n"
+"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 2.10.1\n"
#. type: Plain text
#, no-wrap
@@ -29,7 +30,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
@@ -41,17 +42,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
msgid "Changes"
-msgstr ""
+msgstr "Changements"
#. type: Title ##
#, no-wrap
msgid "New features"
-msgstr ""
+msgstr "Nouvelles fonctionnalités"
#. type: Bullet: '- '
msgid ""
@@ -116,7 +117,7 @@ msgstr ""
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
-msgstr ""
+msgstr "Mises à jour et changements"
#. type: Bullet: '- '
msgid ""
@@ -166,7 +167,7 @@ msgstr ""
#. type: Title ##
#, no-wrap
msgid "Fixed problems"
-msgstr ""
+msgstr "Problèmes résolus"
#. type: Plain text
msgid "- Remove the display of debug and error messages when starting."
@@ -199,16 +200,18 @@ msgid ""
"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
"\"]]."
msgstr ""
+"Pour plus d'informations, lisez notre [[!tails_gitweb debian/changelog desc="
+"\"liste des changements\"]]."
#. type: Plain text
#, no-wrap
msgid "<a id=\"known-issues\"></a>\n"
-msgstr ""
+msgstr "<a id=\"known-issues\"></a>\n"
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "Problèmes connus"
#. type: Bullet: '- '
msgid ""
@@ -228,6 +231,8 @@ msgstr ""
#. type: Plain text
msgid "See the list of [[long-standing issues|support/known_issues]]."
msgstr ""
+"Voir la liste de nos [[problèmes connus de longue "
+"date|support/known_issues]]."
#. type: Title #
#, no-wrap
@@ -236,7 +241,13 @@ msgstr ""
#. type: Plain text
msgid "- To install, follow our [[installation instructions|install]]."
-msgstr ""
+msgstr "- Pour installer, suivez nos [[instructions d'installation|install]]."
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "<a id=\"known-issues\"></a>\n"
+msgid "<a id=\"upgrade\"></a>\n"
+msgstr "<a id=\"known-issues\"></a>\n"
#. type: Bullet: '- '
msgid ""
@@ -246,13 +257,18 @@ msgid ""
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
#. type: Title #
#, no-wrap
msgid "What's coming up?"
-msgstr ""
+msgstr "Et ensuite ?"
#. type: Plain text
msgid "Tails 3.7 is [[scheduled|contribute/calendar]] for May 8."
@@ -261,6 +277,8 @@ msgstr ""
#. type: Plain text
msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
msgstr ""
+"Jetez un œil à notre [[!tails_roadmap desc=\"feuille de route\"]] pour "
+"savoir ce que nous avons en tête."
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/news/version_3.6.it.po b/wiki/src/news/version_3.6.it.po
index ab4f58a..40795db 100644
--- a/wiki/src/news/version_3.6.it.po
+++ b/wiki/src/news/version_3.6.it.po
@@ -3,18 +3,19 @@
# 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: 2018-03-14 10:19+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2018-03-14 09:33+0000\n"
+"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.10.1\n"
#. type: Plain text
#, no-wrap
@@ -29,7 +30,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
@@ -41,17 +42,17 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
msgid "Changes"
-msgstr ""
+msgstr "Cambi"
#. type: Title ##
#, no-wrap
msgid "New features"
-msgstr ""
+msgstr "Nuove funzionalità"
#. type: Bullet: '- '
msgid ""
@@ -116,7 +117,7 @@ msgstr ""
#. type: Title ##
#, no-wrap
msgid "Upgrades and changes"
-msgstr ""
+msgstr "Aggiornamenti e cambiamenti"
#. type: Bullet: '- '
msgid ""
@@ -166,7 +167,7 @@ msgstr ""
#. type: Title ##
#, no-wrap
msgid "Fixed problems"
-msgstr ""
+msgstr "Problemi risolti"
#. type: Plain text
msgid "- Remove the display of debug and error messages when starting."
@@ -199,6 +200,8 @@ msgid ""
"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
"\"]]."
msgstr ""
+"Per maggiori dettagli, leggi il nostro [[!tails_gitweb debian/changelog desc="
+"\"changelog\"]]."
#. type: Plain text
#, no-wrap
@@ -208,7 +211,7 @@ msgstr ""
#. type: Title #
#, no-wrap
msgid "Known issues"
-msgstr ""
+msgstr "Problemi noti"
#. type: Bullet: '- '
msgid ""
@@ -227,7 +230,7 @@ msgstr ""
#. type: Plain text
msgid "See the list of [[long-standing issues|support/known_issues]]."
-msgstr ""
+msgstr "Vedi la lista dei [[problemi noti da tempo|support/known_issues]]."
#. type: Title #
#, no-wrap
@@ -237,6 +240,12 @@ msgstr ""
#. type: Plain text
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
+"- Per installare, segui le nostre [[istruzioni per l'installazione|install]]."
+
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"upgrade\"></a>\n"
+msgstr ""
#. type: Bullet: '- '
msgid ""
@@ -246,13 +255,18 @@ msgid ""
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
#. type: Title #
#, no-wrap
msgid "What's coming up?"
-msgstr ""
+msgstr "Cosa arriverà nelle prossime versioni?"
#. type: Plain text
msgid "Tails 3.7 is [[scheduled|contribute/calendar]] for May 8."
@@ -260,7 +274,7 @@ msgstr ""
#. type: Plain text
msgid "Have a look at our [[!tails_roadmap]] to see where we are heading to."
-msgstr ""
+msgstr "Dai uno sguardo alla [[!tails_roadmap]] per sapere a cosa puntiamo."
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/news/version_3.6.mdwn b/wiki/src/news/version_3.6.mdwn
index 8f33882..311b820 100644
--- a/wiki/src/news/version_3.6.mdwn
+++ b/wiki/src/news/version_3.6.mdwn
@@ -100,10 +100,14 @@ See the list of [[long-standing issues|support/known_issues]].
- To install, follow our [[installation instructions|install]].
+<a id="upgrade"></a>
+
- We do not provide automatic upgrades from older Tails installations for
this release, as we've hit an old bug while generating the necessary files
([[!tails_ticket 13426]]). You have to [[upgrade manually|upgrade]].
+ [[!inline pages="news/version_3.5/manual_upgrade.inline" raw="yes" sort="age"]]
+
- [[Download Tails 3.6.|install/download]]
# What's coming up?
diff --git a/wiki/src/news/version_3.6.pt.po b/wiki/src/news/version_3.6.pt.po
index ab4f58a..0a08992 100644
--- a/wiki/src/news/version_3.6.pt.po
+++ b/wiki/src/news/version_3.6.pt.po
@@ -3,18 +3,19 @@
# 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: 2018-03-14 10:19+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2018-03-14 10:28+0000\n"
+"Last-Translator: Weblate Admin <admin@example.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.10.1\n"
#. type: Plain text
#, no-wrap
@@ -29,7 +30,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!tag announce]]\n"
-msgstr ""
+msgstr "[[!tag announce]]\n"
#. type: Plain text
msgid ""
@@ -41,7 +42,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid "[[!toc levels=1]]\n"
-msgstr ""
+msgstr "[[!toc levels=1]]\n"
#. type: Title #
#, no-wrap
@@ -238,6 +239,11 @@ msgstr ""
msgid "- To install, follow our [[installation instructions|install]]."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid "<a id=\"upgrade\"></a>\n"
+msgstr ""
+
#. type: Bullet: '- '
msgid ""
"We do not provide automatic upgrades from older Tails installations for this "
@@ -246,6 +252,11 @@ msgid ""
msgstr ""
#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
msgid "- [[Download Tails 3.6.|install/download]]"
msgstr ""
diff --git a/wiki/src/upgrade/tails.de.po b/wiki/src/upgrade/tails.de.po
index 0330406..035f1ac 100644
--- a/wiki/src/upgrade/tails.de.po
+++ b/wiki/src/upgrade/tails.de.po
@@ -6,9 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-02-21 18:45+0100\n"
-"PO-Revision-Date: 2016-02-19 19:22+0100\n"
-"Last-Translator: Tails translators <tails@boum.org>\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
+"PO-Revision-Date: 2018-03-16 13:40+0000\n"
+"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,9 @@ msgid "[[!meta title=\"Manually upgrade inside Tails\"]]\n"
msgstr "[[!meta title=\"Manuell in Tails aktualisieren\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
+#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -149,6 +148,26 @@ msgid ""
"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
msgstr "Schließen Sie den <span class=\"application\">Tails Installer</span>."
+#. type: Plain text
+#, no-wrap
+msgid " <a id=\"3.5\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr " <div class=\"bug\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.de\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
#. type: Bullet: '1. '
msgid ""
"Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
@@ -207,10 +226,13 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
-#~ "In diesem Schritt werden Sie ein zwischenzeitliches Tails installieren, indem Sie\n"
-#~ "mithilfe des <span class=\"application\">Tails Installers</span> Ihr veraltetes Tails auf einen anderen USB-Stick klonen.\n"
+#~ "In diesem Schritt werden Sie ein zwischenzeitliches Tails installieren, "
+#~ "indem Sie\n"
+#~ "mithilfe des <span class=\"application\">Tails Installers</span> Ihr "
+#~ "veraltetes Tails auf einen anderen USB-Stick klonen.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -221,8 +243,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Aktualisieren Sie das zwischenzeitliche Tails\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
@@ -239,7 +265,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
#~ " </span>\n"
-#~ " um den <span class=\"application\">Tails Installer</span> erneut zu starten.\n"
+#~ " um den <span class=\"application\">Tails Installer</span> erneut zu "
+#~ "starten.\n"
#~ msgid "Click on the <span class=\"button\">Upgrade from ISO</span> button."
#~ msgstr ""
@@ -294,13 +321,6 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.de\" raw=\"yes\
#~ msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
-#~ msgid ""
-#~ "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort="
-#~ "\"age\"]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"install/inc/steps/download.inline.de\" raw=\"yes\" sort="
-#~ "\"age\"]]\n"
-
#~ msgid "[[!inline pages=\"install/inc/steps/switch.inline\" raw=\"yes\"]]\n"
#~ msgstr ""
#~ "[[!inline pages=\"install/inc/steps/switch.inline.de\" raw=\"yes\"]]\n"
diff --git a/wiki/src/upgrade/tails.es.po b/wiki/src/upgrade/tails.es.po
index a5a7058..667fe1b 100755
--- a/wiki/src/upgrade/tails.es.po
+++ b/wiki/src/upgrade/tails.es.po
@@ -4,10 +4,10 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-02-21 18:45+0100\n"
-"PO-Revision-Date: 2018-01-31 16:47+0000\n"
-"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
+"PO-Revision-Date: 2018-03-16 13:38+0000\n"
+"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"upgrade-tails/es/>\n"
"Language: es\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.10.1\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -146,6 +146,26 @@ msgid ""
"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
msgstr "Cierra el <span class=\"application\">Tails Installer</span>."
+#. type: Plain text
+#, no-wrap
+msgid " <a id=\"3.5\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr " <div class=\"bug\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.es\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
#. type: Bullet: '1. '
msgid ""
"Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
@@ -204,10 +224,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
#~ "En este paso, instalarás un Tails intermedio clonando tu\n"
-#~ "Tails desactualizado en otra memoria USB usando el <span class=\"application\">Tails Installer</span>.\n"
+#~ "Tails desactualizado en otra memoria USB usando el <span class="
+#~ "\"application\">Tails Installer</span>.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -218,8 +240,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Actualiza el Tails intermedio\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
@@ -236,7 +262,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
#~ " </span>\n"
-#~ " para iniciar el <span class=\"application\">Tails Installer</span> nuevamente.\n"
+#~ " para iniciar el <span class=\"application\">Tails Installer</span> "
+#~ "nuevamente.\n"
#~ msgid "Click on the <span class=\"button\">Upgrade from ISO</span> button."
#~ msgstr ""
@@ -289,10 +316,3 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.es\" raw=\"yes\
#~ msgstr ""
#~ "[[!inline pages=\"install/inc/tails-installation-assistant.inline.es\" "
#~ "raw=\"yes\" sort=\"age\"]]\n"
-
-#~ msgid ""
-#~ "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort="
-#~ "\"age\"]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"install/inc/steps/download.inline.es\" raw=\"yes\" sort="
-#~ "\"age\"]]\n"
diff --git a/wiki/src/upgrade/tails.fa.po b/wiki/src/upgrade/tails.fa.po
index 5ff8715..12d0a4d 100644
--- a/wiki/src/upgrade/tails.fa.po
+++ b/wiki/src/upgrade/tails.fa.po
@@ -3,18 +3,18 @@
# 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: 2018-02-21 18:45+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"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
+"PO-Revision-Date: 2018-03-16 13:44+0000\n"
+"Last-Translator: Tails translators <amnesia@boum.org>\n"
+"Language-Team: \n"
+"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
#. type: Plain text
#, no-wrap
@@ -130,6 +130,26 @@ msgid ""
"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
msgstr ""
+#. type: Plain text
+#, no-wrap
+msgid " <a id=\"3.5\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fa\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr ""
+
#. type: Bullet: '1. '
msgid ""
"Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
diff --git a/wiki/src/upgrade/tails.fr.po b/wiki/src/upgrade/tails.fr.po
index 73d8ac6..a6f47f7 100644
--- a/wiki/src/upgrade/tails.fr.po
+++ b/wiki/src/upgrade/tails.fr.po
@@ -6,9 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-02-21 18:45+0100\n"
-"PO-Revision-Date: 2017-08-26 12:57+0000\n"
-"Last-Translator: AtomiKe <tails@atomike.ninja>\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
+"PO-Revision-Date: 2018-03-16 13:45+0000\n"
+"Last-Translator: Tails translators <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
@@ -147,6 +147,26 @@ msgid ""
"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
msgstr "Fermer l'<span class=\"application\">Installeur de Tails</span>."
+#. type: Plain text
+#, no-wrap
+msgid " <a id=\"3.5\"></a>\n"
+msgstr " <a id=\"3.5\"></a>\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr " <div class=\"bug\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.fr\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
#. type: Bullet: '1. '
msgid ""
"Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
@@ -205,10 +225,13 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
-#~ "À cette étape, vous devrez installer un Tails intermédiaire en clonant votre\n"
-#~ "Tails obsolète sur une autre clé USB en utilisant l'<span class=\"application\">Installeur de Tails</span>.\n"
+#~ "À cette étape, vous devrez installer un Tails intermédiaire en clonant "
+#~ "votre\n"
+#~ "Tails obsolète sur une autre clé USB en utilisant l'<span class="
+#~ "\"application\">Installeur de Tails</span>.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -219,8 +242,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Mettre à jour le Tails intermédiaire\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
@@ -235,9 +262,11 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ " <span class=\"menuchoice\">\n"
#~ " <span class=\"guimenu\">Applications</span>&nbsp;▸\n"
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
-#~ " <span class=\"guimenuitem\">Programme d'installation de Tails</span>\n"
+#~ " <span class=\"guimenuitem\">Programme d'installation de Tails</"
+#~ "span>\n"
#~ " </span>\n"
-#~ " pour démarrer l'<span class=\"application\">Installeur de Tails</span> à nouveau.\n"
+#~ " pour démarrer l'<span class=\"application\">Installeur de Tails</span> "
+#~ "à nouveau.\n"
#~ msgid "Click on the <span class=\"button\">Upgrade from ISO</span> button."
#~ msgstr ""
@@ -291,10 +320,3 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline.fr\" raw=\"yes\
#~ msgid "[[!meta script=\"install/inc/js/dave\"]]\n"
#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
-
-#~ msgid ""
-#~ "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort="
-#~ "\"age\"]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"install/inc/steps/download.inline.fr\" raw=\"yes\" sort="
-#~ "\"age\"]]\n"
diff --git a/wiki/src/upgrade/tails.it.po b/wiki/src/upgrade/tails.it.po
index edf95db..6670d69 100644
--- a/wiki/src/upgrade/tails.it.po
+++ b/wiki/src/upgrade/tails.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-02-21 18:45+0100\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2016-08-25 18:00-0000\n"
"Last-Translator: transitails <transitails@inventati.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -22,10 +22,9 @@ msgid "[[!meta title=\"Manually upgrade inside Tails\"]]\n"
msgstr "[[!meta title=\"Aggiornamento Manuale dentro Tails\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
+#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -149,6 +148,26 @@ msgid ""
"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
msgstr "Chiudi <span class=\"application\">Tails Installer</span>."
+#. type: Plain text
+#, no-wrap
+msgid " <a id=\"3.5\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr " <div class=\"bug\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.it\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
#. type: Bullet: '1. '
msgid ""
"Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
@@ -207,10 +226,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
#~ "In questo passo, installerai una Tails intermedia clonando la tua\n"
-#~ "vecchia Tails su un altra pennetta USB <span class=\"application\">Installatore di Tails</span>.\n"
+#~ "vecchia Tails su un altra pennetta USB <span class=\"application"
+#~ "\">Installatore di Tails</span>.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -221,8 +242,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Aggiornare la Tails intermedia\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
#~ msgid ""
#~ "1. Choose\n"
@@ -294,13 +319,6 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ msgstr "[[!meta script=\"install/inc/js/dave\"]]\n"
#~ msgid ""
-#~ "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort="
-#~ "\"age\"]]\n"
-#~ msgstr ""
-#~ "[[!inline pages=\"install/inc/steps/download.inline\" raw=\"yes\" sort="
-#~ "\"age\"]]\n"
-
-#~ msgid ""
#~ "<div class=\"step-image\">[[!img install/inc/infography/plug-upgrade-usb."
#~ "png link=\"no\" alt=\"Second USB stick plugged on the left\"]]</div>\n"
#~ msgstr ""
diff --git a/wiki/src/upgrade/tails.mdwn b/wiki/src/upgrade/tails.mdwn
index 7173348..94d37d9 100644
--- a/wiki/src/upgrade/tails.mdwn
+++ b/wiki/src/upgrade/tails.mdwn
@@ -49,6 +49,14 @@ copied.</p>
1. Choose <span class="guilabel">Use a downloaded Tails ISO
image</span>.
+ <a id="3.5"></a>
+
+ <div class="bug">
+
+ [[!inline pages="news/version_3.5/manual_upgrade.inline" raw="yes" sort="age"]]
+
+ </div>
+
1. Use the <span class="guilabel">Target Device</span> drop-down list to
specify the intermediary USB stick.
diff --git a/wiki/src/upgrade/tails.pt.po b/wiki/src/upgrade/tails.pt.po
index 6fc4d8a..7fbb122 100644
--- a/wiki/src/upgrade/tails.pt.po
+++ b/wiki/src/upgrade/tails.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
-"POT-Creation-Date: 2018-02-21 18:45+0100\n"
+"POT-Creation-Date: 2018-03-16 15:33+0100\n"
"PO-Revision-Date: 2016-04-02 13:51-0300\n"
"Last-Translator: Tails Developers <amnesia@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -22,10 +22,9 @@ msgid "[[!meta title=\"Manually upgrade inside Tails\"]]\n"
msgstr "[[!meta title=\"Atualizar manualmente dentro do Tails\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
+#, no-wrap
msgid "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
-msgstr "[[!meta stylesheet=\"bootstrap\" rel=\"stylesheet\" title=\"\"]]\n"
+msgstr "[[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" title=\"\"]]\n"
#. type: Plain text
#, no-wrap
@@ -151,6 +150,26 @@ msgid ""
"Choose <span class=\"guilabel\">Use a downloaded Tails ISO image</span>."
msgstr "Feche o <span class=\"application\">Tails Installer</span>."
+#. type: Plain text
+#, no-wrap
+msgid " <a id=\"3.5\"></a>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid " <div class=\"bug\">\n"
+msgstr " <div class=\"bug\">\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " [[!inline pages=\"news/version_3.5/manual_upgrade.inline\" raw=\"yes\" sort=\"age\"]]\n"
+msgstr " [[!inline pages=\"news/version_3.5/manual_upgrade.inline.pt\" raw=\"yes\" sort=\"age\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid " </div>\n"
+msgstr " </div>\n"
+
#. type: Bullet: '1. '
msgid ""
"Use the <span class=\"guilabel\">Target Device</span> drop-down list to "
@@ -212,10 +231,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
#~ msgid ""
#~ "In this step, you will install an intermediary Tails by cloning your\n"
-#~ "outdated Tails on another USB stick using <span class=\"application\">Tails Installer</span>.\n"
+#~ "outdated Tails on another USB stick using <span class=\"application"
+#~ "\">Tails Installer</span>.\n"
#~ msgstr ""
#~ "Nesta etapa, você instalará um Tails intermediário clonando o\n"
-#~ "Tails desatualizado em outra unidade USB usando o <span class=\"application\">Tails Installer</span>.\n"
+#~ "Tails desatualizado em outra unidade USB usando o <span class="
+#~ "\"application\">Tails Installer</span>.\n"
#~ msgid ""
#~ "Click on the <span class=\"button\">Install by cloning</span> button."
@@ -225,8 +246,12 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ msgid "Upgrade the intermediary Tails\n"
#~ msgstr "Atualize o Tails intermediário\n"
-#~ msgid "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
-#~ msgstr "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgid ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
+#~ msgstr ""
+#~ "<div class=\"step-image\">[[!img install/inc/infography/upgrade-upgrade-"
+#~ "usb.png link=\"no\" alt=\"\"]]</div>\n"
# Mantive "Tails Installer" porque no sistema operacional, o item do menu está com este nome.
#~ msgid ""
@@ -244,7 +269,8 @@ msgstr "[[!inline pages=\"install/inc/steps/install_final.inline\" raw=\"yes\" s
#~ " <span class=\"guisubmenu\">Tails</span>&nbsp;▸\n"
#~ " <span class=\"guimenuitem\">Tails Installer</span>\n"
#~ " </span>\n"
-#~ " para iniciar o <span class=\"application\">Tails Installer</span> novamente.\n"
+#~ " para iniciar o <span class=\"application\">Tails Installer</span> "
+#~ "novamente.\n"
#~ msgid "Click on the <span class=\"button\">Upgrade from ISO</span> button."
#~ msgstr "Clique no botão <span class=\"button\">Atualizar de uma ISO</span>."