- tor-commits - lists.torproject.org

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 01 Sep '21

01 Sep '21

commit cfe928d6e8ab36e77f72c3f75bbd27748258c992 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 1 12:15:24 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- si/torbrowser_strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/si/torbrowser_strings.xml b/si/torbrowser_strings.xml index 0df95fc4d0..79b4238992 100644 --- a/si/torbrowser_strings.xml +++ b/si/torbrowser_strings.xml @@ -2,4 +2,6 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> + <string name="tor_onboarding_donate_button">දැන් පරිත්‍යාග කරන්න</string> + </resources>

1 0

[community/master] first shot at https://gitlab.torproject.org/tpo/community/l10n/-/issues/40035, basically a copy from the working one at https://gitlab.torproject.org/tpo/web/manual/-/blob/master/.gitlab-ci.yml
by emmapeel＠torproject.org 01 Sep '21

01 Sep '21

commit 644e6a96a6acf9ce0b9c7d8bd0f544585d0b4773 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 1 12:07:42 2021 +0200 first shot at https://gitlab.torproject.org/tpo/community/l10n/-/issues/40035, basically a copy from the working one at https://gitlab.torproject.org/tpo/web/manual/-/blob/master/.gitlab-ci.yml --- .gitlab-ci.yml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..8cc9541 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,60 @@ +image: debian:buster-slim + +cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - lego + - apt-cache + +# This template should be usable on any system that's based on apt. +# taken from tor gitlabci + +.apt-template: &apt-template | + export LC_ALL=C.UTF-8 + echo Etc/UTC > /etc/timezone + mkdir -p apt-cache + export APT_CACHE_DIR="$(pwd)/apt-cache" + echo 'quiet "1";' \ + 'APT::Install-Recommends "0";' \ + 'APT::Install-Suggests "0";' \ + 'APT::Acquire::Retries "20";' \ + 'APT::Get::Assume-Yes "true";' \ + 'Dpkg::Use-Pty "0";' \ + "Dir::Cache::Archives \"${APT_CACHE_DIR}\"; " \ + >> /etc/apt/apt.conf.d/99gitlab + apt-get update -qq + apt-get upgrade -qy + +variables: + GIT_SUBMODULE_STRATEGY: recursive + +before_script: + - *apt-template + - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector -y + - pip3 install virtualenv + - virtualenv venv + - source venv/bin/activate + - pip3 install lektor + - echo 'checking out translations' + - rm -rf i18n + - git clone --branch communitytpo-contentspot https://git.torproject.org/translation.git i18n + - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - pip3 install polib + +pages: + script: + - echo 'reinstalling plugins to have last version' + - lektor plugins reinstall + - echo 'building lektor 3 times to get translations in place' + - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public + - echo 'lets see if there are any updates in the strings for translation' + - l10n/bin/check_po_status.py communitytpo-contentspot + artifacts: + paths: + - public + - i18n + +check_l10n: + script: + - l10n/bin/check_markdown_links.py i18n/

1 0

[community/master] update lego
by emmapeel＠torproject.org 01 Sep '21

01 Sep '21

commit 72d0540aa5526ab396513d1a6e4e733f61e41032 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 1 11:57:08 2021 +0200 update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 5db6fa6..1e20c72 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b +Subproject commit 1e20c72f727c838806183f2cbee300c96e686eb8

1 0

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

01 Sep '21

commit c709e8a79de824231eb94aa15f604493373e0f9f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 1 09:47:53 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+et.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+et.po b/contents+et.po index 1455323273..85287553c2 100644 --- a/contents+et.po +++ b/contents+et.po @@ -6,6 +6,7 @@ # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 # Max Moiseev <max.moiseev(a)chamber.fi>, 2020 # erinm, 2021 +# Taka, 2021 # msgid "" msgstr "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-08-02 19:42+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: erinm, 2021\n" +"Last-Translator: Taka, 2021\n" "Language-Team: Estonian (https://www.transifex.com/otf/teams/1519/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1397,7 +1398,7 @@ msgstr "" #: lego/templates/secure-connections.html:11 msgid "HTTPS" -msgstr "" +msgstr "HTTPS" #: lego/templates/secure-connections.html:15 #: lego/templates/secure-connections.html:65 @@ -1993,7 +1994,7 @@ msgstr "" #: templates/release.html:31 msgid "Get in Touch" -msgstr "" +msgstr "Võta Ühendust" #: templates/macros/question.html:12 templates/release.html:43 msgid "Contributors to this page:"

1 0

