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

[tpo/master] Delete fvcn.ico
by gus＠torproject.org 09 Oct '19

09 Oct '19

commit e06f2f163cb63f22ddce6d33fd8b32e4794ff3a6 Author: Aadi Bajpai <me(a)aadibajpai.me> Date: Tue Oct 8 22:46:03 2019 +0530 Delete fvcn.ico --- assets/static/images/favicon/fvcn.ico | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/static/images/favicon/fvcn.ico b/assets/static/images/favicon/fvcn.ico deleted file mode 100644 index 4202011..0000000 --- a/assets/static/images/favicon/fvcn.ico +++ /dev/null @@ -1 +0,0 @@ -to be deleted

1 0

[tpo/master] Add favicon to file
by gus＠torproject.org 09 Oct '19

09 Oct '19

commit 1bf167991f17f35ad80fe393362dab9681bd6fa2 Author: Aadi Bajpai <me(a)aadibajpai.me> Date: Tue Oct 8 22:49:08 2019 +0530 Add favicon to file --- templates/meta.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/meta.html b/templates/meta.html index 04b9e93..a301461 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -14,4 +14,8 @@ <link rel="stylesheet" href="{{ '/static/css/digital-climate-strike/main.css'|asseturl }}"> <link rel="… [View More]

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit d80c114eb6a8302f4b709ac7c8609afbbafc5581 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 13:15:23 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- is/LC_MESSAGES/bridgedb.po | 257 +++++++++++++++++++++++---------------------- 1 file changed, 131 insertions(+), 126 deletions(-) diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po index b9c424f30..ebdfaba2b 100644 --- a/is/LC_MESSAGES/… [View More]bridgedb.po +++ b/is/LC_MESSAGES/bridgedb.po @@ -1,24 +1,43 @@ -# Translations template for BridgeDB. -# Copyright (C) 2015 'The Tor Project, Inc.' -# This file is distributed under the same license as the BridgeDB project. +# Translations template for bridgedb. +# Copyright (C) 2019 'The Tor Project, Inc.' +# This file is distributed under the same license as the bridgedb project. # # Translators: -# Sveinn í Felli <sv1(a)fellsnet.is>, 2016-2017 +# Sveinn í Felli <sv1(a)fellsnet.is>, 2016-2017,2019 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: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-01-22 09:08+0000\n" +"POT-Creation-Date: 2019-10-03 15:04-0700\n" +"PO-Revision-Date: 2019-10-09 12:58+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.7.0\n" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" +#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*- +#. This file is part of BridgeDB, a Tor bridge distribution system. +#. :authors: please see included AUTHORS file +#. :copyright: (c) 2007-2017, The Tor Project, Inc. +#. (c) 2013-2017, Isis Lovecruft +#. :license: see LICENSE for licensing information +#. : The path to the HTTPS distributor's web templates. (Should be the +#. : "templates" directory in the same directory as this file.) +#. Setting `filesystem_checks` to False is recommended for production servers, +#. due to potential speed increases. This means that the atimes of the Mako +#. template files aren't rechecked every time the template is requested +#. (otherwise, if they are checked, and the atime is newer, the template is +#. recompiled). `collection_size` sets the number of compiled templates which +#. are cached before the least recently used ones are removed. See: +#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup +#. : Localisations which BridgeDB supports which should be rendered right-to- +#. left. +#. We use our metrics singleton to keep track of BridgeDB metrics such as +#. "number of failed HTTPS bridge requests." #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" @@ -30,177 +49,173 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/https/server.py:167 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." -msgstr "Úbbs! Eitthvað fór úrskeiðis varðandi beiðnina þína." +msgstr "" -#: bridgedb/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Tilkynna um villu" +msgstr "" -#: bridgedb/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:82 msgid "Source Code" -msgstr "Grunnkóði" +msgstr "" -#: bridgedb/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:85 msgid "Changelog" -msgstr "Breytingaannáll" - -#: bridgedb/https/templates/base.html:88 -msgid "Contact" -msgstr "Hafa samband" +msgstr "" -#: bridgedb/https/templates/bridges.html:35 +#: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" -msgstr "Velja allt" +msgstr "" -#: bridgedb/https/templates/bridges.html:40 +#: bridgedb/distributors/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Birta QR-kóða" +msgstr "" -#: bridgedb/https/templates/bridges.html:52 +#: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QR-kóði fyrir brúarlínurnar þínar" +msgstr "" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: bridgedb/https/templates/bridges.html:67 -#: bridgedb/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:67 +#: bridgedb/distributors/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Æ, æ, skrambans!" +msgstr "" -#: bridgedb/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Villa kom upp þegar þú reyndar að nálgast QR-kóðann þinn." +msgstr "" -#: bridgedb/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Þessi QR-kóði inniheldur brúarlínurnar þínar. Skannaðu QR-kóðann með strikamerkjalesara til að afrita brúarlínurnar yfir á farsíma og önnur snjalltæki." +msgstr "" -#: bridgedb/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Engar brýr eru tiltækar í augnablikinu..." +msgstr "" -#: bridgedb/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr " Hugsanlega ættirðu að reyna að %s fara til baka %s og velja aðra tegund brúar!" +msgstr "" -#: bridgedb/https/templates/index.html:11 +#: bridgedb/distributors/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "Skref %s1%s" +msgstr "" -#: bridgedb/https/templates/index.html:13 +#: bridgedb/distributors/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Sækja %s Tor-vafrann %s" +msgstr "" -#: bridgedb/https/templates/index.html:25 +#: bridgedb/distributors/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "Skref %s2%s" +msgstr "" -#: bridgedb/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Ná í %s brýr %s" +msgstr "" -#: bridgedb/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "Skref %s3%s" +msgstr "" -#: bridgedb/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Núna á að %s bæta brúnum við Tor-vafrann %s" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#: bridgedb/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sG%sefðu mér bara brýrnar!" +msgstr "" -#: bridgedb/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:51 msgid "Advanced Options" -msgstr "Nánari stillingar" +msgstr "" -#: bridgedb/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:86 msgid "No" -msgstr "Nei" +msgstr "" -#: bridgedb/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:87 msgid "none" -msgstr "ekkert" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: bridgedb/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "%sJ%sá!" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: bridgedb/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sN%sá í brýr" +msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[Þetta er sjálfvirkt skeyti; ekki svara því.]" +msgstr "" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Hér eru brýrnar þínar:" +msgstr "" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Þú hefur farið fram úr þér, slakaðu aðeins á! Lágmarkstími milli tölvupóstsendinga\ner %s klukkustundir. Allar auka-póstsendingar á því tímabili verða hunsaðar." +msgstr "" #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "SKIPUN: (sameinaðu skipanir til að skilgreina marga valkosti í einu)" +msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "Velkomin í BridgeDB brúagagnagrunninn!" +msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Studdar TYPE tegundir tengileiða:" +msgstr "" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "Hæ, %s!" +msgstr "" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "Sæll vinur!" +msgstr "" -#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 msgid "Public Keys" -msgstr "Dreifilyklar" +msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -210,7 +225,7 @@ msgstr "Dreifilyklar" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Þessi tölvupóstur var útbúinn með öllum sínum göllum og gæðum\nfyrir %s hjá %s þann %s." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -224,7 +239,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB getur útbúið brýr með nokkrum %sgerðum Pluggable Transports%s\ntengileiða, sem geta hjálpað til við að fela tengingar þínar við Tor-netið,\ngert það enn erfiðara fyrir hvern þann sem fylgist með netumferðinni þinni\nað sjá að þú sért að nota Tor.\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -232,7 +247,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Einhverjar brýr með IPv6 vistföngum eru einnig tiltækar, en þó eru sumar Pluggable\nTransport tengileiðir ekki IPv6-samhæfar.\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -246,136 +261,126 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Að auki er BridgeDB með fullt af ósköp venjulegum brúm %s sem ekki nota\nPluggable Transports %s, sem gæti hljómað aðeins minna svalt, en getur samt\nhjálpað til í mörgum tilfellum til að komast framhjá ritskoðun.\n\n" +msgstr "" -#: bridgedb/strings.py:101 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 msgid "What are bridges?" -msgstr "Hvað eru brýr?" +msgstr "" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Brýr %s eru Tor-endurvarpar sem hjálpa þér við að komast framhjá ritskoðun." +msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "Ég þarf einhverja aðra leið til að ná í brýr!" +msgstr "" #: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" -"%s, %s or %s." -msgstr "Önnur leið til að ná í brýr er að senda tölvupóst til %s. Athugaðu að þú verður\nað senda tölvupóstinn með netfangi frá einhverjum að eftirtöldum póstþjónustum:\n%s, %s eða %s." +"%s or %s." +msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "Brýrnar mínar virka ekki! Ég þarf hjálp!" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format -msgid "If your Tor doesn't work, you should email %s." -msgstr "Ef Tor virkar ekki, ættirðu að senda tölvupóst á %s." +msgid "If your Tor cannot connect, please take a look at the %s and our %s." +msgstr "" -#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:121 -msgid "" -"Try including as much info about your case as you can, including the list of\n" -"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" -"and any messages which Tor gave out, etc." -msgstr "Reyndu að hafa með eins miklar upplýsingar um aðstæður þínar eins og hægt er,\nþar með talið allar þær brýr og Pluggable Transport tengileiðir þú reyndir að nota,\nútgáfu Tor-vafrans, auk allra skilaboða sem komu frá Tor, o.s.frv.." - -#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Hér eru brúarlínurnar þínar:" +msgstr "" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:122 msgid "Get Bridges!" -msgstr "Sækja brýr!" +msgstr "" -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:126 msgid "Please select options for bridge type:" -msgstr "Veldu valkosti fyrir tegund brúar:" +msgstr "" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:127 msgid "Do you need IPv6 addresses?" -msgstr "Þarftu IPv6-vistföng?" +msgstr "" -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:128 #, python-format msgid "Do you need a %s?" -msgstr "Þarftu %s?" +msgstr "" -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:132 msgid "Your browser is not displaying images properly." -msgstr "Vafrinn þinn birtir myndir ekki rétt." +msgstr "" -#: bridgedb/strings.py:140 +#: bridgedb/strings.py:133 msgid "Enter the characters from the image above..." -msgstr "Settu inn stafina úr myndinni hér að ofan..." +msgstr "" -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:137 msgid "How to start using your bridges" -msgstr "Leiðir til að byrja að nota brýrnar þínar" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:139 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Til að setja brýr inn í Tor-vafrann, farðu fyrst á %s niðurhalssíðu Tor-vafrans %s\nog farðu eftir leiðbeiningum um hvernig eigi að sækja og gangsetja hann." +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:151 +#: bridgedb/strings.py:144 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Þegar glugginn 'Netkerfisstillingar Tor' birtist, smelltu á 'Stilla' og fylgdu síðan\nleiðarvísinum þar til hann spyr:" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:155 +#: bridgedb/strings.py:148 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "Hindrar eða ritskoðar netþjónustuaðilinn þinn (ISP) á einhvern hátt tengingar\ninn á Tor-netið?" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:159 +#: bridgedb/strings.py:152 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Veldu 'Já' og smelltu síðan á 'Næsta'. Til að setja upp nýju brýrnar þínar, afritaðu\nog límdu brúarlínurnar inn í textareitinn. Að lokum smellirðu á 'Tengjast', og þá\nætti allt að vera tilbúið! Ef þú lendir í vandræðum, geturðu prófað að smella á\n'Hjálp'-hnappinn í 'Netstillingar Tor'-leiðarvísinum." +msgstr "" -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:160 msgid "Displays this message." -msgstr "Birtir þessi skilaboð." +msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:164 msgid "Request vanilla bridges." -msgstr "Biðja um venjulegar brýr." +msgstr "" -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:165 msgid "Request IPv6 bridges." -msgstr "Biðja um IPv6-brýr." +msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:167 msgid "Request a Pluggable Transport by TYPE." -msgstr "Biðja um Pluggable Transport tengileið eftir TYPE tegundum." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:177 +#: bridgedb/strings.py:170 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Ná í afrit af GnuPG-dreifilykli frá BridgeDB" +msgstr "" [View Less]

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit 01f0eaaab9027b282bb411682c1bfab6a4d7c7e1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 13:15:16 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- is/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po index 12b7a3ad4..8c8084c25 100644 --- a/is/LC_MESSAGES/bridgedb.po +++ b/is/LC_MESSAGES/bridgedb.po @@ -3,14 … [View More]

