May 2020 - tor-commits - lists.torproject.org

[gettor/master] Set default log level for gettor to "info"
by cohosh＠torproject.org 05 May '20

05 May '20

commit b8d228adc2d24891e49d53d62ff93f7b45041cc2 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Apr 29 14:12:34 2020 -0400 Set default log level for gettor to "info" --- gettor/utils/commons.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gettor/utils/commons.py b/gettor/utils/commons.py index b769efc..981a21b 100644 --- a/gettor/utils/commons.py +++ b/gettor/utils/commons.py @@ -10,11 +10,13 @@ # # :license: This is Free Software. See LICENSE for license information. -from twisted.logger import Logger +from twisted.logger import Logger, LogLevel +from twisted.logger import FilteringLogObserver, LogLevelFilterPredicate from twisted.application import internet - # Define an application logger log = Logger(namespace="gettor") +predicate = LogLevelFilterPredicate(defaultLogLevel=LogLevel.info) +log.observer = FilteringLogObserver(log.observer, [predicate]) class BaseService(internet.TimerService): """

1 0

[gettor/master] Change levels at which service messages are logged
by cohosh＠torproject.org 05 May '20

05 May '20

commit 3670e782fd76e1d3eb0214656c601e2d541407ae Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Apr 29 14:26:54 2020 -0400 Change levels at which service messages are logged A lot of these are debug messages and don't need to be logged by default. --- gettor/services/email/sendmail.py | 12 ++++++------ gettor/services/twitter/twitterdm.py | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index cb2ab9a..a877ede 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -57,13 +57,13 @@ class Sendmail(object): :param message (string): Success details from the server. """ - log.info("Email sent successfully.") + log.debug("Email sent successfully.") def sendmail_errback(self, error): """ Errback if we don't/can't send the message. """ - log.debug("Could not send email.") + log.warn("Could not send email.") raise error def sendmail(self, email_addr, subject, body): @@ -198,7 +198,7 @@ class Sendmail(object): subject_msg = strings._("help_subject") elif command == "links": - log.info("Getting links for {} {}.".format(platform, language)) + log.debug("Getting links for {} {}.".format(platform, language)) links = yield self.conn.get_links( platform=platform, language=language, status="ACTIVE" ) @@ -208,12 +208,12 @@ class Sendmail(object): body_msg = self.build_body_message(link_msg, platform, file) subject_msg = strings._("links_subject") else: - log.info("Invalid gettor command {}.".format(command)) + log.warn("Invalid gettor command {}.".format(command)) yield self.conn.remove_request( id=id, service="email", date=date ) - log.info("Sending {} message.".format(request[1])) + log.debug("Sending {} message.".format(request[1])) yield self.sendmail( email_addr=id, @@ -235,7 +235,7 @@ class Sendmail(object): yield self.conn.remove_request( id=id, service="email", date=date ) - log.info("Error sending email: {}.".format(e)) + log.error("Error sending email: {}.".format(e)) except Exception as e: log.error("Error sending email: {}.".format(e)) diff --git a/gettor/services/twitter/twitterdm.py b/gettor/services/twitter/twitterdm.py index b0a1a48..109f06d 100644 --- a/gettor/services/twitter/twitterdm.py +++ b/gettor/services/twitter/twitterdm.py @@ -59,14 +59,14 @@ class Twitterdm(object): :param message (string): Success details from the server. """ - log.info("Message sent successfully.") + log.debug("Message sent successfully.") def twitter_errback(self, error): """ Errback if we don't/can't send the message. """ - log.debug("Could not send message.") + log.warn("Could not send message.") raise RuntimeError("{}".format(error)) @@ -131,7 +131,7 @@ class Twitterdm(object): if help_requests: strings.load_strings("en") try: - log.info("Got new help request.") + log.debug("Got new help request.") for request in help_requests: ids = json.loads("{}".format(request[0].replace("'", '"'))) @@ -140,7 +140,7 @@ class Twitterdm(object): date = request[5] hid = hashlib.sha256(twitter_id.encode('utf-8')) - log.info( + log.debug( "Sending help message to {}.".format( hid.hexdigest() ) @@ -166,11 +166,11 @@ class Twitterdm(object): ) except RuntimeError as e: - log.info("Error sending twitter message: {}.".format(e)) + log.error("Error sending twitter message: {}.".format(e)) elif link_requests: try: - log.info("Got new links request.") + log.debug("Got new links request.") for request in link_requests: ids = json.loads("{}".format(request[0].replace("'", '"'))) @@ -188,7 +188,7 @@ class Twitterdm(object): strings.load_strings(language) locale = locales[language]['locale'] - log.info("Getting links for {}.".format(platform)) + log.debug("Getting links for {}.".format(platform)) links = yield self.conn.get_links( platform=platform, language=locale, status="ACTIVE" ) @@ -225,7 +225,7 @@ class Twitterdm(object): body_msg += trings._("links_body_ending") hid = hashlib.sha256(twitter_id.encode('utf-8')) - log.info( + log.debug( "Sending links to {}.".format( hid.hexdigest() ) @@ -247,6 +247,6 @@ class Twitterdm(object): ) except RuntimeError as e: - log.info("Error sending message: {}.".format(e)) + log.error("Error sending message: {}.".format(e)) else: log.debug("No pending twitter requests. Keep waiting.")

