Merge remote-tracking branch 'origin/master'

03e6a99d · sajolida · 975a9079 · 70deaad0 · 03e6a99d · 03e6a99d
Commit 03e6a99d authored Jul 27, 2020 by sajolida
--- a/bin/gitlab-api-token
+++ b/bin/gitlab-api-token
+#!/usr/bin/python3
+
+from gitlab.config import GitlabConfigParser
+import sys
+
+gitlab_id = sys.argv[1]
+
+print(GitlabConfigParser(gitlab_id=gitlab_id).private_token)
--- a/bin/gitlab-triage-post-release
+++ b/bin/gitlab-triage-post-release
+#!/bin/sh
+
+set -e
+set -u
+set -x
+
+export DOCKER_ARGS="--env VERSION --env NEXT_PLANNED_VERSION"
+
+"$(dirname "$0")"/../config/gitlab-triage/bin/gitlab-triage \
+    --source-id tails --source groups \
+    --policies-file /etc/gitlab-triage-policies/release_management/missed-resources.yml \
+    "${@}"
--- a/bin/gitlab-url
+++ b/bin/gitlab-url
+#!/usr/bin/python3
+
+from gitlab.config import GitlabConfigParser
+import sys
+
+gitlab_id = sys.argv[1]
+
+print(GitlabConfigParser(gitlab_id=gitlab_id).url)
--- a/config/gitlab-triage/Dockerfile
+++ b/config/gitlab-triage/Dockerfile
+FROM debian:stable
+
+RUN set -eux ; \
+    apt-get -q update ; \
+    DEBIAN_FRONTEND=noninteractive apt-get -qy install ruby
+
+RUN gem install gitlab-triage
--- a/config/gitlab-triage/bin/ensure-up-to-date-Docker-image
+++ b/config/gitlab-triage/bin/ensure-up-to-date-Docker-image
+#!/bin/sh
+
+set -e
+set -u
+set -x
+
+# Update Docker image tails:gitlab-triage-stable is based on
+docker image pull debian:stable
+
+# Build our own Docker image
+docker build --tag tails:gitlab-triage-stable "$(dirname "$0")/.."
+
+# Remove dangling Docker images
+docker image prune --force
--- a/config/gitlab-triage/bin/gitlab-triage
+++ b/config/gitlab-triage/bin/gitlab-triage
+#! /bin/sh
+
+# Wrapper to run gitlab-triage (https://gitlab.com/gitlab-org/gitlab-triage)
+# in Docker
+
+set -e
+set -u
+set -x
+
+GITLAB_TRIAGE_POLICIES_DIR="$(readlink -f "$(dirname "$0")"/../policies)"
+
+docker run \
+    --name tails-gitlab-triage \
+    --rm \
+    --volume "${GITLAB_TRIAGE_POLICIES_DIR}":/etc/gitlab-triage-policies \
+    ${DOCKER_ARGS:-} \
+    tails:gitlab-triage-stable \
+    /usr/local/bin/gitlab-triage "${@}"
--- a/config/gitlab-triage/policies/release_management/missed-resources.yml
+++ b/config/gitlab-triage/policies/release_management/missed-resources.yml
+.label-missed-resources: &label-missed-resources
+  rules:
+    - name: Postpone resources that missed their milestone
+      conditions:
+        state: opened
+        milestone: any
+        ruby: |
+          return false unless ENV['VERSION']
+          return false unless ENV['NEXT_PLANNED_VERSION']
+          return false unless milestone&.title == "Tails_#{ENV['VERSION']}"
+          Date.today >= milestone.due_date
+      actions:
+        comment: |
+          /label ~"missed:#{ENV['VERSION']}"
+          /milestone %"Tails_#{ENV['NEXT_PLANNED_VERSION']}"
+
+resource_rules:
+  issues:
+    *label-missed-resources
+  merge_requests:
+    *label-missed-resources
--- a/wiki/src/contribute.ar.po
+++ b/wiki/src/contribute.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: 2020-05-25 13:48+0000\n"
+"POT-Creation-Date: 2020-07-25 21:06+0000\n"
 "PO-Revision-Date: 2018-10-26 13:14+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: Arabic <http://translate.tails.boum.org/projects/tails/"