1 0

[tor-browser-build/master] Bug 31568: Update How to Create Gradle Dependencies
by gk＠torproject.org 09 Oct '19

09 Oct '19

commit 5d8507dd6ae08f9d3552aba0b34cab918c35e341 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Sep 16 12:01:54 2019 -0700 Bug 31568: Update How to Create Gradle Dependencies --- .../how-to-create-gradle-dependencies-list.txt | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index d980ba2..e85c56a 100644 --- a/… [View More]projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -1,11 +1,22 @@ ### Updating Gradle Dependencies If additional Android dependencies are required by the project's build, then the Gradle build will fail due to missing dependencies. To find out what the -missing dependencies are, comment out the following line in the project's build -file: +missing dependencies are take the following steps. + +For tor-onion-proxy-library and tor-android-service, replace the following line +in the respective project build file: + $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint +with + $GRADLE_HOME/gradle-4.10.2/bin/gradle --debug --no-daemon -P androidplugin=3.1.0 assembleRelease -x lint + +For the firefox project, comment out the following line in the project's build file: export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" +Also modify the gradle flags to include the debug option so the download logs will show up: + + export GRADLE_FLAGS="--no-daemon --debug" + then allow network access during the build by setting var/container/disable_network/build to 0 in rbm.conf, and rerun the build. @@ -13,7 +24,15 @@ Dependent artifacts will show up as downloads in the logs. You can pull out these dependencies into a list with the following command (replacing "firefox-android-armv7.log" with the build log file name of the actual project): -`cat logs/firefox-android-armv7.log | grep "Download http" | sed "s/^.*Download //g" > download-urls.txt` +`cat logs/firefox-android-armv7.log | grep "Performing HTTP" | grep -o "https://.*" | sort | uniq > download-attempts.txt` + +The download-attempts.txt file contains all the attempted downloads, so we need to find out which ones failed + +`cat logs/firefox-android-armv7.log | grep "Resource missing" | grep -o "https:.*[^]]" | sort | uniq > download-fails.txt` + +Now take the intersection. This removes failures from attempts, leaving just successful downloads + +`sort download-attempts.txt download-fails.txt | uniq -u | rev | sort -t/ -u -k1,4 | rev | sort > download-urls.txt` You will then need to add the new dependency URLs and SHA-256 values into the projects/$project/gradle-dependencies-list.txt file. The format of this file is [View Less]

