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

[translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 1d216b35c66312d84ad635b1882c46294a912796 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 06:46:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml --- ml/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ml/strings.xml b/ml/strings.xml index 2f96b47569..d23a447532 100644 --- a/ml/strings.xml +++ b/ml/strings.xml @@ -1,6 +1,6 @@ <resources> <string name="app_name">ഓര്ഫോക്സ് ആർ ഐ പി </string> - <string name="try_tor_browser">ടോർ ബ്രൌസർ ശ്രെമിക്കുക </string> + <string name="try_tor_browser">ടോർ ബ്രൌസർ ഉപയോഗിച്ചു നോക്കുക</string> <string name="orfox_is_now_tor_browser">ഓര്ഫോക്സ് ഇപ്പോൾ ആൻഡ്രോയിഡ് നു വേണ്ടിയുള്ള ടോർ ബ്രൌസർ ആണ് </string> <string name="get_it">നിങ്ങൾ പ്രീതിപാദിക്കുന്ന ഉറവിടത്തിൽ നിന്നും ലഭ്യമാക്കുക </string> <string name="go_to_f_droid">എഫ് ഡ്രോയിഡിലേക് പോകുക </string>

1 0

[metrics-web/master] Add error code and message for code 400 responses.
by karsten＠torproject.org 08 Apr '20

08 Apr '20

commit da604d9c11e22f3c4b9486b73a77906f6824d04f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 9 11:00:19 2020 +0100 Add error code and message for code 400 responses. Fixes #32683. --- src/main/resources/web/js/rs/collections/aggregates.js | 4 +++- src/main/resources/web/js/rs/collections/results.js | 4 +++- src/main/resources/web/templates/rs/aggregate/map.html | 7 +++++++ src/main/resources/web/templates/rs/aggregate/search.html | 7 +++++++ src/main/resources/web/templates/rs/search/do.html | 7 +++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/main/resources/web/js/rs/collections/aggregates.js b/src/main/resources/web/js/rs/collections/aggregates.js index bbf5a45..bffb7da 100644 --- a/src/main/resources/web/js/rs/collections/aggregates.js +++ b/src/main/resources/web/js/rs/collections/aggregates.js @@ -127,7 +127,9 @@ define([ success(err, onionooVersion, buildRevision, relaysPublished, bridgesPublished); }).fail(function(jqXHR, textStatus, errorThrown) { - if(jqXHR.statusText == "error") { + if (jqXHR.status / 100 == 4) { + error(4); + } else if (jqXHR.statusText == "error") { error(2); } else { error(3); diff --git a/src/main/resources/web/js/rs/collections/results.js b/src/main/resources/web/js/rs/collections/results.js index 0110b7b..dfec6df 100644 --- a/src/main/resources/web/js/rs/collections/results.js +++ b/src/main/resources/web/js/rs/collections/results.js @@ -78,7 +78,9 @@ define([ chunkedLookup(); }).fail( function(jqXHR, textStatus, errorThrown) { - if(jqXHR.statusText == "error") { + if (jqXHR.status / 100 == 4) { + error(4); + } else if(jqXHR.statusText == "error") { error(2); } else { error(3); diff --git a/src/main/resources/web/templates/rs/aggregate/map.html b/src/main/resources/web/templates/rs/aggregate/map.html index b30e800..8ecb359 100644 --- a/src/main/resources/web/templates/rs/aggregate/map.html +++ b/src/main/resources/web/templates/rs/aggregate/map.html @@ -25,6 +25,13 @@ backend IP address. If the problem persits consult <a href="https://trac.torproject.org/">the bugtracker.</a></p> </div> + <% } else if (error == 4) { %> + <div class="alert alert-danger"> + <strong>Query error!</strong><p>The backend server reports a problem + with your query. Please have a look at + <a href="#about">the About page</a> that explains what type of search + queries are supported by Relay Search.</p> + </div> <% } else if (error == 5) { %> <div class="alert alert-warning"> <strong>No query submitted!</strong> diff --git a/src/main/resources/web/templates/rs/aggregate/search.html b/src/main/resources/web/templates/rs/aggregate/search.html index 151afb6..3046160 100644 --- a/src/main/resources/web/templates/rs/aggregate/search.html +++ b/src/main/resources/web/templates/rs/aggregate/search.html @@ -26,6 +26,13 @@ backend IP address. If the problem persits consult <a href="https://trac.torproject.org/">the bugtracker.</a></p> </div> + <% } else if (error == 4) { %> + <div class="alert alert-danger"> + <strong>Query error!</strong><p>The backend server reports a problem + with your query. Please have a look at + <a href="#about">the About page</a> that explains what type of search + queries are supported by Relay Search.</p> + </div> <% } else if (error == 5) { %> <div class="alert alert-warning"> <strong>No query submitted!</strong> diff --git a/src/main/resources/web/templates/rs/search/do.html b/src/main/resources/web/templates/rs/search/do.html index 1fe06b4..e2a669d 100644 --- a/src/main/resources/web/templates/rs/search/do.html +++ b/src/main/resources/web/templates/rs/search/do.html @@ -26,6 +26,13 @@ backend IP address. If the problem persits consult <a href="https://trac.torproject.org/">the bugtracker.</a></p> </div> + <% } else if (error == 4) { %> + <div class="alert alert-danger"> + <strong>Query error!</strong><p>The backend server reports a problem + with your query. Please have a look at + <a href="#about">the About page</a> that explains what type of search + queries are supported by Relay Search.</p> + </div> <% } else if (error == 5) { %> <div class="alert alert-warning"> <strong>No query submitted!</strong>

1 0

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

08 Apr '20

commit 8ccf84c61e372c8856bad4a91226f5c19df7014d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 05:53:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- sv/sv.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 1fdaeb2e3b..3aeb2afab9 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -6,7 +6,7 @@ # cryptohead <cryptohead(a)gmail.com>, 2013 # Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2017 # Jonatan Nyberg, 2017 -# Jonatan Nyberg, 2018-2019 +# Jonatan Nyberg, 2018-2020 # leveebreaks, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" @@ -14,7 +14,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: 2019-05-10 07:23+0000\n" +"PO-Revision-Date: 2020-04-08 05:45+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgstr "Ogiltig OpenPGP publikt nyckelblock" msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, or ./config.py" -msgstr "" +msgstr "%s variabeln hittades inte i någon av konfigurationsfilerna /etc/whisperback/config.py, ~/.whisperback/config.py, eller ./config.py" #: ../whisperBack/gui.py:114 msgid "Name of the affected software" @@ -55,7 +55,7 @@ msgstr "Exakta steg för att återskapa felet" #: ../whisperBack/gui.py:118 msgid "Actual result and description of the error" -msgstr "" +msgstr "Faktiskt resultat och beskrivning av felet" #: ../whisperBack/gui.py:120 msgid "Desired result" @@ -80,7 +80,7 @@ msgstr "Det här kan ta en stund..." #: ../whisperBack/gui.py:189 msgid "The contact email address doesn't seem valid." -msgstr "" +msgstr "Kontaktens e-postadress verkar inte giltig." #: ../whisperBack/gui.py:206 msgid "Unable to send the mail: SMTP error." @@ -101,7 +101,7 @@ msgid "" "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\nFelrapporten kunde inte skickas, troligen på grund av nätverksproblem. Försök att ansluta till nätverket på nytt och klicka på skicka igen.\n\nOm det inte fungerar kommer du att få möjlighet att spara felrapporten." +msgstr "\n\nFelrapporten kunde inte skickas, troligen på grund av nätverksproblem. Vänligen försök att ansluta till nätverket igen och klicka på skicka igen.\n\nOm det inte fungerar kommer du att erbjudas att spara felrapporten." #: ../whisperBack/gui.py:226 msgid "Your message has been sent." @@ -136,7 +136,7 @@ msgstr "Skicka återkoppling som krypterad e-post." #: ../whisperBack/gui.py:342 msgid "Copyright © 2009-2018 Tails developers (tails(a)boum.org)" -msgstr "" +msgstr "Copyright © 2009-2018 Tails developers (tails(a)boum.org)" #: ../whisperBack/gui.py:343 msgid "Tails developers <tails(a)boum.org>" @@ -152,7 +152,7 @@ msgstr "Detta verkar inte vara en korrekt URL eller OpenPGP-nyckel." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2018 tails(a)boum.org" -msgstr "" +msgstr "Copyright © 2009-2018 tails(a)boum.org" #: ../data/whisperback.ui.h:3 msgid "https://tails.boum.org/" @@ -175,7 +175,7 @@ msgid "" "\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 "" +msgstr "WhisperBack - Skicka återkoppling i ett krypterat meddelande\nCopyright (C) 2009-2018 Tails developers <tails(a)boum.org>\n\nDetta program är fri programvara; du kan distribuera det och/eller ändra\ndet under villkoren för GNU General Public License som publicerats av\nFree Software Foundation; antingen version 3 av licensen, eller (om\ndu så vill) någon senare version.\n\nDetta program distribueras i hopp om att det ska vara användbart, men\nUTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\nSÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se\nGNU General Public License för ytterligare information.\n\nDu bör ha fått en kopia av GNU General Public License tillsammans med\ndetta program. Om inte, se <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:20 msgid "" @@ -193,15 +193,15 @@ msgstr "Felbeskrivning" #: ../data/whisperback.ui.h:24 msgid "Help:" -msgstr "" +msgstr "Hjälp:" #: ../data/whisperback.ui.h:25 msgid "Read our bug reporting guidelines." -msgstr "" +msgstr "Läs våra felrapporteringsriktlinjer." #: ../data/whisperback.ui.h:26 msgid "Email address (if you want an answer from us)" -msgstr "" +msgstr "E-postadress (om du vill ha ett svar från oss)" #: ../data/whisperback.ui.h:27 msgid "optional PGP key" @@ -225,11 +225,11 @@ msgstr "Skicka" #: ../data/whisperback.desktop.in.h:1 msgid "WhisperBack Error Reporting" -msgstr "" +msgstr "WhisperBack-felrapportering" #: ../data/whisperback.desktop.in.h:2 msgid "Send feedback via encrypted e-mail" -msgstr "" +msgstr "Skicka återkoppling via krypterad e-post" #: ../data/whisperback.desktop.in.h:3 msgid "feedback;bug;report;tails;error;"

1 0

[translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit db656c2f88a150e21a2b550bbfdda127c008322b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 05:46:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- sv/sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 02e5f0cb4c..22cabae276 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -12,7 +12,7 @@ # Göran Uddeborg <goeran(a)uddeborg.se>, 2010 # Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2018-2019 # Jonatan Nyberg, 2017 -# Jonatan Nyberg, 2018-2019 +# Jonatan Nyberg, 2018-2020 # Jonatan Nyberg, 2017 # Mikael Hiort af Ornäs <mikael.hafo(a)hotmail.com>, 2013 # leveebreaks, 2014 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-21 09:03+0200\n" -"PO-Revision-Date: 2019-12-03 20:34+0000\n" +"PO-Revision-Date: 2020-04-08 05:45+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -266,7 +266,7 @@ msgstr "Se till att din USB nyckel är inkopplat och formaterad med filsystemet msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "Filsystem som inte stöds: %s\nGör en säkerhetskopia och formatera din USB-pinne med filsystemet FAT." +msgstr "Filsystem som inte stöds: %s\nVänligen säkerhetskopiera och formatera din USB-nyckel med FAT-filsystemet." #: ../tails_installer/creator.py:1481 msgid ""

1 0

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

08 Apr '20

commit 6414e26b9aa8b8c7bba38eabde5daceffbfee402 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 05:45:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- sv/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index f8d4857e3e..d6241c2596 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-07 10:14-0700\n" -"PO-Revision-Date: 2020-04-07 20:50+0000\n" +"PO-Revision-Date: 2020-04-08 05:37+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -408,7 +408,7 @@ msgstr "Lägg till dessa broar i din Tor Browser genom att öppna inställningar #: bridgedb/strings.py:182 msgid "(Request unobfuscated Tor bridges.)" -msgstr "" +msgstr "(Begär icke-dolda Tor-broar.)" #: bridgedb/strings.py:183 msgid "(Request IPv6 bridges.)" @@ -416,7 +416,7 @@ msgstr "(Begär IPv6-broar.)" #: bridgedb/strings.py:184 msgid "(Request obfs4 obfuscated bridges.)" -msgstr "" +msgstr "(Begär obfs4 dolda broar.)" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG".

1 0

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

08 Apr '20

commit 844f8c2fb5dbd49ac4a0c66554ade6afddfee048 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 05:23:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 69f542cdd9..f34e652c4a 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -14,8 +14,8 @@ # MD Rights <psychi2009(a)gmail.com>, 2020 # ff98sha, 2020 # erinm, 2020 -# Scott Rhodes <starring169(a)gmail.com>, 2020 # Emma Peel, 2020 +# Scott Rhodes <starring169(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -23,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-31 14:00+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2020\n" +"Last-Translator: Scott Rhodes <starring169(a)gmail.com>, 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -347,7 +347,7 @@ msgstr "" #: https//support.torproject.org/glossary/captcha/ #: (content/glossary/captcha/contents+en.lrword.spelling) msgid "Always in capital letters: CAPTCHA" -msgstr "" +msgstr "总是使用大写字母：CAPTCHA " #: https//support.torproject.org/glossary/checksum/ #: (content/glossary/checksum/contents+en.lrword.term) @@ -6423,7 +6423,7 @@ msgstr "" #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) msgid "" "Exit relays that filter some traffic would likely forfeit those protections." -msgstr "" +msgstr "过滤某些流量的出口节点将丧失那些保护。" #: https//support.torproject.org/operators/outgoing-firewall/ #: (content/operators/outgoing-firewall/contents+en.lrquestion.description) @@ -6532,7 +6532,7 @@ msgstr "" msgid "" "If you are uncomfortable allowing people to exit from your relay, you can " "set it up to only allow connections to other Tor relays." -msgstr "" +msgstr "如果你不喜欢允许别人的流量经由你的中继出口，你可以设置成仅允许从其他Tor中继的连接。" #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description)

1 0

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

07 Apr '20

commit ab0847cdb032ce9df2e03a6b2d6239ad88aaa84d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 7 22:45:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- es/LC_MESSAGES/bridgedb.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index e909e2dad5..d53661cdff 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-04-06 13:53-0700\n" -"PO-Revision-Date: 2020-04-07 10:57+0000\n" +"POT-Creation-Date: 2020-04-07 10:14-0700\n" +"PO-Revision-Date: 2020-04-07 22:25+0000\n" "Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -419,13 +419,12 @@ msgstr "" msgid "(Request IPv6 bridges.)" msgstr "" -#. TRANSLATORS: Please DO NOT translate the word "TYPE". -#: bridgedb/strings.py:185 -msgid "(Request obfuscated bridges. Replace TYPE with 'obfs4'.)" +#: bridgedb/strings.py:184 +msgid "(Request obfs4 obfuscated bridges.)" msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:189 +#: bridgedb/strings.py:187 msgid "(Get a copy of BridgeDB's public GnuPG key.)" msgstr ""

1 0

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

07 Apr '20

commit 88ce50383d54ba597dea6c57c59469de99d0e409 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 7 22:45:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- es/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 5e21489e2e..3a3313c32e 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-07 10:14-0700\n" -"PO-Revision-Date: 2020-04-07 19:47+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-04-07 22:25+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -421,7 +421,7 @@ msgstr "(Solicita puentes IPv6)" #: bridgedb/strings.py:184 msgid "(Request obfs4 obfuscated bridges.)" -msgstr "" +msgstr "(Solicita puentes ofuscados obfs4.)" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG".

1 0

[stem/master] Use --root arg for installation test
by atagar＠torproject.org 07 Apr '20

07 Apr '20

commit 2ec94c9b14c991440e3c0edeeb638b09802b54a5 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 7 15:04:33 2020 -0700 Use --root arg for installation test Third time's the charm? Jenkins has a 'dist-packages' site path, causing our hack to continue to mismatch... You are attempting to install a package to a directory that is not on PYTHONPATH and which Python does not read ".pth" files from. The installation directory you specified (via --install-dir, --prefix, or the distutils default setting) was: /tmp/stem_test/lib/python3.7/site-packages/ and your PYTHONPATH environment variable currently contains: '/tmp/stem_test/lib/python3.7/dist-packages' This test failure doesn't reproduce for me, but experimentation indicates that the '--root' argument acts similarly to '--prefix' but does not produce this warning. The installation path differs slightly, so accounting for this in the test... % python setup.py install --prefix /tmp/my_path installs to /tmp/my_path/lib/python3.7/site-packages/stem-1.8.0.dev0-py3.7.egg/stem/ % python setup.py install --root /tmp/my_path installs to /tmp/my_path/usr/local/lib/python3.7/site-packages/stem/ --- test/integ/installation.py | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index fbf7267e..657b5d88 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -6,7 +6,6 @@ import glob import os import platform import shutil -import site import sys import tarfile import time @@ -45,7 +44,7 @@ def _assert_has_all_files(path): for root, dirnames, filenames in os.walk(path): for filename in filenames: - if not filename.endswith('.pyc') and 'EGG-INFO' not in root: + if not filename.endswith('.pyc') and 'egg-info' not in root: installed.add(os.path.join(root, filename)[len(path) + 1:]) missing = expected.difference(installed) @@ -71,32 +70,15 @@ class TestInstallation(unittest.TestCase): install. """ - # Some systems fail installation unless our PYTHONPATH cites the - # site-packages that will be created at this destination. Unfortunately - # this can vary so attempting to determine it from site.getsitepackages(). - # For example... - # - # /tmp/stem_test/lib/python3.7/site-packages/ - - site_packages = site.getsitepackages() - - if site_packages and site_packages[0].count(os.path.sep) >= 3: - python_path = os.path.sep.join([BASE_INSTALL_PATH] + site_packages[0].split(os.path.sep)[-3:]) - - if not os.path.exists(python_path): - os.makedirs(python_path) - else: - python_path = '' - try: try: - stem.util.system.call('%s setup.py install --prefix %s' % (PYTHON_EXE, BASE_INSTALL_PATH), timeout = 60, cwd = test.STEM_BASE, env = {'PYTHONPATH': python_path}) + stem.util.system.call('%s setup.py install --root %s' % (PYTHON_EXE, BASE_INSTALL_PATH), timeout = 60, cwd = test.STEM_BASE) stem.util.system.call('%s setup.py clean --all' % PYTHON_EXE, timeout = 60, cwd = test.STEM_BASE) # tidy up the build directory if platform.python_implementation() == 'PyPy': - site_packages_paths = glob.glob('%s/site-packages' % BASE_INSTALL_PATH) + site_packages_paths = glob.glob('%s/*/*/site-packages' % BASE_INSTALL_PATH) else: - site_packages_paths = glob.glob('%s/lib*/*/site-packages/stem-*' % BASE_INSTALL_PATH) + site_packages_paths = glob.glob('%s/*/*/lib*/*/site-packages' % BASE_INSTALL_PATH) except stem.util.system.CallError as exc: msg = ["Unable to install with '%s': %s" % (exc.command, exc.msg)]

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 07 Apr '20

07 Apr '20

commit 53032a7b49461bec0fea0862634d1eca5c932e51 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 7 21:23:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sv-SE/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv-SE/network-settings.dtd b/sv-SE/network-settings.dtd index 64e7dd5bc0..01ffc23dbc 100644 --- a/sv-SE/network-settings.dtd +++ b/sv-SE/network-settings.dtd @@ -45,7 +45,7 @@ <!ENTITY torsettings.useBridges.captchaSolution.placeholder ""> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip ""> <!ENTITY torsettings.useBridges.captchaSubmit ""> -<!ENTITY torsettings.useBridges.custom "Använd en egen bro"> +<!ENTITY torsettings.useBridges.custom "Ange en bro jag vet"> <!ENTITY torsettings.useBridges.label "Ange broinformationen från en betrodd källa"> <!ENTITY torsettings.useBridges.placeholder "skriv adress:port (en per rad)">

1 0