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

[stem/master] Tests fail to run with python 3.8
by atagar＠torproject.org 12 Jun '19

12 Jun '19

commit af52d8b16f6623e3bdf0b470697b91a69b497dc2 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 12 13:18:20 2019 -0700 Tests fail to run with python 3.8 Python's platform module removed its linux_distribution() method... https://trac.torproject.org/projects/tor/ticket/30847 https://docs.python.org/3/library/platform.html#platform.linux_distribution https://stackoverflow.com/questions/49554443/platform-linux-distribution-de… This method was only used for display purposes to indicate the OS where the tests were ran. No big whoop if we simply omit the information. --- test/task.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/task.py b/test/task.py index be518ca7..1c14e64e 100644 --- a/test/task.py +++ b/test/task.py @@ -120,7 +120,10 @@ def _check_platform_version(): extra = platform.release() elif platform.system() == 'Darwin': extra = platform.release() - elif platform.system() == 'Linux': + elif platform.system() == 'Linux' and hasattr(platform, 'linux_distribution'): + # TODO: platform.linux_distribution() was removed in python 3.8 + # https://trac.torproject.org/projects/tor/ticket/30847 + extra = ' '.join(platform.linux_distribution()[:2]) else: extra = None

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 12 Jun '19

12 Jun '19

commit a0fed3e160bc4ee25769106fec69614fe14e02ad Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 12 16:49:42 2019 +0000 Update translations for torbutton-browseronboardingproperties --- nb-NO/browserOnboarding.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nb-NO/browserOnboarding.properties b/nb-NO/browserOnboarding.properties index d1acc0eb5..d8901f994 100644 --- a/nb-NO/browserOnboarding.properties +++ b/nb-NO/browserOnboarding.properties @@ -5,7 +5,7 @@ onboarding.tour-tor-welcome=Velkommen onboarding.tour-tor-welcome.title=Du er klar. onboarding.tour-tor-welcome.description=Tor Nettleser tilbyr den høyeste standarden på personvern og sikkerhet mens du surfer på nettet. Du er nå beskyttet mot sporing, overvåkning og sensur. Denne raske onboarding vil vise deg hvordan. -onboarding.tour-tor-welcome.next-button=Go to Privacy +onboarding.tour-tor-welcome.next-button=Gå til Personvern onboarding.tour-tor-privacy=Personvern onboarding.tour-tor-privacy.title=Snub trackers and snoopers. @@ -21,20 +21,20 @@ onboarding.tour-tor-circuit-display=Kretsvisning onboarding.tour-tor-circuit-display.title=Se din vei. onboarding.tour-tor-circuit-display.description=For hvert domene du besøker, blir trafikken din omdirigert og kryptert i en krets over tre Tor-reléer rundt om i verden. Ingen nettside vet hvor du kobler fra. Du kan be om en ny krets ved å klikke "Ny krets for dette nettstedet" på vår kretsvisning. onboarding.tour-tor-circuit-display.button=Se Min Vei -onboarding.tour-tor-circuit-display.next-button=Go to Security +onboarding.tour-tor-circuit-display.next-button=Gå til Sikkerhet onboarding.tour-tor-security=Sikkerhet onboarding.tour-tor-security.title=Velg din opplevelse. onboarding.tour-tor-security.description=Vi gir deg også tilleggsinnstillinger for å støte på nettleserens sikkerhet. Våre sikkerhetsinnstillinger lar deg blokkere elementer som kan brukes til å angripe datamaskinen din. Klikk nedenfor for å se hva de forskjellige alternativene gjør. -onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and HTTPS Everywhere are not included on the toolbar, but you can customize your toolbar to add them. -onboarding.tour-tor-security-level.button=See Your Security Level +onboarding.tour-tor-security.description-suffix=Merk: Som standard er NoScript og HTTPS Everywhere ikke inkludert i verktøylinjen, men du kan tilpasse verktøylinjen din for å legge dem til. +onboarding.tour-tor-security-level.button=Se Sikkerhetsnivået Ditt onboarding.tour-tor-security-level.next-button=Go to Experience Tips onboarding.tour-tor-expect-differences=Opplevelsestips onboarding.tour-tor-expect-differences.title=Forvent noen forskjeller. onboarding.tour-tor-expect-differences.description=Med alle de sikkerhets og personvernfunksjonene som Tor leverer, kan din erfaring mens du surfer på Internett, være litt annerledes. Det kan være litt tregere, og avhengig av sikkerhetsnivået, kan noen elementer ikke fungere eller lastes. Du kan også bli bedt om å bevise at du er et menneske og ikke en robot. onboarding.tour-tor-expect-differences.button=se FAQs -onboarding.tour-tor-expect-differences.next-button=Go to Onion Services +onboarding.tour-tor-expect-differences.next-button=Gå til Onion Tjenester onboarding.tour-tor-onion-services=Løk-tjenester onboarding.tour-tor-onion-services.title=Vær ekstra beskyttet. @@ -46,10 +46,10 @@ onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S onboarding.tour-tor-update.prefix-new=Ny onboarding.tour-tor-update.prefix-updated=Oppdatert -onboarding.tour-tor-toolbar=Toolbar -onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout +onboarding.tour-tor-toolbar=Verktøylinje +onboarding.tour-tor-toolbar-update-8.5.title=Verktøylinjeoppsett onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. -onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security +onboarding.tour-tor-toolbar-update-8.5.next-button=Gå til Sikkerhet onboarding.tour-tor-security-update-8.5.title=Security level experience onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings.

