tor-commits July 2021

tor-commits@lists.torproject.org

17 participants
1544 discussions

[manual/develop] add forward for dropped locale
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 0da7313aae7bbecff2767ae7eb0ffaaf981f6f4f Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 10:57:13 2021 +0000 add forward for dropped locale --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 54bca0c..c13c656 100644 --- a/.htaccess +++ b/.htaccess @@ -13,8 +13,8 @@ RewriteRule ^(en-US|en)$ / [R=302,L] RewriteRule ^(en-US|en)/(.*) /$2 [R=302,L] # Rewrites for languages that have a different mapping in the page -RewriteRule ^(es-ES|es-MX|es-CO)$ /es [R=302,L] -RewriteRule ^(es-ES|es-MX|es-CO)/(.*) /es/$2 [R=302,L] +RewriteRule ^(es-ES|es-MX|es-CO|es-AR)$ /es [R=302,L] +RewriteRule ^(es-ES|es-MX|es-CO|es-AR)/(.*) /es/$2 [R=302,L] # Rewrites for languages that have a Tor Browser release # but don't have a translated manual

1 0

[manual/develop] remove non-supported languages
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 377d660a4a1bbb6597b6c234792c22b164dcf524 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 10:56:29 2021 +0000 remove non-supported languages --- databags/alternatives.ini | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/databags/alternatives.ini b/databags/alternatives.ini index a0c0a8c..b87c383 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -34,24 +34,12 @@ order = order-last url = /el/ language = Ελληνικά (el) -[en-US] -direction = text-left -order = order-last -url = /en-US/ -language = English (en-US) - [es] direction = text-left order = order-last url = /es/ language = Español (es) -[es-AR] -direction = text-left -order = order-last -url = /es-AR/ -language = Español Arg. (es-AR) - [fr] direction = text-left order = order-last

1 0

[manual/develop] better lines for localization. trailing space
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 4855d21516cb84020b2fafa64ff125bcb1b5d09c Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 3 15:41:53 2021 +0100 better lines for localization. trailing space --- content/onion-services/contents.lr | 3 ++- content/troubleshooting/contents.lr | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index dfe914a..8334f0c 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -22,7 +22,8 @@ Onion services offer several advantages over ordinary services on the non-privat Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of 16 (and in V3 format, 56) mostly random letters and numbers, followed by ".onion". -When accessing a website that uses an onion service, Tor Browser will show in the URL bar an icon of an onion displaying the state of your connection: secure and using an onion service. You can learn more about the onion site that you are visiting by looking at the Circuit Display. +When accessing a website that uses an onion service, Tor Browser will show in the URL bar an icon of an onion displaying the state of your connection: secure and using an onion service. +You can learn more about the onion site that you are visiting by looking at the Circuit Display. Another way to learn about an onion site is if the website administrator has implemented a feature called Onion-Location. Onion-Location is a non-standard HTTP header that websites can use to advertise their onion counterpart. diff --git a/content/troubleshooting/contents.lr b/content/troubleshooting/contents.lr index 9131667..757a345 100644 --- a/content/troubleshooting/contents.lr +++ b/content/troubleshooting/contents.lr @@ -42,7 +42,7 @@ Alternatively, on GNU/Linux, to view the logs right in the terminal, navigate to `./start-tor-browser.desktop --verbose` -or to save the logs to a file (default: tor-browser.log) +Or to save the logs to a file (default: tor-browser.log): `./start-tor-browser.desktop --log [file]`

1 0

[manual/develop] add gitlabCI for master branch. will-fix: https://gitlab.torproject.org/tpo/web/manual/-/issues/89
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit c271259b7dcd5c0c42a8d75fb0426eb8645a4deb Author: emma peel <emma.peel(a)riseup.net> Date: Sun Apr 25 08:08:48 2021 +0000 add gitlabCI for master branch. will-fix: https://gitlab.torproject.org/tpo/web/manual/-/issues/89 --- .gitlab-ci.yml | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..5245ef4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,69 @@ +image: python:3.9-slim-buster + +cache: + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} + paths: + - packages + - venv + - i18n + - 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 wheel + - pip3 install lektor + - echo 'checking out translations' + - > + if [ "i18n" ]; then + cd i18n && git checkout tbmanual-contentspot && git reset --hard && git pull && cd .. + else + git clone https://git.torproject.org/translation.git i18n + cd i18n && git checkout tbmanual-contentspot && cd .. + fi + - rm -rf i18n + - git clone https://git.torproject.org/translation.git i18n + - cd i18n && git checkout tbmanual-contentspot && cd .. + +pages: + script: + - 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 + artifacts: + paths: + - public + - i18n + only: + - master + +check_l10n: + script: + - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - pip3 install polib + - l10n/bin/check_markdown_links.py i18n/

