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

[translation/whisperback_completed] https://gitweb.torproject.org/translation.git/commit/?h=whisperback_completed
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit b01f4589c07b62307221eab108f2d91a2f86c96e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:24:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback_complet… --- da/da.po | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) diff --git a/da/da.po b/da/da.po new file mode 100644 index 0000000000..9dd9d1b1c5 --- /dev/null +++ b/da/da.po @@ -0,0 +1,233 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Caspar Christensen, 2013 +# scootergrisen, 2017-2020 +# Tore Bjørnson <tore.bjornson(a)gmail.com>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-04-29 12:08+0200\n" +"PO-Revision-Date: 2020-04-29 14:57+0000\n" +"Last-Translator: scootergrisen\n" +"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: da\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "Kontaktens e-mail er ugyldig: %s" + +#: ../whisperBack/whisperback.py:83 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "Kontaktens OpenPGP-nøgle er ugyldig: %s" + +#: ../whisperBack/whisperback.py:85 +msgid "Invalid contact OpenPGP public key block" +msgstr "Kontaktens offentlig nøgle-blok for OpenPGP er ugyldig" + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The %s variable was not found in any of the configuration files " +"/etc/whisperback/config.py, ~/.whisperback/config.py, or ./config.py" +msgstr "Variablen %s blev ikke fundet i nogen af konfigurationsfilerne /etc/whisperback/config.py, ~/.whisperback/config.py eller ./config.py" + +#: ../whisperBack/gui.py:114 +msgid "Name of the affected software" +msgstr "Navnet på det påvirkede software" + +#: ../whisperBack/gui.py:116 +msgid "Exact steps to reproduce the error" +msgstr "Præcise trin til er reproducere fejlen" + +#: ../whisperBack/gui.py:118 +msgid "Actual result and description of the error" +msgstr "Resultatet og beskrivelse af fejlen" + +#: ../whisperBack/gui.py:120 +msgid "Desired result" +msgstr "Ønsket resultat" + +#: ../whisperBack/gui.py:133 +msgid "Unable to load a valid configuration." +msgstr "Kan ikke indlæse en gyldig konfiguration." + +#: ../whisperBack/gui.py:170 +msgid "Sending mail..." +msgstr "Sender mail..." + +#: ../whisperBack/gui.py:171 +msgid "Sending mail" +msgstr "Sender mail" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:173 +msgid "This could take a while..." +msgstr "Det kan tage et stykke tid..." + +#: ../whisperBack/gui.py:189 +msgid "The contact email address doesn't seem valid." +msgstr "Kontaktens e-mailadressen ser ikke ud til at være gyldig." + +#: ../whisperBack/gui.py:206 +msgid "Unable to send the mail: SMTP error." +msgstr "Kan ikke sende mailen: fejl ved SMTP." + +#: ../whisperBack/gui.py:208 +msgid "Unable to connect to the server." +msgstr "Kan ikke oprette forbindelse til serveren." + +#: ../whisperBack/gui.py:210 +msgid "Unable to create or to send the mail." +msgstr "Kan ikke oprette eller sende mailen." + +#: ../whisperBack/gui.py:213 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "\n\nFejlrapporten kunne ikke sende, sandsynligvis pga. netværksproblemer. Prøv venligst at genoprette forbindelsen til netværket og klik på send igen.\n\nVirker det ikke, så får du mulighed for at gemme fejlrapporten." + +#: ../whisperBack/gui.py:226 +msgid "Your message has been sent." +msgstr "Din meddelelse er blevet sendt." + +#: ../whisperBack/gui.py:233 +msgid "An error occured during encryption." +msgstr "Der opstod en fejl under krypteringen." + +#: ../whisperBack/gui.py:253 +#, python-format +msgid "Unable to save %s." +msgstr "Kan ikke gemme %s." + +#: ../whisperBack/gui.py:276 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "Fejlrapporten kunne ikke sendes, sandsynligvis pga. netværksproblemer.\n\nSom en midlertidig løsning kan du gemme fejlrapporten som en fil på et USB-drev og prøve at sende den til os på %s fra din e-mailkonto på et andet system. Bemærk at din fejlrapport ikke længere er anonym, med mindre du selv foretager yderligere trin (f.eks. bruger Tor med en \"smid ud\"-e-mailkonto).\n\nVil du gemme fejlrapporten til en fil?" + +#: ../whisperBack/gui.py:338 ../data/whisperback.ui.h:21 +msgid "WhisperBack" +msgstr "WhisperBack" + +#: ../whisperBack/gui.py:339 ../data/whisperback.ui.h:2 +msgid "Send feedback in an encrypted mail." +msgstr "Send feedback i en krypteret mail." + +#: ../whisperBack/gui.py:342 +msgid "Copyright © 2009-2018 Tails developers (tails(a)boum.org)" +msgstr "Ophavsret © 2009-2018 Tails-udviklere (tails(a)boum.org)" + +#: ../whisperBack/gui.py:343 +msgid "Tails developers <tails(a)boum.org>" +msgstr "Tails-udviklere <tails(a)boum.org>" + +#: ../whisperBack/gui.py:344 +msgid "translator-credits" +msgstr "scootergrisen" + +#: ../whisperBack/gui.py:377 +msgid "This doesn't seem to be a valid URL or OpenPGP key." +msgstr "Det ser ikke ud til at være en valid URL eller OpenPGP-nøgle." + +#: ../data/whisperback.ui.h:1 +msgid "Copyright © 2009-2018 tails(a)boum.org" +msgstr "Ophavsret © 2009-2018 tails(a)boum.org" + +#: ../data/whisperback.ui.h:3 +msgid "https://tails.boum.org/" +msgstr "https://tails.boum.org/" + +#: ../data/whisperback.ui.h:4 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2018 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - Send feedback i en krypteret mail\nOphavsret (C) 2009-2018 Tails-udviklere <tails(a)boum.org>\n\nDette program er fri software; du kan videredistribuere det og/eller ændre\ndet i henhold til GNU General Public License som udgivet af\nFree Software Foundation; enten version 3 af licensen, eller (efter\neget valg) en hvilken som helst senere version.\n\nDette program er distribueret i håbet om at det vil være anvendeligt, men\nUDEN NOGEN GARANTI; uden selv den underforståede garanti for\nSALGSBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Læs GNU\nGeneral Public License for flere detaljer.\n\nDu burde have modtaget en kopi af GNU General Public License\nsammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>.\n" + +#: ../data/whisperback.ui.h:20 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "Hvis du vil have os til at kryptere meddelelser når vi besvarer dig, så tilføj dit nøgle-ID, et link til din nøgle eller din nøgle som en offentlig nøgle-blok:" + +#: ../data/whisperback.ui.h:22 +msgid "Summary" +msgstr "Opsummering" + +#: ../data/whisperback.ui.h:23 +msgid "Bug description" +msgstr "Fejlbeskrivelse" + +#: ../data/whisperback.ui.h:24 +msgid "Help:" +msgstr "Hjælp:" + +#: ../data/whisperback.ui.h:25 +msgid "Read our bug reporting guidelines." +msgstr "Læs vores fejlrapporteringsretningslinjer." + +#: ../data/whisperback.ui.h:26 +msgid "Email address (if you want an answer from us)" +msgstr "E-mailadresse (hvis du vil have et svar fra os)" + +#: ../data/whisperback.ui.h:27 +msgid "optional PGP key" +msgstr "valgfri PGP-nøgle" + +#: ../data/whisperback.ui.h:28 +msgid "Technical details to include" +msgstr "Tekniske detaljer som skal med" + +#: ../data/whisperback.ui.h:29 +msgid "headers" +msgstr "headere" + +#: ../data/whisperback.ui.h:30 +msgid "debugging info" +msgstr "fejlretningsinformation" + +#: ../data/whisperback.ui.h:31 +msgid "Send" +msgstr "Send" + +#: ../data/whisperback.desktop.in.h:1 +msgid "WhisperBack Error Reporting" +msgstr "WhisperBack-fejlrapportering" + +#: ../data/whisperback.desktop.in.h:2 +msgid "Send feedback via encrypted e-mail" +msgstr "Send feedback via krypteret e-mail" + +#: ../data/whisperback.desktop.in.h:3 +msgid "feedback;bug;report;tails;error;" +msgstr "feedback;fejl;rapport;tails;"

