Merge remote-tracking branch 'origin/master' into stable

bin/gitlab-triage-gardener

+#!/bin/sh
+
+set -e
+set -u
+set -x
+
+rm -f config/gitlab-triage/policies/stalled.yml
+./config/gitlab-triage/bin/generate-stalled-policy \
+    > config/gitlab-triage/policies/stalled.yml
+
+sudo "$(dirname "$0")"/../config/gitlab-triage/bin/gitlab-triage \
+    --source-id tails --source groups \
+    --policies-file /etc/gitlab-triage-policies/stalled.yml \
+    "${@}"

config/gitlab-triage/bin/generate-stalled-policy

+#! /usr/bin/python3
+
+import gitlab
+import os
+
+from jinja2 import Environment, FileSystemLoader
+from pathlib import Path
+
+PYTHON_GITLAB_CONFIG_FILE = os.getenv('PYTHON_GITLAB_CONFIG_FILE',
+                                      default=Path.home() /
+                                      '.python-gitlab.cfg')
+
+PYTHON_GITLAB_NAME = os.getenv('GITLAB_NAME', default='TailsGardener')
+
+gl = gitlab.Gitlab.from_config(PYTHON_GITLAB_NAME,
+                               config_files=[PYTHON_GITLAB_CONFIG_FILE])
+gl.auth()
+usernames = [user.username for user in gl.users.list(
+    all=True
+)]
+
+env = Environment(loader=FileSystemLoader('config/gitlab-triage/templates'),
+                  block_start_string='[[%',
+                  block_end_string='%]]',
+                  variable_start_string='[[',
+                  variable_end_string=']]')
+
+print(env.get_template('stalled.yml').render(usernames=usernames))

config/gitlab-triage/policies/.gitignore

+stalled.yml

config/gitlab-triage/templates/README.md

+The files in this directory are Jinja2 templates, that use non-default start/end
+block/variable strings, in order not to conflict with gitlab-triage's own
+templating syntax.
+
+They are processed and rendered by
+`config/gitlab-triage/bin/generate-stalled-policy`.

config/gitlab-triage/templates/stalled.yml

