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

[manual/translations] Fix grammar
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit d07e4d3fb463bf30242556153ee89ae60a6ca835 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Apr 1 01:07:28 2020 +0000 Fix grammar --- content/circumvention/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index b1218ee..f0d1cdf 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -49,9 +49,9 @@ meek ### USING PLUGGABLE TRANSPORTS -To use a pluggable transport, click "Configure" when starting Tor Browser for the first time. After checking the checkbox "Tor is censored in my country," choose "Select a built-in bridge" option. From the dropdown, select whichever pluggable transport you'd like to use. Once you've selected the pluggable transport, click "Connect" to save your settings. +To use a pluggable transport, click "Configure" when starting Tor Browser for the first time. After checking the checkbox "Tor is censored in my country," choose the "Select a built-in bridge" option. From the dropdown, select whichever pluggable transport you'd like to use. Once you've selected the pluggable transport, click "Connect" to save your settings. -Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Select a built-in bridge", choose whichever pluggable transport you'd like to use from the dropdown. Your setting will automatically be saved once you close the tab. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Select a built-in bridge," choose whichever pluggable transport you'd like to use from the dropdown. Your setting will automatically be saved once you close the tab. ### WHICH TRANSPORT SHOULD I USE?

1 0

[manual/translations] Erase repeated instructions
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit f9edaec8992b961c2248a5812fa665615490bb36 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Tue Mar 31 20:25:23 2020 +0000 Erase repeated instructions --- content/circumvention/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index 641c23c..dbb9a10 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -60,6 +60,6 @@ Each of the transports listed in Tor Launcher’s menu works in a different way, If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs4, snowflake, or meek-azure. -If you try all of these options and none of them gets you online, you can choose "Request a bridge from torproject.org" for BridgeDB to provide a bridge or "Provide a bridge I know" to manually enter bridge addresses. +If you try all of these options, and none of them gets you online, you will need to request a bridge or to manually enter bridge addresses. Read the [Bridges](/en-US/bridges/) section to learn what bridges are and how to obtain them.

1 0

[manual/translations] Clarify 'Preferences' instruction similar to Bridges page
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit 611bf0229fe4c47cda22a42bea4b4aff3cd26251 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Apr 1 00:37:19 2020 +0000 Clarify 'Preferences' instruction similar to Bridges page --- content/circumvention/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index 07b6a89..b1218ee 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -51,7 +51,7 @@ meek To use a pluggable transport, click "Configure" when starting Tor Browser for the first time. After checking the checkbox "Tor is censored in my country," choose "Select a built-in bridge" option. From the dropdown, select whichever pluggable transport you'd like to use. Once you've selected the pluggable transport, click "Connect" to save your settings. -Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the dropdown "Select a built-in bridge", choose whichever pluggable transport you'd like to use. Your setting will automatically be saved once you close the tab. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Select a built-in bridge", choose whichever pluggable transport you'd like to use from the dropdown. Your setting will automatically be saved once you close the tab. ### WHICH TRANSPORT SHOULD I USE?

1 0

[manual/translations] Remove word 'to'
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit 49bf092202f5c8ecc4c69fcfb89a2ea62c5ffb5d Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Tue Mar 31 20:48:12 2020 +0000 Remove word 'to' --- content/circumvention/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index dbb9a10..07b6a89 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -60,6 +60,6 @@ Each of the transports listed in Tor Launcher’s menu works in a different way, If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs4, snowflake, or meek-azure. -If you try all of these options, and none of them gets you online, you will need to request a bridge or to manually enter bridge addresses. +If you try all of these options, and none of them gets you online, you will need to request a bridge or manually enter bridge addresses. Read the [Bridges](/en-US/bridges/) section to learn what bridges are and how to obtain them.

1 0

[manual/translations] Fix active 'nav-item' in side nav mobile view
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit 65d480f8ddb5bcbf25f486e5deca5821940061dd Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Apr 1 18:42:43 2020 +0000 Fix active 'nav-item' in side nav mobile view --- templates/sidenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index 3a154a1..9fab4c0 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -15,7 +15,7 @@ <ul class="nav nav-pills flex-column"> {% set topicbag = 'topics' %} {% for id, item in bag(topicbag).items() %} - <li{% if this.is_child_of(item.path) %} class="nav-item" {% else %} class="toc-entry toc-h2 nav-item"{% endif %}> + <li{% if this.is_child_of(item.path) %} class="toc-entry toc-h2 active nav-item" {% else %} class="toc-entry toc-h2 nav-item"{% endif %}> {% if this.alt != "en" %} {% set p = '/' + this.alt + '/' + item.path %} {% else %}