1 0

[community/master] rollback lektor file that shouldn't have been committed
by pili＠torproject.org 12 Jun '19

12 Jun '19

commit f0a6a864168149cdcb3314881e095344c8ae927f Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 12 18:38:42 2019 +0200 rollback lektor file that shouldn't have been committed --- .../i18n/__pycache__/lektor_i18n.cpython-37.pyc | Bin 15397 -> 15379 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc index 488bd31..52322b7 100644 Binary files a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc and b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc differ

1 0

[community/master] Training section
by pili＠torproject.org 12 Jun '19

12 Jun '19

commit 6b6a515a2146371e7ccf79ea72a39a38e062def8 Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 12 17:56:11 2019 +0200 Training section --- content/training/best-practices/contents.lr | 58 +++++++++++++++++++++ content/training/resources/contents.lr | 19 +++++++ content/training/resources/tor-network-2019.odp | Bin 0 -> 244102 bytes content/training/resources/tor-network-2019.odp.lr | 13 +++++ content/training/resources/tor-network-2019.pdf | Bin 0 -> 524047 bytes content/training/resources/tor-network-2019.pdf.lr | 13 +++++ .../resources/tor-slides-full-deck-2019.odp | Bin 0 -> 3569187 bytes .../resources/tor-slides-full-deck-2019.odp.lr | 13 +++++ .../resources/tor-slides-full-deck-2019.pdf | Bin 0 -> 2344713 bytes .../resources/tor-slides-full-deck-2019.pdf.lr | 13 +++++ models/resource.ini | 32 ++++++++++++ models/resources.ini | 34 ++++++++++++ .../i18n/__pycache__/lektor_i18n.cpython-37.pyc | Bin 15379 -> 15397 bytes templates/macros/resources.html | 8 +++ templates/resource.html | 1 + templates/resources.html | 29 +++++++++++ templates/training.html | 17 ++++-- 17 files changed, 247 insertions(+), 3 deletions(-) diff --git a/content/training/best-practices/contents.lr b/content/training/best-practices/contents.lr new file mode 100644 index 0000000..741685b --- /dev/null +++ b/content/training/best-practices/contents.lr @@ -0,0 +1,58 @@ +section: training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Training Best Practices +--- +subtitle: Good preparation is essential to an effective and safe training, so we've curated some resources to help you make the most of your training event. +--- +cta: Best Practices for Trainers +--- +key: 1 +--- +html: two-columns-page.html +--- +body: + +Running security trainings is a fun and rewarding way to help your community conduct human rights work safely. Good preparation is essential to an effective and safe training, so we've curated some resources to help you make the most of your training event. + +## Before the training + +_Am I the right person to give this training?_ + +Security trainings can help people communicate and use the internet safely, but there are additional considerations to be made before training some at-risk groups. That's why we recommend this resource from EFF's Security Education Companion, ["Am I the right person to give this training?"](https://sec.eff.org/articles/right-person-to-train). This resource can help you be sure that you're doing the best by the community of people you wish to train. + +Other questions to ask yourself before deciding to do a training: + +- How will you assess the needs of your group? What needs can you meet? +- How will you assess the skill level of your group? What skill levels can you teach to? + +Once you've answered those questions, you're ready to plan your training! + +1. Find a location that is accessible, affordable, has an internet connection and other materials like a white board, projector, and screen. Make sure that the location is safe for your attendees to visit. +2. Promote your event in your community's spaces, taking safety into consideration. Under many circumstances, social media is great for promotion, but for higher risk groups, you may want to use a smaller word-of-mouth network or require community members to share information individually to other trusted people. +3. Create localized handouts for some of the more difficult concepts that you'll be teaching. +4. Make sure you have plenty of stickers to hand out to participants! +5. Create a link list of all the resources you'll be talking about. This includes downloads and PDFs of handouts. You'll share this link list on a whiteboard or project it at the training. +6. Determine how you'll do hands-on assistance at your training. Will you be able to handle this alone? Or will you require partners? If you need more help, make sure the partners you're bringing in are aware of the safety needs of the community, and communicate with your contacts in the community to make sure they're okay with you bringing in additional trainers. +7. Make sure your presentation is up-to-date (both information and screenshots) and save your presentation in two file formats -- for example, odp and pdf -- and on at least one additional device -- for example, on your computer and on a USB stick. +8. Decide how you will facilitate a safer space. We recommend using the Tor Code of Conduct. You can also start the training by asking participants to come up with their own community agreements for the space. + +## At the training + +1. Create an agenda and share it on a projection or on a whiteboard so that your participants can be prepared for the day. +2. Communicate about how much time the training will take, and when breaks will happen. Make sure you take breaks! +3. Communicate about when you'll take questions, either during the training, at the end, or both. +4. Communicate about how you'll offer hands-on help (if at all). +5. Communicate about how participants can contact you securely after the training. +6. Show the participants the resources at community.torproject.org and support.torproject.org. +7. Show the participants other resources like sec.eff.org. + +## After the training + +1. Think about how you will evaluate your success at the training. You may want to create a follow up survey, or at least contact participants and ask them to share their feedback with you. + diff --git a/content/training/resources/contents.lr b/content/training/resources/contents.lr new file mode 100644 index 0000000..58a6907 --- /dev/null +++ b/content/training/resources/contents.lr @@ -0,0 +1,19 @@ +section: training +--- +section_id: training +--- +color: primary +--- +_template: layout.html +--- +title: Training Resources +--- +subtitle: Do you teach your community about using Tor? These resources are for you. +--- +key: 2 +--- +html: resources.html +--- +body: + +Do you teach your community about using Tor? These training resources are for you. \ No newline at end of file diff --git a/content/training/resources/tor-network-2019.odp b/content/training/resources/tor-network-2019.odp new file mode 100644 index 0000000..2d24160 Binary files /dev/null and b/content/training/resources/tor-network-2019.odp differ diff --git a/content/training/resources/tor-network-2019.odp.lr b/content/training/resources/tor-network-2019.odp.lr new file mode 100644 index 0000000..d1abc51 --- /dev/null +++ b/content/training/resources/tor-network-2019.odp.lr @@ -0,0 +1,13 @@ +_model: resource +--- +title: Tor Network +--- +description: ODP file +--- +type: odp +--- +date: 2019 +--- +file: tor-network-2019.odp +--- +key: 1 \ No newline at end of file diff --git a/content/training/resources/tor-network-2019.pdf b/content/training/resources/tor-network-2019.pdf new file mode 100644 index 0000000..a5187ea Binary files /dev/null and b/content/training/resources/tor-network-2019.pdf differ diff --git a/content/training/resources/tor-network-2019.pdf.lr b/content/training/resources/tor-network-2019.pdf.lr new file mode 100644 index 0000000..5a84664 --- /dev/null +++ b/content/training/resources/tor-network-2019.pdf.lr @@ -0,0 +1,13 @@ +_model: resource +--- +title: Tor Network +--- +description: PDF file +--- +type: pdf +--- +date: 2019 +--- +file: tor-network-2019.pdf +--- +key: 0 \ No newline at end of file diff --git a/content/training/resources/tor-slides-full-deck-2019.odp b/content/training/resources/tor-slides-full-deck-2019.odp new file mode 100644 index 0000000..66d3d70 Binary files /dev/null and b/content/training/resources/tor-slides-full-deck-2019.odp differ diff --git a/content/training/resources/tor-slides-full-deck-2019.odp.lr b/content/training/resources/tor-slides-full-deck-2019.odp.lr new file mode 100644 index 0000000..97ef6dc --- /dev/null +++ b/content/training/resources/tor-slides-full-deck-2019.odp.lr @@ -0,0 +1,13 @@ +_model: resource +--- +title: Tor Network +--- +description: ODP file +--- +type: odp +--- +date: 2019 +--- +file: tor-slides-full-deck-2019.odp +--- +key: 3 \ No newline at end of file diff --git a/content/training/resources/tor-slides-full-deck-2019.pdf b/content/training/resources/tor-slides-full-deck-2019.pdf new file mode 100644 index 0000000..6933dcf Binary files /dev/null and b/content/training/resources/tor-slides-full-deck-2019.pdf differ diff --git a/content/training/resources/tor-slides-full-deck-2019.pdf.lr b/content/training/resources/tor-slides-full-deck-2019.pdf.lr new file mode 100644 index 0000000..86b9049 --- /dev/null +++ b/content/training/resources/tor-slides-full-deck-2019.pdf.lr @@ -0,0 +1,13 @@ +_model: resource +--- +title: Tor Network +--- +description: PDF file +--- +type: pdf +--- +date: 2019 +--- +file: tor-slides-full-deck-2019.pdf +--- +key: 3 \ No newline at end of file diff --git a/models/resource.ini b/models/resource.ini new file mode 100644 index 0000000..2198873 --- /dev/null +++ b/models/resource.ini @@ -0,0 +1,32 @@ +[model] +name = Resource +label = {{ this.title }} + +[fields.name] +label = Name +type = string +translate = True + +[fields.link] +label = Link +type = string + +[fields.description] +label = Description +type = string + +[fields.type] +label = Type +type = string + +[fields.date] +label = date +type = string + +[fields.file] +label = File +type = string + +[fields.key] +label = Key +type = string \ No newline at end of file diff --git a/models/resources.ini b/models/resources.ini new file mode 100644 index 0000000..1df9906 --- /dev/null +++ b/models/resources.ini @@ -0,0 +1,34 @@ +[model] +name = Resources +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string +translate = True + +[fields.section_id] +label = Section_id +type = string +translate = False + +[fields.body] +label = Body +type = markdown + +[fields.color] +label = Color +type = string + +[fields.html] +label = Html +type = string + +[children] +model = resource +order_by = key \ No newline at end of file diff --git a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc index 52322b7..488bd31 100644 Binary files a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc and b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc differ diff --git a/templates/macros/resources.html b/templates/macros/resources.html new file mode 100644 index 0000000..e632faf --- /dev/null +++ b/templates/macros/resources.html @@ -0,0 +1,8 @@ +{% macro render_resource(item) %} +<tr> + <td><a href="{{ item|url }}">{{ item.file }}</a></td> + <td>{{ item.description }}</td> + <td>{{ item.type}}</td> + <td>{{ item.date }}</td> +</tr> +{% endmacro %} diff --git a/templates/resource.html b/templates/resource.html new file mode 100644 index 0000000..0b1bdf2 --- /dev/null +++ b/templates/resource.html @@ -0,0 +1 @@ +{{ this.name }} \ No newline at end of file diff --git a/templates/resources.html b/templates/resources.html new file mode 100644 index 0000000..d40c313 --- /dev/null +++ b/templates/resources.html @@ -0,0 +1,29 @@ +<div class="row pt-5"> + {% include 'sidenav.html' %} + <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> + {{ this.body }} + <div class="container py-3"> + <div class="row"> + <table class="table"> + <thead> + <tr> + <th scope="col">Title</th> + <th scope="col">Description</th> + <th scope="col">Formats</th> + <th scope="col">Last Updated</th> + </tr> + </thead> + <tbody> + {% from "macros/resources.html" import render_resource %} + {% for item in this.attachments %} + {{ render_resource(item) }} + {% endfor %} + </tbody> + </table> + </div> + </div> + </div> +</div> + + + diff --git a/templates/training.html b/templates/training.html index a7fcbb6..65c7187 100644 --- a/templates/training.html +++ b/templates/training.html @@ -7,10 +7,21 @@ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> - <div class="row py-5"> - <h2 class="text-primary text-center mx-auto"><u>{{ _('Resources') }}</u> - </h2> + {% for child in this.children|sort(attribute='key') %} + {% if child.key != '0' %} + <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> + <div class="card h-100 border-0"> + <div class="card-body"> + <h2 class="text-primary display-2"><i class="fas fa-{{ child.image }}"></i></h2> + <h4 class="card-title text-primary">{{ child.title }}</h4> + <p class="card-text">{{ child.subtitle }}</p> + <a href="{{ child.path|url }}">{{ child.cta }} <i class="fas fa-arrow-right"></i></a> + </div> + </div> + </div> + {% endif %} + {% endfor %} </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Join the Community') }}</h2>

