[tor-commits] [tpo/translations] content updates

emmapeel at torproject.org emmapeel at torproject.org
Fri Oct 8 11:17:01 UTC 2021 

commit 61d21e02cbc1f4a24070ee6eea7770b81d6a576f
Author: emma peel <emma.peel at riseup.net>
Date:   Fri Oct 8 10:10:22 2021 +0200

    content updates
---
 CONTRIBUTING.md                                    |   2 +-
 README.md                                          |   6 +-
 .../findoc/2020-TorProject-Annual-Report.pdf       | Bin 0 -> 973190 bytes
 assets/static/images/membership/logos/samourai.png | Bin 0 -> 12446 bytes
 assets/static/images/people/championquizzer.png    | Bin 0 -> 307270 bytes
 assets/static/images/privchat/etienne.jpg          | Bin 0 -> 153030 bytes
 assets/static/images/privchat/jsr.jpg              | Bin 0 -> 63929 bytes
 assets/static/images/privchat/likhita.jpg          | Bin 0 -> 60161 bytes
 assets/static/images/privchat/privchat-5.ics       |  56 ++++++++++
 assets/static/images/sponsors/Sloan_logo.png       | Bin 0 -> 35030 bytes
 assets/static/keys/championquizzer.txt             | 115 +++++++++++++++++++++
 content/about/people/acat/contents.lr              |  15 ---
 content/about/people/cindy-core/contents.lr        |  20 ----
 content/about/people/cindy/contents.lr             |  18 ----
 content/about/people/mrphs/contents.lr             |  17 ---
 content/about/people/schneier-core/contents.lr     |  15 ---
 content/about/people/schneier/contents.lr          |  13 ---
 content/about/people/ssteele-core/contents.lr      |  21 ----
 content/well-known/contents.lr                     |   9 --
 databags/download-alternatives-alpha.ini           |   4 +
 databags/platforms.ini                             |   2 +-
 databags/versions.ini                              |  20 ++--
 22 files changed, 190 insertions(+), 143 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 25979b08..922a5389 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -148,7 +148,7 @@ This table summarises how each databag file is used
 | tags.ini | Content tags and styling information |
 
 