+resource_rules:
+
+  issues:
+    summaries:
+      - name: Stalled WIP
+        actions:
+          summarize:
+            destination: tails/tails
+            title: "Triage stalled work-in-progress: #{Time.now.strftime('%Y-%m-%d')}"
+            summary: |
+              Thanks for having started to work on a Tails issue! This is an
+              automated triaging system that intends to avoid situations where
+              inaccurate metadata ends up causing delays in completion
+              of issues.
+
+              There is at least one issue in a 'Doing' state assigned to you
+              that has not been updated since more than 3 months. Please, make
+              sure to update such issues in order to:
+
+              - better reflect your plans regarding current and further work in
+                each issue
+              - avoid an unsustainable level of work-in-progress for yourself
+              - encourage team work and increase the chances
+                that someone finishes the work
+
+              Below, there's a section titled with your GitLab username, that
+              lists the issues assigned to you, in 'Doing' state, that were not
+              updated since more than 3 months.
+
+              For each such issue, you have a few options, such as:
+
+              - Unassign yourself. That's fine. If it really matters, someone
+                else, possibly you, may pick it up later.
+
+                Then, if the issue is relevant for a Tails team, bring it to
+                their attention; else, forget it and take care of yourself :)
+
+
+              - If you think you can realistically come back to it and finish
+                the work in the next months, say so on the issue, for example
+                by commenting about your planned time frame, replacing the
+                "Doing" label with "To Do", and setting a suitable milestone.
+
+                This will communicate your plans to the rest of the project and
+                ensure the task pops up on your radar at a suitable time.
+
+                Of course, you can still realize later that it is not going to
+                work as planned, and revisit today's choice.
+
+              Cheers,  
+              the robot that avoids a human doing ticket triaging
+              and asking you the above questions on each such issue
+
+              {{items}}
+
+              /assign @intrigeri
+              /label ~"T:Communicate"
+              /label ~"To Do"
+        rules:
+          [[% for username in usernames %]]
+          - name: "Stalled WIP: [[username]]"
+            conditions:
+              state: opened
+              labels:
+                - Doing
+              date:
+                attribute: updated_at
+                condition: older_than
+                interval_type: months
+                interval: 3
+              ruby: |
+                !resource[:assignee].nil? && resource[:assignee][:username] == "[[username]]"
+            actions:
+              summarize:
+                item: "- [ ] [{{title}}]({{web_url}})"
+                summary: |
+                  @[[username]]
+                  =========
+
+                  {{items}}
+          [[% endfor %]]
+      - name: Stalled validation
+        actions:
+          summarize:
+            destination: tails/tails
+            title: "Triage stalled validation: #{Time.now.strftime('%Y-%m-%d')}"
+            summary: |
+              Thanks for having started to work on a Tails issue! This is an
+              automated triaging system that intends to avoid situations where
+              inaccurate metadata ends up causing delays in completion
+              of issues.
+
+              There is at least one issue in a 'Needs Validation' state assigned
+              to you that has not been updated since more than 45 days. Please,
+              make sure to update such issues in order to:
+
+              - better reflect your plans regarding current and further work in
+                each issue
+              - avoid an unsustainable level of work-in-progress for yourself
+              - encourage team work and increase the chances
+                that someone finishes the work
+
+              Below, there's a section titled with your GitLab username, that
+              lists the issues assigned to you, in "Needs Validation" state,
+              that were not updated since more than 45 days.
+
+              For each such issue, you have a few options, such as:
+
+              - If you are the author of the work that needs validation: try to
+                find someone who can complete the review in a timely manner.
+              - Else, if you are the reviewer, then you are currently the one
+                person responsible for the work of someone else becoming
+                effective or not. Because of that, please either:
+                - unassign yourself to make it clear that someone else can
+                  handle it, or
+                - coordinate with the author of the work and organize yourself
+                  to commit with a certain time frame for handling the review.
+
+              Cheers,  
+              the robot that avoids a human doing ticket triaging
+              and asking you the above questions on each such issue
+
+              {{items}}
+
+              /assign @intrigeri
+        rules:
+          [[% for username in usernames %]]
+          - name: "Stalled validation: [[username]]"
+            conditions:
+              state: opened
+              labels:
+                - Needs Validation
+              date:
+                attribute: updated_at
+                condition: older_than
+                interval_type: days
+                interval: 45
+              ruby: |
+                !resource[:assignee].nil? && resource[:assignee][:username] == "[[username]]"
+            actions:
+              summarize:
+                item: "- [ ] [{{title}}]({{web_url}})"
+                summary: |
+                  @[[username]]
+                  =========
+
+                  {{items}}
+          [[% endfor %]]
+
+  merge_requests:
+    summaries:
+      - name: Stalled MRs
+        actions:
+          summarize:
+            destination: tails/tails
+            title: "Triage stalled merge requests: #{Time.now.strftime('%Y-%m-%d')}"
+            summary: |
+              Thanks for having started to work on a Tails MR! This is an
+              automated triaging system that intends to avoid situations where
+              inaccurate metadata ends up causing delays in completion
+              of issues.
+
+              There is at least one MR assigned to you that has not been updated
+              since more than 45 days. Please, make sure to update such issues
+              in order to:
+
+              - better reflect your plans regarding current and further work in
+                each MR
+              - avoid an unsustainable level of work-in-progress for yourself
+              - encourage team work and increase the chances
+                that someone finishes the work
+
+              Below, there's a section titled with your GitLab username, that
+              lists the MRs assigned to you, that were not updated since more
+              than 45 days.
+
+              For each such MR, you have a few options, such as:
+
+              - If you are the author of the work:
+                - Unassign yourself. That's fine. If it really matters, someone
+                  else, possibly you, may pick it up later.
+
+                  Then, if the issue is relevant for a Tails team, bring it to
+                  their attention; else, forget it and take care of yourself :)
+
+              - Else, if you are the reviewer, then you are currently the one
+                person responsible for the work of someone else becoming
+                effective or not. Because of that, please either:
+                - unassign yourself to make it clear that someone else can
+                  handle it, or
+                - coordinate with the author of the work and organize yourself
+                  to commit with a certain time frame for handling the review.
+
+              Cheers,  
+              the robot that avoids a human doing ticket triaging
+              and asking you the above questions on each such MR
+
+              {{items}}
+
+              /assign @intrigeri
+        rules:
+          [[% for username in usernames %]]
+          - name: "Stalled MRs: [[username]]"
+            conditions:
+              state: opened
+              date:
+                attribute: updated_at
+                condition: older_than
+                interval_type: days
+                interval: 45
+              ruby: |
+                !resource[:assignee].nil? && resource[:assignee][:username] == "[[username]]"
+            actions:
+              summarize:
+                item: "- [ ] [{{title}}]({{web_url}})"
+                summary: |
+                  @[[username]]
+                  =========
+
+                  {{items}}
+          [[% endfor %]]

release