1 0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit 6068a5447b1adcc13bdd5a1ab498c42f16541c7f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 12:45:22 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- cs/LC_MESSAGES/bridgedb.po | 204 +++++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 99 deletions(-) diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po index 9a0e93e02..e6255439b 100644 --- a/cs/LC_MESSAGES/… [View More]bridgedb.po +++ b/cs/LC_MESSAGES/bridgedb.po @@ -1,10 +1,11 @@ -# Translations template for BridgeDB. -# Copyright (C) 2015 'The Tor Project, Inc.' -# This file is distributed under the same license as the BridgeDB project. +# Translations template for bridgedb. +# Copyright (C) 2019 'The Tor Project, Inc.' +# This file is distributed under the same license as the bridgedb project. # # Translators: # A5h8d0wf0x <littleslyfoxie28(a)gmail.com>, 2014 # Adam Slovacek <adamslovacek(a)gmail.com>, 2013 +# David Stepan <stepand(a)tiscali.cz>, 2019 # Elisa <valhalla(a)gishpuppy.com>, 2011 # Filip Hruska <fhr(a)fhrnet.eu>, 2015 # Sanky <gsanky+transifex(a)gmail.com>, 2011 @@ -18,17 +19,36 @@ 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: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-10-25 18:02+0000\n" -"Last-Translator: Michal Stanke <mstanke(a)mozilla.cz>\n" +"POT-Creation-Date: 2019-10-03 15:04-0700\n" +"PO-Revision-Date: 2019-10-09 12:19+0000\n" +"Last-Translator: David Stepan <stepand(a)tiscali.cz>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.7.0\n" "Language: cs\n" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" +#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*- +#. This file is part of BridgeDB, a Tor bridge distribution system. +#. :authors: please see included AUTHORS file +#. :copyright: (c) 2007-2017, The Tor Project, Inc. +#. (c) 2013-2017, Isis Lovecruft +#. :license: see LICENSE for licensing information +#. : The path to the HTTPS distributor's web templates. (Should be the +#. : "templates" directory in the same directory as this file.) +#. Setting `filesystem_checks` to False is recommended for production servers, +#. due to potential speed increases. This means that the atimes of the Mako +#. template files aren't rechecked every time the template is requested +#. (otherwise, if they are checked, and the atime is newer, the template is +#. recompiled). `collection_size` sets the number of compiled templates which +#. are cached before the least recently used ones are removed. See: +#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup +#. : Localisations which BridgeDB supports which should be rendered right-to- +#. left. +#. We use our metrics singleton to keep track of BridgeDB metrics such as +#. "number of failed HTTPS bridge requests." #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" @@ -40,123 +60,119 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/https/server.py:167 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." -msgstr "Promiňte. Váš požadavek se nepodařilo provést." +msgstr "" -#: bridgedb/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:79 msgid "Report a Bug" msgstr "Nahlásit chybu" -#: bridgedb/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:82 msgid "Source Code" msgstr "Zdrojový kód" -#: bridgedb/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:85 msgid "Changelog" msgstr "Seznam změn" -#: bridgedb/https/templates/base.html:88 -msgid "Contact" -msgstr "Kontakt" - -#: bridgedb/https/templates/bridges.html:35 +#: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" msgstr "Označit vše" -#: bridgedb/https/templates/bridges.html:40 +#: bridgedb/distributors/https/templates/bridges.html:40 msgid "Show QRCode" msgstr "Zobrazit QR kód" -#: bridgedb/https/templates/bridges.html:52 +#: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QR kód pro vaše linky k mostům" +msgstr "" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: bridgedb/https/templates/bridges.html:67 -#: bridgedb/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:67 +#: bridgedb/distributors/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" msgstr "Ježíšku na křížku!" -#: bridgedb/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Při zpracování vašeho QR kódu zřejmě nastala chyba." +msgstr "" -#: bridgedb/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Tento QR kód obsahuje linky pro váš most. Pro zkopírování na mobilní nebo jiná zařízení naskenujte QR kód čtečkou." +msgstr "" -#: bridgedb/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Nyní nejsou k dispozici žádné mosty..." +msgstr "" -#: bridgedb/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" msgstr "Možná by jste měl zkusit %s jít zpět %s a vybrat jiný typ mostů!" -#: bridgedb/https/templates/index.html:11 +#: bridgedb/distributors/https/templates/index.html:11 #, python-format msgid "Step %s1%s" msgstr "Krok %s1%s" -#: bridgedb/https/templates/index.html:13 +#: bridgedb/distributors/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Stáhnout %sprohlížeč Tor %s" +msgstr "" -#: bridgedb/https/templates/index.html:25 +#: bridgedb/distributors/https/templates/index.html:25 #, python-format msgid "Step %s2%s" msgstr "Krok %s2%s" -#: bridgedb/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Získat %s mosty %s" +msgstr "" -#: bridgedb/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:36 #, python-format msgid "Step %s3%s" msgstr "Krok %s3%s" -#: bridgedb/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Nyní %s přidejte mosty do prohlížeče Tor %s" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#: bridgedb/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "%sJ%sen mi dejte mosty!" -#: bridgedb/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:51 msgid "Advanced Options" -msgstr "Rozšířená nastavení" +msgstr "" -#: bridgedb/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:86 msgid "No" msgstr "Ne" -#: bridgedb/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:87 msgid "none" msgstr "žádné" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: bridgedb/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:124 #, python-format msgid "%sY%ses!" msgstr "%sA%sno!" @@ -164,14 +180,14 @@ msgstr "%sA%sno!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: bridgedb/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sN%sastavit mosty" +msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[Toto je automatická zpráva. Neodpovídejte na ni prosím.]" +msgstr "" #: bridgedb/strings.py:45 msgid "Here are your bridges:" @@ -182,7 +198,7 @@ msgstr "Zde jsou vaše mosty:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Překročili jste limit počtu požadavků. Zpomalte prosím. Minimální čas mezi e-maily je %s hodin. Všechny následující e-maily během této časové doby budou ignorovány." +msgstr "" #: bridgedb/strings.py:50 msgid "" @@ -202,13 +218,13 @@ msgstr "V současnosti podporované transport TYPEs:" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "Hey, %s!" +msgstr "" #: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Ahoj, příteli!" -#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 msgid "Public Keys" msgstr "Veřejné klíče" @@ -220,7 +236,7 @@ msgstr "Veřejné klíče" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Tento duhový e-mail plný jednorožců a hvězd byl generován pro %s dne %s v %s." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -234,7 +250,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB může nabídnou mosty s několika %s typy Pluggable Transports%s,\ncož může zamaskovat vaše připojení k síti Tor a znesnadnit pro kohokoli\nsledovat vaši internetovou aktivitu a určit, zda Tor používáte\nnebo nikoliv.\n\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -242,7 +258,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "K dispozici jsou také některé mosty s IPv6 adresami, přestože některé Pluggable Transports\nnejsou s IPv6 kompatibilní.\n" +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -256,28 +272,28 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "BridgeDB má také spoustu obyčejných mostů %s bez žádných \nPluggable Transports %s. To sice nemusí znít tak super, ale pořád vám mohou v mnoha případech\npomoci obejít internetovou cenzuru.\n\n" +msgstr "" -#: bridgedb/strings.py:101 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 msgid "What are bridges?" msgstr "Co jsou to mosty?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Mosty %s jsou uzly Toru, které vám pomáhají obejít cenzuru." +msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "Potřebuji jiný způsob jak získat most!" +msgstr "" #: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" -"%s, %s or %s." -msgstr "Další způsob, jak získat mosty, je poslat e-mail na %s. Mějte prosím na paměti, že musíte poslat e-mail pouze ze schránky následujících poskytovatelů e-mailových služeb:\n%s, %s nebo %s." +"%s or %s." +msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -286,106 +302,96 @@ msgstr "Mé mosty nefungují. Potřebuji pomoc!" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format -msgid "If your Tor doesn't work, you should email %s." -msgstr "Pokud vám Tor nefunguje, pošlete nám e-mail na %s." +msgid "If your Tor cannot connect, please take a look at the %s and our %s." +msgstr "" -#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:121 -msgid "" -"Try including as much info about your case as you can, including the list of\n" -"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" -"and any messages which Tor gave out, etc." -msgstr "Napište nám co nejvíce o vašem problému, včetně seznamu\nmostů a pluggable Transports, které jste se pokusili použít, vaši verzi prohlížeče Tor,\nvšechny zprávy, které jste od Toru získali, atd." - -#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Zde jsou vaše linky k mostům: " -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:122 msgid "Get Bridges!" -msgstr "Získat mosty!" +msgstr "" -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:126 msgid "Please select options for bridge type:" -msgstr "Vyberte úrosím nastavení pro typ mostu:" +msgstr "" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:127 msgid "Do you need IPv6 addresses?" msgstr "Potřebujete IPv6 adresu?" -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:128 #, python-format msgid "Do you need a %s?" msgstr "Potřebujete %s?" -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:132 msgid "Your browser is not displaying images properly." -msgstr "Váš prohlížeč nezobrazuje správně obrázky." +msgstr "" -#: bridgedb/strings.py:140 +#: bridgedb/strings.py:133 msgid "Enter the characters from the image above..." -msgstr "Zadejte písmena z obrázku výše..." +msgstr "" -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:137 msgid "How to start using your bridges" msgstr "Jak začít používat mosty." #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:139 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "K vložení mostů do prohlížeče Tor, postupujte podle instrukcí ke stažení a spuštění na %s stránce\nke stažení prohlížeče Tor %s." +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:151 +#: bridgedb/strings.py:144 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Když vyskočí 'Nastavení sítě Tor', klepněte na 'Konfigurovat' a postupujte\npodle průvodce, dokud se nezeptá:" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:155 +#: bridgedb/strings.py:148 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí Tor?" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:159 +#: bridgedb/strings.py:152 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Vyberte 'Ano' a poté klikněte 'Další'. Pro nastavení nových mostů zkopírujte a\nvložte linky k mostům do textového pole. Nakonec klikněte na 'Připojit' a\nto by už mělo být všechno. Pokud narazíte na problémy, zkuste kliknout na tlačítko 'Pomoc'\nv dialogu průvodce 'Nastavení sítě Tor'." +msgstr "" -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:160 msgid "Displays this message." msgstr "Zobrazí tuto zprávu." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:164 msgid "Request vanilla bridges." -msgstr "Požádat o obyčejné mosty." +msgstr "" -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:165 msgid "Request IPv6 bridges." -msgstr "Požádat o IPv6 mosty." +msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:167 msgid "Request a Pluggable Transport by TYPE." -msgstr "Požádat o Pluggable Transport s TYPE." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:177 +#: bridgedb/strings.py:170 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Získat kopii veřejného GnuPG klíče BridgeDB." +msgstr "" [View Less]

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit b9d0770f8d51629d9aa55df4e50bb99fd9630065 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 12:45:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- cs/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po index 9c661eb4a..cca4e40b2 100644 --- a/cs/LC_MESSAGES/bridgedb.po +++ b/cs/LC_MESSAGES/bridgedb.po @@ -5,6 +5,… [View More]

