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

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit 9478009f97878e78319d465294459636691f0a22 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 12:20:26 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 2a6dfb8f9..6e00c17f5 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -472,6 +472,12 @@ msgid "" " You will then be taken to the [Circumvention](/circumvention) screen to " "configure a pluggable transport." msgstr "" +"A primeira tela pergunta se a sua conexão bloqueia ou censura o seu acesso à" +" rede Tor. Se você não acredita que seja o caso, selecione “Não”. Se você " +"souber que a sua conexão é cesurada ou se você tiver tentado mas não " +"conseguido se conectar à rede Tor, e que nenhuma solução tiver dado certo, " +"selecione “Sim”. A tela [Driblar a censura](/circumvention) será aberta para" +" que você configure um transportador plugável." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -854,6 +860,12 @@ msgid "" "transports”. See the [Pluggable Transports](/en-US/transports) page for more" " information on the types of transport that are currently available." msgstr "" +"Pode acontecer de o acesso direto à rede Tor ser bloqueado pelo seu provedor" +" de serviço de Internet ou por algum governo. O Navegador Tor inclui algumas" +" ferramentas anticensura para driblar esses bloqueios. Essas ferramentas " +"são chamadas \"transportadores plugáveis\". Consulte a página " +"[Transportadores Plugáveis](/en-US/transports) para saber mais sobre os " +"tipos de transportadores atualmente disponíveis." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -2086,8 +2098,8 @@ msgid "" "[Circumvention](/circumvention) section for possible solutions." msgstr "" "Se você continua não conseguindo se conectar, seu Provedor de Serviço " -"Internet pode estar censurando conexões ao Navegador Tor. Leia a seção " -"[Driblar a Censura](/circumvention) para possíveis soluções." +"Internet pode estar censurando conexões ao Navegador Tor. Leia a seção de " +"[Driblar a censura](/circumvention) para possíveis soluções." #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body)

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit 3f0e997074dadfda95df5c55c385cb7fc4535bdd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 12:16:11 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- sk/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/https-everywhere.dtd b/sk/https-everywhere.dtd index d0c7d61d3..01e4bc409 100644 --- a/sk/https-everywhere.dtd +++ b/sk/https-everywhere.dtd @@ -45,7 +45,7 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "Rozšírenie HTTPS Everywhere zaznamenalo, že ste sa pokúsili dostať na nezabezpečenú verziu stránky a pokúsilo sa vám poskytnúť jej zabezpečenú verziu. Táto však nie je dostupná. S najväčšou pravdepodobnosťou stránka nepodporuje HTTPS, no je taktiež možné, že útočník blokuje jej zabezpečenú verziu. Ak si chcete pozrieť nezabezpečenú verziu stránky, zrušte zaškrtnutie možnosti „Šifrovať všetky vhodné stránky (EASE)“ v možnostiach tohto rozšírenia. Berte však na vedomie, že tak môžete svoj prehliadač vystaviť riziku útoku typu network-based downgrade."> <!ENTITY https-everywhere.cancel.he_blocking_network "útok typu network-based downgrade"> <!ENTITY https-everywhere.cancel.open_page "Otvoriť nezabezpečenú stránku"> -<!ENTITY https-everywhere.cancel.http_once "Open insecure page for this session only"> +<!ENTITY https-everywhere.cancel.http_once "Otvoriť nezabezpečenú stránku len pre túto reláciu"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "Nastavenia pre túto stránku"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Zmeniť nastavenia pre šifrované spojenia">

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit cec057da05f77f2e4a683bcc39bb88e889c2249d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 12:15:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- sk/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/aboutTor.dtd b/sk/aboutTor.dtd index 697b66a51..b2879b539 100644 --- a/sk/aboutTor.dtd +++ b/sk/aboutTor.dtd @@ -34,4 +34,4 @@  <!ENTITY aboutTor.ey2019.mozilla "Prispejte dnes, a Mozilla prispeje rovnakou sumou."> <!ENTITY aboutTor.ey2019.tracking "Stopovanie, sledovanie a cenzúra sú online veľmi rozšírené."> -<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor"> +<!ENTITY aboutTor.ey2019.takeback "Získajte internet späť prostredníctvom sieťe Tor">

