summaryrefslogtreecommitdiffstats
path: root/wiki/src
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-06-18 12:05:27 +0000
committerintrigeri <intrigeri@boum.org>2019-06-18 12:05:27 +0000
commitc62ab232e8d365795854f2d78ba5f75463caea2f (patch)
treefc79ff6cea68c8c4b97d3ab820bb6a8bada65a47 /wiki/src
parent364dcc86cb454c2babe4029459d3dae68f2a1eff (diff)
parentc3446ba98ec5263ba4e129c6d4fc91f3a556edbb (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'wiki/src')
-rw-r--r--wiki/src/contribute/calendar.mdwn6
-rw-r--r--wiki/src/lib/partners/bestvpn.pngbin6970 -> 5470 bytes
-rw-r--r--wiki/src/lib/partners/vpnreview.pngbin0 -> 1679 bytes
-rw-r--r--wiki/src/local.css18
-rw-r--r--wiki/src/partners.de.po20
-rw-r--r--wiki/src/partners.es.po20
-rw-r--r--wiki/src/partners.fa.po12
-rw-r--r--wiki/src/partners.fr.po20
-rw-r--r--wiki/src/partners.html1
-rw-r--r--wiki/src/partners.it.po12
-rw-r--r--wiki/src/partners.pt.po12
11 files changed, 108 insertions, 13 deletions
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index e7689b4..8bd917b 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -6,14 +6,18 @@ All times are referenced to Berlin and Paris time.
* 2019-06-17 and 2019-06-18: Buster (remote) sprint
-* 2019-06-25, 16:00 Fundraising meeting
+* 2019-06-19, 16:00 Fundraising meeting
* 2019-06-25 to 2019-06-27: Translation platform sprint
+* 2019-06-26, 16:00 Fundraising meeting
+
* 2019-07-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-07-09: **Release 3.15** (Firefox 60.8, Tor Browser 8.5; bugfix release — kibi is the RM)
+* 2019-07-10, 16:00 Fundraising meeting
+
* 2019-08-06, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
* 2019-09-03, 16:00: [[Foundations Team|contribute/working_together/roles/foundations_team]] meeting
diff --git a/wiki/src/lib/partners/bestvpn.png b/wiki/src/lib/partners/bestvpn.png
index 63c964d..242c7a1 100644
--- a/wiki/src/lib/partners/bestvpn.png
+++ b/wiki/src/lib/partners/bestvpn.png
Binary files differ
diff --git a/wiki/src/lib/partners/vpnreview.png b/wiki/src/lib/partners/vpnreview.png
new file mode 100644
index 0000000..b2de71c
--- /dev/null
+++ b/wiki/src/lib/partners/vpnreview.png
Binary files differ
diff --git a/wiki/src/local.css b/wiki/src/local.css
index 25a79ba..0aea54b 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -1345,13 +1345,10 @@ div#highlight p {
font-weight: bold;
color: #bbb;
overflow: hidden;
- width: 120px;
text-align: left;
- clear: left;
line-height: 1.4em;
margin-right: 2em;
margin-top: 1em;
- float: left;
}
#pagebody .currentpartner {
@@ -1387,10 +1384,9 @@ div#highlight p {
-moz-transition-duration: 0.6s;
-webkit-transition-duration: 0.6s;
transition-duration: 0.6s;
- height: 85px;
- width: auto;
+ max-width: 100%;
+ height: auto;
}
-
#pagebody .partner:hover img {
opacity: 0.8;
}
@@ -1409,3 +1405,13 @@ div#highlight p {
filter: none;
opacity: 1;
}
+@media all and (min-width: 600px) {
+ #pagebody .amount-range {
+ float: left;
+ clear: left;
+ width: 120px;
+ }
+ #pagebody .currentpartner {
+ margin-left: 120px;
+ }
+}
diff --git a/wiki/src/partners.de.po b/wiki/src/partners.de.po
index abd6161..585b9e5 100644
--- a/wiki/src/partners.de.po
+++ b/wiki/src/partners.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-05-28 06:44+0000\n"
+"POT-Creation-Date: 2019-06-17 13:30+0000\n"
"PO-Revision-Date: 2018-04-06 18:26+0200\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -145,6 +145,24 @@ msgstr ""
"<a href=\"https://torproject.org\">[[!img lib/partners/tor.png link=\"no"
"\"]]</a>"
+#. type: Attribute 'title' of: <div><p>
+#, fuzzy
+#| msgid "ExpressVPN - $1.000"
+msgid "VPN Review - $1 000"
+msgstr "ExpressVPN - $1.000"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://torproject.org\">[[!img lib/partners/tor.png link=\"no"
+#| "\"]]</a>"
+msgid ""
+"<a href=\"https://vpn-review.com/\" target=\"_blank\">[[!img lib/partners/"
+"vpnreview.png link=\"no\"]]</a>"
+msgstr ""
+"<a href=\"https://torproject.org\">[[!img lib/partners/tor.png link=\"no"
+"\"]]</a>"
+
#. type: Content of: <p>
msgid "in-kind"
msgstr "Sachleistungen"
diff --git a/wiki/src/partners.es.po b/wiki/src/partners.es.po
index 6154df0..1f1c15e 100644
--- a/wiki/src/partners.es.po
+++ b/wiki/src/partners.es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2019-05-28 06:44+0000\n"
+"POT-Creation-Date: 2019-06-17 13:30+0000\n"
"PO-Revision-Date: 2018-05-21 07:06+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -138,6 +138,24 @@ msgstr ""
"<a href=\"https://deeponion.org/\">[[!img lib/partners/deeponion.png link="
"\"no\"]]</a>"
+#. type: Attribute 'title' of: <div><p>
+#, fuzzy
+#| msgid "ExpressVPN - $1 000"
+msgid "VPN Review - $1 000"
+msgstr "ExpressVPN - $1 000"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://deeponion.org/\">[[!img lib/partners/deeponion.png link="
+#| "\"no\"]]</a>"
+msgid ""
+"<a href=\"https://vpn-review.com/\" target=\"_blank\">[[!img lib/partners/"
+"vpnreview.png link=\"no\"]]</a>"
+msgstr ""
+"<a href=\"https://deeponion.org/\">[[!img lib/partners/deeponion.png link="
+"\"no\"]]</a>"
+
#. type: Content of: <p>
msgid "in-kind"
msgstr "en especie"
diff --git a/wiki/src/partners.fa.po b/wiki/src/partners.fa.po
index 458d40a..be896c1 100644
--- a/wiki/src/partners.fa.po
+++ b/wiki/src/partners.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-05-28 06:44+0000\n"
+"POT-Creation-Date: 2019-06-17 13:30+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"
@@ -109,6 +109,16 @@ msgid ""
"bestvpn.png link=\"no\"]]</a>"
msgstr ""
+#. type: Attribute 'title' of: <div><p>
+msgid "VPN Review - $1 000"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"<a href=\"https://vpn-review.com/\" target=\"_blank\">[[!img lib/partners/"
+"vpnreview.png link=\"no\"]]</a>"
+msgstr ""
+
#. type: Content of: <p>
msgid "in-kind"
msgstr ""
diff --git a/wiki/src/partners.fr.po b/wiki/src/partners.fr.po
index 87df050..95f3752 100644
--- a/wiki/src/partners.fr.po
+++ b/wiki/src/partners.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-05-28 06:44+0000\n"
+"POT-Creation-Date: 2019-06-17 13:30+0000\n"
"PO-Revision-Date: 2019-02-03 14:05+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -118,6 +118,24 @@ msgstr ""
"<a href=\"https://thebestvpn.com/\" target=\"_blank\">[[!img lib/partners/"
"bestvpn.png link=\"no\"]]</a>"
+#. type: Attribute 'title' of: <div><p>
+#, fuzzy
+#| msgid "ExpressVPN - $1 000"
+msgid "VPN Review - $1 000"
+msgstr "ExpressVPN - 1 000$"
+
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"https://thebestvpn.com/\" target=\"_blank\">[[!img lib/partners/"
+#| "bestvpn.png link=\"no\"]]</a>"
+msgid ""
+"<a href=\"https://vpn-review.com/\" target=\"_blank\">[[!img lib/partners/"
+"vpnreview.png link=\"no\"]]</a>"
+msgstr ""
+"<a href=\"https://thebestvpn.com/\" target=\"_blank\">[[!img lib/partners/"
+"bestvpn.png link=\"no\"]]</a>"
+
#. type: Content of: <p>
msgid "in-kind"
msgstr "en nature"
diff --git a/wiki/src/partners.html b/wiki/src/partners.html
index e51beab..d88e26e 100644
--- a/wiki/src/partners.html
+++ b/wiki/src/partners.html
@@ -27,6 +27,7 @@ Are you an individual and want to help Tails? [[We warmly welcome your donations
<p class="partner partner-size-4" title="An individual - 1 000€">[[!img lib/partners/anonymous.png link="no"]]</p><!-- 2018-12-18 -->
<p class="partner partner-size-4" title="An individual - $1 000">[[!img lib/partners/anonymous.png link="no"]]</p><!-- 2018-12-19 -->
<p class="partner partner-size-4" title="The Best VPN - $1 000"><a href="https://thebestvpn.com/" target="_blank">[[!img lib/partners/bestvpn.png link="no"]]</a></p><!-- 2019-05-20 -->
+ <p class="partner partner-size-4" title="VPN Review - $1 000"><a href="https://vpn-review.com/" target="_blank">[[!img lib/partners/vpnreview.png link="no"]]</a></p><!-- 2019-06-17 -->
</div>
<p class="amount-range">in-kind</p>
diff --git a/wiki/src/partners.it.po b/wiki/src/partners.it.po
index 328168c..ea3d62b 100644
--- a/wiki/src/partners.it.po
+++ b/wiki/src/partners.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-05-28 06:44+0000\n"
+"POT-Creation-Date: 2019-06-17 13:30+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"
@@ -108,6 +108,16 @@ msgid ""
"bestvpn.png link=\"no\"]]</a>"
msgstr ""
+#. type: Attribute 'title' of: <div><p>
+msgid "VPN Review - $1 000"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"<a href=\"https://vpn-review.com/\" target=\"_blank\">[[!img lib/partners/"
+"vpnreview.png link=\"no\"]]</a>"
+msgstr ""
+
#. type: Content of: <p>
msgid "in-kind"
msgstr ""
diff --git a/wiki/src/partners.pt.po b/wiki/src/partners.pt.po
index 8fb277d..2d49ebe 100644
--- a/wiki/src/partners.pt.po
+++ b/wiki/src/partners.pt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-05-28 06:44+0000\n"
+"POT-Creation-Date: 2019-06-17 13:30+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"
@@ -110,6 +110,16 @@ msgid ""
"bestvpn.png link=\"no\"]]</a>"
msgstr ""
+#. type: Attribute 'title' of: <div><p>
+msgid "VPN Review - $1 000"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
+"<a href=\"https://vpn-review.com/\" target=\"_blank\">[[!img lib/partners/"
+"vpnreview.png link=\"no\"]]</a>"
+msgstr ""
+
#. type: Content of: <p>
msgid "in-kind"
msgstr ""