1 0

[gettor/master] Modify bash script to upload files
by hiro＠torproject.org 09 Oct '19

09 Oct '19

commit e4278339fd62bb71088edbc41cfe1a9629edae7f Author: hiro <hiro(a)torproject.org> Date: Wed Oct 9 12:12:13 2019 +0200 Modify bash script to upload files --- scripts/update_files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_files b/scripts/update_files index 7183d50..6e9e013 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -58,5 +58,5 @@ for f in $(ls); do # Update Google Drive rclone copy $f gdrive:releases # Update … [View More]

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 27511: Add new identity button to toolbar
by gk＠torproject.org 09 Oct '19

09 Oct '19

commit 1a1a15edd4288a852610ddc173bac9442c367c50 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 4 19:08:33 2019 +0200 Bug 27511: Add new identity button to toolbar Also added 'New circuit for this site' button to CustomizableUI, but not visible by default. --- browser/base/content/browser.xul | 10 ++++++++++ .../components/customizableui/CustomizableUI.jsm | 21 +++++++++++++++++++++ browser/themes/shared/icons/new_circuit.svg … [View More] | 8 ++++++++ browser/themes/shared/icons/new_identity.svg | 9 +++++++++ browser/themes/shared/jar.inc.mn | 3 +++ browser/themes/shared/menupanel.inc.css | 8 ++++++++ browser/themes/shared/toolbarbutton-icons.inc.css | 8 ++++++++ 7 files changed, 67 insertions(+) diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 65e84da77c3f..6a81cc8c0f72 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -1207,6 +1207,16 @@ ondragenter="newWindowButtonObserver.onDragOver(event)" ondragexit="newWindowButtonObserver.onDragExit(event)"/> + <toolbarbutton id="new-identity-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + label="&torbutton.context_menu.new_identity;" + oncommand="torbutton_new_identity();" + tooltiptext="&torbutton.context_menu.new_identity;"/> + + <toolbarbutton id="new-circuit-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + label="&torbutton.context_menu.new_circuit;" + oncommand="torbutton_new_circuit();" + tooltiptext="&torbutton.context_menu.new_circuit;"/> + <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" observes="View:FullScreen" type="checkbox" diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index 4103fc5dd788..5040ac18f994 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -68,6 +68,8 @@ const kSubviewEvents = ["ViewShowing", "ViewHiding"]; */ var kVersion = 16; +var kTorVersion = 1; + /** * Buttons removed from built-ins by version they were removed. kVersion must be * bumped any time a new id is added to this. Use the button id as key, and @@ -566,6 +568,20 @@ var CustomizableUIInternal = { navbarPlacements.push("fxa-toolbar-menu-button"); } } + + let currentTorVersion = gSavedState.currentTorVersion; + if (currentTorVersion < 1 && gSavedState.placements) { + let navbarPlacements = gSavedState.placements[CustomizableUI.AREA_NAVBAR]; + if (navbarPlacements) { + let secLevelIndex = navbarPlacements.indexOf("security-level-button"); + if (secLevelIndex === -1) { + let urlbarIndex = navbarPlacements.indexOf("urlbar-container"); + secLevelIndex = urlbarIndex + 1; + navbarPlacements.splice(secLevelIndex, 0, "security-level-button"); + } + navbarPlacements.splice(secLevelIndex + 1, 0, "new-identity-button"); + } + } }, /** @@ -2369,6 +2385,10 @@ var CustomizableUIInternal = { gSavedState.currentVersion = 0; } + if (!("currentTorVersion" in gSavedState)) { + gSavedState.currentTorVersion = 0; + } + gSeenWidgets = new Set(gSavedState.seen || []); gDirtyAreaCache = new Set(gSavedState.dirtyAreaCache || []); gNewElementCount = gSavedState.newElementCount || 0; @@ -2447,6 +2467,7 @@ var CustomizableUIInternal = { seen: gSeenWidgets, dirtyAreaCache: gDirtyAreaCache, currentVersion: kVersion, + currentTorVersion: kTorVersion, newElementCount: gNewElementCount, }; diff --git a/browser/themes/shared/icons/new_circuit.svg b/browser/themes/shared/icons/new_circuit.svg new file mode 100644 index 000000000000..e0a93cc83502 --- /dev/null +++ b/browser/themes/shared/icons/new_circuit.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Icon / New Circuit(a)1.5x</title> + <g id="Icon-/-New-Circuit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <path d="M13.4411138,10.1446317 L9.5375349,10.1446317 C8.99786512,10.1446317 8.56164018,10.5818326 8.56164018,11.1205264 C8.56164018,11.6592203 8.99786512,12.0964212 9.5375349,12.0964212 L11.4571198,12.0964212 C10.7554515,13.0479185 9.73466563,13.692009 8.60067597,13.9359827 C8.41818366,13.9720908 8.23276366,14.0033194 8.04734366,14.0218614 C7.97219977,14.0277168 7.89803177,14.0306445 7.82288788,14.0335722 C6.07506044,14.137017 4.290149,13.4499871 3.38647049,11.857327 C2.52280367,10.3349312 2.77263271,8.15966189 3.93687511,6.87343267 C5.12453898,5.56183017 7.44814431,5.04363008 8.21226987,3.38558497 C9.01738301,4.92847451 9.60682342,5.02801577 10.853041,6.15029468 C11.2892659,6.54455615 11.9704404,7.55558307 12.1861132,8.10501179 C12.3051723,8.40949094 12.5013272,9.17947187 12.5013272,9.17947187 L14.2862386,9.17947187 C14.2091429,7.59754654 13.439162,5.96877827 12.2261248,4.93628166 C11.279507,4.13116853 10.5065984,3.84718317 9.77662911,2.8088312 C9.63219669,2.60194152 9.599 99216,2.4565332 9.56290816,2.21646311 C9.53851079,2.00762164 9.54143848,1.78511764 9.62048595,1.53919218 C9.65952174,1.41720534 9.59804037,1.28545955 9.47702943,1.23764071 L6.40296106,0.0167964277 C6.32391359,-0.0134563083 6.23413128,-0.00272146652 6.16679454,0.0480250584 L5.95502539,0.206120002 C5.85743592,0.280288 5.82815908,0.416913259 5.89159223,0.523285783 C6.70060895,1.92564648 6.36978064,2.82542141 5.8984235,3.20211676 C5.4914754,3.4900057 4.99084141,3.72226864 4.63366394,3.95453159 C3.82367132,4.47956294 3.03222071,5.02508808 2.40374451,5.76774396 C0.434388969,8.09427695 0.519291809,12.0046871 2.77165682,14.1077402 C3.65288975,14.9284676 4.70295247,15.4749686 5.81742423,15.7570022 C5.81742423,15.7570022 6.13556591,15.833122 6.21754107,15.8497122 C7.36616915,16.0829511 8.53529102,16.0146384 9.62243774,15.6672199 C9.67416016,15.6525815 9.77174963,15.620377 9.76784605,15.6154975 C10.7730176,15.2700308 11.7049971,14.7010841 12.4652191,13.90573 L12.4652191,15.0241053 C12.4652191, 15.5627992 12.901444,16 13.4411138,16 C13.9798077,16 14.4170085,15.5627992 14.4170085,15.0241053 L14.4170085,11.1205264 C14.4170085,10.5818326 13.9798077,10.1446317 13.4411138,10.1446317" id="Fill-3" fill="context-fill" fill-opacity="context-fill-opacity"></path> + <path d="M5.107,7.462 C4.405,8.078 4,8.946 4,9.839 C4,10.712 4.422,11.57 5.13,12.132 C5.724,12.607 6.627,12.898 7.642,12.949 L7.642,5.8 C7.39,6.029 7.103,6.227 6.791,6.387 C5.993,6.812 5.489,7.133 5.107,7.462" id="Fill-1" fill="context-fill" fill-opacity="context-fill-opacity"></path> + </g> +</svg> diff --git a/browser/themes/shared/icons/new_identity.svg b/browser/themes/shared/icons/new_identity.svg new file mode 100644 index 000000000000..91d5b35f7e80 --- /dev/null +++ b/browser/themes/shared/icons/new_identity.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>New Identity Icon</title> + <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="New-Identity-Icon" fill="#000000" fill-rule="nonzero"> + <path d="M4.65687153,14.5532899 L5.79494313,12.0855326 C5.8689125,11.9251399 5.6620883,11.7793527 5.53742729,11.9040137 L3.77194352,13.6694975 L2.32342782,12.2228406 L4.089841,10.4564274 C4.21450201,10.3317664 4.06871482,10.1249422 3.90832206,10.1989116 L1.43773764,11.338287 L0.206601383,10.1087306 C0.0509544211,9.9532834 -0.0167994233,9.75447206 0.00351451705,9.53432844 C0.0238284574,9.31418483 0.154794797,9.13897939 0.330406365,9.0302193 L4.61213917,6.53066101 C4.98542292,6.31331572 5.42541251,6.16259067 5.8659261,6.07796117 C6.63682488,5.92985954 7.40999434,6.06817199 8.09666802,6.42610336 L12.618483,1.910278 C13.0562019,1.47313888 13.7399062,1.45652879 14.1403159,1.87828207 C14.5407256,2.30003536 14.523905,2.96081599 14.0861861,3.39795511 L9.56437119,7.91378047 C9.92258101,8.57753432 10.0391721,9.37155544 9.91292178,10.1416209 C9.85023328,10.5817332 9.67706706,10.9989392 9.45960494,11.3937636 L6.95651989,15.6478297 C6.84761416,15.82321 6.6720026,15.9319701 6.47398108 ,15.9964916 C6.25354962,16.0167745 6.0544801,15.9491049 5.89883314,15.7936577 L4.65687153,14.5532899 L4.65687153,14.5532899 Z M6.35600863,9.57888316 C6.35684236,9.57982492 6.35770616,9.58074275 6.35860024,9.58163642 L7.56801202,10.7899206 C7.78820303,11.010009 8.15567242,10.9533982 8.29166823,10.678253 C8.42766403,10.4031079 8.55818512,10.1511975 8.61427424,9.83946755 C8.73630873,9.14856819 8.51477165,8.45005355 8.01189873,7.92920397 C8.01085853,7.92816425 8.00979562,7.92715687 8.00871022,7.92618158 C8.00773493,7.92509618 8.00672754,7.92403327 8.00568783,7.92299307 C7.48483824,7.42012014 6.7863236,7.19858307 6.09542425,7.32061756 C5.78369428,7.37670668 5.53178393,7.50722777 5.25663877,7.64322357 C4.98149362,7.77921937 4.92488284,8.14668876 5.14497116,8.36687978 L6.35325537,9.57629155 C6.35414904,9.57718564 6.35506687,9.57804944 6.35600863,9.57888316 L6.35600863,9.57888316 Z M3.56503003,4.86094581 C3.44279837,4.85716019 3.33693302,4.76594656 3.31450832,4.6450962 C3.29259157,4.5009814 3 3.24425431,4.36089837 3.1719467,4.23194774 C3.04272848,4.15978087 2.90235166,4.11153221 2.75793184,4.08964745 C2.63678145,4.06729735 2.5453314,3.9616241 2.54155161,3.83961366 C2.53777182,3.71760322 2.62276629,3.61489221 2.74265726,3.59658884 C2.88757581,3.57942626 3.02687427,3.53584537 3.15371096,3.46798665 C3.21938702,3.3436261 3.26061987,3.20700605 3.27529255,3.0651408 C3.29205048,2.94466859 3.39451537,2.85825378 3.5172925,2.86104768 C3.6386065,2.86399065 3.74452528,2.95324633 3.76872081,3.07292141 C3.79288781,3.21715288 3.84342323,3.35694342 3.91777207,3.4852254 C4.04615548,3.55876237 4.18583906,3.60883869 4.32991405,3.63297757 C4.45015386,3.6576218 4.53936117,3.76418021 4.54139495,3.88559216 C4.54342874,4.00700411 4.45770065,4.10814717 4.33816215,4.12536877 C4.1960481,4.14067978 4.05931708,4.18249381 3.9349938,4.24866259 C3.86697751,4.37522253 3.82328954,4.51422019 3.80607564,4.65882867 C3.78847982,4.77811508 3.68677836,4.86339193 3.56503003,4.86094581 Z M14.4103464,14.3126948 C14.2513672,14.307719 14.1137716,14.188804 14.0849193,14.0314492 C14.045996,13.7585014 13.9510862,13.4938971 13.8061961,13.2543814 C13.5663773,13.109665 13.301434,13.0148623 13.0281329,12.9759728 C12.8707684,12.946921 12.75198,12.8095493 12.7470672,12.6509372 C12.7421545,12.492325 12.8525523,12.3587997 13.0082799,12.3350024 C13.2816632,12.3044807 13.5433622,12.2185794 13.7775725,12.0824861 C13.9099238,11.8524988 13.992337,11.5955854 14.0197279,11.3275956 C14.0417134,11.1717293 14.1740126,11.0598594 14.3327736,11.0628895 C14.4905572,11.0667732 14.6282205,11.1831391 14.6593783,11.3389665 C14.703143,11.6110771 14.8017156,11.8740418 14.9490566,12.1117486 C15.1872615,12.2578242 15.450159,12.3559923 15.7221615,12.4004323 C15.8783433,12.4324665 15.9942186,12.5709889 15.9968634,12.7288231 C15.9995083,12.8866572 15.8881575,13.0181443 15.7328877,13.0405352 C15.4641157,13.0669716 15.2064728,13.14931 14.9763475,13.2823129 C14.8406047,13.5164173 14.7548186,13.7777086 14.724105,14.0506041 C14.70 09285,14.2056508 14.5685348,14.3162427 14.4103464,14.3126948 Z M8.37194288,2.75251202 C8.23729358,2.7482977 8.12075529,2.6475812 8.09631849,2.5143077 C8.06335201,2.28313133 7.98296703,2.05902158 7.86025062,1.85616098 C7.65713325,1.73359169 7.43273641,1.65329741 7.2012608,1.62035947 C7.06797908,1.59575373 6.9673698,1.47940513 6.96320889,1.34506671 C6.95904797,1.21072829 7.05255074,1.09763741 7.18444606,1.07748204 C7.41599123,1.0516313 7.6376403,0.978876138 7.83600755,0.863610339 C7.94810399,0.668819911 8.01790485,0.45122403 8.04110388,0.224246882 C8.05972477,0.0922341146 8.17177714,-0.00251545243 8.30624168,5.089704e-05 C8.43987839,0.00334026838 8.55647391,0.101897787 8.58286336,0.233877601 C8.61993042,0.464344927 8.70341768,0.687066016 8.82820981,0.888394549 C9.02996027,1.012115 9.25262444,1.09525963 9.4830002,1.13289867 C9.6152802,1.16003037 9.71342219,1.27735361 9.71566226,1.41103311 C9.71790232,1.5447126 9.62359245,1.65607713 9.49208487,1.67504141 C9.26444525,1.69743199 9.0462315 3,1.76716948 8.85132417,1.87981789 C8.73635526,2.07809534 8.66369764,2.2993991 8.63768445,2.53053117 C8.61805481,2.66184983 8.50592239,2.75551697 8.37194288,2.75251202 Z" id="Shape" fill="context-fill" fill-opacity="context-fill-opacity"></path> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 7decceb8100b..680893a66140 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -270,3 +270,6 @@ skin/classic/browser/privatebrowsing/favicon.svg (../shared/privatebrowsing/favicon.svg) skin/classic/browser/privatebrowsing/private-browsing.svg (../shared/privatebrowsing/private-browsing.svg) skin/classic/browser/privatebrowsing/tracking-protection.svg (../shared/privatebrowsing/tracking-protection.svg) + + skin/classic/browser/new_circuit.svg (../shared/icons/new_circuit.svg) + skin/classic/browser/new_identity.svg (../shared/icons/new_identity.svg) diff --git a/browser/themes/shared/menupanel.inc.css b/browser/themes/shared/menupanel.inc.css index 2fe9bdd79438..268315240d9a 100644 --- a/browser/themes/shared/menupanel.inc.css +++ b/browser/themes/shared/menupanel.inc.css @@ -161,3 +161,11 @@ toolbarpaletteitem[place="palette"] > #bookmarks-menu-button, #appMenu-library-downloads-show-button { list-style-image: url("chrome://browser/skin/folder.svg"); } + +#appMenuNewIdentity { + list-style-image: url("chrome://browser/skin/new_identity.svg"); +} + +#appMenuNewCircuit { + list-style-image: url("chrome://browser/skin/new_circuit.svg"); +} \ No newline at end of file diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css index 1c6c03cf26da..b843aa37daad 100644 --- a/browser/themes/shared/toolbarbutton-icons.inc.css +++ b/browser/themes/shared/toolbarbutton-icons.inc.css @@ -227,6 +227,14 @@ toolbar[brighttext] { list-style-image: url("chrome://browser/skin/new-tab.svg"); } +#new-identity-button { + list-style-image: url("chrome://browser/skin/new_identity.svg"); +} + +#new-circuit-button { + list-style-image: url("chrome://browser/skin/new_circuit.svg"); +} + #privatebrowsing-button { list-style-image: url("chrome://browser/skin/privateBrowsing.svg"); } [View Less]

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Update Torbutton to latest changes
by gk＠torproject.org 09 Oct '19

09 Oct '19

commit b744ccf7e59c60cf7929f77c71a6494e91d4e1da Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 9 07:15:17 2019 +0000 Update Torbutton to latest changes --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 4f453d5570d4..3509fb9c4e9d 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit … [View More]

1 0