@@ -56,7 +56,7 @@ msgid ""
 "  <p>Every user can help others or provide developers with useful information.</p>\n"
 "  <ul>\n"
 "    <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
-"    <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
+"    <li>[[Test experimental Tails images|contribute/how/testing]]</li>\n"
 "    <li>[[Provide input to developers|contribute/how/input]]</li>\n"
 "    <li>[[Help other Tails users|contribute/how/help]]</li>\n"
 "  </ul>\n"
@@ -142,7 +142,7 @@ msgstr ""
 msgid ""
 "  <p>Speakers can advocate Tails to all kinds of public.</p>\n"
 "  <ul>\n"
-"    <li>[[Talk at events|contribute/how/promote]]</li>\n"
+"    <li>[[Outreach material: logo, leaflets, stickers, etc.|contribute/how/promote]]</li>\n"
 "    <li>[[Press and media information|press]]</li>\n"
 "  </ul>\n"
 "</div>\n"
@@ -228,7 +228,6 @@ msgid ""
 "\t<ol>\n"
 "\t\t<li class=\"L2\"><a href=\"#reference-documents\">Reference documents</a></li>\n"
 "\t\t<li class=\"L2\"><a href=\"#tools\">Tools for contributors</a></li>\n"
-"\t\t<li class=\"L2\"><a href=\"#mentors\">Mentors & guidance for new contributors</a></li>\n"
 "\t\t<li class=\"L2\"><a href=\"#release-cycle\">Release cycle</a></li>\n"
 "\t\t<li class=\"L2\"><a href=\"#upstream\">Relationship with upstream</a></li>\n"
 "\t\t<li class=\"L2\"><a href=\"#collective-process\">Collective process</a></li>\n"
@@ -325,7 +324,8 @@ msgid ""
 "  - [[Building a Tails image|contribute/build]]\n"
 "    - [[Build a local copy of the website|contribute/build/website]]\n"
 "    - [[Customize Tails|contribute/customize]]\n"
-"    - [Nightly ISO builds](http://nightly.tails.boum.org)\n"
+"    - [Nightly Tails image builds](https://nightly.tails.boum.org)\n"
+"    - [[Jenkins CI|contribute/working_together/roles/sysadmins/Jenkins]]\n"
 "  - Debian packages\n"
 "    - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
 "    - How we manage and upgrade the [[Linux kernel|contribute/Linux_kernel]].\n"
@@ -333,112 +333,6 @@ msgid ""
 "  - [[Glossary for contributors|contribute/glossary]]\n"
 msgstr ""

-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mentors\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Mentors & guidance for new contributors"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Once you have found a first [[Starter task|starter_tasks]] to work on, you "
-"might need some guidance."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Here is a list of mentors who can help with\n"
-"specific tasks. Feel free to talk to them if you plan to work on anything related to their\n"
-"field of expertise, for example\n"
-"by assigning them issues on GitLab or <a href=\"#talk\">talking to us</a>\n"
-"using the usual communication channels.\n"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "AppArmor: intrigeri, jvoisin"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Build system (Vagrant, Rake): anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Debian related work: intrigeri"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Documentation: BitingBird, sajolida"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Onion Circuits* (Python): alan"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*OpenPGP Applet* (Perl): nodens"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Persistent Storage (Perl): intrigeri, kurono"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Sysadmin: [[contact|contribute/how/sysadmin/#contact]]"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Welcome Screen (Python): alan, intrigeri"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Tails Installer* (Python): alan, kurono"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Tails Upgrader* (Perl): intrigeri"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Tails Verification* (JavaScript): sajolida, anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Test suite (Gherkin, Ruby): anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Thunderbird* (Icedove): anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Tor configuration, time syncing, MAC spoofing: anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Tor Browser*: anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Usability: sajolida"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Unsafe Web Browser*: anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Website: sajolida"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*WhisperBack* (Python): alan"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid "<a id=\"release-cycle\"></a>\n"
@@ -538,6 +432,8 @@ msgid ""
 "    - [[UX designers|contribute/working_together/roles/ux]]\n"
 "    - [[Verification extension\n"
 "      maintainers|contribute/working_together/roles/verification_extension]]\n"