@@ -70,12 +70,6 @@ perl -pi'' -e 's/\A  \* update[d]? PO file[s]?[.]?\n//' debian/changelog
 perl -pi'' -e 's/\A  \* \n//' debian/changelog
 perl -pi'' -e 's/\A  \[ 127\.0\.0\.1 \]\n//' debian/changelog
 perl -pi'' -e 's/\A  \[ amnesia \]\n//' debian/changelog
-perl -pi'' -e 's/\A  \[ anonym \]\n//' debian/changelog
-perl -pi'' -e 's/\A  \[ bertagaz \]\n//' debian/changelog
-perl -pi'' -e 's/\A  \[ BitingBird \]\n//' debian/changelog
-perl -pi'' -e 's/\A  \[ intrigeri \]\n//' debian/changelog
-perl -pi'' -e 's/\A  \[ kytv \]\n//' debian/changelog
-perl -pi'' -e 's/\A  \[ sajolida \]\n//' debian/changelog
 perl -pi'' -e 's/\A  \[ T\(A\)ILS developers \]\n//' debian/changelog
 perl -pi'' -e 's/\A  \[ Tails developers \]\n//' debian/changelog
 perl -pi'' -e 's/\A  \[ Tails \]\n//' debian/changelog

wiki/src/about.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-28 06:53+0000\n"
+"POT-Creation-Date: 2020-07-23 01:14+0000\n"
 "PO-Revision-Date: 2018-07-10 09:26+0000\n"
 "Last-Translator: monfi <monfi@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid ""
 "[[!meta title=\"How Tails works\"]] [[!meta stylesheet=\"about\" rel="
 "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"hide-breadcrumbs\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta robots=\"noindex\"]]"
+"\"stylesheet\" title=\"\"]]"
 msgstr ""
 
 #. type: Content of: <h1>
@@ -202,7 +202,7 @@ msgstr ""
 
 #. type: Content of: <section><div><ul><li>
 msgid ""
-"<i>Tor Browser</i> with <i>uBlock</i>, a secure browser with an ad-blocker"
+"<i>Tor Browser</i> with <i>uBlock</i>, a secure browser and an ad-blocker"
 msgstr ""
 
 #. type: Content of: <section><div><ul><li>
@@ -293,6 +293,12 @@ msgid ""
 "coming from."
 msgstr ""
 
+#. type: Content of: <section><div><ul><li>
+msgid ""
+"The connection to the final destination is encrypted whenever possible to "
+"prevent the 3rd relay from reading its content."
+msgstr ""
+
 #. type: Content of: <section><div><p>
 msgid ""
 "This way, Tor is <strong>secure by design</strong> even if a few relays are "
@@ -317,6 +323,11 @@ msgid ""
 "[[Viewing the status and circuits of Tor|doc/anonymous_internet/tor_status]]"
 msgstr ""
 
+#. type: Content of: <section><div><div><ul><li>
+msgid ""
+"[[Browsing the web with Tor Browser|doc/anonymous_internet/Tor_Browser]]"
+msgstr ""
+
 #
 #
 #. type: Content of: <section><div>
@@ -453,7 +464,7 @@ msgid "[[Partners|partners]]"
 msgstr ""
 
 #. type: Content of: <section><div><div><ul><li>
-msgid "[[Social Contract|contribute/working_together/social_contract]]"
+msgid "[[Social Contract|doc/about/social_contract]]"
 msgstr ""
 
 #

wiki/src/about.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-28 06:53+0000\n"
+"POT-Creation-Date: 2020-07-23 01:14+0000\n"
 "PO-Revision-Date: 2018-02-06 15:26+0000\n"
 "Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid ""
 "[[!meta title=\"How Tails works\"]] [[!meta stylesheet=\"about\" rel="
 "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"hide-breadcrumbs\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta robots=\"noindex\"]]"
+"\"stylesheet\" title=\"\"]]"
 msgstr ""
 
 #. type: Content of: <h1>
@@ -201,7 +201,7 @@ msgstr ""
 
 #. type: Content of: <section><div><ul><li>
 msgid ""
-"<i>Tor Browser</i> with <i>uBlock</i>, a secure browser with an ad-blocker"
+"<i>Tor Browser</i> with <i>uBlock</i>, a secure browser and an ad-blocker"
 msgstr ""
 
 #. type: Content of: <section><div><ul><li>
@@ -292,6 +292,12 @@ msgid ""
 "coming from."
 msgstr ""
 
+#. type: Content of: <section><div><ul><li>
+msgid ""
+"The connection to the final destination is encrypted whenever possible to "
+"prevent the 3rd relay from reading its content."
+msgstr ""
+
 #. type: Content of: <section><div><p>
 msgid ""
 "This way, Tor is <strong>secure by design</strong> even if a few relays are "
