Commit cf0adb36 authored by cbrownstein's avatar cbrownstein
Browse files

Merge remote-tracking branch 'origin/master' into doc/17844-auto-ref-toc

parents faaa82a4 5db2a577
[[!meta title="Improvements to the donation process"]] [[!meta title="Improvements to the donation process"]]
[[!toc levels=3]]
Calendar until the campaign: Calendar until the campaign:
- Week 32, Aug 3: summit - Week 32, Aug 3: summit
...@@ -16,6 +18,9 @@ Calendar until the campaign: ...@@ -16,6 +18,9 @@ Calendar until the campaign:
I think that we should do, in this rough order: I think that we should do, in this rough order:
Week 31
-------
### Skip any in-person usability tests for now ### Skip any in-person usability tests for now
It's quite time consuming and the Covid situation makes it more It's quite time consuming and the Covid situation makes it more
...@@ -29,9 +34,7 @@ Week 32 ...@@ -29,9 +34,7 @@ Week 32
Week 33 Week 33
------- -------
<a id="survey"></a> <h3 id="survey">Survey lapsed donors</h3>
### Survey lapsed donors
Goals: Goals:
...@@ -120,12 +123,22 @@ Questions: ...@@ -120,12 +123,22 @@ Questions:
1. **Why did you donate to Tails?** (Short free text) 1. **Why did you donate to Tails?** (Short free text)
| Topic | |
|--|
| Privacy | 24 |
| Protection | 18 |
| Freedom | 16 |
| Surveillance | 6 |
| Security | 5 |
| Censorship | 2 |
1. **Which part of our mission appeals to you most?** (Single choice) 1. **Which part of our mission appeals to you most?** (Single choice)
* Protecting against surveillance | Answer | |
* Protecting against censorship |--|
* Building a secure operating system | Protecting against surveillance | 53% |
* Other: | Protecting against censorship | 18% |
| Building a secure operating system | 29% |
1. **Did you donate to Tails because you use it yourself or because you 1. **Did you donate to Tails because you use it yourself or because you
want other people to be able to use it?** (5-point Likert scale) want other people to be able to use it?** (5-point Likert scale)
...@@ -133,40 +146,119 @@ Questions: ...@@ -133,40 +146,119 @@ Questions:
* I use Tails myself * I use Tails myself
* I want other people to be able to use Tails * I want other people to be able to use Tails
| | |
|--|
| Myself | 22% |
| | 6% |
| | 30% |
| | 16% |
| Others | 25% |
Average: 3.1
1. **How much of an impact do you feel your donation had?** (5-point Likert scale) 1. **How much of an impact do you feel your donation had?** (5-point Likert scale)
| | |
|--|
| 1 | 36% |
| 2 | 21% |
| 3 | 29% |
| 4 | 7% |
| 5 | 7% |
Average: 2.3
2 people commented on the ambiguity of the scale, whether 1 was good
or bad. I would take these results with a pinch of salt.
1. **Do you feel like you received too much or not enough communication 1. **Do you feel like you received too much or not enough communication
from us?** (Multiple choice) from us?** (Multiple choice)
* Not enough | | |
* The right amount |--|
* Too much | Not enough | 13% |
| The right amount | 81% |
| Too much | 2% |
If "*Not enough*": If "*Not enough*":
1. **How many times a year would you like to receive information from us?** (5-point Likert scale) 1. **How many times a year would you like to receive information from us?** (5-point Likert scale)
| | |
|--|
| 1 | 0% |
| 2 | 0% |
| 3 | 31% |
| 4 | 25% |
| 5 | 44% |
Average: 4.1
1. **What would like us to communicate more about?** (Short text) 1. **What would like us to communicate more about?** (Short text)
1. **If you didn't renew your donation last year, would you mind telling us why?** (Multiple choice) - Features and improvements (9)
- Educational content: how to use Tails and other resources (4)
- Technical work and life of the project (3)
- What donations are used for (2)
- Global impact: use cases and number of users (2)
- Security vulnerabilities (2)
* I did renew my donation 1. **If you didn't renew your donation last year, would you mind telling us why?** (Multiple choice)
* I was not aware
* I couldn't afford it
* I had a problem while donating
* I donated to a different project instead
* I lost interest in Tails
* I got irritated with too much communication
* I felt pressurized to donate
* I was not sure how my money was used
* Other:
If *I had a problem while donating*: | | |
|--|
| I was not aware | 29% |
| I did renew my donation | 21% |
| I couldn't afford it | 20% |
| I donated to a different project instead | 6% |
| I got irritated with too much communication | 2% |
| I lost interest in Tails | 2% |
| I had a problem while donating | 0% |
| I felt pressurized to donate | 0% |
| I was not sure how my money was used | 0% |
1. **What problem did you have while donating?** (Short text) 1. **What problem did you have while donating?** (Short text)
1. **Do you have any questions, concerns, or possible improvements for us to take into account?** (Open ended) 1. **Do you have any questions, concerns, or possible improvements for us to take into account?** (Open ended)
- How we calculate the number of users (1)
- Rude answer from Help Desk (1)
- T-shirts (1)
- A few technical suggestions
- Lots of love!
Conclusions:
- We're doing good! Negative comments were few exceptions in a mass of love:
the work that we do is very important and we do it well.
- We should communicate a bit more and better with past donors:
* The main reason for lapsed donors not to renew their donation is lack of
awareness.
* We should write a newsletter to donors half-way through the year or when we
have major improvements. ([[!tails_ticket fundraising#17703]])
* Adding an opt-in mechanism for our newsletter would allow us to be less shy
to write them. ([[!tails_ticket fundraising#17702]])
* LimeSurvey is more convenient to send mass emails to donors.
([[!tails_ticket fundraising#17704]])
* We should communicate more about the impact of donations and how we spend
the money.
- About our donors and their interests:
* Donors are mostly users (59%) but they also want to help others (70%).
* Donors mostly talk about:
- Privacy (24)
- Protection from oppressive governments and persecution (18)
- Liberty and freedom of speech (16)
Week 34 Week 34
------- -------
......
...@@ -1722,25 +1722,30 @@ Skip this part if preparing a release candidate. ...@@ -1722,25 +1722,30 @@ Skip this part if preparing a release candidate.
desc="*Hole in the Roof* milestone"]] to a date between the next desc="*Hole in the Roof* milestone"]] to a date between the next
2 releases 2 releases
### Tickets linked from the website ### Issues linked from the website
Go through the issues linked from the documentation and support sections of the 1. Go through the issues linked from the documentation and support sections of the
website and point our lead technical writer (sajolida) to those that might website to identify the issues that might
be resolved in this release. be resolved in this release.
cd "${MASTER_CHECKOUT:?}" && \ cd "${MASTER_CHECKOUT:?}" && \
find wiki/src/{doc,support} ! -path wiki/src/support/known_issues/graphics.mdwn -name "*.mdwn" -o -name "*.html" | xargs cat | \ find wiki/src/{doc,support} ! -path wiki/src/support/known_issues/graphics.mdwn -name "*.mdwn" -o -name "*.html" | xargs cat | \
ruby -e 'puts STDIN.read.scan(/\[\[!tails_ticket\s+(\d+)[^\]]*\]\]/)' | \ ruby -e 'puts STDIN.read.scan(/\[\[!tails_ticket\s+(\d+)[^\]]*\]\]/)' | \
while read ticket; do while read ticket; do
ticket_status="$(python-gitlab --gitlab TailsRM -o json --fields state project-issue get --project-id 2 --iid "$ticket" | jq --raw-output .state)" ticket_status="$(python-gitlab --gitlab TailsRM -o json --fields state project-issue get --project-id 2 --iid "$ticket" | jq --raw-output .state)"
if [ -z "${ticket_status:-}" ]; then if [ -z "${ticket_status:-}" ]; then
echo "Failed to find the status of #${ticket:?}" >&2 echo "Failed to find the status of #${ticket:?}" >&2
continue continue
fi fi
if [ "${ticket_status:?}" = "closed" ]; then if [ "${ticket_status:?}" = "closed" ]; then
echo "It seems issue #${ticket:?} has been fixed. Please find all instances on the website and adjust them as needed. Ticket URL: https://gitlab.tails.boum.org/tails/tails/-/issues/${ticket:?}" echo "It seems issue #${ticket:?} has been fixed. Please find all instances on the website and adjust them as needed. Ticket URL: https://gitlab.tails.boum.org/tails/tails/-/issues/${ticket:?}"
fi fi
done done
2. Create a GitLab issue to list them.
Title: *“Issues linked from the website” for Tails $VERSION*
Labels: *Core Work:Technical writing* and *To Do*
Twitter Twitter
------- -------
......
...@@ -349,6 +349,12 @@ the name of the corresponding [[!tails_gitlab explore/groups desc="group"]]: ...@@ -349,6 +349,12 @@ the name of the corresponding [[!tails_gitlab explore/groups desc="group"]]:
`@xyz-team`. GitLab will send an email notification about it to every member `@xyz-team`. GitLab will send an email notification about it to every member
of this group, and add it to their To-Do list. of this group, and add it to their To-Do list.
Please note that the `root` user is part of all groups only because it is used
for the administration of our GitLab instance. There's no human being behind
that account and its notifications are turned off. Do not expect to receive
answers from that user, make sure to mention other appropriate users and groups
instead.
## Acting upon input requests ## Acting upon input requests
It's important to provide requested information as quickly as you can, It's important to provide requested information as quickly as you can,
......
...@@ -57,6 +57,14 @@ Here's how to do that: ...@@ -57,6 +57,14 @@ Here's how to do that:
`~/.config/git/config`, and in this repository's `.git/config`. These could `~/.config/git/config`, and in this repository's `.git/config`. These could
lead to problems that are hard to debug. lead to problems that are hard to debug.
4. Update submodules.
For example, for `tails.git` you would run:
rm -rf submodules .git/modules/submodules
git submodule sync
git submodule update --init
Note: some repositories have not been migrated to GitLab yet ([[!tails_ticket Note: some repositories have not been migrated to GitLab yet ([[!tails_ticket
17605]]). That's why you need to do this operation on a per-clone basis, 17605]]). That's why you need to do this operation on a per-clone basis,
and not globally. and not globally.
......
...@@ -8,7 +8,7 @@ msgstr "" ...@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Tails\n" "Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n" "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-07-25 21:06+0000\n" "POT-Creation-Date: 2020-07-25 21:06+0000\n"
"PO-Revision-Date: 2019-09-16 17:09+0000\n" "PO-Revision-Date: 2020-08-22 10:29+0000\n"
"Last-Translator: xin <xin@riseup.net>\n" "Last-Translator: xin <xin@riseup.net>\n"
"Language-Team: Tails translators <tails@boum.org>\n" "Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n" "Language: fr\n"
...@@ -16,7 +16,7 @@ msgstr "" ...@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n" "Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 2.20\n" "X-Generator: Weblate 3.5.1\n"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
...@@ -73,18 +73,13 @@ msgstr "" ...@@ -73,18 +73,13 @@ msgstr ""
"dépôt Git|contribute/git]]." "dépôt Git|contribute/git]]."
#. type: Bullet: '- ' #. type: Bullet: '- '
#, fuzzy
#| msgid ""
#| "The source code of the Debian packages included in Tails is available in "
#| "the [APT snapshot](http://tagged.snapshots.deb.tails.boum.org/) that we "
#| "created for that version of Tails."
msgid "" msgid ""
"The source code of the Debian packages included in Tails is available in the " "The source code of the Debian packages included in Tails is available in the "
"[APT snapshot](https://tagged.snapshots.deb.tails.boum.org/) that we " "[APT snapshot](https://tagged.snapshots.deb.tails.boum.org/) that we "
"created for that version of Tails." "created for that version of Tails."
msgstr "" msgstr ""
"Le code source des paquets Debian inclus dans Tails est disponible dans le " "Le code source des paquets Debian inclus dans Tails est disponible dans le ["
"[snapshot APT](http://tagged.snapshots.deb.tails.boum.org/) que nous avons " "snapshot APT](https://tagged.snapshots.deb.tails.boum.org/) que nous avons "
"créé pour cette version de Tails." "créé pour cette version de Tails."
#. type: Plain text #. type: Plain text
......
...@@ -7,8 +7,8 @@ msgstr "" ...@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: Tails\n" "Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n" "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-04-23 16:49+0000\n" "POT-Creation-Date: 2020-04-23 16:49+0000\n"
"PO-Revision-Date: 2020-08-19 08:29+0000\n" "PO-Revision-Date: 2020-08-22 12:36+0000\n"
"Last-Translator: emmapeel <emma.peel@riseup.net>\n" "Last-Translator: eulalio <eulalio@disroot.org>\n"
"Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/" "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
"electrum/es/>\n" "electrum/es/>\n"
"Language: es\n" "Language: es\n"
...@@ -152,12 +152,12 @@ msgstr "" ...@@ -152,12 +152,12 @@ msgstr ""
#. type: Title = #. type: Title =
#, no-wrap #, no-wrap
msgid "Recovering your wallet from its seed" msgid "Recovering your wallet from its seed"
msgstr "" msgstr "Recupera tu cartera de su siembra"
#. type: Title - #. type: Title -
#, no-wrap #, no-wrap
msgid "Backing up your seed" msgid "Backing up your seed"
msgstr "" msgstr "Respalda tu siembra"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
...@@ -167,10 +167,15 @@ msgid "" ...@@ -167,10 +167,15 @@ msgid ""
"when creating the wallet. But if you lose your seed, you\n" "when creating the wallet. But if you lose your seed, you\n"
"lose your entire wallet.\n" "lose your entire wallet.\n"
msgstr "" msgstr ""
"Puedes recuperar tu billetera totalmente de su <em>semilla</em>: la\n"
"cadena de palabras generadas por <span class=\"application\">Electrum</span>"
"\n"
"cuando se creó la cartera. Pero si pierdes tu semilla,\n"
"pierdes toda la cartera.\n"
#. type: Plain text #. type: Plain text
msgid "That's why we recommend you both:" msgid "That's why we recommend you both:"
msgstr "" msgstr "Por eso te recomendamos que:"
#. type: Bullet: '- ' #. type: Bullet: '- '
msgid "" msgid ""
...@@ -178,22 +183,27 @@ msgid "" ...@@ -178,22 +183,27 @@ msgid ""
"feature of the Persistent Storage to store your bitcoin wallet and " "feature of the Persistent Storage to store your bitcoin wallet and "
"preferences across separate working sessions." "preferences across separate working sessions."
msgstr "" msgstr ""
"Activa la opción [[Bitcoin Client|doc/first_steps/persistence/"
"configure#bitcoin]] en el Almacenamiento Persistente para guardar tu cartera "
"de bitcoin y sus preferencias a lo largo de distintas sesiones de trabajo."
#. type: Bullet: '- ' #. type: Bullet: '- '
msgid "" msgid ""
"Backup your seed outside of Tails. For example, you can write it down on a " "Backup your seed outside of Tails. For example, you can write it down on a "
"piece of paper and keep it with you." "piece of paper and keep it with you."
msgstr "" msgstr ""
"Respalda tu semilla fuera de Tails. Por ejemplo, puedes escribirla en un "
"papel y guárdala encima."
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
msgid "<a name=\"corrupted\"></a>\n" msgid "<a name=\"corrupted\"></a>\n"
msgstr "" msgstr "<a name=\"corrupted\"></a>\n"
#. type: Title - #. type: Title -
#, no-wrap #, no-wrap
msgid "Fixing a corrupted wallet" msgid "Fixing a corrupted wallet"
msgstr "" msgstr "Arreglar una cartera corrupta"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
...@@ -202,18 +212,23 @@ msgid "" ...@@ -202,18 +212,23 @@ msgid ""
"minimized, maybe your <span class=\"application\">Electrum</span> folder\n" "minimized, maybe your <span class=\"application\">Electrum</span> folder\n"
"is corrupted.\n" "is corrupted.\n"
msgstr "" msgstr ""
"Si <span class=\"application\">Electrum</span> no se inicia o se queda\n"
"minimizado, posiblemente tu carpeta de <span class=\"application\""
">Electrum</span>\n"
"se ha corrompido.\n"
#. type: Plain text #. type: Plain text
msgid "To recover your wallet from its seed:" msgid "To recover your wallet from its seed:"
msgstr "" msgstr "Para recuperar tu cartera de su semilla:"
#. type: Bullet: '1. ' #. type: Bullet: '1. '
msgid "Make sure that <span class=\"application\">Electrum</span> is closed." msgid "Make sure that <span class=\"application\">Electrum</span> is closed."
msgstr "" msgstr ""
"Asegurate de que <span class=\"application\">Electrum</span> está cerrado."
#. type: Bullet: '1. ' #. type: Bullet: '1. '
msgid "Open your <span class=\"filename\">Home</span> folder." msgid "Open your <span class=\"filename\">Home</span> folder."
msgstr "" msgstr "Abre tu carpeta <span class=\"filename\">Home</span>."
#. type: Bullet: '1. ' #. type: Bullet: '1. '
msgid "" msgid ""
...@@ -227,21 +242,23 @@ msgstr "" ...@@ -227,21 +242,23 @@ msgstr ""
#. type: Bullet: '1. ' #. type: Bullet: '1. '
msgid "Open the <span class=\"filename\">.electrum</span> folder." msgid "Open the <span class=\"filename\">.electrum</span> folder."
msgstr "" msgstr "Abre la carpieta <span class=\"filename\">.electrum</span>."
#. type: Bullet: '1. ' #. type: Bullet: '1. '
msgid "Delete the <span class=\"filename\">wallets</span> folder." msgid "Delete the <span class=\"filename\">wallets</span> folder."
msgstr "" msgstr "Borra la carpeta <span class=\"filename\">wallets</span>."
#. type: Bullet: '1. ' #. type: Bullet: '1. '
msgid "Start <span class=\"application\">Electrum</span>." msgid "Start <span class=\"application\">Electrum</span>."
msgstr "" msgstr "Inicia <span class=\"application\">Electrum</span>."
#. type: Bullet: '1. ' #. type: Bullet: '1. '
msgid "" msgid ""
"When creating a new wallet choose <span class=\"guilabel\">I already have a " "When creating a new wallet choose <span class=\"guilabel\">I already have a "
"seed</span> and specify the seed of your wallet." "seed</span> and specify the seed of your wallet."
msgstr "" msgstr ""
"Al crear un nuevo monedero elige <span class=\"guilabel\">Ya tengo una "
"semilla</span> y escribe la semilla de tu monedero."
#~ msgid "<div class=\"bug\">\n" #~ msgid "<div class=\"bug\">\n"
#~ msgstr "<div class=\"bug\">\n" #~ msgstr "<div class=\"bug\">\n"
......
...@@ -8,15 +8,15 @@ msgstr "" ...@@ -8,15 +8,15 @@ msgstr ""
"Project-Id-Version: Tails\n" "Project-Id-Version: Tails\n"
"Report-Msgid-Bugs-To: tails-l10n@boum.org\n" "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
"POT-Creation-Date: 2020-07-21 15:44+0000\n" "POT-Creation-Date: 2020-07-21 15:44+0000\n"
"PO-Revision-Date: 2019-11-13 13:45+0000\n" "PO-Revision-Date: 2020-08-22 10:29+0000\n"
"Last-Translator: Chre <tor@renaudineau.org>\n" "Last-Translator: xin <xin@riseup.net>\n"
"Language-Team: Tails translators <tails@boum.org>\n" "Language-Team: Tails translators <tails@boum.org>\n"
"Language: fr\n" "Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n" "Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 2.20\n" "X-Generator: Weblate 3.5.1\n"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
...@@ -29,10 +29,9 @@ msgid "[[!toc levels=2]]\n" ...@@ -29,10 +29,9 @@ msgid "[[!toc levels=2]]\n"
msgstr "[[!toc levels=2]]\n" msgstr "[[!toc levels=2]]\n"
#. type: Title = #. type: Title =
#, fuzzy, no-wrap #, no-wrap
#| msgid "Connecting to a network\n"
msgid "Connecting to a network" msgid "Connecting to a network"
msgstr "Se connecter à un réseau\n" msgstr "Se connecter à un réseau"
#. type: Plain text #. type: Plain text
#, fuzzy #, fuzzy
...@@ -155,10 +154,9 @@ msgid "<a id=\"no-wi-fi\"></a>\n" ...@@ -155,10 +154,9 @@ msgid "<a id=\"no-wi-fi\"></a>\n"
msgstr "<a id=\"no-wi-fi\"></a>\n" msgstr "<a id=\"no-wi-fi\"></a>\n"
#. type: Title = #. type: Title =
#, fuzzy, no-wrap #, no-wrap
#| msgid "Troubleshooting Wi-Fi not working\n"
msgid "Troubleshooting Wi-Fi not working" msgid "Troubleshooting Wi-Fi not working"
msgstr "Résoudre les problèmes de Wi-Fi\n" msgstr "Résoudre les problèmes de Wi-Fi"
#. type: Plain text #. type: Plain text
#, no-wrap #, no-wrap
...@@ -176,10 +174,9 @@ msgstr "" ...@@ -176,10 +174,9 @@ msgstr ""
"interface Wi-Fi dans Tails." "interface Wi-Fi dans Tails."
#. type: Title = #. type: Title =
#, fuzzy, no-wrap #, no-wrap
#| msgid "Using Tor bridges or a local proxy\n"
msgid "Using Tor bridges or a local proxy"