July 2019 - tor-commits - lists.torproject.org

[tpo/staging] typo
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit 6a95b4adbaf8c101359d82af4ef982cddfd9af33 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Jun 7 15:02:12 2019 +0200 typo --- databags/menu+zh-CN.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini index a720d13..773af15 100644 --- a/databags/menu+zh-CN.ini +++ b/databags/menu+zh-CN.ini @@ -15,5 +15,5 @@ path = https://blog.torproject.org label = Blog [donate] -path = https://donate.torproject.org/zh_CN/ +path = https://donate.torproject.org/zh_CN label = Donate

1 0

[tpo/staging] add Simplified Chinese (zh-CN) lang
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit cf30d3cfa0c9eab46a25b6a13d8dfa56804ccc9e Author: emma peel <emma.peel(a)riseup.net> Date: Fri Jun 7 13:37:27 2019 +0200 add Simplified Chinese (zh-CN) lang --- configs/i18n.ini | 2 +- databags/alternatives.ini | 6 ++++++ tpo.lektorproject | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 81d4abd..986169b 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = de,es,fr,is,it,ka,pt-BR,ru,tr +translations = de,es,fr,is,it,ka,pt-BR,ru,tr,zh-CN i18npath = i18n translate_paragraphwise = False url_prefix = https://www.torproject.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 7603b21..a372d8c 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -57,3 +57,9 @@ direction = text-left order = order-last url = /tr/ language = Türkçe (tr) + +[zh-CN] +direction = text-left +order = order-last +url = /zh-CN/ +language = 简体字 (zh-CN) diff --git a/tpo.lektorproject b/tpo.lektorproject index 8523e44..633244b 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -54,3 +54,8 @@ locale = ru name = Türkçe (tr) url_prefix = /tr/ locale = tr + +[alternatives.zh-CN] +name = 简体字 (zh-CN) +url_prefix = /zh-CN/ +locale = zh-CN

1 0

[tpo/staging] Add new Tor Browser version: 9.0a2
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit ec24bd813b8e1b6bcad02c3ca317fb831e35c9f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 11 22:27:11 2019 +0200 Add new Tor Browser version: 9.0a2 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index ebf1875..de47691 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -16,5 +16,9 @@ body: "9.0a1", "9.0a1-MacOS", "9.0a1-Linux", -"9.0a1-Windows" +"9.0a1-Windows", +"9.0a2", +"9.0a2-MacOS", +"9.0a2-Linux", +"9.0a2-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index fcf94af..ca363ef 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -4,8 +4,8 @@ release_date = 2019-06-04 win32 = 0.3.5.8 [torbrowser-alpha] -version = 9.0a1 -release_date = 2019-05-22 +version = 9.0a2 +release_date = 2019-06-11 [tor-stable] version = 0.4.0.5

1 0

[tpo/staging] changed name of chinese locale as per translators suggestion
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit 7e4db8409c56272344ecf9115faf41562e61471e Author: emma peel <emma.peel(a)riseup.net> Date: Sun Jun 9 07:39:49 2019 +0200 changed name of chinese locale as per translators suggestion --- databags/alternatives.ini | 2 +- databags/download-alternatives-alpha.ini | 2 +- databags/download-alternatives.ini | 2 +- tpo.lektorproject | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/databags/alternatives.ini b/databags/alternatives.ini index a372d8c..658328e 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -62,4 +62,4 @@ language = Türkçe (tr) direction = text-left order = order-last url = /zh-CN/ -language = 简体字 (zh-CN) +language = 简体中文 (zh-CN) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 33276bc..ebbe7a6 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -108,7 +108,7 @@ language = Tiếng Việt (vi) [zh-CN] url = /zh-CN/ -language = 中文简 (zh-CN) +language = 简体中文 (zh-CN) [zh-TW] url = /zh-TW/ diff --git a/databags/download-alternatives.ini b/databags/download-alternatives.ini index 102e9b8..0f924bd 100644 --- a/databags/download-alternatives.ini +++ b/databags/download-alternatives.ini @@ -112,7 +112,7 @@ language = Tiếng Việt (vi) [zh-CN] url = /zh-CN/ -language = 中文简 (zh-CN) +language = 简体中文 (zh-CN) [zh-TW] url = /zh-TW/ diff --git a/tpo.lektorproject b/tpo.lektorproject index 633244b..8cf24ab 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -56,6 +56,6 @@ url_prefix = /tr/ locale = tr [alternatives.zh-CN] -name = 简体字 (zh-CN) +name = 简体中文 (zh-CN) url_prefix = /zh-CN/ locale = zh-CN

