summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2020-07-21 15:14:20 +0000
committersajolida <sajolida@pimienta.org>2020-07-21 15:28:30 +0000
commitd2048ad7a678b9628b39e646dc56a3d53eb8dff8 (patch)
tree8374277af9f62c1445d7946ea9c0d0cf20b6c8f3
parentbc4b9df1c07662a69aa7f38e2f59401033cd5172 (diff)
Translate our Social Contract (#17537)
In the discussion on tails-project, I clarified that the audience for this document are our users as it states the commitments of our team towards users. So it makes sense to translate it *and* move it to /doc until we have a proper "About Us" section (#17700). Moving it to /doc also makes it translatable automatically :)
-rw-r--r--wiki/src/about.html2
-rw-r--r--wiki/src/contribute.mdwn2
-rw-r--r--wiki/src/contribute/mission.html2
-rw-r--r--wiki/src/contribute/working_together/code_of_conduct.mdwn2
-rw-r--r--wiki/src/doc/about.index.mdwn1
-rw-r--r--wiki/src/doc/about/social_contract.mdwn (renamed from wiki/src/contribute/working_together/social_contract.mdwn)0
-rw-r--r--wiki/src/news/celebrating_10_years.mdwn2
-rw-r--r--wiki/src/news/many_hands_make_tails.mdwn2
-rw-r--r--wiki/src/news/report_2017_05.mdwn2
-rw-r--r--wiki/src/news/social_contract.mdwn2
-rw-r--r--wiki/src/news/what_we_accomplished_in_2017.mdwn2
11 files changed, 10 insertions, 9 deletions
diff --git a/wiki/src/about.html b/wiki/src/about.html
index 6cb7d91..7379cab 100644
--- a/wiki/src/about.html
+++ b/wiki/src/about.html
@@ -352,7 +352,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>
diff --git a/wiki/src/contribute.mdwn b/wiki/src/contribute.mdwn
index 15bf475..68b753a 100644
--- a/wiki/src/contribute.mdwn
+++ b/wiki/src/contribute.mdwn
@@ -171,7 +171,7 @@ Collective process
- [[Calendar|contribute/calendar]] of releases, meetings, working sessions, etc.
- [[Code of conduct|contribute/working_together/code_of_conduct]]
- - [[Social contract|contribute/working_together/social_contract]]
+ - [[Social contract|doc/about/social_contract]]
- [[Marking a task as Starter|contribute/working_together/criteria_for_starter_tasks]]
- [[Document progress|contribute/working_together/GitLab#document-progress]]
- Reimbursements
diff --git a/wiki/src/contribute/mission.html b/wiki/src/contribute/mission.html
index f89073f..4157778b 100644
--- a/wiki/src/contribute/mission.html
+++ b/wiki/src/contribute/mission.html
@@ -67,7 +67,7 @@ magic.</strong></p>
</div>
<p>See also the [[Tails Social
-Contract|contribute/working_together/social_contract]], which is a set
+Contract|doc/about/social_contract]], which is a set
of commitments that Tails stands by.</p>
<h1>Our style</h1>
diff --git a/wiki/src/contribute/working_together/code_of_conduct.mdwn b/wiki/src/contribute/working_together/code_of_conduct.mdwn
index 570a64f..297bcbc 100644
--- a/wiki/src/contribute/working_together/code_of_conduct.mdwn
+++ b/wiki/src/contribute/working_together/code_of_conduct.mdwn
@@ -5,7 +5,7 @@ made up of a mixture of people from all over the world, working on every
aspect of the mission — including mentorship, teaching, and
connecting people. The commitments that we stand by as a community are
described in the
-[[Tails Social Contract|contribute/working_together/social_contract]].
+[[Tails Social Contract|doc/about/social_contract]].
Diversity is one of our huge strengths, but it can also lead to
communication issues and unhappiness. To that end, we have a few ground
diff --git a/wiki/src/doc/about.index.mdwn b/wiki/src/doc/about.index.mdwn
index 9c8cb8d..b4bc29e 100644
--- a/wiki/src/doc/about.index.mdwn
+++ b/wiki/src/doc/about.index.mdwn
@@ -3,6 +3,7 @@
- [[!traillink Features_and_included_software|about/features]]
- [[!traillink Why_does_Tails_use_Tor?|about/tor]]
- [[!traillink Can_I_hide_the_fact_that_I_am_using_Tails?|about/fingerprint]]
+ - [[!traillink Social_contract|doc/about/social_contract]]
- [[!traillink Trusting_Tails|about/trust]]
- [[!traillink License_and_source_code_distribution|about/license]]
- [[!traillink Acknowledgments_and_similar_projects|about/acknowledgments_and_similar_projects]]
diff --git a/wiki/src/contribute/working_together/social_contract.mdwn b/wiki/src/doc/about/social_contract.mdwn
index ad37436..ad37436 100644
--- a/wiki/src/contribute/working_together/social_contract.mdwn
+++ b/wiki/src/doc/about/social_contract.mdwn
diff --git a/wiki/src/news/celebrating_10_years.mdwn b/wiki/src/news/celebrating_10_years.mdwn
index bd197eb..d2c9d3a 100644
--- a/wiki/src/news/celebrating_10_years.mdwn
+++ b/wiki/src/news/celebrating_10_years.mdwn
@@ -265,7 +265,7 @@ Since 2014:
- We worked on foundational documents and processes to ensure a healthy
community and project, such as our [[Code of
Conduct|contribute/working_together/code_of_conduct]], [[Social
- Contract|contribute/working_together/social_contract]], and [[Missions
+ Contract|doc/about/social_contract]], and [[Missions
and values|contribute/mission]].
[[!img users-budget.svg link="no" alt=""]]
diff --git a/wiki/src/news/many_hands_make_tails.mdwn b/wiki/src/news/many_hands_make_tails.mdwn
index 4eade57..5163e6a 100644
--- a/wiki/src/news/many_hands_make_tails.mdwn
+++ b/wiki/src/news/many_hands_make_tails.mdwn
@@ -18,7 +18,7 @@ reaching up to several billions of dollars for some companies.
At Tails we will never sell your data, nor send you targeted
advertising. And we will never sell our project to a company. We have
made this clear in our [[Social
-Contract|contribute/working_together/social_contract]]. This contract is
+Contract|doc/about/social_contract]]. This contract is
our public promise to our users as well as to the rest of the world, and
with it, we are affirming a commitment to our beliefs.
diff --git a/wiki/src/news/report_2017_05.mdwn b/wiki/src/news/report_2017_05.mdwn
index 372f4ad..75fde39 100644
--- a/wiki/src/news/report_2017_05.mdwn
+++ b/wiki/src/news/report_2017_05.mdwn
@@ -87,7 +87,7 @@ for our work on the infrastructural aspects of this project.
Documentation and website
=========================
-- We have published the [[Tails Social contract|contribute/working_together/social_contract]].
+- We have published the [[Tails Social contract|doc/about/social_contract]].
- We finished updating all our documentation to Tails 3.0, based on
Debian Stretch.
diff --git a/wiki/src/news/social_contract.mdwn b/wiki/src/news/social_contract.mdwn
index 8c28495..064c2d7 100644
--- a/wiki/src/news/social_contract.mdwn
+++ b/wiki/src/news/social_contract.mdwn
@@ -10,7 +10,7 @@ to make our public spaces welcoming and friendly to every sentient
being.
We have since then worked on a [[Social
-Contract|contribute/working_together/social_contract]] which we proudly
+Contract|doc/about/social_contract]] which we proudly
present today!
<!-- Note for translators: Starting from here the content is a copy of the Social Contract. -->
diff --git a/wiki/src/news/what_we_accomplished_in_2017.mdwn b/wiki/src/news/what_we_accomplished_in_2017.mdwn
index 3352210..af6e814 100644
--- a/wiki/src/news/what_we_accomplished_in_2017.mdwn
+++ b/wiki/src/news/what_we_accomplished_in_2017.mdwn
@@ -35,7 +35,7 @@ We recently asked you to [[give us a hand to fund our work in
- **Community**
- We published our **[[Social
- contract|/contribute/working_together/social_contract]]**, the guiding
+ contract|/doc/about/social_contract]]**, the guiding
principles that reflect the commitment to our ideals.
- **Fundraising**