1 0

[community/master] Update link to contact
by pili＠torproject.org 12 Jun '19

12 Jun '19

commit 949f242d5e5a6dc24dbab152784a2b90e556f6ec Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Jun 12 11:54:52 2019 +0200 Update link to contact --- content/training/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/training/contents.lr b/content/training/contents.lr index 1cb0f37..da8dfc2 100644 --- a/content/training/contents.lr +++ b/content/training/contents.lr @@ -20,4 +20,4 @@ body: ##We want to teach the world about Tor. Will you help? -Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please contact our community team for more help [link to contact]. +Are you a Tor trainer or interested in becoming one? Looking for resources to help your community learn the most about Tor? We've got you covered. For some users with serious threat models, using Tor and other privacy tools can be risky if not done with care. If this describes your community, or if you're not sure, please [contact our community team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam… for more help.

1 0

[styleguide/master] no hardcoded uppercase #30027
by emmapeel＠torproject.org 12 Jun '19

12 Jun '19

commit 07137a11a87317f829b08a84ac75d88b36bf3755 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jun 12 16:01:42 2019 +0200 no hardcoded uppercase #30027 --- assets/scss/_tor.scss | 4 ++-- assets/scss/_type.scss | 2 +- assets/scss/utilities/_text.scss | 4 ++-- assets/static/bootstrap.css | 12 ++++++------ templates/components.html | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/scss/_tor.scss b/assets/scss/_tor.scss index 4ea5311..ea45e2f 100755 --- a/assets/scss/_tor.scss +++ b/assets/scss/_tor.scss @@ -179,7 +179,7 @@ small, .small{ } h6 { - text-transform: uppercase; + text-transform: none !important; font-weight: bold; color: $purple; } @@ -299,7 +299,7 @@ mark, .mark { // Badges // .badge{ - text-transform: uppercase; + text-transform: none !important; } // diff --git a/assets/scss/_type.scss b/assets/scss/_type.scss index b1b8f61..4d3c698 100755 --- a/assets/scss/_type.scss +++ b/assets/scss/_type.scss @@ -105,7 +105,7 @@ mark, // Builds on `abbr` .initialism { font-size: 90%; - text-transform: uppercase; + text-transform: none !important; } // Blockquotes diff --git a/assets/scss/utilities/_text.scss b/assets/scss/utilities/_text.scss index f4b6e65..a65d1b1 100755 --- a/assets/scss/utilities/_text.scss +++ b/assets/scss/utilities/_text.scss @@ -25,8 +25,8 @@ // Transformation .text-lowercase { text-transform: lowercase !important; } -.text-uppercase { text-transform: uppercase !important; } -.text-capitalize { text-transform: capitalize !important; } +.text-uppercase { text-transform: none !important; } +.text-capitalize { text-transform: none !important; } // Weight and italics diff --git a/assets/static/bootstrap.css b/assets/static/bootstrap.css index 21874b7..95e67d2 100644 --- a/assets/static/bootstrap.css +++ b/assets/static/bootstrap.css @@ -440,7 +440,7 @@ mark, .initialism { font-size: 90%; - text-transform: uppercase; } + text-transform: none; } .blockquote { margin-bottom: 1rem; @@ -6269,10 +6269,10 @@ a.bg-dark:focus, a.bg-dark:hover { text-transform: lowercase !important; } .text-uppercase { - text-transform: uppercase !important; } + text-transform: none !important; } .text-capitalize { - text-transform: capitalize !important; } + text-transform: none !important; } .font-weight-light { font-weight: 300 !important; } @@ -6401,12 +6401,12 @@ a.text-dark:focus, a.text-dark:hover { font-family: Source Sans Pro Bold; } h5 { - text-transform: uppercase; + text-transform: none; font-weight: bold; color: #7D4698; } h6 { - text-transform: uppercase; + text-transform: none; font-weight: bold; color: #7D4698; } @@ -6593,7 +6593,7 @@ mark, .mark { padding: 20px !important; } .badge { - text-transform: uppercase; } + text-transform: none; } .breadcrumb { background-color: #fff; } diff --git a/templates/components.html b/templates/components.html index cb5b6cc..1726f3a 100644 --- a/templates/components.html +++ b/templates/components.html @@ -54,13 +54,13 @@ </div> <div class="row p-5 bg-light"> <div class="col-12"> - <h2>Example heading <span class="badge badge-primary">New</span></h2> + <h2>Example heading <span class="badge badge-primary">NEW</span></h2> </div> <div class="col-12"> - <h4 class="pt-4">Example heading <span class="badge badge-secondary">New</span></h4> + <h4 class="pt-4">Example heading <span class="badge badge-secondary">NEW</span></h4> </div> <div class="col-12"> - <h6 class="pt-4">Example heading <span class="badge-pill badge-primary">New</span></h6> + <h6 class="pt-4">Example heading <span class="badge-pill badge-primary">NEW</span></h6> </div> </div>

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 12 Jun '19

