merge with main git using merge_canonical_changes.py.

wiki/src/about/contact.ar.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/about/contact.ca.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/about/contact.id.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/about/contact.pl.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/about/contact.ru.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/about/contact.sr_Latn.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/about/contact.tr.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/about/contact.zh.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/about/contact.zh_TW.po: updating as wiki/src/about/contact.de.po has changed.
wiki/src/news/version_3.0.ar.po: updating as wiki/src/news/version_3.0.de.po has changed.
wiki/src/news/version_3.0.ca.po: updating as wiki/src/news/version_3.0.de.po has changed.
wiki/src/news/version_3.0.id.po: updating as wiki/src/news/version_3.0.de.po has changed.
wiki/src/news/version_3.0.pl.po: updating as wiki/src/news/version_3.0.de.po has changed.
wiki/src/news/version_3.0.ru.po: updating as wiki/src/news/version_3.0.de.po has changed.
wiki/src/news/version_3.0.sr_Latn.po: updating as wiki/src/news/version_3.0.de.po has changed.
wiki/src/news/version_3.0.tr.po: updating as wiki/src/news/version_3.0.de.po has changed.
wiki/src/news/version_3.0.zh.po: updating as wiki/src/news/version_3.0.de.po has changed.
wiki/src/news/version_3.0.zh_TW.po: updating as wiki/src/news/version_3.0.de.po has changed.

16 files changed, 48 insertions, 41 deletions

diff --git a/wiki/src/news/version_3.0.ar.po b/wiki/src/news/version_3.0.ar.po
index 13199e0..bbbbb41 100644
--- a/wiki/src/news/version_3.0.ar.po
+++ b/wiki/src/news/version_3.0.ar.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-09-05 06:34+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -115,7 +115,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.ca.po b/wiki/src/news/version_3.0.ca.po
index 9e1fa39..47bd482 100644
--- a/wiki/src/news/version_3.0.ca.po
+++ b/wiki/src/news/version_3.0.ca.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-03-07 14:28+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,7 +114,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.de.po b/wiki/src/news/version_3.0.de.po
index 1eb865f..f30efca 100644
--- a/wiki/src/news/version_3.0.de.po
+++ b/wiki/src/news/version_3.0.de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2018-04-08 13:54+0000\n"
 "Last-Translator: Tails translators <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,7 +114,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.es.po b/wiki/src/news/version_3.0.es.po
index 5fb01d2..fcc513c 100644
--- a/wiki/src/news/version_3.0.es.po
+++ b/wiki/src/news/version_3.0.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: 2019-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-08-17 10:29+0000\n"
 "Last-Translator: Joaquín Serna <bubuanabelas@cryptolab.net>\n"
 "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -114,7 +114,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.fa.po b/wiki/src/news/version_3.0.fa.po
index c72da15..3eeb474 100644
--- a/wiki/src/news/version_3.0.fa.po
+++ b/wiki/src/news/version_3.0.fa.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-04-24 09:35+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -115,7 +115,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.fr.po b/wiki/src/news/version_3.0.fr.po
index f4d8966..b4b8001 100644
--- a/wiki/src/news/version_3.0.fr.po
+++ b/wiki/src/news/version_3.0.fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2019-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-02-12 11:26+0000\n"
 "Last-Translator: xin <xin@riseup.net>\n"
 "Language-Team: Tails translators <tails@boum.org>\n"
@@ -137,11 +137,16 @@ msgstr ""
 "  - Les options d'accessibilité peuvent être activées dès le départ.\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  This has been a long process, started three years ago with the UX team of\n"
+#| "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
+#| "  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+#| "  designs!\n"
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 "  Cela a été un long processus, démarré il y a trois ans avec l'équipe UX de\n"
@@ -452,8 +457,8 @@ msgid ""
 "For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
 "\"]]."
 msgstr ""
-"Pour plus de détails, lisez notre [[!tails_gitweb debian/changelog desc=\""
-"liste des changements\"]]."
+"Pour plus de détails, lisez notre [[!tails_gitweb debian/changelog desc="
+"\"liste des changements\"]]."
 
 #. type: Plain text
 #, no-wrap
diff --git a/wiki/src/news/version_3.0.id.po b/wiki/src/news/version_3.0.id.po
index 5359b11..69c3691 100644
--- a/wiki/src/news/version_3.0.id.po
+++ b/wiki/src/news/version_3.0.id.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-01-16 00:27+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,7 +114,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.it.po b/wiki/src/news/version_3.0.it.po
index 3cd9097..be9dea0 100644
--- a/wiki/src/news/version_3.0.it.po
+++ b/wiki/src/news/version_3.0.it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2019-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-08-14 21:29+0000\n"
 "Last-Translator: _ignifugo <ignifugo@insicuri.net>\n"
 "Language-Team: \n"
