summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrike Uhlig <u@451f.org>2018-06-11 14:44:00 +0200
committerUlrike Uhlig <u@451f.org>2018-06-11 14:44:00 +0200
commite60ae5a18797605a5a1dd0cedf9be35f5985f1aa (patch)
treea90c0de6f2edc89224f1e856a0c23adc46616f2f
parente38982bacae5c88e701a52da986a7dfea1b0b526 (diff)
parent1a94628cefc63c30df5e072c12f1964268c85a36 (diff)
Merge branch 'master' of webmasters.boum.org:wiki
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn59
-rw-r--r--wiki/src/blueprint/strategic_planning.mdwn3
-rw-r--r--wiki/src/contribute/calendar.mdwn12
-rw-r--r--wiki/src/upgrade.de.po8
-rw-r--r--wiki/src/upgrade.es.po12
-rw-r--r--wiki/src/upgrade.fa.po8
-rw-r--r--wiki/src/upgrade.fr.po8
-rw-r--r--wiki/src/upgrade.it.po8
-rw-r--r--wiki/src/upgrade.pt.po8
9 files changed, 40 insertions, 86 deletions
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 5372b16..23e8fc6 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -25,62 +25,11 @@ and add your topic here:
### Strategic planning
-We'll discuss "Containers/separated identities without rebooting [R, +1-1]".
+We'll discuss XXX
### Gather comments on our draft personas
-Chapter 2: [[Cris, the sensitive information gatherer|personas#cris]]
-
-From the work that we did at the last summit, we drafted skeletons of
-personas: a very basic description of what kind of users they are.
-
-We are still missing lots of:
-
-- Details, to bring them to life
-- Research, to make sure they represent real users accurately
-- Collective discussions, to decide how much effort we want to dedicate
- to make Tails work better for each of them
-
-But, still I wanted to gather some initial comments from all of you on
-the work that we already.
-
-We drafted four personas:
-
-- Kim, the surveilled at home
-- Cris, the sensitive information gatherer
-- Riou, the protest organizer
-- Derya, the privacy advocate
-
-Until in May, June, July, and August I'll propose you to comment of each
-of them, one each month.
-
-I'm interested in gathering as much feedback from you as possible, like
-in a brainstorming, but I want to refrain from discussing each comment.
-
-Comments I'm interested in:
-
-- Stuff you would add, change, or remove in each section of the
- skeleton.
-
- For example:
-
- « *I think that Kim is too scared to use the shared computer from his
- institution and instead he's rather borrowing from time to time the
- computer of a trusted friend.* »
-
-- External data or research that could feed this persona.
-
- For example:
-
- « *Here is an article recently about the repression of gay youth in
- Africa: https://example.com/.* »
-
-- You raw subjectivity.
-
- For example:
-
- « *I won't be able to work with a persona named Kim because I have
- daily nightmares involving Kim Jong-un.* »
+Chapter 3?
Roles
=====
@@ -98,7 +47,7 @@ designate themselves beforehand.
| June 2018 | intrigeri | u |
| July 2018 | | u |
| August 2018 | | |
-| September 2018 | | |
+| September 2018 | | intrigeri |
| October 2018 | | |
-| November 2018 | | |
+| November 2018 | intrigeri | |
| December 2018 | | |
diff --git a/wiki/src/blueprint/strategic_planning.mdwn b/wiki/src/blueprint/strategic_planning.mdwn
index 9d80d0a..cb65872 100644
--- a/wiki/src/blueprint/strategic_planning.mdwn
+++ b/wiki/src/blueprint/strategic_planning.mdwn
@@ -102,6 +102,8 @@ put dot in favour of it, while one attendee put a dot against it.
this and abide by our [[contribute/working together/Code of conduct]]
([R, consensus])
- I want to find things on the website without the 90s experience [UX, +2]
+- Make it easier to switch between a Tails contextual identity and
+ another identity outside of Tails
## Needs discussion
@@ -112,7 +114,6 @@ put dot in favour of it, while one attendee put a dot against it.
- Users can give feedback to help improve UX [UX, +1-1]
- Tails is easily customizable [UX+B, +2-2]
- Tails should be endorsed (sponsored) by (meta-) state institutions (EU?) [R, +1-3]
-- Containers/separated identities without rebooting [R, +1-1]
- I can meet Tails people in person [I, +1-1]
- The Tails project can be trusted [I, +2-1]
- Funding from government independent organizations [I, +2-2]
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 84bb5f6..a2deffa 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -6,10 +6,6 @@ All times are referenced to Berlin and Paris time.
* 2018-06-01: Beta release of VeraCrypt
-* 2018-06-05, 14:00: Additional Software team meeting
-
-* 2018-06-06, 19:00: [[Contributors meeting|contribute/meetings]]
-
* 2018-06-25: Build and upload tentative 3.8 ISO image — intrigeri
* 2018-06-26: Test the tentative 3.8 ISO image
@@ -39,11 +35,19 @@ All times are referenced to Berlin and Paris time.
* 2018-08-13: Release 3.9~rc1 — anonym
+* 2018-09-03, 19:00: [[Contributors meeting|contribute/meetings]]
+
* 2018-09-05: **Release 3.9** (Firefox 60.2, major release) — anonym is the RM
- includes VeraCrypt support + major Additional Software Packages improvements
## 2018Q4
+* 2018-10-03, 19:00: [[Contributors meeting|contribute/meetings]]
+
* 2018-10-16: **Release 3.10** (Firefox 60.3, bugfix release) — anonym is the RM
+* 2018-11-06, 19:00: [[Contributors meeting|contribute/meetings]]
+
* 2018-11-27: **Release 3.11** (Firefox 60.4, major release) — anonym is the RM
+
+* 2018-12-03, 19:00: [[Contributors meeting|contribute/meetings]]
diff --git a/wiki/src/upgrade.de.po b/wiki/src/upgrade.de.po
index 0321dab..1882006 100644
--- a/wiki/src/upgrade.de.po
+++ b/wiki/src/upgrade.de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-06-11 13:41+0200\n"
"PO-Revision-Date: 2017-02-10 14:45+0100\n"
"Last-Translator: Tails translators <tails@boum.org>\n"
"Language-Team: \n"
@@ -76,11 +76,11 @@ msgstr "¼ Stunde zum Aktualisieren"
msgid "[["
msgstr "[["
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "<small>Manually</small>"
msgstr "<small>Manuell</small>"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade from another Tails"
msgstr "von einem anderen Tails aus aktualisieren"
@@ -118,7 +118,7 @@ msgstr ""
msgid "½ hour to upgrade"
msgstr "½ Stunde zum Aktualisieren"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade inside Tails"
msgstr "innerhalb von Tails aktualisieren"
diff --git a/wiki/src/upgrade.es.po b/wiki/src/upgrade.es.po
index 7a53bc8..0fe2792 100644
--- a/wiki/src/upgrade.es.po
+++ b/wiki/src/upgrade.es.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-06-11 13:41+0200\n"
"PO-Revision-Date: 2018-05-13 22:07+0000\n"
"Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -27,8 +27,8 @@ msgid ""
msgstr ""
"[[!meta title=\"Elige tu escenario de actualización manual\"]] [[!meta "
"robots=\"noindex\"]] [[!meta stylesheet=\"bootstrap.min\" rel=\"stylesheet\" "
-"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel=\""
-"stylesheet\" title=\"\"]]"
+"title=\"\"]] [[!meta stylesheet=\"install/inc/stylesheets/assistant\" rel="
+"\"stylesheet\" title=\"\"]]"
#. type: Content of: <div><div><h3>
msgid "Upgrade from another Tails"
@@ -62,11 +62,11 @@ msgstr "¼ hora para actulizar"
msgid "[["
msgstr "[["
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "<small>Manually</small>"
msgstr "<small>Manualmente</small>"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade from another Tails"
msgstr "actualizar desde otro Tails"
@@ -102,7 +102,7 @@ msgstr ""
msgid "½ hour to upgrade"
msgstr "½ hora para actualizar"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade inside Tails"
msgstr "actualizar dentro de Tails"
diff --git a/wiki/src/upgrade.fa.po b/wiki/src/upgrade.fa.po
index 7943a96..66dbe7a 100644
--- a/wiki/src/upgrade.fa.po
+++ b/wiki/src/upgrade.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-06-11 13:41+0200\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"
@@ -54,11 +54,11 @@ msgstr ""
msgid "[["
msgstr ""
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "<small>Manually</small>"
msgstr ""
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade from another Tails"
msgstr ""
@@ -88,7 +88,7 @@ msgstr ""
msgid "½ hour to upgrade"
msgstr ""
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade inside Tails"
msgstr ""
diff --git a/wiki/src/upgrade.fr.po b/wiki/src/upgrade.fr.po
index d304d6e..b5ddeda 100644
--- a/wiki/src/upgrade.fr.po
+++ b/wiki/src/upgrade.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-06-11 13:41+0200\n"
"PO-Revision-Date: 2018-05-16 08:38+0000\n"
"Last-Translator: \n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -60,11 +60,11 @@ msgstr "¼ heure pour mettre à jour"
msgid "[["
msgstr "[["
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "<small>Manually</small>"
msgstr "<small>Manuellement</small>"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade from another Tails"
msgstr "mettre à jour depuis un autre Tails"
@@ -101,7 +101,7 @@ msgstr ""
msgid "½ hour to upgrade"
msgstr "½ heure pour mettre à jour"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade inside Tails"
msgstr "mettre à jour dans Tails"
diff --git a/wiki/src/upgrade.it.po b/wiki/src/upgrade.it.po
index 8a9e788..fd71b81 100644
--- a/wiki/src/upgrade.it.po
+++ b/wiki/src/upgrade.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: transitails\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-06-11 13:41+0200\n"
"PO-Revision-Date: 2017-07-23 21:02+0200\n"
"Last-Translator: boyska <piuttosto@logorroici.org>\n"
"Language-Team: ita <transitails@inventati.org>\n"
@@ -72,11 +72,11 @@ msgstr "¼ d'ora per aggiornare "
msgid "[["
msgstr "[["
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "<small>Manually</small>"
msgstr "<small>Manualmente</small>"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade from another Tails"
msgstr "aggiornare da un altro Tails"
@@ -112,7 +112,7 @@ msgstr ""
msgid "½ hour to upgrade"
msgstr "½ ora per aggiornare"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade inside Tails"
msgstr "aggiornamento da Tails"
diff --git a/wiki/src/upgrade.pt.po b/wiki/src/upgrade.pt.po
index cc7d76c..585bb93 100644
--- a/wiki/src/upgrade.pt.po
+++ b/wiki/src/upgrade.pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tails 2.2.1\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2018-05-07 20:12+0300\n"
+"POT-Creation-Date: 2018-06-11 13:41+0200\n"
"PO-Revision-Date: 2018-04-27 10:40+0000\n"
"Last-Translator: Tails translators <tails-l10n@boum.org>\n"
"Language-Team: Tails translators <tails@boum.org>\n"
@@ -76,11 +76,11 @@ msgstr "¼ de hora para atualizar"
msgid "[["
msgstr "[["
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "<small>Manually</small>"
msgstr "<small>Manualmente</small>"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade from another Tails"
msgstr "atualizar a partir de outro Tails"
@@ -116,7 +116,7 @@ msgstr ""
msgid "½ hour to upgrade"
msgstr "½ hora para atualizar"
-#. type: Content of: <div><div><div><div><h3>
+#. type: Content of: <div><div><div><div>
msgid "upgrade inside Tails"
msgstr "atualizar dentro do Tails"