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

[community/master] update content
by antonela＠torproject.org 19 Oct '19

19 Oct '19

commit 8b765e8d11300b913673075b5a6305fcef2d3110 Author: Antonela <hola(a)antonela.me> Date: Sat Oct 19 09:59:10 2019 -0300 update content steph's review. Close #103 https://dip.torproject.org/steph/community/blob/develop/content/user-resear… --- content/user-research/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 5787f2c..2ad1aeb 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -8,7 +8,7 @@ _template: layout.html --- title: User Research --- -subtitle: We conduct user research while also respecting user privacy. +subtitle: We respect our users' privacy when we conduct research. --- cta: Learn about Tor users --- @@ -18,6 +18,6 @@ html: user-research.html --- body: -## We conduct user research while also respecting user privacy. +## We respect our users' privacy when we conduct research. -We practice human-centered design on building tools for internet freedom while we build community. Our user research is funded by the premises of consent, respect, and empathy. Make an impact in your local community by listening to our users. Learn how we do it and help Tor with user research. +We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research.

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 19 Oct '19

19 Oct '19

commit ab4b949f865705c5a1f9ad6dbcd068201042b858 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 19 11:22:46 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ca.po | 12 ++++++------ contents+de.po | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 820f79180..f63f21133 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -74,7 +74,7 @@ msgid "" " censorship, using onion services, and more." msgstr "" "Us cal ajuda? Visiteu el nostre [Portal " -"d'assistència](https://support.torproject.org), amb respostes a les " +"d'assistència](https://support.torproject.org/ca), amb respostes a les " "preguntes més freqüents sobre el Tor, eludir la censura, utilitzar els " "serveis onion, i més." @@ -205,7 +205,7 @@ msgid "" msgstr "" "Baixeu la versió alfa només si no us importa que algunes coses no funcionin " "correctament, si voleu ajudar-nos a trobar i [notificar " -"errors](https://support.torproject.org/misc/bug-or-feedback/) i si no us " +"errors](https://support.torproject.org/ca/misc/bug-or-feedback/) i si no us " "esteu posant en risc." #: https//www.torproject.org/download/languages/ @@ -323,7 +323,7 @@ msgstr "" "El Tor Project està reconegut com a expert líder en la privadesa en línia, i" " [els mitjans de comunicació sovint el consulten per a obtenir informació " "sobre com poden els individus i els consumidors protegir la seva " -"privadesa](https://www.torproject.org/press/)." +"privadesa](https://www.torproject.org/ca/press/)." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -365,7 +365,7 @@ msgstr "#### Més informació" msgid "- [The Tor Project in the Media](https://www.torproject.org/press/)" msgstr "" "- [El Tor Project als mijatns de " -"comunicació](https://www.torproject.org/press/)" +"comunicació](https://www.torproject.org/ca/press/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -374,7 +374,7 @@ msgid "" "Reports](https://www.torproject.org/about/reports/)" msgstr "" "- [Informes financers del Tor " -"Project](https://www.torproject.org/about/reports/)" +"Project](https://www.torproject.org/ca/about/reports/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -383,7 +383,7 @@ msgid "" "Staff](https://www.torproject.org/about/people/)" msgstr "" "- [Membres del Consell i personal del Tor " -"Project](https://www.torproject.org/about/people/)" +"Project](https://www.torproject.org/ca/about/people/)" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) diff --git a/contents+de.po b/contents+de.po index 79a4da823..207e4e969 100644 --- a/contents+de.po +++ b/contents+de.po @@ -3,12 +3,11 @@ # Ikono Gangansi <ikonogangansi(a)gmail.com>, 2019 # ducki2p <ducki2p(a)gmail.com>, 2019 # Lars Schimmer <echelon(a)i2pmail.org>, 2019 -# Cat C <cat.cozzi(a)gmx.de>, 2019 # c8faa9c4b9d81319c5c2fd62ae3a9956, 2019 # Marcel Haring <getting(a)autistici.org>, 2019 # erinm, 2019 -# Emma Peel, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -16,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-18 16:11+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +53,7 @@ msgid "" msgstr "" "Wir fördern die Menschenrechte und schützen deine Privatsphäre online durch " "kostenlose Software und offene Netzwerke. [Lerne unser Team " -"kennen](über/mitarbeiter)." +"kennen](about/people)." #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.title) @@ -181,7 +180,7 @@ msgid "" msgstr "" "Wir brauchen deine Hilfe, um Tor für Millionen von Menschen auf der ganzen " "Welt sicher und geschützt zu halten. [Spende " -"jetzt](https://donate.torproject.org/)" +"jetzt](https://donate.torproject.org/de)" #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title) #: https//www.torproject.org/about/history/ @@ -337,7 +336,7 @@ msgstr "" "Das Tor Project gilt als führender Experte für den Datenschutz im Internet " "und wird [oft von den Medien angesprochen, um zu erfahren, wie " "Einzelpersonen und Verbraucher ihre Privatsphäre schützen können] " -"(https://www.torproject.org/press/)" +"(https://www.torproject.org/de/press/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -384,7 +383,8 @@ msgstr "#### Weitere Informationen" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "- [The Tor Project in the Media](https://www.torproject.org/press/)" -msgstr "- [Das Tor Project in den Medien](https://www.torproject.org/press/)" +msgstr "" +"- [Das Tor Project in den Medien](https://www.torproject.org/de/press/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -393,7 +393,7 @@ msgid "" "Reports](https://www.torproject.org/about/reports/)" msgstr "" "- [Die Tor Project " -"Finanzberichte](https://www.torproject.org/about/reports/)" +"Finanzberichte](https://www.torproject.org/de/about/reports/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -402,7 +402,7 @@ msgid "" "Staff](https://www.torproject.org/about/people/)" msgstr "" "- [Die Tor Project Vorstandsmitglieder und " -"Mitarbeiter](https://www.torproject.org/about/people/)" +"Mitarbeiter](https://www.torproject.org/de/about/people/)" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body)

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 19 Oct '19