1 0

[tpo/staging] add Dutch to the website translations
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 1ec37ecc6245275ff519df6cceed964448f4d7c7 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 12:54:57 2019 +0100 add Dutch to the website translations --- configs/i18n.ini | 2 +- tpo.lektorproject | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index a2cb42d..6647fc6 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = ar,bn,ca,da,de,es,fr,he,hu,id,is,it,ja,ka,ko,ms,pl,pt-BR,pt-PT,ro,ru,th,tr,zh-CN +translations = ar,bn,ca,da,de,es,fr,he,hu,id,is,it,ja,ka,ko,ms,nl,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/tpo.lektorproject b/tpo.lektorproject index 752881b..463643e 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -90,6 +90,11 @@ name = Melayu (ms) url_prefix = /ms/ locale = ms +[alternatives.nl] +name = Nederlands (nl) +url_prefix = /nl/ +locale = nl + [alternatives.pl] name = polski (pl) url_prefix = /pl/

1 0

[tpo/staging] add Dutch language
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 40dbd8fa9c68ffb9edd12fa9898fbcf0d88153bb Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 12:55:45 2019 +0100 add Dutch language --- databags/about+nl.ini | 1 + databags/menu+nl.ini | 1 + databags/menu_footer+nl.ini | 1 + 3 files changed, 3 insertions(+) diff --git a/databags/about+nl.ini b/databags/about+nl.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+nl.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/menu+nl.ini b/databags/menu+nl.ini new file mode 120000 index 0000000..1fa7edf --- /dev/null +++ b/databags/menu+nl.ini @@ -0,0 +1 @@ +../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu_footer+nl.ini b/databags/menu_footer+nl.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+nl.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit fadb79b0e1c5179efa09a75dde5f7506cbb2a758 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 11:50:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+pt-BR.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 8a77ec6b6..4b49320dd 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -757,7 +757,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) msgid "CIRCUMVENTION" -msgstr "" +msgstr "DRIBLAR A CENSURA" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.description) @@ -1822,6 +1822,9 @@ msgid "" "censoring connections to the Tor network. Read the " "[Circumvention](/circumvention) section for possible solutions." msgstr "" +"Se você continua não conseguindo se conectar, seu Provedor de Serviço " +"Internet pode estar censurando conexões ao Navegador Tor. Leia a seção " +"[Driblar a Censura](/circumvention) para possíveis soluções." #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit e7c1fb0d575da587fabd8f35788857ebd4e06448 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 11:50:29 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 14febc140..2a6dfb8f9 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -838,7 +838,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) msgid "CIRCUMVENTION" -msgstr "CIRCUMENTAÇÃO" +msgstr "DRIBLAR A CENSURA" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.description) @@ -2086,8 +2086,8 @@ msgid "" "[Circumvention](/circumvention) section for possible solutions." msgstr "" "Se você continua não conseguindo se conectar, seu Provedor de Serviço " -"Internet pode estar censurando conexões ao Navegador Tor. Leia a seção de " -"[Circumentação](/circumvention) para possíveis soluções." +"Internet pode estar censurando conexões ao Navegador Tor. Leia a seção " +"[Driblar a Censura](/circumvention) para possíveis soluções." #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body)

1 0

[tpo/staging] fix text direction
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 7dd5b3ccda04147a4a4c4421f78c7a112c4540f6 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 12:40:14 2019 +0100 fix text direction --- databags/alternatives.ini | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/databags/alternatives.ini b/databags/alternatives.ini index e4bbd2d..b7c88aa 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -53,7 +53,7 @@ url = /he/ language = עברית (he) [hu] -direction = text-right +direction = text-left order = order-last url = /hu/ language = Magyar nyelv (hu) @@ -100,6 +100,12 @@ order = order-last language = Melayu (ms) url = /ms/ +[nl] +direction = text-left +order = order-last +url = /nl/ +language = Nederlands (nl) + [pl] direction = text-left order = order-last