1 0

[tpo/staging] Tor 0.4.1.2-alpha is released
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit 990ac4a861c65b94eee13418b10c302efee82ffc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 6 08:27:17 2019 -0400 Tor 0.4.1.2-alpha is released --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 091e26c..fcf94af 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -11,4 +11,4 @@ release_date = 2019-05-22 version = 0.4.0.5 [tor-alpha] -version = 0.4.1.1-alpha +version = 0.4.1.2-alpha

1 0

[tpo/staging] Add the ro locale for Tor Browser alpha
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit 12e576c0f3b1eb26e450a8f371df11ab9dbbbcaa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 11 22:36:48 2019 +0200 Add the ro locale for Tor Browser alpha --- databags/download-alternatives-alpha.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index ebbe7a6..92ab78f 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -90,6 +90,10 @@ language = Polszczyzna (pl) url = /pt-BR/ language = Português Brasil(pt-BR) +[ro] +url = /ro/ +language = Română (ro) + [ru] language = Русский (ru) url = /ru/

1 0

[tpo/staging] Set Android version to 8.5.1 for now
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit db182d4687dd7313ff26f3e20895ae691afa7483 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 19 21:38:01 2019 +0200 Set Android version to 8.5.1 for now We should revert this commit when 8.5.2 for Android is available. --- databags/versions.ini | 3 +++ templates/download-android.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 38b0ce3..85cb4ba 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,6 +3,9 @@ version = 8.5.2 release_date = 2019-06-19 win32 = 0.3.5.8 +[torbrowser-stable-android] +version = 8.5.1 + [torbrowser-alpha] version = 9.0a2 release_date = 2019-06-11 diff --git a/templates/download-android.html b/templates/download-android.html index 71eb856..dee3912 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -16,7 +16,7 @@ </div> <div class="row my-5"> <div class="col-xl-6 mx-auto text-center"> - {% set t = bag('versions', 'torbrowser-stable') %} + {% set t = bag('versions', 'torbrowser-stable-android') %} <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>sig</small></a> <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a>

1 0