12 Jun '19

commit 0c66f9a497fab14d47a6b5d5b137b6d0e1ba6f54 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 12 10:18:08 2019 +0000 Update translations for tbmanual-contentspot --- contents+ca.po | 12 ++++++++++++ contents+cs.po | 51 ++++++++++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 773a9ccec..6b13ead9a 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -259,6 +259,9 @@ msgid "" "The safest and simplest way to download Tor Browser is from the official Tor" " Project website at https://www.torproject.org/download." msgstr "" +"La manera segura i simple de descarregar el navegador Tor és mitjançant la " +"pàgina oficial del projecte Tor en el web " +"https://www.torproject.org/download." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -366,6 +369,9 @@ msgid "" " Message to @get_tor with the words \"osx en\" in it (you don't need to " "follow the account)." msgstr "" +"Per obtenir els enllaços per la descàrrega del navegador Tor en anglès per " +"macOS, enviï una piulada a @get_tor amb el següent text: \"osx en\" (no " +"precisa se seguidor del compte)." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -1917,6 +1923,8 @@ msgid "" "Visit https://www.torproject.org/download/ and download a copy of the latest" " Tor Browser release, then install it as before." msgstr "" +"Visitar https://www.torproject.org/download/ i descarregar una còpia de " +"l'última versió del navegador Tor, posteriorment instal·lar." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.title) @@ -2297,6 +2305,10 @@ msgid "" "default location, however the folder will be named \"tor-browser_en-US\" if " "you are running the English Tor Browser." msgstr "" +"1. Ubica la carpeta del navegador Tor. La localització per defecte a Windows" +" és en el escriptori; en macOS és en la carpeta d'aplicacions. A Linux, no " +"hi ha una localització prefixada, de manera que la carpeta serà anomenada " +"\"tor-browser_en-US\" si s'utilitza la versió anglesa." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) diff --git a/contents+cs.po b/contents+cs.po index 17849b563..44ed32a59 100644 --- a/contents+cs.po +++ b/contents+cs.po @@ -4,6 +4,7 @@ # Michal Várady <miko.vaji(a)gmail.com>, 2019 # erinm, 2019 # Michal Stanke <mstanke(a)mozilla.cz>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -11,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-06-03 14:04+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Michal Stanke <mstanke(a)mozilla.cz>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -138,7 +139,7 @@ msgstr "Známé problémy" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.title) msgid "ABOUT TOR BROWSER" -msgstr "" +msgstr "O PROHLÍŽEČI TOR" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.description) @@ -191,7 +192,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "##### HOW TOR WORKS" -msgstr "" +msgstr "##### JAK TOR FUNGUJE" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -225,7 +226,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.title) msgid "DOWNLOADING" -msgstr "" +msgstr "STAHOVÁNÍ" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.description) @@ -277,7 +278,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "##### GETTOR" -msgstr "" +msgstr "##### GETTOR" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -290,7 +291,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "###### TO USE GETTOR VIA EMAIL:" -msgstr "" +msgstr "##### POUŽITÍ GETTOR POMOCÍ E-MAILU:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -322,7 +323,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "###### TO USE GETTOR VIA TWITTER:" -msgstr "" +msgstr "##### POUŽITÍ GETTOR PŘES TWITTER:" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -335,7 +336,7 @@ msgstr "" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) msgid "###### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):" -msgstr "" +msgstr "##### POUŽITÍ GETTOR POMOCÍ JABBER/XMPP (JITSI, COYIM, ETC):" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -349,7 +350,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) msgid "RUNNING TOR BROWSER FOR THE FIRST TIME" -msgstr "" +msgstr "PRVNÍ SPUŠTĚNÍ TORU" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.description) @@ -370,7 +371,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "##### CONNECT" -msgstr "" +msgstr "##### PŘIPOJIT" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -393,7 +394,7 @@ msgstr "" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "##### CONFIGURE" -msgstr "" +msgstr "##### KONFIGUROVAT" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -451,7 +452,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) msgid "BRIDGES" -msgstr "" +msgstr "MOSTY" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.description) @@ -482,7 +483,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "##### GETTING BRIDGE ADDRESSES" -msgstr "" +msgstr "##### ZÍSKÁNÍ ADRESY PŘEMOSTĚNÍ" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -508,7 +509,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "##### ENTERING BRIDGE ADDRESSES" -msgstr "" +msgstr "##### ZADÁNÍ ADRES PŘEMOSTĚNÍ" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -704,7 +705,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "##### USING PLUGGABLE TRANSPORTS" -msgstr "" +msgstr "##### POUŽÍVÁNÍ DODATEČNÝCH SPOJENÍ" #: https//tb-manual.torproject.org/transports/ #: (content/transports/contents+en.lrtopic.body) @@ -749,7 +750,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) msgid "CIRCUMVENTION" -msgstr "" +msgstr "OBCHÁZENÍ" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.description) @@ -809,7 +810,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "##### WHICH TRANSPORT SHOULD I USE?" -msgstr "" +msgstr "##### KTERÝ TRANSPORT BYCH MĚL POUŽÍT?" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -839,7 +840,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.title) msgid "MANAGING IDENTITIES" -msgstr "" +msgstr "SPRÁVA IDENTIT" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.description) @@ -927,7 +928,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "##### LOGGING IN OVER TOR" -msgstr "" +msgstr "##### PŘIHLÁŠENÍ PŘES TOR" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1141,7 +1142,7 @@ msgstr "" #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.title) msgid "SECURE CONNECTIONS" -msgstr "" +msgstr "ZABEZPEČENÁ PŘIPOJENÍ" #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.description) @@ -1436,7 +1437,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.title) msgid "SECURITY SETTINGS" -msgstr "" +msgstr "NASTAVENÍ ZABEZPEČENÍ" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1552,7 +1553,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.title) msgid "UPDATING" -msgstr "" +msgstr "AKTUALIZACE" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.description) @@ -1753,7 +1754,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.title) msgid "TROUBLESHOOTING" -msgstr "" +msgstr "ODSTRAŇOVÁNÍ PROBLÉMŮ" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.description) @@ -1845,7 +1846,7 @@ msgstr "" #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.title) msgid "KNOWN ISSUES" -msgstr "" +msgstr "ZNÁMÉ PROBLÉMY" #: https//tb-manual.torproject.org/known-issues/ #: (content/known-issues/contents+en.lrtopic.body) @@ -1930,7 +1931,7 @@ msgstr "" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.title) msgid "UNINSTALLING" -msgstr "" +msgstr "ODINSTALACE" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.description)