19 Oct '19

commit c213366aa146c5b4f992b2fbe46a1189e1d29470 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 19 08:52:43 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- zh_TW/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 582483351..05cbd9584 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -79,5 +79,5 @@ <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "解決驗證碼來請求橋接"> <!ENTITY torPreferences.requestBridgeErrorBadSolution "解答不正確。請再試一次。"> <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.viewLogs "查看日誌…"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">

1 0

[tpo/staging] OTF description is missing details of currently sponsored projects
by emmapeel＠torproject.org 19 Oct '19

19 Oct '19

commit 3e338b52fdfc8ef922b63e764462921364a7d464 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Wed Oct 9 18:08:34 2019 +0000 OTF description is missing details of currently sponsored projects --- content/about/sponsors/otf/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index 7931bf6..98c6273 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/content/about/sponsors/otf/contents.lr @@ -16,4 +16,5 @@ link: https://www.opentech.fund/ --- description: -OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These contracts are used to further our work observing and responding to internet censorship around the world and also to help improve transparency and credibility in Tor metrics and measurement. +OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These contracts are used to further our work observing and responding to internet censorship around the world and also to improve onion services, one of the few censorship circumvention technologies that allows users to route around censorship while simultaneously protecting their privacy and identity. +

1 0

[tpo/staging] add Catalan
by emmapeel＠torproject.org 19 Oct '19

19 Oct '19

commit 7053dfd5e69a757de485c45db57554b61a7d9cfb Author: emma peel <emma.peel(a)riseup.net> Date: Sat Oct 19 10:42:02 2019 +0200 add Catalan --- configs/i18n.ini | 2 +- databags/about+ca.ini | 1 + databags/alternatives.ini | 6 ++++++ databags/menu+ca.ini | 1 + databags/menu_footer+ca.ini | 1 + lego | 2 +- tpo.lektorproject | 5 +++++ 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index e127ac4..6c487cd 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = ar,bn,da,de,es,fr,he,id,is,it,ka,ko,ms,pl,pt-BR,pt-PT,ro,ru,th,tr,zh-CN +translations = ar,bn,ca,da,de,es,fr,he,id,is,it,ka,ko,ms,pl,pt-BR,pt-PT,ro,ru,th,tr,zh-CN i18npath = i18n translate_paragraphwise = False url_prefix = https://www.torproject.org/ diff --git a/databags/about+ca.ini b/databags/about+ca.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+ca.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 30095e2..170e07f 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -16,6 +16,12 @@ order = order-last url = /bn/ language = বাংলা ভাষা (bn) +[ca] +direction = text-left +order = order-last +url = /ca/ +language = Català (ca) + [da] direction = text-left ordar = order-last diff --git a/databags/menu+ca.ini b/databags/menu+ca.ini new file mode 120000 index 0000000..ac518ba --- /dev/null +++ b/databags/menu+ca.ini @@ -0,0 +1 @@ +../lego/databags/menu+ca.ini \ No newline at end of file diff --git a/databags/menu_footer+ca.ini b/databags/menu_footer+ca.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+ca.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/lego b/lego index 09c5813..f69eb16 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 +Subproject commit f69eb16bf837b326cdec06e1af22a26770cdac38 diff --git a/tpo.lektorproject b/tpo.lektorproject index 368cb53..15914e5 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -20,6 +20,11 @@ name = বাংলা ভাষা (bn) url_prefix = /bn/ locale = bn +[alternatives.ca] +name = Català (ca) +url_prefix = /ca/ +locale = ca + [alternatives.da] name = Dansk (da) url_prefix = /da/