-Check our [wiki pages](https://gitlab.torproject.org/tpo/web/community/-/wikis/How-to-develop-on-the-website) for more information.
+Check our [wiki pages](https://gitlab.torproject.org/tpo/web/wiki/-/wikis/How-to-develop-on-the-website) for more information.
 
 ## Translations
 
diff --git a/README.md b/README.md
index 407049d4..aca7c61c 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # Tor Project Website
 
-This is the repository of Tor Project website. The current online version of this portal can be found at [https://torproject.org](https://torproject.org) or [Tor Project Onion Service](http://expyuzz4wqqyqhjn.onion/).
+This is the repository of Tor Project website. The current online version of this portal can be found at [https://torproject.org](https://torproject.org) or [Tor Project Onion Service](http://2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.onion/).
 
 To clone the code use either of
 
 ```git clone https://git.torproject.org/project/web/tpo.git/```
 
-```torify git clone http://dccbbv6cooddgcrq.onion/project/web/tpo.git/```
+```torify git clone http://xtlfhaspqtkeeqxk6umggfbr3gyfznvf4jhrge2fujz53433i2fcs3id.onion/project/web/tpo.git/```
 
 or browse it [online](http://gitweb.torproject.org/project/web/tpo.git).
 
@@ -50,7 +50,7 @@ To just build the website once: ```$ lektor build -O <folder>```
 
 #### How to develop on the website
 
-Check our [wiki pages](https://gitlab.torproject.org/web/community/wikis/How-to-develop-on-the-website).
+Check our [wiki pages](https://gitlab.torproject.org/tpo/web/wiki/-/wikis/How-to-develop-on-the-website).
 
 ### Translations
 
diff --git a/assets/static/findoc/2020-TorProject-Annual-Report.pdf b/assets/static/findoc/2020-TorProject-Annual-Report.pdf
new file mode 100644
index 00000000..d55196e2
Binary files /dev/null and b/assets/static/findoc/2020-TorProject-Annual-Report.pdf differ
diff --git a/assets/static/images/membership/logos/samourai.png b/assets/static/images/membership/logos/samourai.png
new file mode 100644
index 00000000..d65ba840
Binary files /dev/null and b/assets/static/images/membership/logos/samourai.png differ
diff --git a/assets/static/images/people/championquizzer.png b/assets/static/images/people/championquizzer.png
new file mode 100644
index 00000000..a9995f28
Binary files /dev/null and b/assets/static/images/people/championquizzer.png differ
diff --git a/assets/static/images/privchat/etienne.jpg b/assets/static/images/privchat/etienne.jpg
new file mode 100644
index 00000000..4e89d6f2
Binary files /dev/null and b/assets/static/images/privchat/etienne.jpg differ
diff --git a/assets/static/images/privchat/jsr.jpg b/assets/static/images/privchat/jsr.jpg
new file mode 100644
index 00000000..8fc2414a
Binary files /dev/null and b/assets/static/images/privchat/jsr.jpg differ
diff --git a/assets/static/images/privchat/likhita.jpg b/assets/static/images/privchat/likhita.jpg
new file mode 100644
index 00000000..be985bc0
Binary files /dev/null and b/assets/static/images/privchat/likhita.jpg differ
diff --git a/assets/static/images/privchat/privchat-5.ics b/assets/static/images/privchat/privchat-5.ics
new file mode 100644
index 00000000..a17dea51
--- /dev/null
+++ b/assets/static/images/privchat/privchat-5.ics
@@ -0,0 +1,56 @@
+BEGIN:VCALENDAR
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:America/Los_Angeles
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+TZNAME:PDT
+DTSTART:19700308T020000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+TZNAME:PST
+DTSTART:19701101T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20210920T200957Z
+LAST-MODIFIED:20210920T201302Z
+DTSTAMP:20210920T201302Z
+UID:8e15ebea-845a-3e45-99a8-f932fc89703c
+SUMMARY:PrivChat with Tor | Proctection Against Pegasus
+DTSTART;TZID=America/Los_Angeles:20210927T100000
+DTEND;TZID=America/Los_Angeles:20210927T110000
+TRANSP:OPAQUE
+LOCATION:https://www.youtube.com/watch?v=4ovmcZtaacY
+DESCRIPTION:WHAT: PrivChat with Tor | Proctection Against Pegasus\n\nWHERE
+ : https://www.youtube.com/watch?v=4ovmcZtaacY\n\nWHEN: Sept. 27 @ 17:00 UT
+ C\n\n---\n\nEvery year\, governments\, law enforcement agencies\, militari
+ es\, and corporations invest billions of dollars into building and buying 
+ malicious spyware software designed to silently infiltrate a user's device
+  and allow attackers to view the contents without detection.\n\nThis year\
+ , the Pegasus Project revealed that users of this kind of spyware\, known 
+ as Pegasus and built by the NSO group\, had targeted the phones that belon
+ g to thousands of people in more than 50 countries\, including business ex
+ ecutives\, politicians\, journalists\, and human rights activists.\n\nIn t
+ his edition of PrivChat\, join Likhita and Etienne Maynier of Amnesty Inte
+ rnational and John Scott Railton of Citizen Lab to discuss:\n\n- What can 
+ individuals\, journalists\, activists\, and human rights defenders can do 
+ to protect themselves against sophisticated spyware?\n- What kind of organ
+ izations can we support to help stop this abuse?\n- Who is working on safe
+ r\, more private software that we can trust?\n\nRoger Dingledine\, Co-Foun
+ der of the Tor Project\, will join us as our host and moderator.\nhttps://
+ torproject.org/privchat\n
+X-MOZ-GENERATION:1
+BEGIN:VALARM
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION:-PT15M
+DESCRIPTION:Default Mozilla Description
+END:VALARM
+END:VEVENT
+END:VCALENDAR
diff --git a/assets/static/images/sponsors/Sloan_logo.png b/assets/static/images/sponsors/Sloan_logo.png
new file mode 100644
index 00000000..cd1258d1
Binary files /dev/null and b/assets/static/images/sponsors/Sloan_logo.png differ
diff --git a/assets/static/keys/championquizzer.txt b/assets/static/keys/championquizzer.txt
new file mode 100644
index 00000000..89acc3dd
--- /dev/null
+++ b/assets/static/keys/championquizzer.txt
@@ -0,0 +1,115 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=oD2/
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/content/about/people/acat/contents.lr b/content/about/people/acat/contents.lr
deleted file mode 100644
index ade319b0..00000000
--- a/content/about/people/acat/contents.lr
+++ /dev/null
@@ -1,15 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role: core
----
-name: Alex Catarineu
----
-pronoun: he
----
-nickname: acat
----
-description:
-
-Works on Tor Browser
diff --git a/content/about/people/cindy-core/contents.lr b/content/about/people/cindy-core/contents.lr
deleted file mode 100644
index 4398526b..00000000
--- a/content/about/people/cindy-core/contents.lr
+++ /dev/null
@@ -1,20 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role:core
----
-name: Cindy Cohn
----
-nickname: cindy
----
-pronoun: she
----
-gpg: https://www.eff.org/files/key_cindy.txt
----
-image: /static/images/people/cindy.png
----
-description:
-
-Tor Board member and [Executive Director of the EFF](https://www.eff.org/about/staff/cindy-cohn).
-Lawyer by training, her [focus](https://blog.torproject.org/blog/tor-heart-notes-board-member) is on making sure Tor stays available and that Tor users stay safe.
diff --git a/content/about/people/cindy/contents.lr b/content/about/people/cindy/contents.lr
deleted file mode 100644
index e9670684..00000000
--- a/content/about/people/cindy/contents.lr
+++ /dev/null
@@ -1,18 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role:board
----
-name: Cindy Cohn
----
-title: Board Treasurer
----
-nickname: cindy
----
-description:
-
-Cindy is the Executive Director of the Electronic Frontier Foundation (EFF).
-From 2000 to 2015 she served as EFF's Legal Director as well as its General Counsel.
-Cindy first became involved with EFF in 1993, when EFF asked her to serve as the outside lead attorney in Bernstein v. Dept. of Justice, the successful First Amendment challenge to the U.S. export restrictions on cryptography.
-Ms. Cohn works to ensure that people around the world have the right to access information and communicate privately and anonymously, including mounting lawsuits against NSA spying, providing legal counsel to computer programmers building and developing privacy and anonymity tools, and helping to develop the Necessary and Proportionate Principles applying international human rights standards to digital communications surveillance.
diff --git a/content/about/people/mrphs/contents.lr b/content/about/people/mrphs/contents.lr
deleted file mode 100644
index 0d8ee831..00000000
--- a/content/about/people/mrphs/contents.lr
+++ /dev/null
@@ -1,17 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role:core
----
-name: Nima Fatemi
----
-nickname: mrphs
----
-twitter_handle: mrphs
----
-gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=E745A4CC726A94229B2B2DEE58C4B928A3E218F6
----
-description:
-
-His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.
diff --git a/content/about/people/schneier-core/contents.lr b/content/about/people/schneier-core/contents.lr
deleted file mode 100644
index 2edb18aa..00000000
--- a/content/about/people/schneier-core/contents.lr
+++ /dev/null
@@ -1,15 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role:core
----
-name: Bruce Schneier
----
-twitter_handle: schneierblog
----
-image: /static/images/people/no_photo.png
----
-description:
-
-Bruce Schneier is on the board of directors for the Tor Project.
diff --git a/content/about/people/schneier/contents.lr b/content/about/people/schneier/contents.lr
deleted file mode 100644
index 45b26400..00000000
--- a/content/about/people/schneier/contents.lr
+++ /dev/null
@@ -1,13 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role:board
----
-name: Bruce Schneier
----
-title: Director
----
-description:
-
-Bruce is an internationally renowned security technologist. He is the author of 14 books as well as hundreds of articles, essays, and academic papers. His newsletter "Crypto-Gram" and blog "Schneier on Security" are read by over 250,000 people. Bruce is a fellow at the Berkman Center for Internet and Society at Harvard University, a Lecturer in Public Policy at the Harvard Kennedy School, a board member of the Electronic Frontier Foundation (as well as the Tor Project), and an advisory board member of EPIC and VerifiedVoting.org. He is also a special advisor to IBM Security and the Chief Technology Officer of Resilient. 
diff --git a/content/about/people/ssteele-core/contents.lr b/content/about/people/ssteele-core/contents.lr
deleted file mode 100644
index 09af9d20..00000000
--- a/content/about/people/ssteele-core/contents.lr
+++ /dev/null
@@ -1,21 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role:core
----
-name: Shari Steele
----
-nickname: ssteele
----
-pronoun: she
----
-twitter_handle: ssteele1234
----
-gpg: /static/keys/ssteele.txt
----
-image: /static/images/people/ssteele.png
----
-description:
-
-Shari Steele is on the board of directors for the Tor Project.
diff --git a/content/well-known/contents.lr b/content/well-known/contents.lr
deleted file mode 100644
index 46369f2e..00000000
--- a/content/well-known/contents.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-_model: text
----
-_template: empty.html
----
-body:
-This is a Brave Rewards publisher verification file.
-
-Domain: torproject.org
-Token: 82054e47b80e8bf9338ac801e13bf001ca99dec06fae4e1b4168345dcb3326a8
diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini
index cdb9448a..08c2f7c9 100644
--- a/databags/download-alternatives-alpha.ini
+++ b/databags/download-alternatives-alpha.ini
@@ -30,6 +30,10 @@ language = ελληνικά (el)
 url = /es/
 language = Español (es)
 
+[es-AR]
+url = /es/
+language = Español Arg. (es-AR)
+
 [fa]
 url = /fa/
 language = فارسی (fa)
diff --git a/databags/platforms.ini b/databags/platforms.ini
index 7d0efbe3..a72c437f 100644
--- a/databags/platforms.ini
+++ b/databags/platforms.ini
@@ -4,7 +4,7 @@ label = Windows
 
 [apple]
 path = osx
-label = OS X
+label = macOS
 
 [linux]
 path = linux
diff --git a/databags/versions.ini b/databags/versions.ini
index d5ce5d9e..ffbdbd3a 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -1,28 +1,28 @@
 [torbrowser-stable]
-version = 10.0.16
-win32 = 0.4.5.7
+version = 10.5.8
+win32 = 0.4.5.10
 
 [torbrowser-android-stable]
-version = 10.0.16
+version = 10.5.8
 
 [torbrowser-win-stable]
-version = 10.0.16
+version = 10.5.8
 
 [torbrowser-linux-stable]
-version = 10.0.16
+version = 10.5.8
 
 [torbrowser-alpha]
-version = 10.5a15
+version = 11.0a7
 
 [torbrowser-android-alpha]
-version = 10.5a15
+version = 11.0a7
 
 [torbrowser-win-alpha]
-version = 10.5a15
+version = 11.0a7
 
 [tor-stable]
-version = 0.4.5.8
+version = 0.4.6.7
 
 [tor-alpha]
-version = 0.4.6.3-rc
+version = 0.4.7.1-alpha

More information about the tor-commits mailing list