1 0

[gettor/master] Delete service instance during shutdown
by cohosh＠torproject.org 05 May '20

05 May '20

commit 21645db1a39631276b69504cfde43f242360bdeb Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Apr 29 14:46:58 2020 -0400 Delete service instance during shutdown Before we were calling a non-existent shutdown function. These instances already have __del__ functions so we can just call those instead. --- gettor/services/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettor/services/__init__.py b/gettor/services/__init__.py index a99bf3b..bb87d49 100644 --- a/gettor/services/__init__.py +++ b/gettor/services/__init__.py @@ -57,7 +57,7 @@ class BaseService(internet.TimerService): """ log.info("SERVICE:: Stopping {} service.".format(self.name)) log.debug("SERVICE:: Calling shutdown on {}".format(self.name)) - self.instance.shutdown() + del self.instance log.debug("SERVICE:: Shutdown for {} done".format(self.name)) internet.TimerService.stopService(self) log.info("SERVICE:: Service stopped.")

1 0

[tpo/master] Make alert banner responsive
by gus＠torproject.org 05 May '20

05 May '20

commit 2e208215a2e4ec35b8331cfb194f1cb41703cdfd Author: gus <gus(a)torproject.org> Date: Fri May 1 15:35:38 2020 -0400 Make alert banner responsive --- templates/thank-you.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/thank-you.html b/templates/thank-you.html index 0c9f8d3e..d602d8ba 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -1,6 +1,6 @@ <div class="container"> <div class="row border-bottom border-light"> - <div class="badge content bg-warning p-3 mb-5 mx-auto text-lowercase"> + <div class="alert content bg-warning p-3 mb-5 mx-auto text-lowercase"> {{ _('We need your help to keep Tor secure and safe for millions across the globe.') }} <a href="/donate">{{ _('Donate Now') }}</a> </div>

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 04 May '20

04 May '20

commit 47ce0920e024b2474071b9313685cc1b2758c2c6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 12:48:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- hr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hr.po b/hr.po index 8e6f891bdc..ea7b389df1 100644 --- a/hr.po +++ b/hr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Emma Peel, 2020 # milotype <mail(a)milotype.de>, 2020 # Vlado V. <vlays(a)mail.com>, 2015 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-04-10 13:45+0000\n" -"Last-Translator: milotype <mail(a)milotype.de>\n" +"PO-Revision-Date: 2020-05-04 12:41+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1019,7 +1020,7 @@ msgstr "Dokumentacija" msgid "" "Remove {package} from your additional software? This will stop installing " "the package automatically." -msgstr "Ukloniti {packages} iz tvog dodatnog softvera? Ovo će automatski prekinuti instaliranje paketa." +msgstr "Ukloniti {package} iz tvog dodatnog softvera? Ovo će automatski prekinuti instaliranje paketa." #. Translators: Don't translate {pkg}, it's a placeholder and will be #. replaced.

1 0

[translation/tails-misc_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
by translation＠torproject.org 04 May '20

04 May '20

commit 15b2782ed8ad653327c9702a8c258068a3324147 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 12:47:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed --- hr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hr.po b/hr.po index 8e6f891bdc..ea7b389df1 100644 --- a/hr.po +++ b/hr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Emma Peel, 2020 # milotype <mail(a)milotype.de>, 2020 # Vlado V. <vlays(a)mail.com>, 2015 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-04-10 13:45+0000\n" -"Last-Translator: milotype <mail(a)milotype.de>\n" +"PO-Revision-Date: 2020-05-04 12:41+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1019,7 +1020,7 @@ msgstr "Dokumentacija" msgid "" "Remove {package} from your additional software? This will stop installing " "the package automatically." -msgstr "Ukloniti {packages} iz tvog dodatnog softvera? Ovo će automatski prekinuti instaliranje paketa." +msgstr "Ukloniti {package} iz tvog dodatnog softvera? Ovo će automatski prekinuti instaliranje paketa." #. Translators: Don't translate {pkg}, it's a placeholder and will be #. replaced.

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 04 May '20

04 May '20

commit c1fefa8e9997b37f90b1b5ae385b81531a3b0c17 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 12:47:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- hr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hr.po b/hr.po index 8e6f891bdc..ea7b389df1 100644 --- a/hr.po +++ b/hr.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Emma Peel, 2020 # milotype <mail(a)milotype.de>, 2020 # Vlado V. <vlays(a)mail.com>, 2015 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-04-10 13:45+0000\n" -"Last-Translator: milotype <mail(a)milotype.de>\n" +"PO-Revision-Date: 2020-05-04 12:41+0000\n" +"Last-Translator: Emma Peel\n" "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1019,7 +1020,7 @@ msgstr "Dokumentacija" msgid "" "Remove {package} from your additional software? This will stop installing " "the package automatically." -msgstr "Ukloniti {packages} iz tvog dodatnog softvera? Ovo će automatski prekinuti instaliranje paketa." +msgstr "Ukloniti {package} iz tvog dodatnog softvera? Ovo će automatski prekinuti instaliranje paketa." #. Translators: Don't translate {pkg}, it's a placeholder and will be #. replaced.

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 04 May '20

04 May '20

commit 194abc82bb65773104d0e3c93197976454afd4af Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 11:15:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+pt-PT.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 122cba39bd..e15a0cb5d5 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -8700,6 +8700,9 @@ msgid "" "censorship/docker-obfs4-bridge/raw/master/Makefile), and then write your " "bridge configuration to a new file, bridge.sh." msgstr "" +"Primeiro, [transfira \"Makefile\"](https://dip.torproject.org/torproject" +"/anti-censorship/docker-obfs4-bridge/raw/master/Makefile), e depois escreva " +"a sua configuração da ponte para um novo ficheiro, bridge.sh." #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 04 May '20

04 May '20

commit a74ba88e0a231f7c640f0da944cfed0d74686c96 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 10:54:48 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-PT.po | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 84e80d72bd..1194a5ca67 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -398,9 +398,9 @@ msgid "" "software without errors, the given checksum and the checksum of your " "downloaded file will be identical." msgstr "" -"A soma de verificação (checksum) são valores [hash](../hash) de ficheiros. " -"Se transferiu o software sem erros, a soma de verificação fornecida e a soma" -" de verificação do ficheiro que transferiu serão idênticas." +"A \"soma de verificação\" são valores de ficheiros [hash](../hash). Se " +"transferiu o ''software'' sem erros, a \"soma de verificação\" fornecida e a" +" \"soma de verificação\" do ficheiro que transferiu serão idênticas." #: https//support.torproject.org/glossary/circuit/ #: (content/glossary/circuit/contents+en.lrword.term) @@ -3342,7 +3342,7 @@ msgstr "" "Cada ficheiro na nossa [página de " "transferências](https://www.torproject.org/download/) está acompanhado por " "um ficheiro com o mesmo nome do programa com a extensão \".asc\". Estes " -"ficheiros .asc são assinaturas OpenPGP." +"ficheiros .asc são assinaturas de OpenPGP." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -4201,10 +4201,10 @@ msgid "" "that by using Tor Mobile on Chrome OS, you will view the mobile (not " "desktop) versions of websites." msgstr "" -"Pode correr o [Tor Browser para " +"Poderia executar o [Tor Browser para " "Android](https://www.torproject.org/download/#android) no Chrome OS. Note " -"que ao usar o Tor Mobile no Chrome OS, irá ver as versões mobile (não " -"desktop) dos sites." +"que ao usar Tor Mobile no Chrome OS, irá ver as versões de dispositivos " +"móveis dos ''sites'' da Web (não de PC)." #: https//support.torproject.org/tbb/tbb-15/ #: (content/tbb/tbb-15/contents+en.lrquestion.description) @@ -5689,6 +5689,10 @@ msgid "" "specifically for Android. Installing Tor Browser for Android is all you need" " to run Tor on your Android device." msgstr "" +"Sim, está disponível uma versão do [Tor " +"Browser](https://www.torproject.org/download/#android) especificamente para " +"Android. Tudo o que precisa é instalar o Tor Browser para Android para " +"executar o Tor no seu dispositivo Android." #: https//support.torproject.org/tormobile/tormobile-1/ #: (content/tormobile/tormobile-1/contents+en.lrquestion.description) @@ -5753,6 +5757,8 @@ msgid "" "Download Onion Browser from the [App Store](https://itunes.apple.com/us/app" "/onion-browser/id519296448)." msgstr "" +"Transferir Onion Browser da [Loja de " +"Aplicações](https://itunes.apple.com/us/app/onion-browser/id519296448)." #: https//support.torproject.org/tormobile/tormobile-4/ #: (content/tormobile/tormobile-4/contents+en.lrquestion.title) @@ -5779,6 +5785,10 @@ msgid "" "Android](https://www.torproject.org/download/#android) Orfox has been " "[retired](https://blog.torproject.org/orfox-paved-way-tor-browser-android)." msgstr "" +"Com o lançamento do [Tor Browser para " +"Android](https://www.torproject.org/download/#android) Orfox foi " +"[cancelado](https://blog.torproject.org/orfox-paved-way-tor-browser-" +"android)." #: https//support.torproject.org/tormobile/tormobile-6/ #: (content/tormobile/tormobile-6/contents+en.lrquestion.title) @@ -5840,6 +5850,9 @@ msgid "" "enabling the [Guardian Project's " "Repository](https://guardianproject.info/fdroid/)." msgstr "" +"Entretanto, pode usar F-Droid para transferir o Tor Browser para Android, " +"ativando o [Repositório do Projeto Guardian] " +"(https://guardianproject.info/fdroid/)" #: https//support.torproject.org/tormobile/tormobile-7/ #: (content/tormobile/tormobile-7/contents+en.lrquestion.description) @@ -5916,10 +5929,11 @@ msgid "" " download](/tbb/how-to-verify-signature/)), the fingerprint of the key used " "to make the signature, and the package’s checksum." msgstr "" -"O GetTor responde com um e-mail contendo links dos quais pode descarregar o " -"Tor Browser, a assinatura criptográfica (necessária para [verificar o " -"descarregamento](/tbb/how-to-verify-signature/)), a impressão digital da " -"chave usada para fazer a assinatura e o checksum do pacote." +"GetTor irá responder com um ''e-mail'' contendo as hiperligações das quais " +"pode transferir o Tor Browser, a assinatura criptográfica (necessária para " +"[verificar a transferência](/tbb/how-to-verify-signature/)), a impressão " +"digital da chave utilizada para criar a assinatura e a \"soma de " +"verificação\" do pacote." #: https//support.torproject.org/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description)

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 04 May '20

04 May '20

commit e43d2157bd48a31f3f0bd8b4c33cd00e8bd28239 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 4 10:54:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+pt-PT.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 4b49d31c2c..1885c878ed 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -1203,7 +1203,7 @@ msgstr "Transfira em outro idioma ou plataforma" #: templates/hero-download.html:50 msgid "Download the latest alpha build" -msgstr "Transfira a última compilação alpha" +msgstr "Transferir a última compilação alfa" #: templates/hero-download.html:55 msgid "Read the latest release announcements"

1 0