1 0

[tpo/staging] NSF- Rochester is no longer an active sponsor as of Aug 2019
by emmapeel＠torproject.org 19 Oct '19

19 Oct '19

commit b461b88ac78e4a98515c5b04f41d44c8690dfc30 Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Oct 17 12:15:43 2019 +0200 NSF- Rochester is no longer an active sponsor as of Aug 2019 --- content/about/sponsors/nsf-rochester/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/nsf-rochester/contents.lr b/content/about/sponsors/nsf-rochester/contents.lr index 381b7e9..f970ec0 100644 --- a/content/about/sponsors/nsf-rochester/contents.lr +++ b/content/about/sponsors/nsf-rochester/contents.lr @@ -1,8 +1,8 @@ _model: sponsor --- -active: True +active: False --- -time: 2016 - Present +time: 2016 - 2019 --- name: National Science Foundation joint with Rochester Institute of Technology ---

1 0

[tpo/staging] Merge branch 'master' into staging
by emmapeel＠torproject.org 19 Oct '19

19 Oct '19

commit 8579a74007a32bf320db5d4bb8c8d8ccd631a280 Merge: e1191f1 b461b88 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Oct 19 10:00:21 2019 +0200 Merge branch 'master' into staging content/about/sponsors/DARPA-georgetown/contents.lr | 2 ++ content/about/sponsors/USSD-DHRL-harvard/contents.lr | 4 ++-- content/about/sponsors/USSD-DHRL/contents.lr | 3 ++- content/about/sponsors/nsf-rochester/contents.lr | 4 ++-- content/about/sponsors/otf/contents.lr | 3 ++- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-)

1 0

[tpo/staging] OTF description needs some grammar fixes
by emmapeel＠torproject.org 19 Oct '19

19 Oct '19

commit 99ca14bbcb7c659b925ba22c0a1543cb78e8ec4e Author: Bekeela Davila <bekeela(a)torproject.org> Date: Wed Oct 9 17:54:35 2019 +0000 OTF description needs some grammar fixes --- content/about/sponsors/otf/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index 4fb9cd5..7931bf6 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/content/about/sponsors/otf/contents.lr @@ -16,4 +16,4 @@ link: https://www.opentech.fund/ --- description: -OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These contracts were used to further our work observing and responding to internet censorship around the world and also to help improve transparency and credibility in Tor metrics and measurement. +OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These contracts are used to further our work observing and responding to internet censorship around the world and also to help improve transparency and credibility in Tor metrics and measurement.

1 0

[tpo/staging] DARPA via Georgetown Sponsor should not be first sponsor listed
by emmapeel＠torproject.org 19 Oct '19

19 Oct '19

commit e03284cef26135092502a2b8bdd91691dd7ea2ef Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Oct 17 11:50:50 2019 +0200 DARPA via Georgetown Sponsor should not be first sponsor listed --- content/about/sponsors/DARPA-georgetown/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/about/sponsors/DARPA-georgetown/contents.lr b/content/about/sponsors/DARPA-georgetown/contents.lr index 0d159ed..dcc3b2f 100644 --- a/content/about/sponsors/DARPA-georgetown/contents.lr +++ b/content/about/sponsors/DARPA-georgetown/contents.lr @@ -6,6 +6,8 @@ time: 2019 - Present --- name: DARPA via Georgetown University --- +key: 18 +--- logo: /static/images/sponsors/darpa.png --- _hidden: yes

1 0

[tpo/staging] DRL Harvard is no longer an active sponsor as of March 2019
by emmapeel＠torproject.org 19 Oct '19

19 Oct '19

commit b3c0263c40ff597c66f20d80c73fb78e062b7b5a Author: Bekeela Davila <bekeela(a)torproject.org> Date: Wed Oct 9 17:47:58 2019 +0000 DRL Harvard is no longer an active sponsor as of March 2019 --- content/about/sponsors/USSD-DHRL-harvard/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/USSD-DHRL-harvard/contents.lr b/content/about/sponsors/USSD-DHRL-harvard/contents.lr index 7433b91..7d76283 100644 --- a/content/about/sponsors/USSD-DHRL-harvard/contents.lr +++ b/content/about/sponsors/USSD-DHRL-harvard/contents.lr @@ -1,8 +1,8 @@ _model: sponsor --- -active: True +active: False --- -time: 2017 - Present +time: 2017 - 2019 --- name: U.S. Department of State Bureau of Democracy, Human Rights, and Labor via Harvard ---

1 0