1 0

[translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit a6c2e4b86668bbafe6019fd17dac817e75ad14c3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:24:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- da/da.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/da/da.po b/da/da.po index 268dad6348..9dd9d1b1c5 100644 --- a/da/da.po +++ b/da/da.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2020-04-29 14:53+0000\n" +"PO-Revision-Date: 2020-04-29 14:57+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -178,7 +178,7 @@ msgstr "WhisperBack - Send feedback i en krypteret mail\nOphavsret (C) 2009-2018 msgid "" "If you want us to encrypt messages when we respond to you, add your key ID, " "a link to your key, or the key as a public key block:" -msgstr "Hvis du vil have os til at kryptere beskeder når vi svarer dig, så tilføj venligst dit nøgle-ID, et link til din nøgle eller din nøgle som en offentlig nøgle-blok:" +msgstr "Hvis du vil have os til at kryptere meddelelser når vi besvarer dig, så tilføj dit nøgle-ID, et link til din nøgle eller din nøgle som en offentlig nøgle-blok:" #: ../data/whisperback.ui.h:22 msgid "Summary" @@ -198,7 +198,7 @@ msgstr "Læs vores fejlrapporteringsretningslinjer." #: ../data/whisperback.ui.h:26 msgid "Email address (if you want an answer from us)" -msgstr "E-mailadresse (hvis du vil have svar fra os)" +msgstr "E-mailadresse (hvis du vil have et svar fra os)" #: ../data/whisperback.ui.h:27 msgid "optional PGP key" @@ -214,7 +214,7 @@ msgstr "headere" #: ../data/whisperback.ui.h:30 msgid "debugging info" -msgstr "fejlretningsinfo" +msgstr "fejlretningsinformation" #: ../data/whisperback.ui.h:31 msgid "Send" @@ -222,7 +222,7 @@ msgstr "Send" #: ../data/whisperback.desktop.in.h:1 msgid "WhisperBack Error Reporting" -msgstr "WhisperBack Fejlrapportering" +msgstr "WhisperBack-fejlrapportering" #: ../data/whisperback.desktop.in.h:2 msgid "Send feedback via encrypted e-mail"

1 0

[translation/torbutton-securitylevelproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties_completed
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit dd70608eb77a2aed338aa468b9b5b38bebaaff37 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:23:35 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securityl… --- da/securitylevel.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da/securitylevel.properties b/da/securitylevel.properties index 5058084b1f..c183723b15 100644 --- a/da/securitylevel.properties +++ b/da/securitylevel.properties @@ -1,13 +1,13 @@ securityLevel.securityLevel = Sikkerhedsniveau -securityLevel.customWarning = Brugerdefineret +securityLevel.customWarning = Tilpasset securityLevel.overview = Deaktivér bestemte webfunktionaliteter som kan bruges til angribe din sikkerhed og anonymitet. securityLevel.standard.level = Standard securityLevel.standard.tooltip = Sikkerhedsniveau : Standard securityLevel.standard.summary = Alle Tor Browser- og webstedsfunktionaliteter er aktiveret. securityLevel.safer.level = Mere sikker securityLevel.safer.tooltip = Sikkerhedsniveau : Mere sikker -securityLevel.safer.summary = Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister deres funktionalitet. -securityLevel.safer.description1 = JavaScript er deaktiveret på ikke-HTTPS steder. +securityLevel.safer.summary = Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister funktionalitet. +securityLevel.safer.description1 = JavaScript er deaktiveret på ikke-HTTPS-steder. securityLevel.safer.description2 = Nogle skrifttyper og matematiksymboler er deaktiverede. securityLevel.safer.description3 = Lyd og video (HTML5-medier) og WebGL er klik-for-at-afspille. securityLevel.safest.level = Mest sikker @@ -18,5 +18,5 @@ securityLevel.safest.description2 = Nogle skrifttyper, ikoner, matematiksymboler securityLevel.safest.description3 = Lyd og video (HTML5-medier) er klik-for-at-afspille. securityLevel.custom.summary = Dine tilpassede browserpræferencer har resulterede i usædvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsårsagen, anbefaler vi at du vælger en af standardsikkerhedsniveauerne. securityLevel.learnMore = Lær mere -securityLevel.restoreDefaults = Gendan Standarder +securityLevel.restoreDefaults = Gendan standarder securityLevel.advancedSecuritySettings = Avancerede sikkerhedsindstillinger…

1 0

[translation/torbutton-securitylevelproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit e8987b07e19d4da781df37f1f31e089b5436f6db Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:23:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securityl… --- da/securitylevel.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da/securitylevel.properties b/da/securitylevel.properties index 5058084b1f..c183723b15 100644 --- a/da/securitylevel.properties +++ b/da/securitylevel.properties @@ -1,13 +1,13 @@ securityLevel.securityLevel = Sikkerhedsniveau -securityLevel.customWarning = Brugerdefineret +securityLevel.customWarning = Tilpasset securityLevel.overview = Deaktivér bestemte webfunktionaliteter som kan bruges til angribe din sikkerhed og anonymitet. securityLevel.standard.level = Standard securityLevel.standard.tooltip = Sikkerhedsniveau : Standard securityLevel.standard.summary = Alle Tor Browser- og webstedsfunktionaliteter er aktiveret. securityLevel.safer.level = Mere sikker securityLevel.safer.tooltip = Sikkerhedsniveau : Mere sikker -securityLevel.safer.summary = Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister deres funktionalitet. -securityLevel.safer.description1 = JavaScript er deaktiveret på ikke-HTTPS steder. +securityLevel.safer.summary = Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister funktionalitet. +securityLevel.safer.description1 = JavaScript er deaktiveret på ikke-HTTPS-steder. securityLevel.safer.description2 = Nogle skrifttyper og matematiksymboler er deaktiverede. securityLevel.safer.description3 = Lyd og video (HTML5-medier) og WebGL er klik-for-at-afspille. securityLevel.safest.level = Mest sikker @@ -18,5 +18,5 @@ securityLevel.safest.description2 = Nogle skrifttyper, ikoner, matematiksymboler securityLevel.safest.description3 = Lyd og video (HTML5-medier) er klik-for-at-afspille. securityLevel.custom.summary = Dine tilpassede browserpræferencer har resulterede i usædvanlige sikkerhedsindstillinger. Pga. sikkerheds- og privatlivsårsagen, anbefaler vi at du vælger en af standardsikkerhedsniveauerne. securityLevel.learnMore = Lær mere -securityLevel.restoreDefaults = Gendan Standarder +securityLevel.restoreDefaults = Gendan standarder securityLevel.advancedSecuritySettings = Avancerede sikkerhedsindstillinger…

1 0

[gettor/master] Refactor to dry out sendmail
by cohosh＠torproject.org 29 Apr '20

29 Apr '20

commit 390120a0f926449e833705ec5323d80bb70f3327 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Apr 27 18:26:03 2020 -0400 Refactor to dry out sendmail Instead of processing link and help requests separately, we can process them together and use the command to determine the different subject and body messages. Removed unused code and simplified database command. --- gettor/services/email/sendmail.py | 135 +++++++++++++------------------------- gettor/utils/db.py | 7 +- tests/test_db.py | 16 ++--- 3 files changed, 57 insertions(+), 101 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index c4fdc95..cb2ab9a 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -168,77 +168,36 @@ class Sendmail(object): """ # Manage help and links messages separately - help_requests = yield self.conn.get_requests( - status="ONHOLD", command="help", service="email" + requests = yield self.conn.get_requests( + status="ONHOLD", service="email" ) - link_requests = yield self.conn.get_requests( - status="ONHOLD", command="links", service="email" - ) + strings.load_strings("en") + try: - if help_requests: - strings.load_strings("en") - try: - log.info("Got new help request.") + for request in requests: + id = request[0] + command = request[1] + platform = request[2] + language = request[3] + date = request[5] - for request in help_requests: - id = request[0] - date = request[5] + if not language: + language = 'en' + + body_msg ="" + subject_msg ="" + + if command == "help": - hid = hashlib.sha256(id.encode('utf-8')) - log.info( - "Sending help message to {}.".format( - hid.hexdigest() - ) - ) locales = yield self.conn.get_locales() locale_string = self.build_locale_string(locales) + # build message body_msg = self.build_help_body_message(locale_string) + subject_msg = strings._("help_subject") - yield self.sendmail( - email_addr=id, - subject=strings._("help_subject"), - body=body_msg - ) - - yield self.conn.update_stats( - command="help", platform='', language='en', - service="email" - ) - - yield self.conn.remove_request( - id=id, service="email", date=date - ) - - except smtp.SMTPClientError as e: - if e.code == 501: # Bad recipient address syntax - yield self.conn.remove_request( - id=id, service="email", date=date - ) - log.info("Error sending email: {}.".format(e)) - - except Exception as e: - log.info("Error sending email: {}.".format(e)) - - elif link_requests: - try: - log.info("Got new links request.") - - for request in link_requests: - id = request[0] - date = request[5] - platform = request[2] - language = request[3] - - if not language: - language = 'en' - - locales = strings.get_locales() - - strings.load_strings(language) - locale = locales['en']['locale'] - + elif command == "links": log.info("Getting links for {} {}.".format(platform, language)) links = yield self.conn.get_links( platform=platform, language=language, status="ACTIVE" @@ -248,37 +207,35 @@ class Sendmail(object): link_msg, file = self.build_link_strings(links, platform, language) body_msg = self.build_body_message(link_msg, platform, file) subject_msg = strings._("links_subject") - - hid = hashlib.sha256(id.encode('utf-8')) - log.info( - "Sending links to {}.".format( - hid.hexdigest() - ) + else: + log.info("Invalid gettor command {}.".format(command)) + yield self.conn.remove_request( + id=id, service="email", date=date ) - yield self.sendmail( - email_addr=id, - subject=subject_msg, - body=body_msg - ) + log.info("Sending {} message.".format(request[1])) - yield self.conn.update_stats( - command="links", platform=platform, language=language, - service="email" - ) + yield self.sendmail( + email_addr=id, + subject=subject_msg, + body=body_msg + ) - yield self.conn.remove_request( - id=id, service="email", date=date - ) + yield self.conn.update_stats( + command=command, platform=platform, language=language, + service="email" + ) - except smtp.SMTPClientError as e: - if e.code == 501: # Bad recipient address syntax - yield self.conn.remove_request( - id=id, service="email", date=date - ) - log.info("Error sending email: {}.".format(e)) + yield self.conn.remove_request( + id=id, service="email", date=date + ) + + except smtp.SMTPClientError as e: + if e.code == 501: # Bad recipient address syntax + yield self.conn.remove_request( + id=id, service="email", date=date + ) + log.info("Error sending email: {}.".format(e)) - except Exception as e: - log.info("Error sending email: {}.".format(e)) - else: - log.debug("No pending email requests. Keep waiting.") + except Exception as e: + log.error("Error sending email: {}.".format(e)) diff --git a/gettor/utils/db.py b/gettor/utils/db.py index 064049e..d6bf153 100644 --- a/gettor/utils/db.py +++ b/gettor/utils/db.py @@ -54,15 +54,14 @@ class SQLite3(object): query, (id, command, platform, language, service, date, status) ).addCallback(self.query_callback).addErrback(self.query_errback) - def get_requests(self, status, command, service): + def get_requests(self, status, service): """ Perform a SELECT request to the database """ - query = "SELECT * FROM requests WHERE service=? AND command=? AND "\ - "status = ?" + query = "SELECT * FROM requests WHERE service=? AND status = ?" return self.dbpool.runQuery( - query, (service, command, status) + query, (service, status) ).addCallback(self.query_callback).addErrback(self.query_errback) def get_num_requests(self, id, service): diff --git a/tests/test_db.py b/tests/test_db.py index 7d5634b..909abb6 100644 --- a/tests/test_db.py +++ b/tests/test_db.py @@ -21,12 +21,12 @@ class DatabaseTests(unittest.TestCase): del self.conn @pytest_twisted.inlineCallbacks - def add_dummy_requests(self, num): + def add_dummy_requests(self, command, num): now_str = datetime.now().strftime("%Y%m%d") - for i in (0, num): + for i in range(0, num): yield self.conn.new_request( id='testid', - command='links', + command=command, platform='linux', language='en', service='email', @@ -45,17 +45,17 @@ class DatabaseTests(unittest.TestCase): @pytest_twisted.inlineCallbacks def test_requests(self): now_str = datetime.now().strftime("%Y%m%d") - yield self.add_dummy_requests(2) + yield self.add_dummy_requests("links", 2) + yield self.add_dummy_requests("help", 1) num = yield self.conn.get_num_requests("testid", "email") - self.assertEqual(num[0][0], 2) + self.assertEqual(num[0][0], 3) - requests = yield self.conn.get_requests("ONHOLD", "links", "email") + requests = yield self.conn.get_requests("ONHOLD", "email") for request in requests: - self.assertEqual(request[1], "links") self.assertEqual(request[4], "email") self.assertEqual(request[5], now_str) self.assertEqual(request[6], "ONHOLD") - self.assertEqual(len(requests), 2) + self.assertEqual(len(requests), 3) yield self.conn.remove_request("testid", "email", now_str) num = yield self.conn.get_num_requests("testid", "email")

1 0

[translation/torbutton-aboutdialogdtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd_completed
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit 28d96102ab42dcb09acb434485ad9dcd2b14ba74 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:22:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- da/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/aboutdialog.dtd b/da/aboutdialog.dtd index 0105c4c743..d96a1f1b88 100644 --- a/da/aboutdialog.dtd +++ b/da/aboutdialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "Hjælp Tor-netværket med at vokse!">  -<!ENTITY bottomLinks.license "Licens Information"> +<!ENTITY bottomLinks.license "Licensinformation"> <!ENTITY tor.TrademarkStatement ""Tor" og "løg-logoet" er registrerede varemærker tilhørende Tor Project, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdialogdtd
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit 30f0563ccda185b012f7deb5756e3a2857232dda Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:22:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- da/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/aboutdialog.dtd b/da/aboutdialog.dtd index 0105c4c743..d96a1f1b88 100644 --- a/da/aboutdialog.dtd +++ b/da/aboutdialog.dtd @@ -15,5 +15,5 @@  <!ENTITY bottomLinks.grow "Hjælp Tor-netværket med at vokse!">  -<!ENTITY bottomLinks.license "Licens Information"> +<!ENTITY bottomLinks.license "Licensinformation"> <!ENTITY tor.TrademarkStatement ""Tor" og "løg-logoet" er registrerede varemærker tilhørende Tor Project, Inc.">

1 0

[translation/torbutton-branddtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_completed
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit 4959fe3bb786025d075f8f835c8cac4c2ba92202 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:22:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_… --- da/brand.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/da/brand.dtd b/da/brand.dtd index 87b2b707ab..b395d3a613 100644 --- a/da/brand.dtd +++ b/da/brand.dtd @@ -2,14 +2,14 @@ - 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/. --> -<!ENTITY brandShorterName ""> -<!ENTITY brandShortName ""> -<!ENTITY brandFullName ""> -<!ENTITY vendorShortName ""> -<!ENTITY trademarkInfo.part1 ""> +<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser"> +<!ENTITY vendorShortName "Tor-projektet"> +<!ENTITY trademarkInfo.part1 ""Tor" og "løg-logoet" er registrerede varemærker tilhørende Tor Project, Inc.">  -<!ENTITY plugins.installed.find ""> -<!ENTITY plugins.installed.enable ""> -<!ENTITY plugins.installed.disable ""> -<!ENTITY plugins.installed.disable.tip ""> +<!ENTITY plugins.installed.find "Klik for at indlæse installerede systemplugins"> +<!ENTITY plugins.installed.enable "Aktivér plugins"> +<!ENTITY plugins.installed.disable "Deaktivér plugins"> +<!ENTITY plugins.installed.disable.tip "Klik for at forhindre indlæsning af systemplugins">

1 0

[translation/torbutton-branddtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit 4016e164ba10d61069961db267cb3246658a44eb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:22:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd --- da/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/brand.dtd b/da/brand.dtd index 188f2d0d05..b395d3a613 100644 --- a/da/brand.dtd +++ b/da/brand.dtd @@ -12,4 +12,4 @@ <!ENTITY plugins.installed.find "Klik for at indlæse installerede systemplugins"> <!ENTITY plugins.installed.enable "Aktivér plugins"> <!ENTITY plugins.installed.disable "Deaktivér plugins"> -<!ENTITY plugins.installed.disable.tip "Klik for at undgå indlæsning af systemplugins"> +<!ENTITY plugins.installed.disable.tip "Klik for at forhindre indlæsning af systemplugins">

1 0

[translation/torbutton-brandproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandproperties_completed
by translation＠torproject.org 29 Apr '20

29 Apr '20

commit 8259bd702be514f288f7a49827bacc4f390959f3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 29 15:21:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandprop… --- da/brand.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/brand.properties b/da/brand.properties index dec4fbd50d..51cba07803 100644 --- a/da/brand.properties +++ b/da/brand.properties @@ -11,6 +11,6 @@ homePageSingleStartMain=Firefox Start, en hurtig startside med indbygget søgnin homePageImport=Importer din startside fra %S homePageMigrationPageTitle=Valg af startside -homePageMigrationDescription=Vælg den ønskede startside: +homePageMigrationDescription=Vælg venligst den startside du ønsker at bruge: syncBrandShortName=Synkroniser

1 0