1 0

[manual/translations] Fix grammar
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit 758c2fc3f16b9e2f64f9ecfb8e3b13bdfaac0d78 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Apr 1 01:32:26 2020 +0000 Fix grammar --- content/bridges/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index dfadea2..5b084cf 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -31,7 +31,7 @@ Because bridge addresses are not public, you will need to request them yourself. If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Click "Connect" to save your settings. -Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Request a bridge from torproject.org", click "Request a New Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Your setting will automatically be saved once you close the tab. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Request a bridge from torproject.org," click "Request a New Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Your setting will automatically be saved once you close the tab. ### ENTERING BRIDGE ADDRESSES @@ -41,6 +41,6 @@ Once you have obtained some bridge addresses, you will need to enter them into T If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Provide a bridge I know" and enter each bridge address on a separate line. Click "Connect" to save your settings. -Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Provide a bridge I know," enter each bridge address on a separate line. Your setting will automatically be saved once you close the tab. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Provide a bridge I know," enter each bridge address on a separate line. Your setting will automatically be saved once you close the tab. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again.

1 0

[manual/translations] Update Bridges page
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit 7df33f9d5f668e79e0ca78ce672da4442980037f Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Wed Apr 1 01:29:11 2020 +0000 Update Bridges page --- assets/static/images/request-a-bridge.png | Bin 0 -> 17195 bytes content/bridges/contents.lr | 12 +++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/assets/static/images/request-a-bridge.png b/assets/static/images/request-a-bridge.png new file mode 100644 index 0000000..21bcd53 Binary files /dev/null and b/assets/static/images/request-a-bridge.png differ diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index 161bfaa..dfadea2 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -27,13 +27,11 @@ Because bridge addresses are not public, you will need to request them yourself. ### USING MOAT -If you're starting Tor Browser for the first time, click 'Configure' to open the Tor Network Settings window. -Otherwise, click on 'Preferences' in the hamburger menu (main menu) and then on 'Tor' in the sidebar. +<img class="col-md-6" align="right" hspace="5" src="../../static/images/request-a-bridge.png"> -In the Tor Network Settings window, select 'Tor is censored in my country.' -Then, select 'Request a bridge from torproject.org' and click 'Request a bridge...' +If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Click "Connect" to save your settings. -Complete the CAPTCHA and click 'Submit'. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Request a bridge from torproject.org", click "Request a New Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Your setting will automatically be saved once you close the tab. ### ENTERING BRIDGE ADDRESSES @@ -41,8 +39,8 @@ Complete the CAPTCHA and click 'Submit'. Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher. -If you're starting Tor Browser for the first time, click 'Configure' to open the Tor Network Settings window. Otherwise, click on 'Preferences' in the hamburger menu (main menu) and then on 'Tor' in the sidebar to access these options. +If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Provide a bridge I know" and enter each bridge address on a separate line. Click "Connect" to save your settings. -In 'Bridges' section, check the box 'Use a bridge', then, select 'Provide a bridge I know' and enter each bridge address on a separate line. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge", and from the option "Provide a bridge I know," enter each bridge address on a separate line. Your setting will automatically be saved once you close the tab. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again.

1 0

[manual/translations] Squashed commit of the following:
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit f30c3199653e7cb69461ea778a7edabb7524c539 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Feb 5 10:27:54 2020 +0100 Squashed commit of the following: commit 350a0c64564c016efe970dfd5efcd987626b010b commit c01c07d2d3e3d17ed621d5de149a0b1b540b5d43 commit 9de60260bff4e62029f5ad32c98d84a1cb52ce2f commit a4700a564e17104ae55f2a37ac3990df5a03e7cf commit a7e082adf2d7dcd92fd1875ea08b95cada615900 commit b1338ffce818b5971b7b68949bbd46653af00f8d commit e9592bfdc153f081709eabd1d392c7b95ad44773 commit ed9342f6be49aeee7062a727e450e3ae2e1c6557 commit 7b71df1efef48db1b9b37d44436fe7f20197e458 commit 0479b96c95e95ed566b50a02ae76b1e62220b1ac commit 21047b53bf1f5ee8a4a526fcd6b194de35f1b4de commit ac8c890d3fe8850e94629e595d66e9ff8cd8c817 commit c4f9dbc06cbf3677c2e7e349b40c3e509075d49c Author: Enjeck Cleopatra <32180937+PROTechThor(a)users.noreply.github.com> Conflicts: databags/topics.ini fixes: https://github.com/torproject/manual/pull/58/ --- databags/topics.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/databags/topics.ini b/databags/topics.ini index 9fc3c67..40ff295 100644 --- a/databags/topics.ini +++ b/databags/topics.ini @@ -66,6 +66,10 @@ label = Known Issues path = mobile-tor label = Mobile Tor +[mobile-tor] +path = mobile-tor +label = Mobile Tor + [becoming-tor-translator] path = becoming-tor-translator label = Becoming a Tor Translator