+"  - Interfaces between roles and teams\n"
+"    - [[Developers and Release Managers|contribute/working_together/interfaces/developers_and_release_managers]]\n"
 "  - Roles for sponsor deliverables:\n"
 "      - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
 "      - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
@@ -561,9 +457,13 @@ msgid ""
 msgstr ""

 #, fuzzy
-#| msgid "[[Mission and values|contribute/mission]]"
-msgid "[[Organizing a sprint|contribute/sprint]]"
-msgstr "[[Ziele und Werte|contribute/mission]]"
+#| msgid "Talk with us\n"
+msgid "Talk with us"
+msgstr "Mit uns reden\n"
+
+#, fuzzy
+#~ msgid "[[Organizing a sprint|contribute/sprint]]"
+#~ msgstr "[[Ziele und Werte|contribute/mission]]"

 #, fuzzy
 #~ msgid ""

--- a/wiki/src/contribute.ca.po
+++ b/wiki/src/contribute.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: 2020-05-25 13:48+0000\n"
+"POT-Creation-Date: 2020-07-25 21:06+0000\n"
 "PO-Revision-Date: 2018-10-26 13:14+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgid ""
 "  <p>Every user can help others or provide developers with useful information.</p>\n"
 "  <ul>\n"
 "    <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
-"    <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
+"    <li>[[Test experimental Tails images|contribute/how/testing]]</li>\n"
 "    <li>[[Provide input to developers|contribute/how/input]]</li>\n"
 "    <li>[[Help other Tails users|contribute/how/help]]</li>\n"
 "  </ul>\n"
@@ -140,7 +140,7 @@ msgstr ""
 msgid ""
 "  <p>Speakers can advocate Tails to all kinds of public.</p>\n"
 "  <ul>\n"
-"    <li>[[Talk at events|contribute/how/promote]]</li>\n"
+"    <li>[[Outreach material: logo, leaflets, stickers, etc.|contribute/how/promote]]</li>\n"
 "    <li>[[Press and media information|press]]</li>\n"
 "  </ul>\n"
 "</div>\n"
@@ -226,7 +226,6 @@ msgid ""
 "\t<ol>\n"
 "\t\t<li class=\"L2\"><a href=\"#reference-documents\">Reference documents</a></li>\n"
 "\t\t<li class=\"L2\"><a href=\"#tools\">Tools for contributors</a></li>\n"
-"\t\t<li class=\"L2\"><a href=\"#mentors\">Mentors & guidance for new contributors</a></li>\n"
 "\t\t<li class=\"L2\"><a href=\"#release-cycle\">Release cycle</a></li>\n"
 "\t\t<li class=\"L2\"><a href=\"#upstream\">Relationship with upstream</a></li>\n"
 "\t\t<li class=\"L2\"><a href=\"#collective-process\">Collective process</a></li>\n"
@@ -323,7 +322,8 @@ msgid ""
 "  - [[Building a Tails image|contribute/build]]\n"
 "    - [[Build a local copy of the website|contribute/build/website]]\n"
 "    - [[Customize Tails|contribute/customize]]\n"
-"    - [Nightly ISO builds](http://nightly.tails.boum.org)\n"
+"    - [Nightly Tails image builds](https://nightly.tails.boum.org)\n"
+"    - [[Jenkins CI|contribute/working_together/roles/sysadmins/Jenkins]]\n"
 "  - Debian packages\n"
 "    - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
 "    - How we manage and upgrade the [[Linux kernel|contribute/Linux_kernel]].\n"
@@ -331,112 +331,6 @@ msgid ""
 "  - [[Glossary for contributors|contribute/glossary]]\n"
 msgstr ""