[tpo/staging] Clean up pronoun display
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit 2f229a3d483cc365445c2c2c50c20c772b73800b Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jun 19 22:04:42 2019 -0500 Clean up pronoun display Display pronoun links without the "https://" prefix on pronoun.is URLs. Modify the templates so that only the variable part of the pronoun URL is needed, e.g., "they" vs "https://pronoun.is/they". --- content/about/people/acat/contents.lr | 2 +- content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/alsmith/contents.lr | 2 +- content/about/people/antonela/contents.lr | 2 +- content/about/people/atagar/contents.lr | 2 +- content/about/people/bdavila/contents.lr | 2 +- content/about/people/catalyst/contents.lr | 2 +- content/about/people/cindy-core/contents.lr | 2 +- content/about/people/cohosh/contents.lr | 2 +- content/about/people/emmapeel/contents.lr | 2 +- content/about/people/flexlibris/contents.lr | 2 +- content/about/people/gaba/contents.lr | 2 +- content/about/people/iangoldberg/contents.lr | 2 +- content/about/people/intrigeri/contents.lr | 2 +- content/about/people/irl/contents.lr | 2 +- content/about/people/karsten/contents.lr | 2 +- content/about/people/kat/contents.lr | 2 +- content/about/people/kushal/contents.lr | 2 +- content/about/people/ln5/contents.lr | 2 +- content/about/people/mcs/contents.lr | 2 +- content/about/people/nickm/contents.lr | 2 +- content/about/people/pili/contents.lr | 2 +- content/about/people/pospeselr/contents.lr | 2 +- content/about/people/sisbell/contents.lr | 2 +- content/about/people/sjmurdoch/contents.lr | 2 +- content/about/people/ssteele-core/contents.lr | 2 +- content/about/people/sstevenson/contents.lr | 2 +- content/about/people/stephw/contents.lr | 2 +- content/about/people/teor/contents.lr | 2 +- content/about/people/tjr/contents.lr | 2 +- content/about/people/wayward/contents.lr | 2 +- content/about/people/wseltzer/contents.lr | 2 +- templates/macros/people.html | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/content/about/people/acat/contents.lr b/content/about/people/acat/contents.lr index 47a35df..ade319b 100644 --- a/content/about/people/acat/contents.lr +++ b/content/about/people/acat/contents.lr @@ -6,7 +6,7 @@ role: core --- name: Alex Catarineu --- -pronoun: https://pronoun.is/he +pronoun: he --- nickname: acat --- diff --git a/content/about/people/agrabeli/contents.lr b/content/about/people/agrabeli/contents.lr index 7de910d..57e7e75 100644 --- a/content/about/people/agrabeli/contents.lr +++ b/content/about/people/agrabeli/contents.lr @@ -8,7 +8,7 @@ name: Maria Xynou --- nickname: agrabeli --- -pronoun: https://pronoun.is/she +pronoun: she --- twitter_handle: agrabeli_ --- diff --git a/content/about/people/ahf/contents.lr b/content/about/people/ahf/contents.lr index 57d27fe..d49d8ac 100644 --- a/content/about/people/ahf/contents.lr +++ b/content/about/people/ahf/contents.lr @@ -8,7 +8,7 @@ name: Alexander Færøy --- twitter_handle: ahfaeroey --- -pronoun: https://pronoun.is/he +pronoun: he --- nickname: ahf --- diff --git a/content/about/people/alsmith/contents.lr b/content/about/people/alsmith/contents.lr index 1a2ca7c..50624b6 100644 --- a/content/about/people/alsmith/contents.lr +++ b/content/about/people/alsmith/contents.lr @@ -12,7 +12,7 @@ gpg: /static/keys/alsmith.txt --- image: /static/images/people/alsmith.png --- -pronoun: https://pronoun.is/they +pronoun: they --- description: diff --git a/content/about/people/antonela/contents.lr b/content/about/people/antonela/contents.lr index 396a80f..22b058c 100644 --- a/content/about/people/antonela/contents.lr +++ b/content/about/people/antonela/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Antonela Debiasi --- -pronoun: https://pronoun.is/she +pronoun: she --- nickname: antonela --- diff --git a/content/about/people/atagar/contents.lr b/content/about/people/atagar/contents.lr index 563c88a..e416c59 100644 --- a/content/about/people/atagar/contents.lr +++ b/content/about/people/atagar/contents.lr @@ -8,7 +8,7 @@ name: Damian Johnson --- nickname: atagar --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD9… --- diff --git a/content/about/people/bdavila/contents.lr b/content/about/people/bdavila/contents.lr index 1163268..c41d0f6 100644 --- a/content/about/people/bdavila/contents.lr +++ b/content/about/people/bdavila/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Bekeela Davila --- -pronoun: https://pronoun.is/she +pronoun: she --- nickname: bdavila --- diff --git a/content/about/people/catalyst/contents.lr b/content/about/people/catalyst/contents.lr index e8e2412..47907da 100644 --- a/content/about/people/catalyst/contents.lr +++ b/content/about/people/catalyst/contents.lr @@ -10,7 +10,7 @@ nickname: catalyst --- twitter_handle: argonblue --- -pronoun: https://pronoun.is/they?or=she +pronoun: they?or=she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2C732B1C0DBEF678AB3AF606… --- diff --git a/content/about/people/cindy-core/contents.lr b/content/about/people/cindy-core/contents.lr index 898886e..4398526 100644 --- a/content/about/people/cindy-core/contents.lr +++ b/content/about/people/cindy-core/contents.lr @@ -8,7 +8,7 @@ name: Cindy Cohn --- nickname: cindy --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://www.eff.org/files/key_cindy.txt --- diff --git a/content/about/people/cohosh/contents.lr b/content/about/people/cohosh/contents.lr index 0c4f22b..781ec31 100644 --- a/content/about/people/cohosh/contents.lr +++ b/content/about/people/cohosh/contents.lr @@ -8,7 +8,7 @@ name: Cecylia --- nickname: cohosh --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=5A618CE840883942BAF1334F… --- diff --git a/content/about/people/emmapeel/contents.lr b/content/about/people/emmapeel/contents.lr index b5e529c..7e685b8 100644 --- a/content/about/people/emmapeel/contents.lr +++ b/content/about/people/emmapeel/contents.lr @@ -6,7 +6,7 @@ role:core --- name: emmapeel --- -pronoun: https://pronoun.is/she +pronoun: she --- nickname: emmapeel --- diff --git a/content/about/people/flexlibris/contents.lr b/content/about/people/flexlibris/contents.lr index d5948b7..6bc58b8 100644 --- a/content/about/people/flexlibris/contents.lr +++ b/content/about/people/flexlibris/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Alison Macrina --- -pronoun: https://pronoun.is/she +pronoun: she --- twitter_handle: flexlibris --- diff --git a/content/about/people/gaba/contents.lr b/content/about/people/gaba/contents.lr index 2f994c9..63cf237 100644 --- a/content/about/people/gaba/contents.lr +++ b/content/about/people/gaba/contents.lr @@ -8,7 +8,7 @@ name: Gaba --- nickname: gaba --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://pgp.mit.edu/pks/lookup?op=vindex&search=0x180DB06C59CABD19 --- diff --git a/content/about/people/iangoldberg/contents.lr b/content/about/people/iangoldberg/contents.lr index d84812e..dab35ea 100644 --- a/content/about/people/iangoldberg/contents.lr +++ b/content/about/people/iangoldberg/contents.lr @@ -8,7 +8,7 @@ name: Ian Goldberg --- nickname: iang --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: /static/keys/ian.txt --- diff --git a/content/about/people/intrigeri/contents.lr b/content/about/people/intrigeri/contents.lr index 7199bde..1df6faa 100644 --- a/content/about/people/intrigeri/contents.lr +++ b/content/about/people/intrigeri/contents.lr @@ -8,7 +8,7 @@ name: intrigeri --- nickname: intrigeri --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://gaffer.ptitcanardnoir.org/intrigeri/contact/ --- diff --git a/content/about/people/irl/contents.lr b/content/about/people/irl/contents.lr index 7b4a908..7a750ff 100644 --- a/content/about/people/irl/contents.lr +++ b/content/about/people/irl/contents.lr @@ -10,7 +10,7 @@ nickname: irl --- twitter_handle: iainlearmonth --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=A8F7BA5041E133339CBA1696… --- diff --git a/content/about/people/karsten/contents.lr b/content/about/people/karsten/contents.lr index 37306f5..b08ef92 100644 --- a/content/about/people/karsten/contents.lr +++ b/content/about/people/karsten/contents.lr @@ -8,7 +8,7 @@ name: Karsten Loesing --- nickname: karsten --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=0CC8157C2578EEE92B0745D6… --- diff --git a/content/about/people/kat/contents.lr b/content/about/people/kat/contents.lr index 8fc4daa..e3eee28 100644 --- a/content/about/people/kat/contents.lr +++ b/content/about/people/kat/contents.lr @@ -8,7 +8,7 @@ name: Kat --- nickname: kat5 --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: /static/keys/kat.txt --- diff --git a/content/about/people/kushal/contents.lr b/content/about/people/kushal/contents.lr index fa408e3..16b53e9 100644 --- a/content/about/people/kushal/contents.lr +++ b/content/about/people/kushal/contents.lr @@ -8,7 +8,7 @@ name: Kushal Das --- nickname: kushal --- -pronoun: https://pronoun.is/he +pronoun: he --- twitter_handle: kushaldas --- diff --git a/content/about/people/ln5/contents.lr b/content/about/people/ln5/contents.lr index 406192d..380bf7c 100644 --- a/content/about/people/ln5/contents.lr +++ b/content/about/people/ln5/contents.lr @@ -8,7 +8,7 @@ name: Linus Nordberg --- nickname: ln5 --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=8C4CD511095E982EB0EFBFA2… --- diff --git a/content/about/people/mcs/contents.lr b/content/about/people/mcs/contents.lr index c541ccc..86e94b6 100644 --- a/content/about/people/mcs/contents.lr +++ b/content/about/people/mcs/contents.lr @@ -8,7 +8,7 @@ name: Mark Smith --- nickname: mcs --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2602B0DD0EB238CCE037196A… --- diff --git a/content/about/people/nickm/contents.lr b/content/about/people/nickm/contents.lr index 4c2cf6d..a8f3955 100644 --- a/content/about/people/nickm/contents.lr +++ b/content/about/people/nickm/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Nick Mathewson --- -pronoun: https://pronoun.is/he +pronoun: he --- nickname: nickm --- diff --git a/content/about/people/pili/contents.lr b/content/about/people/pili/contents.lr index a692f38..9916b41 100644 --- a/content/about/people/pili/contents.lr +++ b/content/about/people/pili/contents.lr @@ -10,7 +10,7 @@ nickname: pili --- twitter_handle: mpguerra --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://pgp.mit.edu/pks/lookup?op=vindex&search=0xC6CB772EF0969C45 --- diff --git a/content/about/people/pospeselr/contents.lr b/content/about/people/pospeselr/contents.lr index 6cbb971..f3885a5 100644 --- a/content/about/people/pospeselr/contents.lr +++ b/content/about/people/pospeselr/contents.lr @@ -8,7 +8,7 @@ name: Richard Pospesel --- nickname: pospeselr --- -pronoun: https://pronoun.is/they/them +pronoun: they/them --- twitter_handle: pospeselr --- diff --git a/content/about/people/sisbell/contents.lr b/content/about/people/sisbell/contents.lr index 1280796..2f95fd9 100644 --- a/content/about/people/sisbell/contents.lr +++ b/content/about/people/sisbell/contents.lr @@ -8,7 +8,7 @@ name: Shane Isbell --- nickname: sisbell --- -pronoun: https://pronoun.is/he +pronoun: he --- twitter_handle: sisbell --- diff --git a/content/about/people/sjmurdoch/contents.lr b/content/about/people/sjmurdoch/contents.lr index a3d3f0b..19da14a 100644 --- a/content/about/people/sjmurdoch/contents.lr +++ b/content/about/people/sjmurdoch/contents.lr @@ -8,7 +8,7 @@ name: Steven Murdoch --- nickname: sjmurdoch --- -pronoun: https://pronoun.is/he +pronoun: he --- twitter_handle: sjmurdoch --- diff --git a/content/about/people/ssteele-core/contents.lr b/content/about/people/ssteele-core/contents.lr index 7a25552..09af9d2 100644 --- a/content/about/people/ssteele-core/contents.lr +++ b/content/about/people/ssteele-core/contents.lr @@ -8,7 +8,7 @@ name: Shari Steele --- nickname: ssteele --- -pronoun: https://pronoun.is/she +pronoun: she --- twitter_handle: ssteele1234 --- diff --git a/content/about/people/sstevenson/contents.lr b/content/about/people/sstevenson/contents.lr index 978a0f8..3269de4 100644 --- a/content/about/people/sstevenson/contents.lr +++ b/content/about/people/sstevenson/contents.lr @@ -8,7 +8,7 @@ name: Sarah Stevenson --- nickname: sstevenson --- -pronoun: https://pronoun.is/she +pronoun: she --- image: /static/images/people/sstevenson.png --- diff --git a/content/about/people/stephw/contents.lr b/content/about/people/stephw/contents.lr index c907734..cae06da 100644 --- a/content/about/people/stephw/contents.lr +++ b/content/about/people/stephw/contents.lr @@ -8,7 +8,7 @@ name: Stephanie Whited --- nickname: stephw --- -pronoun: https://pronoun.is/she +pronoun: she --- twitter_handle: walnutwordsalad --- diff --git a/content/about/people/teor/contents.lr b/content/about/people/teor/contents.lr index 06b2f9b..1d703e2 100644 --- a/content/about/people/teor/contents.lr +++ b/content/about/people/teor/contents.lr @@ -8,7 +8,7 @@ name: teor --- nickname: teor --- -pronoun: https://pronoun.is/they +pronoun: they --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=C8556CED5D90A0C529F64D43… --- diff --git a/content/about/people/tjr/contents.lr b/content/about/people/tjr/contents.lr index fb099d7..3fa1649 100644 --- a/content/about/people/tjr/contents.lr +++ b/content/about/people/tjr/contents.lr @@ -8,7 +8,7 @@ name: Tom Ritter --- nickname: tjr --- -pronoun: https://pronoun.is/he +pronoun: he --- twitter_handle: tomrittervg --- diff --git a/content/about/people/wayward/contents.lr b/content/about/people/wayward/contents.lr index 10e860c..ff63ed0 100644 --- a/content/about/people/wayward/contents.lr +++ b/content/about/people/wayward/contents.lr @@ -8,7 +8,7 @@ name: Maggie Haughey --- nickname: wayward --- -pronoun: https://pronoun.is/she?or=they +pronoun: she?or=they --- twitter_handle: meochaidha --- diff --git a/content/about/people/wseltzer/contents.lr b/content/about/people/wseltzer/contents.lr index 85e6086..2922a6f 100644 --- a/content/about/people/wseltzer/contents.lr +++ b/content/about/people/wseltzer/contents.lr @@ -8,7 +8,7 @@ name: Wendy Seltzer --- nickname: wseltzer --- -pronoun: https://pronoun.is/she +pronoun: she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=4263006A4506740FAD871430… --- diff --git a/templates/macros/people.html b/templates/macros/people.html index 1d4be6e..79afc6f 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -38,7 +38,7 @@ <div class="card-body"> <h5 class="card-title human-name">{{ item.name }}</h5> {% if item.pronoun %} - <h6 class="nick text-primary m-0"><a href="{{ item.pronoun }}">{{ item.pronoun }}</a></h6> + <h6 class="nick text-primary m-0"><a href="https://pronoun.is/{{ item.pronoun }}">pronoun.is/{{ item.pronoun }}</a></h6> {% endif %} {% if item.nickname %} <label class="nick text-primary">IRC:{{ item.nickname }}</label>