[translation/gettor-website-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
by translation＠torproject.org 01 Sep '21

01 Sep '21

commit ebc7ab1333431933046fb38536ef3607dfc63def Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 1 09:45:28 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-cont… --- contents+et.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+et.po b/contents+et.po index f900dd6eea..a742a013d7 100644 --- a/contents+et.po +++ b/contents+et.po @@ -3,6 +3,7 @@ # Madis Otenurm, 2021 # Max Moiseev <max.moiseev(a)chamber.fi>, 2021 # erinm, 2021 +# Taka, 2021 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-17 07:56+CET\n" "PO-Revision-Date: 2021-03-24 14:33+0000\n" -"Last-Translator: erinm, 2021\n" +"Last-Translator: Taka, 2021\n" "Language-Team: Estonian (https://www.transifex.com/otf/teams/1519/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -309,7 +310,7 @@ msgstr "" #: lego/templates/secure-connections.html:11 msgid "HTTPS" -msgstr "" +msgstr "HTTPS" #: lego/templates/secure-connections.html:15 #: lego/templates/secure-connections.html:65

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 01 Sep '21

01 Sep '21

commit 00cd6361c90b4a31a99a823aecdc82d131555456 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 1 09:45:14 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+sw.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+sw.po b/contents+sw.po index ff0d5c3bc0..7e85c3f2fc 100644 --- a/contents+sw.po +++ b/contents+sw.po @@ -5,8 +5,8 @@ # Louis Lloyd <louislloyd12(a)gmail.com>, 2021 # Zaituni Njovu <zaituni(a)zainafoundationtz.org>, 2021 # Suzanne Ferguson, 2021 +# Rose Mmbaga, 2021 # Emma Peel, 2021 -# Rose Mmbaga <rosemmbaga(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-29 12:10+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Rose Mmbaga <rosemmbaga(a)gmail.com>, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Swahili (https://www.transifex.com/otf/teams/1519/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13737,6 +13737,8 @@ msgid "" "https://gitweb.torproject.org/tor.git/plain/contrib/operator-tools/tor-exit-" "notice.html" msgstr "" +"https://gitweb.torproject.org/tor.git/plain/contrib/operator-tools/tor-exit-" +"notice.html" #: https//community.torproject.org/relay/setup/exit/ #: (content/relay/setup/exit/contents+en.lrpage.body)

1 0

[community/translations] content updates
by emmapeel＠torproject.org 01 Sep '21

01 Sep '21

commit 58a863de5f9d71d7bc3e9a51cf9c81a667afabe3 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 1 11:11:34 2021 +0200 content updates --- assets/static/images/onions/png/intercept.png | Bin 0 -> 22212 bytes assets/static/images/training/all-about-tor.png | Bin 0 -> 44384 bytes .../images/training/become-harder-to-trace.png | Bin 0 -> 4899 bytes .../images/training/cibermujeres-anonimato.jpg | Bin 0 -> 26158 bytes ...omo-protegerte-mientras-navegas-en-internet.jpg | Bin 0 -> 42606 bytes .../images/training/como-usar-tor-browser.png | Bin 0 -> 3019 bytes assets/static/images/training/defend-dissent.jpg | Bin 0 -> 28712 bytes .../static/images/training/digital-safety-kit.jpg | Bin 0 -> 86097 bytes assets/static/images/training/eff-ssd-guide.png | Bin 0 -> 33868 bytes .../images/training/exploring-the-tor-network.jpg | Bin 0 -> 49002 bytes .../training/guide-to-choosing-a-web-browser.png | Bin 0 -> 3683 bytes .../images/training/how-to-bypass-censorship.png | Bin 0 -> 21662 bytes .../static/images/training/leak-and-onion-soup.png | Bin 0 -> 4134 bytes assets/static/images/training/milpa-digital.jpg | Bin 0 -> 60173 bytes assets/static/images/training/onion-browser.png | Bin 0 -> 31011 bytes .../images/training/que-es-el-tor-browser.png | Bin 0 -> 39725 bytes .../static/images/training/que-no-quede-huella.jpg | Bin 0 -> 35589 bytes .../static/images/training/running-tor-bridges.png | Bin 0 -> 16642 bytes assets/static/images/training/tails-logo.svg | 102 +++++++++++ assets/static/images/training/the-tor-network.png | Bin 0 -> 47750 bytes assets/static/images/training/todo-sobre-tor.png | Bin 0 -> 38889 bytes .../localization/translation-problem/contents.lr | 2 +- content/training/resources/contents.lr | 21 ++- databags/community-training-materials.json | 194 +++++++++++++++++++++ databags/onions.ini | 15 +- databags/relay-associations.ini | 10 ++ databags/training-resources.json | 11 ++ lego | 2 +- templates/community-resources.html | 33 ++++ templates/resources.html | 68 +++++--- 30 files changed, 421 insertions(+), 37 deletions(-) diff --git a/assets/static/images/onions/png/intercept.png b/assets/static/images/onions/png/intercept.png new file mode 100644 index 0000000..1427be2 Binary files /dev/null and b/assets/static/images/onions/png/intercept.png differ diff --git a/assets/static/images/training/all-about-tor.png b/assets/static/images/training/all-about-tor.png new file mode 100644 index 0000000..9d08e70 Binary files /dev/null and b/assets/static/images/training/all-about-tor.png differ diff --git a/assets/static/images/training/become-harder-to-trace.png b/assets/static/images/training/become-harder-to-trace.png new file mode 100644 index 0000000..79152a9 Binary files /dev/null and b/assets/static/images/training/become-harder-to-trace.png differ diff --git a/assets/static/images/training/cibermujeres-anonimato.jpg b/assets/static/images/training/cibermujeres-anonimato.jpg new file mode 100644 index 0000000..9afbaa0 Binary files /dev/null and b/assets/static/images/training/cibermujeres-anonimato.jpg differ diff --git a/assets/static/images/training/como-protegerte-mientras-navegas-en-internet.jpg b/assets/static/images/training/como-protegerte-mientras-navegas-en-internet.jpg new file mode 100644 index 0000000..a865471 Binary files /dev/null and b/assets/static/images/training/como-protegerte-mientras-navegas-en-internet.jpg differ diff --git a/assets/static/images/training/como-usar-tor-browser.png b/assets/static/images/training/como-usar-tor-browser.png new file mode 100644 index 0000000..96d62e0 Binary files /dev/null and b/assets/static/images/training/como-usar-tor-browser.png differ diff --git a/assets/static/images/training/defend-dissent.jpg b/assets/static/images/training/defend-dissent.jpg new file mode 100644 index 0000000..3d28b08 Binary files /dev/null and b/assets/static/images/training/defend-dissent.jpg differ diff --git a/assets/static/images/training/digital-safety-kit.jpg b/assets/static/images/training/digital-safety-kit.jpg new file mode 100644 index 0000000..6b967fd Binary files /dev/null and b/assets/static/images/training/digital-safety-kit.jpg differ diff --git a/assets/static/images/training/eff-ssd-guide.png b/assets/static/images/training/eff-ssd-guide.png new file mode 100644 index 0000000..14ed95c Binary files /dev/null and b/assets/static/images/training/eff-ssd-guide.png differ diff --git a/assets/static/images/training/exploring-the-tor-network.jpg b/assets/static/images/training/exploring-the-tor-network.jpg new file mode 100644 index 0000000..82f9fb5 Binary files /dev/null and b/assets/static/images/training/exploring-the-tor-network.jpg differ diff --git a/assets/static/images/training/guide-to-choosing-a-web-browser.png b/assets/static/images/training/guide-to-choosing-a-web-browser.png new file mode 100644 index 0000000..b4c3a52 Binary files /dev/null and b/assets/static/images/training/guide-to-choosing-a-web-browser.png differ diff --git a/assets/static/images/training/how-to-bypass-censorship.png b/assets/static/images/training/how-to-bypass-censorship.png new file mode 100644 index 0000000..4e7a988 Binary files /dev/null and b/assets/static/images/training/how-to-bypass-censorship.png differ diff --git a/assets/static/images/training/leak-and-onion-soup.png b/assets/static/images/training/leak-and-onion-soup.png new file mode 100644 index 0000000..38bba3e Binary files /dev/null and b/assets/static/images/training/leak-and-onion-soup.png differ diff --git a/assets/static/images/training/milpa-digital.jpg b/assets/static/images/training/milpa-digital.jpg new file mode 100644 index 0000000..04d0680 Binary files /dev/null and b/assets/static/images/training/milpa-digital.jpg differ diff --git a/assets/static/images/training/onion-browser.png b/assets/static/images/training/onion-browser.png new file mode 100644 index 0000000..38738a6 Binary files /dev/null and b/assets/static/images/training/onion-browser.png differ diff --git a/assets/static/images/training/que-es-el-tor-browser.png b/assets/static/images/training/que-es-el-tor-browser.png new file mode 100644 index 0000000..06b8d2c Binary files /dev/null and b/assets/static/images/training/que-es-el-tor-browser.png differ diff --git a/assets/static/images/training/que-no-quede-huella.jpg b/assets/static/images/training/que-no-quede-huella.jpg new file mode 100644 index 0000000..3530943 Binary files /dev/null and b/assets/static/images/training/que-no-quede-huella.jpg differ diff --git a/assets/static/images/training/running-tor-bridges.png b/assets/static/images/training/running-tor-bridges.png new file mode 100644 index 0000000..1e5c5fb Binary files /dev/null and b/assets/static/images/training/running-tor-bridges.png differ diff --git a/assets/static/images/training/tails-logo.svg b/assets/static/images/training/tails-logo.svg new file mode 100644 index 0000000..0284dd3 --- /dev/null +++ b/assets/static/images/training/tails-logo.svg @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + id="svg3375" + height="222.96574" + width="445.93149" + version="1.1"> + <defs + id="defs3377" /> + <metadata + id="metadata3380"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <rect + style="fill:#56347c;fill-opacity:1;stroke:none;display:inline;enable-background:new" + id="rect5238-1-0" + y="0" + x="0" + height="222.96574" + width="445.93149" /> + <g + style="font-style:normal;font-weight:normal;font-size:61.55144501px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;enable-background:new" + id="text3064" + transform="matrix(0.54009561,0,0,0.54009561,100.01996,109.64097)"> + <path + style="font-variant:normal;font-weight:bold;font-stretch:normal;font-size:226.21522522px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1" + id="path5241" + d="m 146.40953,78.028847 h 33.47986 V -41.412792 h 40.49252 V -69.46348 h -114.4649 v 28.050688 h 40.49252 V 78.028847" /> + <path + style="font-variant:normal;font-weight:bold;font-stretch:normal;font-size:226.21522522px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1" + id="path5243" + d="m 212.79027,46.811146 c 0,19.00206 12.89428,33.932283 33.25363,33.932283 12.66804,0 23.30018,-5.881604 32.80121,-14.251559 h 0.67865 l 2.48836,11.536977 h 27.14583 V 13.783723 c 0,-34.38468 -15.83509,-50.672211 -44.5644,-50.672211 -17.64477,0 -33.70608,6.10782 -47.95763,14.70399 l 11.7632,21.94287681 C 239.25744,-6.5756412 248.7585,-10.421306 258.25953,-10.421306 c 11.98939,0 16.96614,6.3340359 17.64478,16.2874959 C 231.56617,10.39049 212.79027,23.284786 212.79027,46.811146 m 31.67013,-2.488368 c 0,-8.59617 7.69134,-15.382638 31.44391,-18.549648 v 19.680724 c -5.88159,5.88159 -10.85834,9.50104 -18.54965,9.50104 -7.91752,0 -12.89426,-3.393236 -12.89426,-10.632116" /> + <path + style="font-variant:normal;font-weight:bold;font-stretch:normal;font-size:226.21522522px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1" + id="path5245" + d="m 351.42697,-50.687616 c 11.31075,0 19.22829,-7.238898 19.22829,-17.418573 0,-10.179675 -7.91754,-17.192357 -19.22829,-17.192357 -11.08454,0 -19.2283,7.012682 -19.2283,17.192357 0,10.179675 8.14376,17.418573 19.2283,17.418573 M 334.91326,78.028847 h 33.25363 V -34.173905 H 334.91326 V 78.028847" /> + <path + style="font-variant:normal;font-weight:bold;font-stretch:normal;font-size:226.21522522px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1" + id="path5247" + d="m 397.21082,43.191702 c 0,22.6215 7.69134,37.551727 30.53905,37.551727 7.4651,0 13.12049,-1.131077 16.73993,-2.714582 l -4.07187,-24.65746 c -1.80972,0.45243 -2.71459,0.452431 -4.07188,0.452431 -2.71458,0 -5.88159,-2.26216 -5.88159,-9.274825 V -80.548026 H 397.21082 V 43.191702" /> + <path + style="font-variant:normal;font-weight:bold;font-stretch:normal;font-size:226.21522522px;font-family:'Source Sans Pro';-inkscape-font-specification:'Source Sans Pro Bold';fill:#ffffff;fill-opacity:1" + id="path5249" + d="m 451.76403,65.134579 c 11.31075,9.274815 28.27692,15.60885 42.98089,15.60885 30.0866,0 46.14791,-15.835086 46.14791,-36.194436 0,-20.585565 -16.0613,-28.503123 -30.31284,-33.706068 -11.53697,-4.2980851 -21.94288,-7.0126794 -21.94288,-14.2515593 0,-5.655375 4.07189,-8.8223937 12.66806,-8.8223937 7.91752,0 15.60885,3.6194494 23.75259,9.5010393 l 14.93021,-19.9069393 c -9.72725,-7.23888 -22.39533,-14.25156 -39.58767,-14.25156 -26.01472,0 -42.98089,14.25158 -42.98089,35.0633602 0,18.5496298 16.0613,27.8244778 29.6342,33.0274228 11.53696,4.5243 22.84773,7.91754 22.84773,15.382635 0,5.88159 -4.29809,9.50104 -14.25155,9.50104 -9.50103,0 -18.77588,-4.071882 -28.95555,-11.763192 l -14.93021,20.811801" /> + </g> + <g + style="fill:#ffffff;fill-opacity:1" + id="g5374" + transform="matrix(1.2550913,0,0,1.2550913,40.682161,35.305883)"> + <path + style="fill:#ffffff;fill-opacity:1" + id="path5189-4" + d="m 88.342066,56.730068 v 16.662869 c 0,0.510289 -0.341075,0.643984 -0.760689,0.296591 L 79.077314,66.649116 C 78.658103,66.302056 78.317029,65.609 78.317029,65.098711 v -2.097683 l -2.657657,-2.16078 c -2.850156,-2.317289 -5.132376,-7.0217 -5.132376,-10.464763 0,-3.442323 2.29778,-4.339449 5.132376,-2.002743 l 2.657657,2.160782 v -2.097681 c 0,-0.510046 0.341074,-0.643737 0.760285,-0.296677 l 8.503862,7.040243 c 0.420546,0.346435 0.76089,1.040613 0.76089,1.550659 z M 75.81131,51.432227 c -1.50022,-1.236708 -2.716309,-0.761675 -2.716309,1.060197 0,1.822367 1.216089,4.301887 2.716309,5.538595 l 2.505719,2.035532 V 53.467516 L 75.81131,51.431984 Z" /> + <g + style="fill:#ffffff;fill-opacity:1" + id="g3500" + transform="matrix(0.46410314,0.9267926,-0.9267926,0.46410314,77.258376,-14.89278)"> + <path + style="fill:#ffffff;fill-opacity:1" + id="path3502" + d="M 97.976,37.8 C 97.972,37.779 97.968,37.758 97.963,37.737 97.947,37.669 97.927,37.602 97.901,37.538 97.898,37.53 97.896,37.522 97.893,37.515 97.863,37.446 97.826,37.38 97.786,37.317 97.775,37.299 97.762,37.283 97.75,37.266 97.715,37.216 97.676,37.169 97.634,37.125 97.623,37.113 97.613,37.101 97.601,37.089 97.548,37.037 97.49,36.989 97.428,36.946 97.413,36.935 97.396,36.927 97.38,36.917 97.349,36.898 97.32,36.877 97.288,36.86 L 96.743,36.576 71.837016,47.695585 25.252,24.269 l -0.666,0.33 c -0.006,0.003 -0.01,0.007 -0.016,0.01 -0.047,0.024 -0.09,0.055 -0.134,0.084 -0.029,0.019 -0.06,0.036 -0.087,0.057 -0.034,0.027 -0.063,0.059 -0.094,0.09 -0.031,0.03 -0.065,0.059 -0.093,0.092 -0.022,0.026 -0.039,0.056 -0.06,0.084 -0.031,0.043 -0.063,0.086 -0.088,0.132 -0.003,0.005 -0.007,0.01 -0.01,0.015 -0.015,0.028 -0.022,0.057 -0.035,0.085 -0.02,0.046 -0.041,0.09 -0.056,0.138 -0.013,0.041 -0.02,0.082 -0.029,0.123 -0.009,0.043 -0.019,0.085 -0.024,0.128 -0.005,0.043 -0.004,0.085 -0.005,0 .127 -0.001,0.044 -0.003,0.087 0.001,0.13 0.002,0.023 0.005,0.046 0.009,0.069 -0.006,0.051 -0.015,0.1 -0.015,0.152 L 23.854,41.674 27.21708,40.107419 63.622,58.211 38.537615,69.347048 l -18.939,-9.469 L 2.6090632,51.38471 c -0.012,-0.006 -0.025,-0.009 -0.038,-0.014 -0.042,-0.02 -0.086,-0.035 -0.131,-0.05 -0.04,-0.014 -0.08,-0.028 -0.121,-0.038 -0.038,-0.009 -0.078,-0.014 -0.117,-0.019 -0.049,-0.007 -0.098,-0.014 -0.148,-0.015 -0.013,0 -0.024,-0.004 -0.037,-0.004 -0.025,0 -0.049,0.006 -0.074,0.007 -0.05,0.004 -0.099,0.007 -0.148,0.016 -0.04,0.007 -0.079,0.017 -0.118,0.027 -0.043,0.011 -0.085,0.024 -0.127,0.039 -0.039,0.015 -0.077,0.032 -0.114,0.051 -0.039,0.019 -0.077,0.039 -0.115,0.062 -0.035,0.022 -0.068,0.045 -0.1,0.07 -0.035,0.027 -0.07,0.054 -0.103,0.085 -0.031,0.029 -0.059,0.059 -0.087,0.09 -0.028,0.032 -0.056,0.064 -0.082,0.099 -0.028,0.038 -0.052,0.079 -0.076,0.12 -0.013,0.023 -0.03,0.042 -0.042,0.066 -0.006,0.012 -0.008,0.025 -0.014,0.037 -0.02,0.043 -0.036,0.089 -0.051,0.13 5 -0.013,0.039 -0.027,0.078 -0.036,0.117 -0.009,0.04 -0.014,0.081 -0.02,0.122 -0.007,0.048 -0.013,0.095 -0.014,0.142 0.001,0.014 -0.003,0.026 -0.003,0.039 v 19.531 c 0,0.026 0.006,0.051 0.008,0.077 0.003,0.048 0.006,0.096 0.014,0.143 0.007,0.042 0.017,0.082 0.028,0.122 0.011,0.042 0.023,0.083 0.038,0.123 0.015,0.04 0.033,0.079 0.052,0.117 0.019,0.038 0.038,0.076 0.061,0.112 0.022,0.035 0.046,0.069 0.071,0.102 0.027,0.035 0.054,0.069 0.084,0.102 0.028,0.031 0.059,0.059 0.09,0.087 0.032,0.029 0.064,0.056 0.1,0.082 0.038,0.027 0.077,0.051 0.118,0.075 0.023,0.014 0.043,0.031 0.068,0.043 L 37.945615,91.543048 c 0.007,0.004 0.015,0.004 0.022,0.008 0.017,0.008 0.032,0.017 0.049,0.025 0.01,0.004 0.02,0.007 0.03,0.011 0.056,0.022 0.113,0.041 0.171,0.055 0.012,0.003 0.024,0.006 0.036,0.009 0.016,0.003 0.032,0.005 0.048,0.008 0.077,0.014 0.154,0.024 0.232,0.024 0.001,0 0.002,0 0.003,0 h 0.001 10e-4 c 10e-4,0 0.002,0 0.003,0 0.078,0 0.156,-0.01 0.232,-0.024 0.016,-0.003 0.032,-0.005 0.048,-0.00 8 0.012,-0.003 0.024,-0.006 0.036,-0.009 0.058,-0.014 0.115,-0.033 0.17,-0.055 0.01,-0.004 0.021,-0.007 0.031,-0.011 0.017,-0.007 0.032,-0.017 0.049,-0.024 0.007,-0.003 0.015,-0.004 0.022,-0.008 L 61.746,81.642 l 9.462,5.221 c 0.018,0.01 0.037,0.017 0.056,0.026 0.019,0.01 0.038,0.02 0.058,0.029 0.008,0.003 0.016,0.007 0.024,0.01 0.031,0.013 0.063,0.023 0.095,0.033 0.019,0.006 0.038,0.013 0.058,0.019 0.021,0.006 0.043,0.011 0.064,0.015 0.015,0.003 0.029,0.006 0.044,0.008 0.007,0.001 0.015,0.003 0.022,0.004 0.014,0.002 0.028,0.006 0.042,0.008 0.059,0.008 0.117,0.013 0.176,0.013 h 0.001 0.001 c 10e-4,0 0.002,0 0.003,0 0.078,0 0.155,-0.01 0.232,-0.024 0.013,-0.002 0.026,-0.003 0.039,-0.006 0.01,-0.002 0.019,-0.006 0.029,-0.008 0.07,-0.017 0.14,-0.037 0.207,-0.065 0.007,-0.003 0.014,-0.007 0.021,-0.01 0.004,-0.002 0.008,-0.004 0.012,-0.006 0.006,-0.003 0.012,-0.003 0.018,-0.006 L 97.238,75.317 C 97.703,75.098 98,74.631 98,74.117 V 38.034 C 98,38.028 97.998,38.023 97.998,38.017 97.997,37. 943 97.989,37.871 97.976,37.8 Z m -60.762385,40.617048 -7.614,3.666 3.972,1.986 3.641,-1.986 v 6.29 L 3.3410632,71.43771 v -9.829 l 8.6775518,4.241338 -7.2569997,3.35 3.972,1.986 7.2689997,-3.378 4.313,2.051 -7.487,3.456 3.972,1.986 7.503,-3.482 4.621,2.344 -7.381,3.407 3.972,1.986 7.395,-3.434 4.303,2.111 z M 65.228,76.939 39.861615,88.216048 v -16.57 L 65.228,60.37 Z M 3.3410632,58.52771 v -3.31 L 37.213615,71.821048 v 3.31 z" /> + </g> + <polygon + style="fill:#ffffff;fill-opacity:1" + id="polygon3506" + transform="rotate(63.400001,48.43115,48.892589)" + points="45.366,56.241 39.076,59.22 33.117,56.241 39.407,53.262 " /> + <polygon + style="fill:#ffffff;fill-opacity:1" + id="polygon3508" + transform="rotate(63.400001,48.414793,48.413403)" + points="29.145,47.634 35.103,50.613 28.814,53.593 22.855,50.613 " /> + <g + style="fill:#ffffff;fill-opacity:1" + id="Captions" + transform="matrix(0,-0.2492475,0.19547686,0.16114179,71.005984,62.192969)" /> + <g + style="fill:#ffffff;fill-opacity:1" + id="Captions-7" + transform="translate(122.10986,-55.111168)" /> + <path + style="fill:#ffffff;fill-opacity:1" + id="path4818-2-4-3" + d="m 45.058193,34.347585 c 2.124399,2.704098 4.295157,7.985437 4.295157,12.865587 0,4.87818 -2.170758,6.542025 -4.295157,5.703941 0,-1.998055 0,-16.795084 0,-18.569528 z" /> + <g + style="fill:#ffffff;fill-opacity:1" + id="Your_Icon" + transform="translate(74.936297,109.72221)" /> + </g> +</svg> diff --git a/assets/static/images/training/the-tor-network.png b/assets/static/images/training/the-tor-network.png new file mode 100644 index 0000000..b932550 Binary files /dev/null and b/assets/static/images/training/the-tor-network.png differ diff --git a/assets/static/images/training/todo-sobre-tor.png b/assets/static/images/training/todo-sobre-tor.png new file mode 100644 index 0000000..87601b9 Binary files /dev/null and b/assets/static/images/training/todo-sobre-tor.png differ diff --git a/content/localization/translation-problem/contents.lr b/content/localization/translation-problem/contents.lr index 430aafd..bc88892 100644 --- a/content/localization/translation-problem/contents.lr +++ b/content/localization/translation-problem/contents.lr @@ -20,6 +20,6 @@ body: * If you are already a [Tor translator](../becoming-tor-translator), you can simply find the string and fix it in [transifex](https://www.transifex.com/otf/torproject/). * If you don't know how to find the string to fix, you can [open a ticket on our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under the **Community/Localization** repository. - Before opening a ticket, see the currently [open tickets for Translations](https://github.com/torproject/community/tree/master/content/l… because maybe it is already reported. + Before opening a ticket, see the currently [open tickets for Translations](https://gitlab.torproject.org/tpo/community/l10n/-/issues?sco… because maybe it is already reported. * You can send an email to the [tor localization mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n). * You can report such issues on [irc](https://support.torproject.org/get-in-touch/#irc-help), on the #tor-l10n channel on the oftc network (you may need to be registered to log in). diff --git a/content/training/resources/contents.lr b/content/training/resources/contents.lr index 942724c..a5e0588 100644 --- a/content/training/resources/contents.lr +++ b/content/training/resources/contents.lr @@ -16,9 +16,24 @@ cta: Check out our resources --- key: 2 --- -html: resources.html +html: community-resources.html --- body: -##Resources -Do you teach your community about using Tor? These training resources are for you. \ No newline at end of file +Our Community team delivers digital security training about Tor to human rights defenders, journalists, activists and marginalized communities around the world. +To request a Tor training for your organization or community, please contact us and send an email to [training at torproject.org](mailto:training@torproject.org). +Or, if you want to teach your community about Tor, these training materials are for you! + +### Community building + +Do you know of or have any Tor training materials (slides, guides, fanzines, videos, and other formats) that should be part of this training section? +Please send an email to [training at torproject.org](mailto:training@torproject.org) with: + - Title and description + - Author and author contact information + - Link to download or access the resource + - Resource license (Creative Commons or similar license) + +Please note that we will evaluate if: + - The material is being updated and maintained. + - Do no harm: demystifies the "dark/deep web" and training materials that will not put people at risk. + - Follow the Tor Project's [Code of Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_…, [Statement of Values](https://gitweb.torproject.org/community/policies.git/tree/statement…, and [Social Contract](https://gitweb.torproject.org/community/policies.git/tree/social_…. diff --git a/databags/community-training-materials.json b/databags/community-training-materials.json new file mode 100644 index 0000000..1c7eb48 --- /dev/null +++ b/databags/community-training-materials.json @@ -0,0 +1,194 @@ +{ + "all-about-tor": { + "name": "All About Tor", + "author": "Tor Project", + "link": "https://community.torproject.org/training/resources/tor-relay-workshop/", + "description": "Full set of slides for Tor Trainings: how the Tor network works, censorship circumvention, Tor Browser installation, and OnionShare.", + "date": "2021", + "cover": "/static/images/training/all-about-tor.png", + "languages": "English" + }, + "todo sobre tor": { + "name": "Todo sobre Tor", + "author": "Tor Project", + "formats": ["odp", "pdf"], + "description": "Un conjunto completo de diapositivas para los entrenamientos de Tor", + "date": "2019", + "cover": "/static/images/training/todo-sobre-tor.png", + "languages": "Spanish", + "link" : "https://community.torproject.org/training/resources/tor-relay-workshop/" + }, + "tor network workshop": { + "author": "Tor Project", + "name": "The Tor network", + "formats": ["odp","pdf"], + "description": "Learn about the Tor network and how to run a relay", + "date": "2019", + "cover": "/static/images/training/the-tor-network.png", + "languages": "English", + "formats": "Slides", + "link": "https://community.torproject.org/training/resources/tor-relay-workshop/" + }, + "Private bridges workshop": { + "author": "Tor Project", + "name": "Running Tor bridges", + "formats": ["odp","pdf"], + "description": "Learn how to run a private unlisted Tor bridge", + "date": "2021", + "cover": "/static/images/training/running-tor-bridges.png", + "languages": "English", + "link": "https://community.torproject.org/training/resources/tor-relay-workshop/" + }, + "exploring-the-tor-network": { + "name": "Exploring the Tor network (poster)", + "author": "Article19", + "description": "A tabloid containing an amazing graphic about the Tor network. Part of the book How the Internet really works.", + "link": "https://catnip.article19.org/data/ARTICLE19-Catnip-Tor-Network-2021-web.pdf", + "cover": "/static/images/training/exploring-the-tor-network.jpg", + "languages": "English" + }, + "understanding-and-circumventing-network-censorship": { + "name": "Understanding and Circumventing Network Censorship", + "author": "Electronic Frontier Foundation (EFF)", + "description": "This resource is part of Surveillance Self-Defense (SSD) guides maintained by EFF.", + "link": "https://ssd.eff.org/en/module/understanding-and-circumventing-network-censo…", + "cover": "/static/images/training/eff-ssd-guide.png", + "languages": "Multiple languages" + }, + "how-to-use-tor": { + "name": "How to: Use Tor", + "author": "Electronic Frontier Foundation (EFF)", + "description": "This resource is part of Surveillance Self-Defense (SSD) guides maintained by EFF.", + "link": "https://ssd.eff.org/en/node/97", + "cover": "/static/images/training/eff-ssd-guide.png", + "languages": "Multiple languages" + }, + "whats-fingerprinting": { + "name": "What's fingerprinting?", + "author": "Electronic Frontier Foundation (EFF)", + "description": "Surveillance Self-Defense article explaining web browser fingerprinting and how Tor Browser protects you.", + "link": "https://ssd.eff.org/en/module/what-fingerprinting", + "cover": "/static/images/training/eff-ssd-guide.png", + "languages": "Multiple languages" + }, + "evadir-la-censura-y-la-vigilancia-con-tor": { + "name": "Evadir la censura y la vigilancia con Tor", + "author": "Código Sur", + "description": "", + "link": "https://milpadigital.org/milpadigital-8", + "cover": "/static/images/training/milpa-digital.jpg", + "languages": "Spanish" + }, + "how-to-bypass-internet-censorship": { + "name": "How to bypass internet censorship", + "author": "Totem Project", + "description": "An online course that teach how to use anti-censorship tools", + "link": "https://learn.totem-project.org/courses/course-v1:Totem+TP_CT_EN+001/about", + "cover": "/static/images/training/how-to-bypass-censorship.png", + "languages": "Multiple languages" + }, + "use-tor-browser-to-become-harder-to-trace": { + "name": "Use Tor Browser to Become Harder to Trace", + "author": "Security Planner", + "description": "", + "link": "https://securityplanner.consumerreports.org/tool/browse-privately-with-tor", + "cover": "/static/images/training/become-harder-to-trace.png", + "languages": "English" + }, + "curricula-capacitacion-seguridad-digital-holistica": { + "name": "Currícula de capacitación en seguridad digital holística para defensoras de derechos humanos", + "author": "Cibermujeres", + "description": "", + "link": "https://cyber-women.com/es/anonimato/anonimato/", + "cover": "/static/images/training/cibermujeres-anonimato.jpg", + "languages": "Spanish" + }, + "como-usar-tb-en-tu-computadora": { + "name": "Cómo usar Tor Browser en tu computadora", + "author": "Venezuela Inteligente", + "description": "Guide explaining how to use Tor Browser and Tor bridges", + "link": "https://vesinfiltro.com/bloqueos/torbrowser/", + "cover": "/static/images/training/como-usar-tor-browser.png", + "languages": "Spanish" + }, + "digital-safety-kit": { + "name": "Digital Safety kit", + "author": "Committee to Protect Journalists (CPJ)", + "description": "A tailored digital security guide made for journalists.", + "link": "https://cpj.org/2019/07/digital-safety-kit-journalists/", + "cover": "/static/images/training/digital-safety-kit.jpg", + "languages": "Español, Français, Русский, and در فارسی" + }, + "cuidados-digitales-que-es-tor-browser": { + "name": "Cuidados Digitales: ¿Qué es el Tor Browser?", + "author": "SurSiendo", + "description": "E-learning platform based on Moodle.", + "link": "https://cuidadosdigitales.sursiendo.org/mod/page/view.php?id=13", + "cover": "/static/images/training/que-es-el-tor-browser.png", + "languages": "Spanish" + }, + "in-depth-guide-to-choosing-a-web-browser": { + "name": "An in-depth guide to choosing a web browser", + "author": "Freedom of Press Foundation", + "description": "A guide comparing Tor Browser and other browser's security.", + "link": "https://freedom.press/training/-depth-guide-choosing-web-browser/", + "cover": "/static/images/training/guide-to-choosing-a-web-browser.png", + "languages": "English" + }, + "tor-como-protegerte-mientras-navegas-en-internet": { + "name": "Tor: ¿Cómo protegerte mientras navegas en Internet?", + "author": "Artículo 19", + "description": "A short video explaining what's Tor and how Tor works.", + "link": "https://www.youtube.com/watch?v=Zj0FYhcngZ8", + "cover": "/static/images/training/como-protegerte-mientras-navegas-en-internet.jpg", + "languages": "Spanish" + }, + "que-no-quede-huella": { + "name": "'Que no quede huella... que no, que no': diálogos feministas para las libertades y autocuidados digitales", + "author": "Tormenta", + "description": "A feminist fanzine discussing the Internet, anonymity, Tor, Tails.", + "link": "https://www.derechosdigitales.org/wp-content/uploads/que-no-quede-huella.pdf", + "cover": "/static/images/training/que-no-quede-huella.jpg", + "languages": "Spanish" + }, + "onion-browser-tutorial": { + "name": "Onion Browser Tutorial", + "author": "Guardian Project", + "description": "This resource explains the features and how to use Onion Browser. Onion Browser is the only browser for iOS recommended by the Tor Project.", + "link": "https://guardianproject.info/2020/06/02/onion-browser-release-2.6-tutorial/", + "cover": "/static/images/training/onion-browser.png", + "languages": "English" + }, + "onion-browser-video-tutorial": { + "name": "Onion Browser Video Tutorial", + "author": "Guardian Project", + "description": "Video tutorial with best practices to browse the web securely on iOS using Onion Browser", + "link": "https://www.youtube.com/playlist?list=PL4-CVUWabKWeHeBpadBLjzlWVa7binXpj", + "cover": "/static/images/training/onion-browser.png", + "languages": "English" + }, + "getting-your-hands-started-with-tails": { + "name": "Getting your hands started with Tails", + "author": "geb", + "description": "Step by step tutorial used to introduce Tails to journalism students. Actually used in journalism schools in France. Topics: Tor, persistence, metadata, secure removal, Veracrypt, OnionShare etc. On request ; please click to contact author.", + "link": "mailto:geb@riseup.net", + "cover": "/static/images/training/tails-logo.svg", + "languages": "English" + }, + "ebook-defend-dissent": { + "name": "Defend Dissent: Digital Suppression and Cryptographic Defense of Social Movements", + "author": "Glencora Borradaile", + "description": "An introduction book to cryptography, Tor, and surveillance used against social movements in US.", + "link": "https://open.oregonstate.education/defenddissent/", + "cover": "/static/images/training/defend-dissent.jpg", + "languages": "English" + }, + "leak-onion-soup": { + "name": "Leak and Onion Soup", + "author": "Exposing the invisible (Tactical Tech)", + "description": "A guide about using Tor to read, verify and process leaked data, which might come with a risk.", + "link": "https://exposingtheinvisible.org/en/guides/leak-and-onion-soup", + "cover": "/static/images/training/leak-and-onion-soup.png", + "languages": "English" + } +} diff --git a/databags/onions.ini b/databags/onions.ini index 69f703e..096c225 100644 --- a/databags/onions.ini +++ b/databags/onions.ini @@ -9,7 +9,7 @@ image = /static/images/onions/png/nytimes.png label = The New York Times [dw] -link = https://www.dwnewsvdyyiamwnp.onion +link = https://dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion/ image = /static/images/onions/png/dw.png label = Deutsche Welle @@ -18,8 +18,13 @@ link = https://www.bbcnewsv2vjtpsuy.onion image = /static/images/onions/png/bbc.png label = BBC +[intercept] +link = https://27m3p2uv7igmj6kvd4ql3cct5h3sdwrsajovkkndeufumzyfhlfev4qd.onion +image = /static/images/onions/png/intercept.png +label = The Intercept + [facebook] -link = https://facebookcorewwwi.onion +link = https://facebookwkhpilnemxj7asaniu7vnjjbiltxjqhye3mhbshg7kx5tfyd.onion image = /static/images/onions/png/facebook.png label = Facebook @@ -34,12 +39,12 @@ image = /static/images/onions/png/fop.png label = Freedom of Press Foundation [privacyinternational] -link = https://privacyintyqcroe.onion/ +link = http://privacy2ws3ora5p4qpzptqr32qm54gf5ifyzvo5bhl7bb254c6nbiyd.onion image = /static/images/onions/png/privacyinternational.png label = Privacy International [debian] -link = http://sejnfjrq6szgca7v.onion/ +link = http://5ekxbftvqg26oir5wle3p27ax3wksbxcecnm6oemju7bjra2pn26s3qd.onion image = /static/images/onions/png/debian.png label = Debian @@ -54,6 +59,6 @@ image = /static/images/onions/png/riseup.png label = Riseup [brave] -link = https://brave5t5rjjg3s6k.onion +link = https://brave4u7jddbv7cyviptqjc7jusxh72uik7zt6adtckl5f4nwy2v72qd.onion/ image = /static/images/onions/png/brave.png label = Brave diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini index ec4a82e..20913d1 100644 --- a/databags/relay-associations.ini +++ b/databags/relay-associations.ini @@ -167,3 +167,13 @@ contact = https://www.artikel5ev.de/kontakt/ active = True display = donate = + +[artikel10ev] +link = https://artikel10.org/dienste/tor-relays/ +image = +label = Artikel 10 e.V. +country = Germany +contact = https://artikel10.org/kontakt/ +active = True +display = +donate = diff --git a/databags/training-resources.json b/databags/training-resources.json index ba7f3ea..d2120a1 100644 --- a/databags/training-resources.json +++ b/databags/training-resources.json @@ -37,5 +37,16 @@ "formats" : ["odp","pdf"], "description" : "Learn how to run a private unlisted Tor bridge", "date" : "2021" + }, + + "helping survivors" : + { + "label" : "Helping survivors", + "name" : "help-survivors", + "filename" : "help-survivors", + "formats" : ["odp","pdf"], + "description" : "A digital security guide for organizations helping survivors.", + "date" : "2021" } + } diff --git a/lego b/lego index 1e20c72..5db6fa6 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 1e20c72f727c838806183f2cbee300c96e686eb8 +Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b diff --git a/templates/community-resources.html b/templates/community-resources.html new file mode 100644 index 0000000..3158b2f --- /dev/null +++ b/templates/community-resources.html @@ -0,0 +1,33 @@ +<div class="row pt-5"> + {% include 'sidenav.html' %} + <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> + {{ this.body }} + <div class="row"> + + {% for id, item in bag('community-training-materials').items() %} + <div class="col-md-6 col-sm-12 col-xl-3 my-3"> + + <div class="card h-100"> + <div class="card-header bg-white border-0"> + <picture> + <a href="{{ item.link }}"><img src="{{ item.cover }}" class="img-fluid" alt="{{ item.name }}"></a> + </picture> + </div> + <div class="card-body d-flex flex-column"> + <h5 class="card-title human-name">{{ item.name }}</h5> + <p>by {{ item.author }}</p> + <p>In {{ item.languages }}</p> + <p>{{ item.description }}</p> + {% if item.author=='Tor Project' %} + <a href="{{ item.link }}" title="{{ item.name }}" class="btn btn-primary mt-auto">Check this resource</a> + {% else %} + <a href="{{ item.link }}" title="{{ item.name }}" class="btn btn-primary mt-auto">Check this resource</a> + {% endif %} + </div> + </div> + </div> + {% endfor %} + + </div> + </div> +</div> diff --git a/templates/resources.html b/templates/resources.html index 1ee86d9..2397a6c 100644 --- a/templates/resources.html +++ b/templates/resources.html @@ -2,33 +2,47 @@ {% include 'sidenav.html' %} <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> {{ this.body }} - <div class="container py-3"> + <div class="row"> - <table class="table"> - <thead> - <tr> - <th scope="col">Title</th> - <th scope="col">Description</th> - <th scope="col">Formats</th> - <th scope="col">Last Updated</th> - </tr> - </thead> - <tbody> - {% for id, item in bag('training-resources').items() %} - <tr> - <td>{{ item.label}}</td> - <td>{{ item.description }}</td> - <td> - {% for format in item.formats %} - <a href="https://gitweb.torproject.org/community/training.git/plain/{{ item.date }}/{{ item.name }}/{{ item.filename }}.{{format}}">{{ format }}</a> - {% endfor %} - </td> - <td>{{ item.date }}</td> - </tr> - {% endfor %} - </tbody> - </table> - </div> + {% for id, item in bag('community-training-materials').items() %} + {% if item.type=='official' %} + <div class="col-md-3 col-sm-12 col-xl-3 my-3"> + <div class="card h-100"> + <div class="card-header bg-white border-0"> + <picture> + <img src="{{ item.cover }}" class="img-fluid" alt="{{ item.name }}"> + </picture> + </div> + <div class="card-body"> + <h5 class="card-title human-name">{{ item.name }}</h5> + <p>{{ item.description }}</p> + + <p><i>{{ item.languages }}</i></p> + </p>format: {{ item.formats }}</p> + <p>Released: {{ item.date }}</p> + <a href="{{ item.link }}" title="{{ item.name }}" class="btn btn-primary">Check this resource</a> + </div> + </div> + {% else %} + <div class="col-md-3 col-sm-12 col-xl-3 my-3"> + <div class="card h-100"> + <div class="card-header bg-white border-0"> + <picture> + <img src="{{ item.cover }}" class="img-fluid" alt="{{ item.name }}"> + </picture> + </div> + <div class="card-body"> + <h5 class="card-title human-name">{{ item.name }}</h5> + <p>{{ item.description }}</p> + <p><i>{{ item.languages }}</i></p> + <p>Released: {{ item.date }}</p> + <a href="{{ item.link }}" title="{{ item.name }}" class="btn btn-primary">Download</a> + </div> + </div> + {% endif %} + </div> + {% endfor %} + </div> </div> -</div> \ No newline at end of file +</div>

1 0

[community/translations] update lego
by emmapeel＠torproject.org 01 Sep '21

01 Sep '21

commit 8061d58b82877baa8bf1b696e29e4b2015f2a0ee Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 1 11:15:48 2021 +0200 update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 5db6fa6..1e20c72 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b +Subproject commit 1e20c72f727c838806183f2cbee300c96e686eb8

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 01 Sep '21

01 Sep '21

commit f39dca17de62175cda00ad827b6885d6cb110f76 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 1 08:46:58 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+my.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contents+my.po b/contents+my.po index d657c3153b..64569d9021 100644 --- a/contents+my.po +++ b/contents+my.po @@ -1351,6 +1351,8 @@ msgid "" "When you log in to a website over Tor, there are several points you should " "bear in mind:" msgstr "" +"သင်သည် Tor အသုံးပြု၍ ဝဘ်ဆိုက်တစ်ခုသို့ လော့ဂ်အင်ဝင်သောအခါ သတိပြုရန် " +"အချက်အနည်းငယ် ရှိပါသည် -" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1358,6 +1360,9 @@ msgid "" "* See the [Secure Connections](/secure-connections) page for important " "information on how to secure your connection when logging in." msgstr "" +"*လော့ဂ်အင်ဝင်ချိန်တွင် သင့်ချိတ်ဆက်မှုကို လုံခြုံစိတ်ချရအောင် " +"ပြုလုပ်ရန်အတွက် အချက်အလက်ကို [လုံခြုံစိတ်ချရသော ချိတ်ဆက်မှုများ](my/secure-" +"connections) စာမျက်နှာတွင် ကြည့်ပါ။" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body)

1 0

[manual/master] Make the section more clear. Also remove zh because we do not have that locale: we have zh_CN and zh_TW
by emmapeel＠torproject.org 01 Sep '21

01 Sep '21

commit 6afe7940e44855a1509f8b074c9c16365b373f2c Author: emma peel <emma.peel(a)riseup.net> Date: Thu Aug 5 10:01:37 2021 +0200 Make the section more clear. Also remove zh because we do not have that locale: we have zh_CN and zh_TW --- content/downloading/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/downloading/contents.lr b/content/downloading/contents.lr index 5cb1b3c..5e1bd4b 100644 --- a/content/downloading/contents.lr +++ b/content/downloading/contents.lr @@ -27,6 +27,7 @@ If you're unable to download Tor Browser from the official Tor Project website, ### TO USE GETTOR VIA EMAIL: Send an email to [gettor@torproject.org](mailto:gettor@torproject.org), and in the body of the message simply write “windows”, “osx”, or “linux”, (without quotation marks) depending on your operating system. +You can also add a language code to get Tor Browser on a language different than English. +For example, to get links for downloading Tor Browser in Chinese (China) for Windows, send an email to [gettor@torproject.org](mailto:gettor@torproject.org) with the words "windows zh_CN" in it. GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the package’s checksum. You may be offered a choice of “32-bit” or “64-bit” software: this depends on the model of the computer you are using. -For example, to get links for downloading Tor Browser in Chinese for Windows, send an email to [gettor@torproject.org](mailto:gettor@torproject.org) with the words "windows zh" in it.

1 0