1 0

[tor/master] Stop hard-coding env vars in the git scripts
by asn＠torproject.org 12 Jun '19

12 Jun '19

commit 396134188f21b3f8bdfe35171f14c6b70446ea3e Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:34:44 2019 +1000 Stop hard-coding env vars in the git scripts Set the env vars: * TOR_MASTER_NAME to override the tor master branch name, and * TOR_WKT_NAME to override the worktree path Fixes bug 30841; bugfix on 0.4.0.1-alpha. --- changes/bug30841 | 3 +++ scripts/git/git-merge-forward.sh | 4 ++-- scripts/git/git-pull-all.sh | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug30841 b/changes/bug30841 new file mode 100644 index 000000000..c6d1c5146 --- /dev/null +++ b/changes/bug30841 @@ -0,0 +1,3 @@ + o Minor bugfixes (git scripts): + - Stop hard-coding the tor master branch name and worktree path in the + git scripts. Fixes bug 30841; bugfix on 0.4.0.1-alpha. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index c9ec55ac6..ba2998328 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -17,9 +17,9 @@ GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"} # The tor master git repository directory from which all the worktree have # been created. -TOR_MASTER_NAME="tor" +TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"} # The worktrees location (directory). -TOR_WKT_NAME="tor-wkt" +TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} ######################### # End of configuration. # diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index e5ba96a05..8eb42c7c1 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -17,9 +17,9 @@ GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"} # The tor master git repository directory from which all the worktree have # been created. -TOR_MASTER_NAME="tor" +TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"} # The worktrees location (directory). -TOR_WKT_NAME="tor-wkt" +TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} ######################### # End of configuration. #