@@ -316,6 +322,11 @@ msgid ""
 "[[Viewing the status and circuits of Tor|doc/anonymous_internet/tor_status]]"
 msgstr ""
 
+#. type: Content of: <section><div><div><ul><li>
+msgid ""
+"[[Browsing the web with Tor Browser|doc/anonymous_internet/Tor_Browser]]"
+msgstr ""
+
 #
 #
 #. type: Content of: <section><div>
@@ -452,7 +463,7 @@ msgid "[[Partners|partners]]"
 msgstr ""
 
 #. type: Content of: <section><div><div><ul><li>
-msgid "[[Social Contract|contribute/working_together/social_contract]]"
+msgid "[[Social Contract|doc/about/social_contract]]"
 msgstr ""
 
 #

wiki/src/about.de.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-04 05:12+0000\n"
+"POT-Creation-Date: 2020-07-23 01:14+0000\n"
 "PO-Revision-Date: 2020-03-15 08:35+0000\n"
 "Last-Translator: Muri Nicanor <muri@immerda.ch>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid ""
 "[[!meta title=\"How Tails works\"]] [[!meta stylesheet=\"about\" rel="
 "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"hide-breadcrumbs\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta robots=\"noindex\"]]"
+"\"stylesheet\" title=\"\"]]"
 msgstr ""
 "[[!pagetemplate template=\"topbar.tmpl\"]] [[!meta title=\"Wie Tails "
 "funktioniert\"]] [[!meta stylesheet=\"staging/about\" rel=\"stylesheet\" "
@@ -583,8 +583,8 @@ msgid "[[Partners|partners]]"
 msgstr "[[Partner|partners]]"
 
 #. type: Content of: <section><div><div><ul><li>
-msgid "[[Social Contract|contribute/working_together/social_contract]]"
-msgstr "[[sozialer Auftrag|contribute/working_together/social_contract]]"
+msgid "[[Social Contract|doc/about/social_contract]]"
+msgstr "[[sozialer Auftrag|doc/about/social_contract]]"
 
 #
 #

wiki/src/about.es.po

@@ -6,23 +6,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-06-04 05:12+0000\n"
-"PO-Revision-Date: 2020-05-22 04:44+0000\n"
-"Last-Translator: Tails translators <amnesia@boum.org>\n"
+"Report-Msgid-Bugs-To: tails-l10n@boum.org\n"
+"POT-Creation-Date: 2020-07-23 01:14+0000\n"
+"PO-Revision-Date: 2020-08-14 10:53+0000\n"
+"Last-Translator: emmapeel <emma.peel@riseup.net>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Weblate 3.5.1\n"
 
 #. type: Content of: outside any tag (error?)
 #, fuzzy
 msgid ""
 "[[!meta title=\"How Tails works\"]] [[!meta stylesheet=\"about\" rel="
 "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"hide-breadcrumbs\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta robots=\"noindex\"]]"
+"\"stylesheet\" title=\"\"]]"
 msgstr ""
 "[[!pagetemplate template=\"topbar.tmpl\"]] [[!meta title=\"Cómo funciona "
 "Tails\"]] [[!meta stylesheet=\"staging/about\" rel=\"stylesheet\" title="
@@ -350,6 +351,8 @@ msgid ""
 "The connection to the final destination is encrypted whenever possible to "
 "prevent the 3rd relay from reading its content."
 msgstr ""
+"La conexión con el destino final se cifra siempre que es posible para evitar "
+"que un tercero lea tus contenidos."
 
 #. type: Content of: <section><div><p>
 msgid ""
@@ -557,8 +560,8 @@ msgid "[[Partners|partners]]"
 msgstr "[[Socios|partners]]"
 
 #. type: Content of: <section><div><div><ul><li>
-msgid "[[Social Contract|contribute/working_together/social_contract]]"
-msgstr "[[Contrato Social|contribute/working_together/social_contract]]"
+msgid "[[Social Contract|doc/about/social_contract]]"
+msgstr "[[Contrato Social|doc/about/social_contract]]"
 
 #
 #
@@ -609,7 +612,7 @@ msgstr ""
 
 #. type: Content of: <section><div><div><ul><li>
 msgid "[[Contact]]"
-msgstr ""
+msgstr "[[Contacto|Contact]]"
 
 #. type: Content of: <div>
 msgid "[[Get Tails|install]]"

wiki/src/about.fa.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-04 05:12+0000\n"
+"POT-Creation-Date: 2020-07-23 01:14+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"
@@ -20,7 +20,7 @@ msgstr ""
 msgid ""
 "[[!meta title=\"How Tails works\"]] [[!meta stylesheet=\"about\" rel="
 "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"hide-breadcrumbs\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta robots=\"noindex\"]]"