1 0

[tor/release-0.4.2] shellcheck: Start checking most scripts for errors
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 57baea701f8852b94d8ebc3fd8e70ccc998f5036 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 15:40:39 2019 +1000 shellcheck: Start checking most scripts for errors This check was accidentally disabled by a bad find command. Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code. --- changes/bug32402 | 3 +++ scripts/maint/checkShellScripts.sh | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/changes/bug32402 b/changes/bug32402 new file mode 100644 index 000000000..0654389be --- /dev/null +++ b/changes/bug32402 @@ -0,0 +1,3 @@ + o Minor bugfixes (shellcheck): + - Start checking most scripts for shellcheck errors again. + Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/scripts/maint/checkShellScripts.sh b/scripts/maint/checkShellScripts.sh index 318f0fb57..4c872c7ee 100755 --- a/scripts/maint/checkShellScripts.sh +++ b/scripts/maint/checkShellScripts.sh @@ -35,12 +35,8 @@ if [ ! -d "$TOPLEVEL/src" ]; then fi # Check *.sh scripts, but ignore the ones that we can't fix -find "$TOPLEVEL" \ +find "$TOPLEVEL/contrib" "$TOPLEVEL/doc" "$TOPLEVEL/scripts" "$TOPLEVEL/src" \ -name "*.sh" \ - -path "$TOPLEVEL/contrib/*" \ - -path "$TOPLEVEL/doc/*" \ - -path "$TOPLEVEL/scripts/*" \ - -path "$TOPLEVEL/src/*" \ -not -path "$TOPLEVEL/src/ext/*" \ -not -path "$TOPLEVEL/src/rust/registry/*" \ -exec shellcheck {} +

1 0

[tor/release-0.4.2] shellcheck: Fix issues in the git-*.sh scripts
by teor＠torproject.org 06 Nov '19

06 Nov '19

commit 7f23d47f723edeea206d5438af3d109dbb4ac835 Author: teor <teor(a)torproject.org> Date: Wed Nov 6 15:52:18 2019 +1000 shellcheck: Fix issues in the git-*.sh scripts Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code. --- changes/bug32402_git_scripts | 3 +++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 21 +++++++++++---------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/changes/bug32402_git_scripts b/changes/bug32402_git_scripts new file mode 100644 index 000000000..2b10a8998 --- /dev/null +++ b/changes/bug32402_git_scripts @@ -0,0 +1,3 @@ + o Minor bugfixes (shellcheck): + - Fix minor shellcheck errors in the git-*.sh scripts. + Fixes bug 32402; bugfix on 0.4.2.1-alpha. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index e481b4097..bdd0da5b7 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 0d6daf432..dc1606638 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index a388f0156..7c43fe24d 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { @@ -237,7 +237,7 @@ if [ "$PUSH_SAME" -eq 0 ] && [ "$TEST_BRANCH_PREFIX" ]; then fi done if [ "$SKIP_UPSTREAM" ]; then - printf "Skipping unchanged: %s remote: %s\n" \ + printf "Skipping unchanged: %s remote: %s\\n" \ "$b" "$SKIP_UPSTREAM" else if [ "$NEW_PUSH_BRANCHES" ]; then @@ -261,18 +261,19 @@ if [ "$PUSH_DELAY" -le 0 ]; then $GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES else # Push the branches in optimal CI order, with a delay between each push - PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) - MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) + PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | sort -V) + MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep master) if [ -z "$TEST_BRANCH_PREFIX" ]; then - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) - RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ - tr "\n" " ") - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \ + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep maint) + RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep release | \ + tr "\\n" " ") + printf \ + "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n%s\\n" \ "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" else # Actually test branches based on maint branches - MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) - printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n" \ + MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep -v master) + printf "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n" \ "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" # No release branches RELEASE_BRANCHES=

1 0