summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtomiKe <tails@atomike.ninja>2016-10-07 23:11:52 +0200
committerAtomiKe <tails@atomike.ninja>2016-10-07 23:11:52 +0200
commitf3411ad3a40334591825bdfde8264acdf7b48aa3 (patch)
tree31426da8aa6f15d5a62ec96c884a1cce4ceba3a5
parente1eaf2f73c578e545fa1def45f233358d93f431b (diff)
parentb89d6467e8b98a3bb348aa959486e4317da62ac6 (diff)
Merge branch 'master' of https://git-tails.immerda.ch/tails into review/xin/donate
Conflicts: wiki/src/donate.fr.po
-rw-r--r--wiki/src/blueprint/donation_campaign_2016/income.svg4
-rw-r--r--wiki/src/blueprint/randomness_seeding.mdwn3
-rw-r--r--wiki/src/contribute/reports/SponsorS/2015/2016_09.mdwn (renamed from wiki/src/blueprint/SponsorS/reports/2016_09.mdwn)28
-rw-r--r--wiki/src/donate.css2
-rw-r--r--wiki/src/donate.de.po14
-rw-r--r--wiki/src/donate.fa.po14
-rw-r--r--wiki/src/donate.fr.po13
-rw-r--r--wiki/src/donate.html14
-rw-r--r--wiki/src/donate.it.po14
-rw-r--r--wiki/src/donate.pt.po14
-rw-r--r--wiki/src/donate/expenses.pngbin0 -> 27321 bytes
11 files changed, 84 insertions, 36 deletions
diff --git a/wiki/src/blueprint/donation_campaign_2016/income.svg b/wiki/src/blueprint/donation_campaign_2016/income.svg
index 8fb3f84..ae8cd84 100644
--- a/wiki/src/blueprint/donation_campaign_2016/income.svg
+++ b/wiki/src/blueprint/donation_campaign_2016/income.svg
@@ -17,8 +17,8 @@
xml:space="preserve"
sodipodi:docname="income.svg"
inkscape:export-filename="/home/amnesia/Persistent/master/wiki/src/blueprint/donation_campaign_2016/income.png"
- inkscape:export-xdpi="150.00009"
- inkscape:export-ydpi="150.00009"><metadata
+ inkscape:export-xdpi="57.058704"
+ inkscape:export-ydpi="57.058704"><metadata
id="metadata3029"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
diff --git a/wiki/src/blueprint/randomness_seeding.mdwn b/wiki/src/blueprint/randomness_seeding.mdwn
index 43f3e2a..2f82e27 100644
--- a/wiki/src/blueprint/randomness_seeding.mdwn
+++ b/wiki/src/blueprint/randomness_seeding.mdwn
@@ -189,8 +189,7 @@ Using this in addition to the persistent seed mentionned above may thus be the
way to go.
This solution is partial since it only works for Tails Installer+USB stick, and
-there's actually quite a lot of entropy (we sadly can't collect) about the
-future of the Tails installer.
+we don't know if and how we will use the Tails installer in the future (see [[!tails_ticket 11679]]).
One drawback: this would break the ability to verify this system partition with
a simple shasum operation.
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_09.mdwn b/wiki/src/contribute/reports/SponsorS/2015/2016_09.mdwn
index 813aec5..a711a59 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_09.mdwn
+++ b/wiki/src/contribute/reports/SponsorS/2015/2016_09.mdwn
@@ -2,30 +2,6 @@
[[!toc levels=2]]
-<div class="caution">
-<strong>Deadline: 2016-10-05</strong>
-</div>
-
-<div class="note">
-Deliverable identifiers and descriptions are not free-form: they must
-be copy'n'pasted as-is from the proposal sent to the sponsor.
-
-<pre>
-## A.n. description of subsection
-
-- A.n.m. description of deliverable: ticket numbers
-
- status summary:
-
- * what was done
- * what is the outcome (how it makes Tails better)
- * what was not done, and why
-</pre>
-</div>
-
-[Last month's activity on Redmine](https://labs.riseup.net/code/projects/tails/issues?query_id=208)
-can be helpful.
-
This report covers the activity of Tails in September 2016.
Everything in this report is public.
@@ -33,7 +9,7 @@ Everything in this report is public.
# A. Replace Claws Mail with Icedove
Icedove has been released in Tails and all remaining issues have been
-resolved. With the release of Tails 2.7, we consider this deliverable
+resolved. With the release of Tails 2.6, we consider this deliverable
fully completed.
## A.1.1. Secure the Icedove autoconfig wizard
@@ -135,5 +111,3 @@ tracker.
We polished a little bit the way our Jenkins build products are presented to
our core developers.
-
-XXX: bertagaz
diff --git a/wiki/src/donate.css b/wiki/src/donate.css
index 5462545..8caa787 100644
--- a/wiki/src/donate.css
+++ b/wiki/src/donate.css
@@ -93,7 +93,7 @@ span.title {
margin-top: 9px;
}
-#other-ways {
+#other-ways, #expenses {
margin-top: 5em;
}
diff --git a/wiki/src/donate.de.po b/wiki/src/donate.de.po
index 04f6f90..841754a 100644
--- a/wiki/src/donate.de.po
+++ b/wiki/src/donate.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-10-05 17:06+0300\n"
+"POT-Creation-Date: 2016-10-07 18:42+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -386,3 +386,15 @@ msgstr ""
#. type: Content of: <div><div>
msgid "Germany"
msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "How we spend our money"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!img expenses.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "Our financial records are available [[here|doc/about/finances]]."
+msgstr ""
diff --git a/wiki/src/donate.fa.po b/wiki/src/donate.fa.po
index 04f6f90..841754a 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: 2016-10-05 17:06+0300\n"
+"POT-Creation-Date: 2016-10-07 18:42+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -386,3 +386,15 @@ msgstr ""
#. type: Content of: <div><div>
msgid "Germany"
msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "How we spend our money"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!img expenses.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "Our financial records are available [[here|doc/about/finances]]."
+msgstr ""
diff --git a/wiki/src/donate.fr.po b/wiki/src/donate.fr.po
index 3c081af..5baae8d 100644
--- a/wiki/src/donate.fr.po
+++ b/wiki/src/donate.fr.po
@@ -560,3 +560,16 @@ msgstr "44789 Bochum"
#. type: Content of: <div><div>
msgid "Germany"
msgstr "Allemagne"
+
+#. type: Content of: <div><div><h3>
+msgid "How we spend our money"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!img expenses.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "Our financial records are available [[here|doc/about/finances]]."
+msgstr ""
+
diff --git a/wiki/src/donate.html b/wiki/src/donate.html
index d85b26a..d7b10aa2 100644
--- a/wiki/src/donate.html
+++ b/wiki/src/donate.html
@@ -356,3 +356,17 @@ permitted by law.</strong></p>
Germany
</div>
</div>
+
+<div id="expenses" class="row">
+
+<div class="col-md-12">
+
+<h3>How we spend our money</h3>
+
+<p>[[!img expenses.png link="no"]]</p>
+
+<p>Our financial records are available [[here|doc/about/finances]].</p>
+
+</div>
+
+</div>
diff --git a/wiki/src/donate.it.po b/wiki/src/donate.it.po
index 04f6f90..841754a 100644
--- a/wiki/src/donate.it.po
+++ b/wiki/src/donate.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-10-05 17:06+0300\n"
+"POT-Creation-Date: 2016-10-07 18:42+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -386,3 +386,15 @@ msgstr ""
#. type: Content of: <div><div>
msgid "Germany"
msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "How we spend our money"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!img expenses.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "Our financial records are available [[here|doc/about/finances]]."
+msgstr ""
diff --git a/wiki/src/donate.pt.po b/wiki/src/donate.pt.po
index 04f6f90..841754a 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: 2016-10-05 17:06+0300\n"
+"POT-Creation-Date: 2016-10-07 18:42+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -386,3 +386,15 @@ msgstr ""
#. type: Content of: <div><div>
msgid "Germany"
msgstr ""
+
+#. type: Content of: <div><div><h3>
+msgid "How we spend our money"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "[[!img expenses.png link=\"no\"]]"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+msgid "Our financial records are available [[here|doc/about/finances]]."
+msgstr ""
diff --git a/wiki/src/donate/expenses.png b/wiki/src/donate/expenses.png
new file mode 100644
index 0000000..a63f1fc
--- /dev/null
+++ b/wiki/src/donate/expenses.png
Binary files differ