+"\"stylesheet\" title=\"\"]]"
 msgstr ""
 
 #. type: Content of: <h1>
@@ -459,7 +459,7 @@ msgid "[[Partners|partners]]"
 msgstr ""
 
 #. type: Content of: <section><div><div><ul><li>
-msgid "[[Social Contract|contribute/working_together/social_contract]]"
+msgid "[[Social Contract|doc/about/social_contract]]"
 msgstr ""
 
 #

wiki/src/about.fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-04 05:12+0000\n"
+"POT-Creation-Date: 2020-07-23 01:14+0000\n"
 "PO-Revision-Date: 2020-03-21 14:35+0000\n"
 "Last-Translator: xin <xin@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid ""
 "[[!meta title=\"How Tails works\"]] [[!meta stylesheet=\"about\" rel="
 "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"hide-breadcrumbs\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta robots=\"noindex\"]]"
+"\"stylesheet\" title=\"\"]]"
 msgstr ""
 "[[!pagetemplate template=\"topbar.tmpl\"]] [[!meta title=\"Fonctionnement de "
 "Tails\"]] [[!meta stylesheet=\"staging/about\" rel=\"stylesheet\" title="
@@ -576,7 +576,7 @@ msgid "[[Partners|partners]]"
 msgstr "[[Partenaires|partners]]"
 
 #. type: Content of: <section><div><div><ul><li>
-msgid "[[Social Contract|contribute/working_together/social_contract]]"
+msgid "[[Social Contract|doc/about/social_contract]]"
 msgstr "[[Contrat social|news/social_contract]]"
 
 #

wiki/src/about.html

 [[!meta title="How Tails works"]]
 [[!meta stylesheet="about" rel="stylesheet" title=""]]
 [[!meta stylesheet="hide-breadcrumbs" rel="stylesheet" title=""]]
-[[!meta robots="noindex"]]
 
 <h1>Leave no trace on the computer</h1>
 
@@ -352,7 +351,7 @@
     <ul>
       <li>[[Donate|donate]]</li>
       <li>[[Partners|partners]]</li>
-      <li>[[Social Contract|contribute/working_together/social_contract]]</li>
+      <li>[[Social Contract|doc/about/social_contract]]</li>
     </ul>
   </div>
 

wiki/src/about.id.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-04 05:12+0000\n"
+"POT-Creation-Date: 2020-07-23 01:14+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"
@@ -20,7 +20,7 @@ msgstr ""
 msgid ""
 "[[!meta title=\"How Tails works\"]] [[!meta stylesheet=\"about\" rel="
 "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"hide-breadcrumbs\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta robots=\"noindex\"]]"
+"\"stylesheet\" title=\"\"]]"
 msgstr ""
 
 #. type: Content of: <h1>
@@ -461,7 +461,7 @@ msgid "[[Partners|partners]]"
 msgstr ""
 
 #. type: Content of: <section><div><div><ul><li>
-msgid "[[Social Contract|contribute/working_together/social_contract]]"
+msgid "[[Social Contract|doc/about/social_contract]]"
 msgstr ""
 
 #

wiki/src/about.it.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-04 05:12+0000\n"
+"POT-Creation-Date: 2020-07-23 01:14+0000\n"
 "PO-Revision-Date: 2020-05-14 01:56+0000\n"
 "Last-Translator: _ignifugo <ignifugo@insicuri.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid ""
 "[[!meta title=\"How Tails works\"]] [[!meta stylesheet=\"about\" rel="
 "\"stylesheet\" title=\"\"]] [[!meta stylesheet=\"hide-breadcrumbs\" rel="
-"\"stylesheet\" title=\"\"]] [[!meta robots=\"noindex\"]]"
+"\"stylesheet\" title=\"\"]]"
 msgstr ""
 "[[!pagetemplate template=\"topbar.tmpl\"]] [[!meta title=\"Come funziona "
 "Tails\"]] [[!meta stylesheet=\"staging/about\" rel=\"stylesheet\" title="
@@ -575,8 +575,8 @@ msgid "[[Partners|partners]]"
 msgstr "[[Soci|partners]]"
 
 #. type: Content of: <section><div><div><ul><li>
-msgid "[[Social Contract|contribute/working_together/social_contract]]"
-msgstr "[[Contratto sociale|contribute/working_together/social_contract]]"
+msgid "[[Social Contract|doc/about/social_contract]]"
+msgstr "[[Contratto sociale|doc/about/social_contract]]"