1 0

[manual/develop] add new l10n test, remove unuccesful try to cache the translation.git repo
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit a9ab18348923a96ce13304edae1cb958adf6f5fb Author: emma peel <emma.peel(a)riseup.net> Date: Thu May 20 09:58:04 2021 +0200 add new l10n test, remove unuccesful try to cache the translation.git repo --- .gitlab-ci.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40c8948..47a1c71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,18 +40,18 @@ before_script: - pip3 install wheel - pip3 install lektor - echo 'checking out translations' - - > - if [ "i18n" ]; then - cd i18n && git checkout tbmanual-contentspot && git reset --hard && git pull && cd .. - else - git clone https://git.torproject.org/translation.git i18n - cd i18n && git checkout tbmanual-contentspot && cd .. - fi + - rm -rf i18n + - git clone https://git.torproject.org/translation.git i18n + - cd i18n && git checkout tbmanual-contentspot && cd .. + - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - pip3 install polib pages: script: - 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 tbmanual-contentspot artifacts: paths: - public @@ -61,6 +61,4 @@ pages: check_l10n: script: - - git clone https://gitlab.torproject.org/tpo/community/l10n.git - - pip3 install polib - l10n/bin/check_markdown_links.py i18n/

1 0

[manual/develop] remove translation.git from cache
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit dcc592459d6b4b0096784e4b91904986942a4bb5 Author: emma peel <emma.peel(a)riseup.net> Date: Thu May 20 09:58:42 2021 +0200 remove translation.git from cache --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47a1c71..8b73e23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,6 @@ cache: paths: - packages - venv - - i18n - lego - apt-cache

1 0

[manual/develop] remove outdated clone process. now we check for the cached version, and only clone repo if we dont have it
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 6ea170d0c283209121f0de7e9d72568e4a5f69da Author: emma peel <emma.peel(a)riseup.net> Date: Sun Apr 25 08:31:14 2021 +0000 remove outdated clone process. now we check for the cached version, and only clone repo if we dont have it --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5245ef4..40c8948 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,9 +47,6 @@ before_script: git clone https://git.torproject.org/translation.git i18n cd i18n && git checkout tbmanual-contentspot && cd .. fi - - rm -rf i18n - - git clone https://git.torproject.org/translation.git i18n - - cd i18n && git checkout tbmanual-contentspot && cd .. pages: script:

1 0

[manual/develop] update lego
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 34e2cc37cf6475a08b62c64e3270d30622d01a3b Author: emma peel <emma.peel(a)riseup.net> Date: Wed May 19 21:54:52 2021 +0200 update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7bf3403..1e20c72 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7bf34035e6f44bc243fab1674c38ac81a18fbdbd +Subproject commit 1e20c72f727c838806183f2cbee300c96e686eb8

1 0

[manual/develop] install our plugins from lego
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 0039f8f495c1e44778f585ed9f854b93e6a016b0 Author: emma peel <emma.peel(a)riseup.net> Date: Thu May 20 10:32:35 2021 +0200 install our plugins from lego --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b73e23..165814f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,6 @@ before_script: - pip3 install virtualenv - virtualenv venv - source venv/bin/activate - - pip3 install wheel - pip3 install lektor - echo 'checking out translations' - rm -rf i18n @@ -48,6 +47,7 @@ before_script: pages: script: - echo 'building lektor 3 times to get translations in place' + - lektor plugins reinstall - 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 tbmanual-contentspot

1 0

[manual/develop] grammar. reported by translator, thanks!
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 07e0b9cde6eec26266d3c913534ec0214a11927b Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jun 22 18:02:45 2021 +0200 grammar. reported by translator, thanks! --- content/circumvention/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index e9bdc42..2b98024 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -24,7 +24,7 @@ Currently there are three pluggable transports available, but more are being dev obfs4 </td> <td> - obfs4 makes Tor traffic look random, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than its predecessor, obfs3 bridges. + obfs4 makes Tor traffic look random, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than its predecessors, obfs3 bridges. </td> </tr> <tr class="odd">

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2021