-#. type: Plain text
-#, no-wrap
-msgid "<a id=\"mentors\"></a>\n"
-msgstr ""
-
-#. type: Title =
-#, no-wrap
-msgid "Mentors & guidance for new contributors"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Once you have found a first [[Starter task|starter_tasks]] to work on, you "
-"might need some guidance."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"Here is a list of mentors who can help with\n"
-"specific tasks. Feel free to talk to them if you plan to work on anything related to their\n"
-"field of expertise, for example\n"
-"by assigning them issues on GitLab or <a href=\"#talk\">talking to us</a>\n"
-"using the usual communication channels.\n"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "AppArmor: intrigeri, jvoisin"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Build system (Vagrant, Rake): anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Debian related work: intrigeri"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Documentation: BitingBird, sajolida"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Onion Circuits* (Python): alan"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*OpenPGP Applet* (Perl): nodens"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Persistent Storage (Perl): intrigeri, kurono"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Sysadmin: [[contact|contribute/how/sysadmin/#contact]]"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Welcome Screen (Python): alan, intrigeri"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Tails Installer* (Python): alan, kurono"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Tails Upgrader* (Perl): intrigeri"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Tails Verification* (JavaScript): sajolida, anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Test suite (Gherkin, Ruby): anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Thunderbird* (Icedove): anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Tor configuration, time syncing, MAC spoofing: anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Tor Browser*: anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Usability: sajolida"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*Unsafe Web Browser*: anonym"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "Website: sajolida"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "*WhisperBack* (Python): alan"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid "<a id=\"release-cycle\"></a>\n"
@@ -536,6 +430,8 @@ msgid ""
 "    - [[UX designers|contribute/working_together/roles/ux]]\n"
 "    - [[Verification extension\n"
 "      maintainers|contribute/working_together/roles/verification_extension]]\n"
+"  - Interfaces between roles and teams\n"
+"    - [[Developers and Release Managers|contribute/working_together/interfaces/developers_and_release_managers]]\n"
 "  - Roles for sponsor deliverables:\n"
 "      - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
 "      - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
@@ -559,9 +455,13 @@ msgid ""
 msgstr ""

 #, fuzzy
-#| msgid "[[Mission and values|contribute/mission]]"
-msgid "[[Organizing a sprint|contribute/sprint]]"
-msgstr "[[Ziele und Werte|contribute/mission]]"
+#| msgid "Talk with us\n"
+msgid "Talk with us"
+msgstr "Mit uns reden\n"
+
+#, fuzzy
+#~ msgid "[[Organizing a sprint|contribute/sprint]]"
+#~ msgstr "[[Ziele und Werte|contribute/mission]]"

 #, fuzzy
 #~ msgid ""

--- a/wiki/src/contribute.de.po
+++ b/wiki/src/contribute.de.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: 2020-06-10 17:27+0000\n"
+"POT-Creation-Date: 2020-07-25 21:06+0000\n"
 "PO-Revision-Date: 2020-03-12 17:35+0000\n"
 "Last-Translator: Muri Nicanor <muri@immerda.ch>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,12 +56,22 @@ msgid "  [[!img user.png link=no]]\n"
 msgstr "  [[!img user.png link=no]]\n"

 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  <p>Every user can help others or provide developers with useful information.</p>\n"
+#| "  <ul>\n"
+#| "    <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
+#| "    <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
+#| "    <li>[[Provide input to developers|contribute/how/input]]</li>\n"
+#| "    <li>[[Help other Tails users|contribute/how/help]]</li>\n"
+#| "  </ul>\n"
+#| "</div>\n"
+#| "</div>\n"
 msgid ""
 "  <p>Every user can help others or provide developers with useful information.</p>\n"
 "  <ul>\n"
 "    <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
-"    <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
+"    <li>[[Test experimental Tails images|contribute/how/testing]]</li>\n"
 "    <li>[[Provide input to developers|contribute/how/input]]</li>\n"
 "    <li>[[Help other Tails users|contribute/how/help]]</li>\n"
 "  </ul>\n"
@@ -455,7 +465,8 @@ msgid ""
 "  - [[Building a Tails image|contribute/build]]\n"
 "    - [[Build a local copy of the website|contribute/build/website]]\n"
 "    - [[Customize Tails|contribute/customize]]\n"