1 0

[tor/master] scripts/git: Stop hard-coding the bash path in the git scripts
by asn＠torproject.org 12 Jun '19

12 Jun '19

commit 973800b847844cfaacf48658d02fe3ada77cbcf6 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:29:10 2019 +1000 scripts/git: Stop hard-coding the bash path in the git scripts Some OSes don't have bash in /usr/bin, others have an ancient bash at this path. Fixes bug 30840; bugfix on 0.4.0.1-alpha. --- changes/bug30840 | 4 ++++ scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- scripts/git/git-push-all.sh | 2 +- scripts/git/pre-commit.git-hook | 2 +- scripts/git/pre-push.git-hook | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug30840 b/changes/bug30840 new file mode 100644 index 000000000..562b0fbd9 --- /dev/null +++ b/changes/bug30840 @@ -0,0 +1,4 @@ + o Minor bugfixes (git scripts): + - Stop hard-coding the bash path in the git scripts. Some OSes don't + have bash in /usr/bin, others have an ancient bash at this path. + Fixes bug 30840; bugfix on 0.4.0.1-alpha. diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index 15af6f3db..c9ec55ac6 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################## # Configuration (change me!) # diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 6fe7e5981..e5ba96a05 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ################################## # User configuration (change me) # diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 0701b27b5..2030a600f 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # The remote upstream branch on which git.torproject.org/tor.git points to. UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index b285776c0..2a2983719 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # To install this script, copy it to .git/hooks/pre-commit in local copy of # tor git repo and make sure it has permission to execute. diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index c9e72a4d4..51b0c896c 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # git pre-push hook script to: # 1) prevent "fixup!" and "squash!" commit from ending up in master, release-*

1 0

[tor/master] Merge branch 'tor-github/pr/1099'
by asn＠torproject.org 12 Jun '19

12 Jun '19

commit 438b7eec856b0caced7112dd0c87a8dae8df0c75 Merge: 96fade0a7 396134188 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 13:02:49 2019 +0300 Merge branch 'tor-github/pr/1099' changes/bug30840 | 4 ++++ changes/bug30841 | 3 +++ scripts/git/git-merge-forward.sh | 6 +++--- scripts/git/git-pull-all.sh | 6 +++--- scripts/git/git-push-all.sh | 2 +- scripts/git/pre-commit.git-hook | 2 +- scripts/git/pre-push.git-hook | 2 +- 7 files changed, 16 insertions(+), 9 deletions(-)

1 0