1 0

[tpo/staging] Use submodule and links in templates
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit b7fb21282277a5144a9e271da7c25b11912fb14f Author: hiro <hiro(a)torproject.org> Date: Thu Jun 20 12:39:36 2019 +0200 Use submodule and links in templates --- .gitmodules | 3 +++ assets/static/{ => css}/bootstrap-grid.css | 0 assets/static/{ => css}/bootstrap-grid.css.map | 0 assets/static/{ => css}/bootstrap-reboot.css | 0 assets/static/{ => css}/bootstrap-reboot.css.map | 0 assets/static/{ => css}/bootstrap.css | 0 assets/static/{ => css}/bootstrap.css.map | 0 assets/static/{ => css}/style.css | 0 assets/static/{ => js}/collapse.min.js | 0 lego | 1 + templates/meta.html | 2 +- 11 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..01cf3ad --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "lego"] + path = lego + url = git@git-rw.torproject.org:project/web/lego diff --git a/assets/static/bootstrap-grid.css b/assets/static/css/bootstrap-grid.css similarity index 100% rename from assets/static/bootstrap-grid.css rename to assets/static/css/bootstrap-grid.css diff --git a/assets/static/bootstrap-grid.css.map b/assets/static/css/bootstrap-grid.css.map similarity index 100% rename from assets/static/bootstrap-grid.css.map rename to assets/static/css/bootstrap-grid.css.map diff --git a/assets/static/bootstrap-reboot.css b/assets/static/css/bootstrap-reboot.css similarity index 100% rename from assets/static/bootstrap-reboot.css rename to assets/static/css/bootstrap-reboot.css diff --git a/assets/static/bootstrap-reboot.css.map b/assets/static/css/bootstrap-reboot.css.map similarity index 100% rename from assets/static/bootstrap-reboot.css.map rename to assets/static/css/bootstrap-reboot.css.map diff --git a/assets/static/bootstrap.css b/assets/static/css/bootstrap.css similarity index 100% rename from assets/static/bootstrap.css rename to assets/static/css/bootstrap.css diff --git a/assets/static/bootstrap.css.map b/assets/static/css/bootstrap.css.map similarity index 100% rename from assets/static/bootstrap.css.map rename to assets/static/css/bootstrap.css.map diff --git a/assets/static/style.css b/assets/static/css/style.css similarity index 100% rename from assets/static/style.css rename to assets/static/css/style.css diff --git a/assets/static/collapse.min.js b/assets/static/js/collapse.min.js similarity index 100% rename from assets/static/collapse.min.js rename to assets/static/js/collapse.min.js diff --git a/lego b/lego new file mode 160000 index 0000000..7bc659e --- /dev/null +++ b/lego @@ -0,0 +1 @@ +Subproject commit 7bc659e2564b5f131e24042802d43cf7e6384713 diff --git a/templates/meta.html b/templates/meta.html index 387f9f4..325d57a 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -11,6 +11,6 @@ <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" /> <meta property="og:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> -<link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> +<link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>

1 0

[tpo/staging] Add new Tor Browser version: 8.5.2
by emmapeel＠torproject.org 31 Jul '19

31 Jul '19

commit f99a25395ef7a9eb334a41dc22fb60d0ea0550a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 19 21:35:06 2019 +0200 Add new Tor Browser version: 8.5.2 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index de47691..35a18fd 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -13,6 +13,10 @@ body: "8.5.1-MacOS", "8.5.1-Linux", "8.5.1-Windows", +"8.5.2", +"8.5.2-MacOS", +"8.5.2-Linux", +"8.5.2-Windows", "9.0a1", "9.0a1-MacOS", "9.0a1-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index ca363ef..38b0ce3 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,6 +1,6 @@ [torbrowser-stable] -version = 8.5.1 -release_date = 2019-06-04 +version = 8.5.2 +release_date = 2019-06-19 win32 = 0.3.5.8 [torbrowser-alpha]

1 0