-"    - [Nightly ISO builds](http://nightly.tails.boum.org)\n"
+"    - [Nightly Tails image builds](https://nightly.tails.boum.org)\n"
+"    - [[Jenkins CI|contribute/working_together/roles/sysadmins/Jenkins]]\n"
 "  - Debian packages\n"
 "    - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
 "    - How we manage and upgrade the [[Linux kernel|contribute/Linux_kernel]].\n"
@@ -604,6 +615,8 @@ msgid ""
 "    - [[UX designers|contribute/working_together/roles/ux]]\n"
 "    - [[Verification extension\n"
 "      maintainers|contribute/working_together/roles/verification_extension]]\n"
+"  - Interfaces between roles and teams\n"
+"    - [[Developers and Release Managers|contribute/working_together/interfaces/developers_and_release_managers]]\n"
 "  - Roles for sponsor deliverables:\n"
 "      - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
 "      - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"

--- a/wiki/src/contribute.es.po
+++ b/wiki/src/contribute.es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"
 "Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
-"POT-Creation-Date: 2020-06-10 17:27+0000\n"
+"POT-Creation-Date: 2020-07-25 21:06+0000\n"
 "PO-Revision-Date: 2020-03-31 09:34+0000\n"
 "Last-Translator: emma peel <emmapeel@torproject.org>\n"
 "Language-Team: Spanish <http://translate.tails.boum.org/projects/tails/"
@@ -55,12 +55,22 @@ msgid "  [[!img user.png link=no]]\n"
 msgstr "  [[!img user.png link=no]]\n"

 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  <p>Every user can help others or provide developers with useful information.</p>\n"
+#| "  <ul>\n"
+#| "    <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
+#| "    <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
+#| "    <li>[[Provide input to developers|contribute/how/input]]</li>\n"
+#| "    <li>[[Help other Tails users|contribute/how/help]]</li>\n"
+#| "  </ul>\n"
+#| "</div>\n"
+#| "</div>\n"
 msgid ""
 "  <p>Every user can help others or provide developers with useful information.</p>\n"
 "  <ul>\n"
 "    <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
-"    <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
+"    <li>[[Test experimental Tails images|contribute/how/testing]]</li>\n"
 "    <li>[[Provide input to developers|contribute/how/input]]</li>\n"
 "    <li>[[Help other Tails users|contribute/how/help]]</li>\n"
 "  </ul>\n"
@@ -445,7 +455,8 @@ msgid ""
 "  - [[Building a Tails image|contribute/build]]\n"
 "    - [[Build a local copy of the website|contribute/build/website]]\n"
 "    - [[Customize Tails|contribute/customize]]\n"
-"    - [Nightly ISO builds](http://nightly.tails.boum.org)\n"
+"    - [Nightly Tails image builds](https://nightly.tails.boum.org)\n"
+"    - [[Jenkins CI|contribute/working_together/roles/sysadmins/Jenkins]]\n"
 "  - Debian packages\n"
 "    - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
 "    - How we manage and upgrade the [[Linux kernel|contribute/Linux_kernel]].\n"
@@ -597,6 +608,8 @@ msgid ""
 "    - [[UX designers|contribute/working_together/roles/ux]]\n"
 "    - [[Verification extension\n"
 "      maintainers|contribute/working_together/roles/verification_extension]]\n"
+"  - Interfaces between roles and teams\n"
+"    - [[Developers and Release Managers|contribute/working_together/interfaces/developers_and_release_managers]]\n"
 "  - Roles for sponsor deliverables:\n"
 "      - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
 "      - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"
@@ -655,19 +668,24 @@ msgstr ""
 #, fuzzy
 #~| msgid ""
 #~| "Here is a list of mentors who can help with\n"
-#~| "specific tasks. Feel free to talk to them if you plan to work on anything related to their\n"
+#~| "specific tasks. Feel free to talk to them if you plan to work on "
+#~| "anything related to their\n"
 #~| "field of expertise, for example\n"
-#~| "by assigning them tickets on Redmine or <a href=\"#talk\">talking to us</a>\n"
+#~| "by assigning them tickets on Redmine or <a href=\"#talk\">talking to us</"
+#~| "a>\n"
 #~| "using the usual communication channels.\n"
 #~ msgid ""
 #~ "Here is a list of mentors who can help with\n"