@@ -146,19 +146,21 @@ msgstr ""
 "  - Le funzioni di accessibilità possono essere attivate dall'avvio.\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  This has been a long process, started three years ago with the UX team of\n"
+#| "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
+#| "  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+#| "  designs!\n"
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
-"  Questo è stato un lungo processo, iniziato tre anni fa con il gruppo UX "
-"di\n"
-"[NUMA Paris](https://paris.numa.co/) e guidato solo da volontari. Unisciti a "
-"noi\n"
-"[[tails-ux@boum.org|about/contact#tails-ux]] per partecipare alle "
-"discussioni di design\n"
+"  Questo è stato un lungo processo, iniziato tre anni fa con il gruppo UX di\n"
+"[NUMA Paris](https://paris.numa.co/) e guidato solo da volontari. Unisciti a noi\n"
+"[[tails-ux@boum.org|about/contact#tails-ux]] per partecipare alle discussioni di design\n"
 "future!\n"
 
 #. type: Plain text
diff --git a/wiki/src/news/version_3.0.mdwn b/wiki/src/news/version_3.0.mdwn
index 4e16b01..90b6c9b 100644
--- a/wiki/src/news/version_3.0.mdwn
+++ b/wiki/src/news/version_3.0.mdwn
@@ -43,7 +43,7 @@ upgrade as soon as possible.
 
   This has been a long process, started three years ago with the UX team of
   [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on
-  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future
+  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future
   designs!
 
   [[!img tails-greeter.png link="no"]]
diff --git a/wiki/src/news/version_3.0.pl.po b/wiki/src/news/version_3.0.pl.po
index 94fd874..e64ff49 100644
--- a/wiki/src/news/version_3.0.pl.po
+++ b/wiki/src/news/version_3.0.pl.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2018-10-26 11:00+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -115,7 +115,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.pt.po b/wiki/src/news/version_3.0.pt.po
index 7c01d01..198960b 100644
--- a/wiki/src/news/version_3.0.pt.po
+++ b/wiki/src/news/version_3.0.pt.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-03-20 07:36+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: Portuguese <http://translate.tails.boum.org/projects/tails/"
@@ -116,7 +116,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.ru.po b/wiki/src/news/version_3.0.ru.po
index d9615c7..8a5aa51 100644
--- a/wiki/src/news/version_3.0.ru.po
+++ b/wiki/src/news/version_3.0.ru.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2018-10-25 10:27+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -115,7 +115,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.sr_Latn.po b/wiki/src/news/version_3.0.sr_Latn.po
index 69d77e4..b6ee906 100644
--- a/wiki/src/news/version_3.0.sr_Latn.po
+++ b/wiki/src/news/version_3.0.sr_Latn.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-08-14 11:08+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -115,7 +115,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.tr.po b/wiki/src/news/version_3.0.tr.po
index b46b4f5..a90c808 100644
--- a/wiki/src/news/version_3.0.tr.po
+++ b/wiki/src/news/version_3.0.tr.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2020-03-07 11:30+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,7 +114,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.zh.po b/wiki/src/news/version_3.0.zh.po
index b8ec0bb..79bfc19 100644
--- a/wiki/src/news/version_3.0.zh.po
+++ b/wiki/src/news/version_3.0.zh.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-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2018-10-25 10:27+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,7 +114,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""
 
diff --git a/wiki/src/news/version_3.0.zh_TW.po b/wiki/src/news/version_3.0.zh_TW.po
index 3fa79e7..fc494fc 100644
--- a/wiki/src/news/version_3.0.zh_TW.po
+++ b/wiki/src/news/version_3.0.zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tails l10n\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2019-12-10 18:44+0000\n"
+"POT-Creation-Date: 2020-11-12 21:49+0000\n"
 "PO-Revision-Date: 2018-11-02 17:13+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: Tails Chinese translators <jxt@twngo.xyz>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid ""
 "  This has been a long process, started three years ago with the UX team of\n"
 "  [NUMA Paris](https://paris.numa.co/) and lead only by volunteers. Join us on\n"
-"  [[tails-ux@boum.org|about/contact#tails-ux]] to participate in future\n"
+"  [[tails-dev@boum.org|about/contact#tails-dev]] to participate in future\n"
 "  designs!\n"
 msgstr ""