1 0

[manual/translations] Headings
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit 271463f0e4ddf6f7e626d24e97f77feaf84a1db3 Author: Enjeck Cleopatra <32180937+PROTechThor(a)users.noreply.github.com> Date: Thu Apr 2 09:29:50 2020 +0100 Headings --- content/mobile-tor/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr index a809a9f..5bf7a50 100644 --- a/content/mobile-tor/contents.lr +++ b/content/mobile-tor/contents.lr @@ -10,7 +10,7 @@ key: 15 --- body: -#### Tor Browser for Android +### Tor Browser for Android Tor Browser for Android is the only official mobile browser supported and developed by the Tor Project. It is like the desktop Tor Browser, but for your Android mobile device. Some of the prime features of Tor Browser for Android include: reducing tracking across websites, defending against surveillance, resisting browser fingerprinting, and circumventing censorship. @@ -195,6 +195,8 @@ At the moment, there are some features which are not available in Tor Browser fo * You can't take screenshots while using Tor Browser for Android. [#27987](https://trac.torproject.org/projects/tor/ticket/27987) * You can't save images. [#31013](https://trac.torproject.org/projects/tor/ticket/31013) +### More about Tor on mobile devices + #### Orfox Orfox was first released in 2015 by The Guardian Project, with the aim of giving Android users a way to browse the internet over Tor. Over the next three years, Orfox continously improved and became a popular way for people to browse the internet with more privacy

1 0

[manual/translations] sentence in one line
by emmapeel＠torproject.org 11 Apr '20

11 Apr '20

commit 85857eff8830628d988d162c505f2b520c63a7da Author: emma peel <emma.peel(a)riseup.net> Date: Sat Apr 11 08:18:55 2020 +0200 sentence in one line --- content/bridges/contents.lr | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index 5b084cf..608fc29 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -29,9 +29,13 @@ Because bridge addresses are not public, you will need to request them yourself. <img class="col-md-6" align="right" hspace="5" src="../../static/images/request-a-bridge.png"> -If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Click "Connect" to save your settings. +If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. +After checking the checkbox "Tor is censored in my country," choose "Request a bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to provide a bridge. +Complete the CAPTCHA and click "Submit." Click "Connect" to save your settings. -Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Request a bridge from torproject.org," click "Request a New Bridge..." for BridgeDB to provide a bridge. Complete the CAPTCHA and click "Submit." Your setting will automatically be saved once you close the tab. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. +In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Request a bridge from torproject.org," click "Request a New Bridge..." for BridgeDB to provide a bridge. +Complete the CAPTCHA and click "Submit." Your setting will automatically be saved once you close the tab. ### ENTERING BRIDGE ADDRESSES @@ -39,8 +43,12 @@ Or, if you have Tor Browser running, click on "Preferences" in the hamburger men Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher. -If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. After checking the checkbox "Tor is censored in my country," choose "Provide a bridge I know" and enter each bridge address on a separate line. Click "Connect" to save your settings. +If you're starting Tor Browser for the first time, click "Configure" to open the Tor Network Settings window. +After checking the checkbox "Tor is censored in my country," choose "Provide a bridge I know" and enter each bridge address on a separate line. +Click "Connect" to save your settings. -Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Provide a bridge I know," enter each bridge address on a separate line. Your setting will automatically be saved once you close the tab. +Or, if you have Tor Browser running, click on "Preferences" in the hamburger menu and then on "Tor" in the sidebar. +In the "Bridges" section, check the checkbox "Use a bridge," and from the option "Provide a bridge I know," enter each bridge address on a separate line. +Your settings will automatically be saved once you close the tab. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again.

1 0