-#~ "specific tasks. Feel free to talk to them if you plan to work on anything related to their\n"
+#~ "specific tasks. Feel free to talk to them if you plan to work on anything "
+#~ "related to their\n"
 #~ "field of expertise, for example\n"
-#~ "by assigning them issues on GitLab or <a href=\"#talk\">talking to us</a>\n"
+#~ "by assigning them issues on GitLab or <a href=\"#talk\">talking to us</"
+#~ "a>\n"
 #~ "using the usual communication channels.\n"
 #~ msgstr ""
 #~ "Aquí hay una lista de mentores que pueden\n"
-#~ "ayudar con tareas específicas. No dudes en hablar con ellos si quieres trabajar en\n"
+#~ "ayudar con tareas específicas. No dudes en hablar con ellos si quieres "
+#~ "trabajar en\n"
 #~ "alguno de estos temas, por ejemplo\n"
 #~ "puedes asignarles tickets en Redmine o <a href=\"#talk\">hablarles</a>\n"
 #~ "en los canales habituales de comunicación.\n"

--- a/wiki/src/contribute.fa.po
+++ b/wiki/src/contribute.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: 2020-06-10 17:27+0000\n"
+"POT-Creation-Date: 2020-07-25 21:06+0000\n"
 "PO-Revision-Date: 2015-10-15 15:23+0000\n"
 "Last-Translator: sprint5 <translation5@451f.org>\n"
 "Language-Team: Persian <http://weblate.451f.org:8889/projects/tails/"
@@ -56,12 +56,22 @@ msgid "  [[!img user.png link=no]]\n"
 msgstr "  [[!img user.png link=no]]\n"

 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  <p>Every user can help others or provide developers with useful information.</p>\n"
+#| "  <ul>\n"
+#| "    <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
+#| "    <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
+#| "    <li>[[Provide input to developers|contribute/how/input]]</li>\n"
+#| "    <li>[[Help other Tails users|contribute/how/help]]</li>\n"
+#| "  </ul>\n"
+#| "</div>\n"
+#| "</div>\n"
 msgid ""
 "  <p>Every user can help others or provide developers with useful information.</p>\n"
 "  <ul>\n"
 "    <li>[[Report bugs|doc/first_steps/bug_reporting]]</li>\n"
-"    <li>[[Test experimental ISO images|contribute/how/testing]]</li>\n"
+"    <li>[[Test experimental Tails images|contribute/how/testing]]</li>\n"
 "    <li>[[Provide input to developers|contribute/how/input]]</li>\n"
 "    <li>[[Help other Tails users|contribute/how/help]]</li>\n"
 "  </ul>\n"
@@ -455,7 +465,8 @@ msgid ""
 "  - [[Building a Tails image|contribute/build]]\n"
 "    - [[Build a local copy of the website|contribute/build/website]]\n"
 "    - [[Customize Tails|contribute/customize]]\n"
-"    - [Nightly ISO builds](http://nightly.tails.boum.org)\n"
+"    - [Nightly Tails image builds](https://nightly.tails.boum.org)\n"
+"    - [[Jenkins CI|contribute/working_together/roles/sysadmins/Jenkins]]\n"
 "  - Debian packages\n"
 "    - [[APT repository|contribute/APT_repository]], to store our custom Debian packages\n"
 "    - How we manage and upgrade the [[Linux kernel|contribute/Linux_kernel]].\n"
@@ -593,6 +604,8 @@ msgid ""
 "    - [[UX designers|contribute/working_together/roles/ux]]\n"
 "    - [[Verification extension\n"
 "      maintainers|contribute/working_together/roles/verification_extension]]\n"
+"  - Interfaces between roles and teams\n"
+"    - [[Developers and Release Managers|contribute/working_together/interfaces/developers_and_release_managers]]\n"
 "  - Roles for sponsor deliverables:\n"
 "      - [[Team manager|contribute/working_together/roles/sponsor_deliverables/team_manager]]\n"
 "      - [[Worker|contribute/working_together/roles/sponsor_deliverables/worker]]\n"

--- a/wiki/src/contribute.fr.po
+++ b/wiki/src/contribute.fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tails\n"