[tor-commits] [tpo/master] Add yec 2021 links
commit 969bb4eb3ed2f2bf9e3841574c169fc2b919932e Author: gus Date: Fri Oct 15 11:55:42 2021 -0300 Add yec 2021 links Update YEC 2021 donate URLs --- .htaccess | 130 +- 1 file changed, 69 insertions(+), 61 deletions(-) diff --git a/.htaccess b/.htaccess index 17cfc84c..4997131c 100644 --- a/.htaccess +++ b/.htaccess @@ -111,25 +111,33 @@ RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L] # Donation campaign -# 2020 -RewriteRule ^donate/donate-usetor-bp1(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-twitter-en(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-ann-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-ann-usetor-tw-en(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-ann-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-blog(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-hrd-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-hp1(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-md(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +# 2021 +RewriteRule ^donate/donate-phr-bp1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-twitter-en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-hr-md(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-hr-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-phr-tw-en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-phr-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-phr-ig(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-phr-ld(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-hrd-phr-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-hp1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-md(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-tw(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-twitter(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usertor-ld(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-ig(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-tn1(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-yt(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-em1(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-gp(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-ld(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-ig(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-tn1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-yt(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-em1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-gp(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-bp1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-bp2(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-bp3(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-bp4(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-bp5(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-phr-bp6(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/en(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/ru(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/es(.*) https://donate.torproject.org/ [R=302,L] @@ -141,22 +149,22 @@ RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-options(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-en-US(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-ru(.*) https://donate.torproject.org/ [R=302,L] -RewriteRule ^donate/donate-usetor-de(.*) https://donate.torproject.org/ [R=302,L]
[tor-commits] [tpo/master] correct eta's pronoun to not be a URL
commit c10ddda0c3a6afb89fdd8bfa7a09b7f1597a468d Author: eta Date: Fri Oct 22 21:49:28 2021 +0100 correct eta's pronoun to not be a URL --- content/about/people/eta/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/eta/contents.lr b/content/about/people/eta/contents.lr index 4da2dffa..064236ea 100644 --- a/content/about/people/eta/contents.lr +++ b/content/about/people/eta/contents.lr @@ -8,7 +8,7 @@ name: eta --- twitter_handle: eta9 --- -pronoun: https://pronoun.is/she/her +pronoun: she/her --- nickname: eta --- ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [donate-static/master] Add Tor navbar
commit e809cc4a6ae50f8734fe7863b8c1a336664fe522 Author: gus Date: Fri Oct 22 17:37:08 2021 -0300 Add Tor navbar --- templates/meta.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/meta.html b/templates/meta.html index 321462e9..e51f5aff 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -21,3 +21,6 @@ {{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %} {% block head %}{% endblock %} + + {% include 'navbar-min.html' %} + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/main] fix typos/etc in dir-spec
commit 52a5e7152726d279fc73a437d38a6c23eb9fcf73 Author: Roger Dingledine Date: Fri Oct 22 16:27:19 2021 -0400 fix typos/etc in dir-spec --- dir-spec.txt | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 873225d..543e341 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -395,7 +395,7 @@ Table of Contents upload after this time. (0.4.4.1-alpha was the first version to reject votes in this way.) - Note: Refusing late uploaded votes minimises the chance of a consensus + Note: Refusing late uploaded votes minimizes the chance of a consensus split, particular when authorities are under bandwidth pressure. If an authority is struggling to upload its vote, and finally uploads to a fraction of authorities after this period, they will compute a consensus @@ -1429,7 +1429,7 @@ Table of Contents The "{read|write}-overload-count" are the counts of how many times the reported limits of burst/rate were exhausted and thus the maximum -between the read and write count occurances. To make the counter more +between the read and write count occurrences. To make the counter more meaningful and to avoid multiple connections saturating the counter when a relay is overloaded, we only increment it once a minute. @@ -2241,7 +2241,7 @@ Table of Contents [At most once] -See shared-rand-current-value decription above. +See shared-rand-current-value description above. The authority section of a consensus contains groups of the following items, in the order given, with one group for each authority that contributed to @@ -2330,7 +2330,7 @@ Table of Contents "Guard" if the router is suitable for use as an entry guard. "HSDir" if the router is considered a v2 hidden service directory. "NoEdConsensus" if any Ed25519 key in the router's descriptor or - microdesriptor does not reflect authority consensus. + microdescriptor does not reflect authority consensus. "Stable" if the router is suitable for long-lived circuits. "StaleDesc" if the router should upload a new descriptor because the old one is too old. @@ -2342,7 +2342,7 @@ Table of Contents "Valid" if the router has been 'validated'. Clients before 0.2.9.4-alpha would not use routers without this flag by default. Currently, relays without this flag are omitted - fromthe consensus, and current (post-0.2.9.4-alpha) clients + from the consensus, and current (post-0.2.9.4-alpha) clients assume that every listed relay has this flag. "V2Dir" if the router implements the v2 directory protocol or higher. @@ -2935,7 +2935,7 @@ Table of Contents entries. * If consensus-method 26 or later is in use, then we initialize - bandwith weights to 1 in our calculations, to avoid + bandwidth weights to 1 in our calculations, to avoid division-by-zero errors on unusual networks. * If consensus method 27 or later is used, the microdesc consensus @@ -3026,7 +3026,7 @@ Table of Contents "11" -- Don't consider BadExits when calculating bandwidth weights "12" -- Params are only included if enough auths voted for them "13" -- Omit router entries with missing microdescriptors. - "14" -- Adds support for "a" lines in ns consensues and microdescriptors. + "14" -- Adds support for "a" lines in ns consensuses and microdescriptors. "15" -- Adds support for "p6" lines. "16" -- Adds ntor keys to microdescriptors "17" -- Adds "Unmeasured=1" flags to "w" lines @@ -3039,7 +3039,7 @@ Table of Contents "24" -- No longer lists routers that are not Valid in the consensus. "25" -- Vote on recommended-protocols and required-protocols. "26" -- Initialize bandwidth weights to 1 to avoid division-by-zero. - "27" -- Adds support for "a" lines in microdescriptor consensues. + "27" -- Adds support for "a" lines in microdescriptor consensuses. "28" -- Removes "a" lines from microdescriptors. "29" -- Canonicalizes families in microdescriptors. "30" -- Removes padding from ntor-onion-key. @@ -3560,7 +3560,7 @@ Table of Contents they're about to serve match the right hashes (either the hashes from the fetch URL or the hashes from the consensus, respectively). - (NOTE: Due to squid proxy url limitations at most 92 microdescrriptor hashes + (NOTE: Due to squid proxy url limitations at most 92 microdescriptor hashes can be retrieved in a single request.) 4.4. Downloading extra-info documents from directory authorities ___ tor-commits mailing list tor-commits@lists.torproject.org
[tor-commits] [torspec/main] better name for the num-primary-guards variable
commit 8819ca12cd30499d5fea595468f924652a41e606 Author: Roger Dingledine Date: Fri Oct 22 16:25:08 2021 -0400 better name for the num-primary-guards variable --- path-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/path-spec.txt b/path-spec.txt index b1c9fde..6d2df4f 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -183,7 +183,7 @@ Tables of Contents (F is as above.) * Having a descriptor for every one of the first -NUM_GUARDS_TO_USE guards among our primary guards. (see +NUM_USABLE_PRIMARY_GUARDS guards among our primary guards. (see guard-spec.txt) We define the "fraction of bandwidth-weighted paths" as the product of ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [lego/yec21] Disable yec21 banner and FoT
commit 02ae76cbac55d688637c4d2bb4272ed62a8e0280 Author: gus Date: Fri Oct 22 17:08:02 2021 -0300 Disable yec21 banner and FoT --- templates/banner.html | 4 ++-- templates/header.html | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/banner.html b/templates/banner.html index 6b0b447..5bc1a91 100644 --- a/templates/banner.html +++ b/templates/banner.html @@ -12,8 +12,8 @@ - {{ _('Your donation will be matched by Friends of Tor, up to $150,000.') }} - + {% if locale.direction == 'text-right' %} diff --git a/templates/header.html b/templates/header.html index d9acc3e..d7d9f57 100644 --- a/templates/header.html +++ b/templates/header.html @@ -1,5 +1,4 @@ {% if this._model == 'donate-form' and this.header_image|length %} - {% include 'banner.html' %} {% else %} {% if this.color == 'primary' %} ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] add eta to about/people
commit a79b6746fab6c7582bdd0964f72b968c0ad3f5ac Author: eta Date: Fri Oct 22 14:25:43 2021 +0100 add eta to about/people --- assets/static/images/people/eta.png | Bin 0 -> 25069 bytes content/about/people/eta/contents.lr | 22 ++ 2 files changed, 22 insertions(+) diff --git a/assets/static/images/people/eta.png b/assets/static/images/people/eta.png new file mode 100644 index ..9d071985 Binary files /dev/null and b/assets/static/images/people/eta.png differ diff --git a/content/about/people/eta/contents.lr b/content/about/people/eta/contents.lr new file mode 100644 index ..4da2dffa --- /dev/null +++ b/content/about/people/eta/contents.lr @@ -0,0 +1,22 @@ +_model: person +--- +_hidden: yes +--- +role: core +--- +name: eta +--- +twitter_handle: eta9 +--- +pronoun: https://pronoun.is/she/her +--- +nickname: eta +--- +gpg: https://eta.st/tor-pubkey.asc +--- +image: /static/images/people/eta.png +--- + +description: + +Member of the Network Team, working on [Arti](https://gitlab.torproject.org/tpo/core/arti). ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [donate-static/staging] Change lego submodule to master
commit c3eb7f33fd3986eb0765f4257586b57df2767728 Author: gus Date: Fri Oct 22 16:51:40 2021 -0300 Change lego submodule to master --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2b445096..240d9087 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "lego"] path = lego url = https://gitlab.torproject.org/tpo/web/lego.git - branch = yec21 + branch = master ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] update avatar in 128x150 used to identify egypcio
commit 8aedc4efd4ffd28218d552fcde3ee70289e282f5 Author: VinÃcius Zavam Date: Fri Oct 22 19:11:44 2021 + update avatar in 128x150 used to identify egypcio --- assets/static/images/people/egypcio.png | Bin 30422 -> 46118 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/people/egypcio.png b/assets/static/images/people/egypcio.png index afcf3efa..5923cf24 100644 Binary files a/assets/static/images/people/egypcio.png and b/assets/static/images/people/egypcio.png differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] add egypcio's pronoun to people's page
commit 090cd2c2e9f6d4789c1a99205757e7649e2452f3 Author: VinÃcius Zavam Date: Fri Oct 22 19:05:55 2021 + add egypcio's pronoun to people's page --- content/about/people/egypcio/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/about/people/egypcio/contents.lr b/content/about/people/egypcio/contents.lr index 7bb3faf4..151b1ea6 100644 --- a/content/about/people/egypcio/contents.lr +++ b/content/about/people/egypcio/contents.lr @@ -8,6 +8,8 @@ name: Vinicius Zavam --- nickname: egypcio --- +pronoun: he +--- twitter_handle: egypcio --- gpg: /static/keys/egypcio.txt ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/maint-10.5] Release preparations for 10.5.10
commit e8f3e45aa25d96a46d472a3e21371d49f3095aed Author: Richard Pospesel Date: Fri Oct 22 13:47:45 2021 +0200 Release preparations for 10.5.10 Version and Changelog updates --- projects/fenix/config | 2 +- projects/firefox/config| 2 +- projects/tba-translation/config| 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 10 + projects/tor-browser/allowed_addons.json | 252 +++-- rbm.conf | 4 +- 6 files changed, 148 insertions(+), 124 deletions(-) diff --git a/projects/fenix/config b/projects/fenix/config index 72bb3c3..cc4ea5c 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build2' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build3' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg diff --git a/projects/firefox/config b/projects/firefox/config index 904ca01..e8f9743 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 9913dad..f6eca98 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 91ff9c1637358b8e31c63796e837af4a91f1680b +git_hash: d66f8c0f3bffc6b93b4f7d6a482b01441f6e9112 version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2314568..f05945e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,13 @@ +Tor Browser 10.5.10 -- October 23 2021 + * All Platforms + * Translations Update + * Windows + OS X + Linux + * Revert bug 40049 [torbutton] + * Bug 40051: Implement 2021 Year End Campaign look in about:tor [torbutton] + * Android + * Revert bug 40193 [fenix] + * Bug 40194: Add 2021 YEC home screen [fenix] + Tor Browser 10.5.9 -- October 9 2021 * Android * Bug 40052: Skip L10nRegistry source registration on Android [torbutton] diff --git a/projects/tor-browser/allowed_addons.json b/projects/tor-browser/allowed_addons.json index 2f3e8ee..7209bae 100644 --- a/projects/tor-browser/allowed_addons.json +++ b/projects/tor-browser/allowed_addons.json @@ -17,7 +17,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/13/13299/13299734.png?modified=1565722641; } ], -"average_daily_users": 695579, +"average_daily_users": 702973, "categories": { "android": [ "experimental", @@ -239,10 +239,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5613, - "bayesian_average": 4.559966853638345, - "count": 3916, - "text_count": 1263 + "average": 4.5615, + "bayesian_average": 4.560175520717073, + "count": 3952, + "text_count": 1271 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/;, "requires_payment": false, @@ -333,7 +333,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/;, "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/;, -"weekly_downloads": 24111 +"weekly_downloads": 25892 }, "notes": null }, @@ -349,7 +349,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modified=1469820907; } ], -"average_daily_users": 733783, +"average_daily_users": 719568, "categories": { "android": [ "security-privacy" @@ -482,9 +482,9 @@ "category": "recommended" }, "ratings": { - "average": 4.6632, -
[tor-commits] [tor-browser/tor-browser-78.15.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
commit 9afd1f802d0854f118015a0510cc01f2177744a4 Author: Richard Pospesel Date: Thu Oct 21 17:04:06 2021 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 1ecd3f264126..3bc2584d5c7f 16 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 1ecd3f2641264b1389c90af03c6310dbdb53e7e6 +Subproject commit 3bc2584d5c7ff4747195b194640b23abd0eba957 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 7eeaf2bc9e18abcda33855dfc71c2044d3a23daa Author: Translation commit bot Date: Fri Oct 22 13:17:15 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fr.po | 33 - 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 718c531d74..4064a0fd34 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -4,12 +4,12 @@ # 926782667597d71479677e8aab0ad4dc_106149a, 2020 # erinm, 2021 # Gus, 2021 -# Emeric Vallespi , 2021 # Curtis Baltimore , 2021 # Kingouin , 2021 # Emma Peel, 2021 # Matburnx , 2021 # AO , 2021 +# Emeric Vallespi , 2021 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-07 17:29+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: AO , 2021\n" +"Last-Translator: Emeric Vallespi , 2021\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -433,7 +433,7 @@ msgstr "Installation du Navigateur Tor" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "## For Windows" -msgstr "" +msgstr "## Pour Windows" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -470,7 +470,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "## For macOS" -msgstr "" +msgstr "## Pour macOS" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -489,7 +489,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "## For GNU/Linux" -msgstr "" +msgstr "## Pour GNU/Linux" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -500,11 +500,13 @@ msgstr "2. Téléchargez le fichier GNU/Linux `.tar.xz`." #: (content/installation/contents+en.lrtopic.body) msgid "4. Now follow either the graphical or the command-line method:" msgstr "" +"4. Maintenant, suivez soit la méthode avec l'interface graphique soit avec " +"l'interface en ligne de commande :" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid " Graphical method" -msgstr "" +msgstr " Méthode avec l'interface graphique" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -512,6 +514,8 @@ msgid "" "* When the download is complete, extract the archive using an archive " "manager." msgstr "" +"* Une fois le téléchargement terminé, faites l'extraction de l'archive à " +"l'aide d'un gestionnaire d'archives. " #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -519,6 +523,8 @@ msgid "" "* You'll need to tell your GNU/Linux that you want the ability to execute " "shell scripts." msgstr "" +"* Vous devrez indiquer à votre GNU/Linux que vous souhaitez pouvoir exécuter" +" des scripts shell." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -556,11 +562,16 @@ msgid "" "**Note:** On Ubuntu and some other distros if you try to launch `start-tor-" "browser.desktop` a text file might open up." msgstr "" +"**Remarque :** Sur Ubuntu et certaines autres versions de Linux, si vous " +"essayez de lancer `start-tor-browser.desktop`, un fichier texte peut " +"s'ouvrir." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "To change this behavior and launch Tor Browser instead, follow this:" msgstr "" +"Pour modifier ce comportement et lancer le Navigateur Tor à la place, suivez" +" ces étapes :" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -570,17 +581,19 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "* Click on Preferences." -msgstr "" +msgstr "* Cliquez sur Préférences." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "* Navigate to the 'Behavior' Tab." -msgstr "" +msgstr "* Allez à l'onglet \"Comportement\"." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "* Select \"Run them\" or \"Ask what to do\" under \"Executable Text Files\"." msgstr "" +"* Sélectionnez \"Lancez les\" ou \"Demander quoi faire\" sous \"Fichiers " +"textes exécutables\"." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -588,6 +601,8 @@ msgid "" "* If you choose the latter click on \"Run\" after launching the `start-tor-"
[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
commit f01a606aa3f418a5990c3b930f922e37f1a489d1 Author: Translation commit bot Date: Fri Oct 22 12:18:21 2021 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd --- sq/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd index e061cb7c89..5d45604f38 100644 --- a/sq/torbutton.dtd +++ b/sq/torbutton.dtd @@ -45,7 +45,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit 8ff0d91d7ba7febe9c096b8dfdee01b4ae691bd8 Author: Translation commit bot Date: Fri Oct 22 12:15:06 2021 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- sq/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/aboutTor.dtd b/sq/aboutTor.dtd index 1aed23fe13..9ae0430889 100644 --- a/sq/aboutTor.dtd +++ b/sq/aboutTor.dtd @@ -47,7 +47,7 @@ Thank you! --> - +
[tor-commits] [chutney/main] Use the correct name for arti's addr_config.
commit 6a7de8dde6b32d8e2d58d74502ea71f948ebbb7c Author: Nick Mathewson Date: Fri Oct 22 08:02:16 2021 -0400 Use the correct name for arti's addr_config. --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 53a8a6c..863a456 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2370,7 +2370,7 @@ state_dir = "{path}/arti/state" # implements it. enforce_distance = {{ "subnets_family_v4" = 33, "subnets_family_v6" = 129 }} -[client_config] +[addr_config] # Allow the client to accept requests to connect to e.g. 127.0.0.1 allow_local_addrs = true ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/gettor-website-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
commit 1132fe7a84ba1b3d84d7caeae65575fe7f9a6e93 Author: Translation commit bot Date: Fri Oct 22 08:15:26 2021 + https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot --- contents+fr.po | 12 ++-- contents+tr.po | 15 +-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index cbbae701f6..093e69223b 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2,9 +2,9 @@ # Translators: # erinm, 2021 # Gus, 2021 -# Emma Peel, 2021 # Vincent Breitmoser , 2021 # AO , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-22 09:36+CET\n" "PO-Revision-Date: 2021-03-24 14:33+\n" -"Last-Translator: AO , 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -161,6 +161,10 @@ msgid "" "want to use bridges. To use pluggable transports, click 'Configure' in the " "Tor Launcher window that appears when you first run Tor Browser." msgstr "" +"Quand vous lancez le Navigateur Tor pour la première fois, il vous est " +"demandé si vous voulez utiliser des ponts. Pour utiliser des transports " +"enfichables, cliquez sur « Configurer » dans la fenêtre du Lanceur Tor qui " +"apparaît lors de la première utilisation du Navigateur Tor." #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "" @@ -169,6 +173,10 @@ msgid "" "bar. Once in Preferences, navigate to 'Tor' from the menu on the left of the" " screen." msgstr "" +"Vous pouvez aussi configurer les transports enfichables alors que le " +"Navigateur Tor est en fonction en sélectionnant Préférences dans le menu â¡ " +"situé à droite de la barre dâadresse. Dans Préférences, sélectionnez « Tor »" +" dans le menu situé à gauche de lâécran. " #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "" diff --git a/contents+tr.po b/contents+tr.po index 4f88798db8..23ccc40854 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -2,8 +2,8 @@ # Translators: # erinm, 2021 # Gus, 2021 -# Emma Peel, 2021 # Kaya Zeren , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-22 09:36+CET\n" "PO-Revision-Date: 2021-03-24 14:33+\n" -"Last-Translator: Kaya Zeren , 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,6 +62,9 @@ msgid "" "- Step 3: Download Tor Browser from one of the providers. When done, check " "the integrity of the downloaded file by verifying its signature." msgstr "" +"- 3 adım: Bir hizmet saÄlayıcı seçip Tor Browser uygulamasını indirin. " +"Ä°ndirme tamamlandıÄında, indirilen dosyaların bütünlüÄünü imzası ile " +"doÄrulayın." #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "- Step 4: If required, get some bridges!" @@ -158,6 +161,10 @@ msgid "" "want to use bridges. To use pluggable transports, click 'Configure' in the " "Tor Launcher window that appears when you first run Tor Browser." msgstr "" +"TorBrowser uygulamasını ilk kez çalıÅtırdıÄınızda, köprüleri kullanmak " +"isteyip istemediÄiniz sorulur. DeÄiÅtirilebilir taÅıyıcıları kullanmak için," +" Tor Browser uygulamasını ilk kez çalıÅtırdıÄınızda görüntülenen Tor " +"BaÅlatıcı penceresindeki 'Yapılandır' üzerine tıklayın." #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "" @@ -166,6 +173,10 @@ msgid "" "bar. Once in Preferences, navigate to 'Tor' from the menu on the left of the" " screen." msgstr "" +"Tor Browser çalıÅırken, adres çubuÄunun saÄındaki ayarlar menüsünden " +"'Seçenekler' üzerine tıklayarak da DeÄiÅtirilebilir TaÅıyıcıları " +"yapılandırabilirsiniz. Seçenekler bölümünde, ekranın solundaki menüden 'Tor'" +" üzerine tıklayarak Tor Ayarları bölümünü açın." #: https//gettor.torproject.org/ (content/contents+en.lrpage.body) msgid "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor-web/translations] update translation file
commit d75083cca8c3f8e752a542b570aee4ba4c46 Author: emma peel Date: Fri Oct 22 09:52:48 2021 +0200 update translation file --- i18n/contents.pot | 66 ++- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/i18n/contents.pot b/i18n/contents.pot index 84bfde7..349e8a2 100644 --- a/i18n/contents.pot +++ b/i18n/contents.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-22 09:36+CET\n" +"POT-Creation-Date: 2021-10-22 09:52+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -162,32 +162,28 @@ msgid "Close banner" msgstr "" #: lego/templates/banner.html:11 templates/banner.html:11 -msgid "Use a Mask, Use Tor." +msgid "Privacy is a human right" msgstr "" -#: lego/templates/banner.html:20 templates/banner.html:20 -msgid "Resist the surveillance pandemic." +#: lego/templates/banner.html:15 templates/banner.html:15 +msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" -#: lego/templates/banner.html:32 templates/banner.html:32 +#: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000." msgstr "" -#: lego/templates/banner.html:38 lego/templates/footer.html:64 -#: lego/templates/footer.html:66 lego/templates/navbar.html:18 -#: lego/templates/navbar.html:20 templates/banner.html:38 -#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18 -#: templates/navbar.html:20 -msgid "Donate Now" +#: lego/templates/banner.html:32 templates/banner.html:32 +msgid "Donate now" msgstr "" -#: lego/templates/banner.html:40 templates/banner.html:40 +#: lego/templates/banner.html:34 templates/banner.html:34 msgid "DONATE NOW" msgstr "" #: lego/templates/footer.html:13 lego/templates/footer.html:22 -#: lego/templates/navbar.html:83 templates/footer.html:13 -#: templates/footer.html:22 templates/navbar.html:83 +#: lego/templates/navbar.html:95 templates/footer.html:13 +#: templates/footer.html:22 templates/navbar.html:95 msgid "Download Tor Browser" msgstr "" @@ -209,11 +205,19 @@ msgid "" "understanding." msgstr "" +#: lego/templates/footer.html:64 lego/templates/footer.html:66 +#: lego/templates/navbar.html:18 lego/templates/navbar.html:20 +#: lego/templates/navbar.html:63 templates/footer.html:64 +#: templates/footer.html:66 templates/navbar.html:18 templates/navbar.html:20 +#: templates/navbar.html:63 +msgid "Donate" +msgstr "" + #: lego/templates/footer.html:64 lego/templates/footer.html:66 #: lego/templates/navbar.html:18 lego/templates/navbar.html:20 #: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18 #: templates/navbar.html:20 -msgid "Donate" +msgid "Donate Now" msgstr "" #: lego/templates/footer.html:75 templates/footer.html:75 @@ -239,6 +243,38 @@ msgstr "" msgid "Menu" msgstr "" +#: lego/templates/navbar.html:55 templates/navbar.html:55 +msgid "About" +msgstr "" + +#: lego/templates/navbar.html:56 templates/navbar.html:56 +msgid "Documentation" +msgstr "" + +#: lego/templates/navbar.html:57 templates/navbar.html:57 +msgid "Support" +msgstr "" + +#: lego/templates/navbar.html:58 templates/navbar.html:58 +msgid "Community" +msgstr "" + +#: lego/templates/navbar.html:59 templates/navbar.html:59 +msgid "Blog" +msgstr "" + +#: lego/templates/navbar.html:60 templates/navbar.html:60 +msgid "Jobs" +msgstr "" + +#: lego/templates/navbar.html:61 templates/navbar.html:61 +msgid "Contact" +msgstr "" + +#: lego/templates/navbar.html:62 templates/navbar.html:62 +msgid "Press" +msgstr "" + #: lego/templates/search.html:5 msgid "Search" msgstr "" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor-web/translations] update lego
commit 8a2b15ff11aae1517444106ce7b6f43af3c05184 Author: emma peel Date: Fri Oct 22 09:52:03 2021 +0200 update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 842b8e9..8bbc491 16 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 842b8e924653b41b382d9a26eb33ecb4f4638553 +Subproject commit 8bbc49137960f1e05654b65cdd65ae298cf5cb20 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [gettor-web/translations] update translation file
commit 5d460802b35e9c236c01bce024a1393f7b904762 Author: emma peel Date: Fri Oct 22 09:37:16 2021 +0200 update translation file --- i18n/contents.pot | 170 -- 1 file changed, 74 insertions(+), 96 deletions(-) diff --git a/i18n/contents.pot b/i18n/contents.pot index 7176908..84bfde7 100644 --- a/i18n/contents.pot +++ b/i18n/contents.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-17 07:56+CET\n" +"POT-Creation-Date: 2021-10-22 09:36+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -11,94 +11,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: (dynamic) -msgid "Tor Project" -msgstr "" - -#: (dynamic) -msgid "Donate" -msgstr "" - -#: (dynamic) -msgid "Donate Now" -msgstr "" - -#: (dynamic) -msgid "Menu" -msgstr "" - -#: (dynamic) -msgid "About" -msgstr "" - -#: (dynamic) -msgid "Documentation" -msgstr "" - -#: (dynamic) -msgid "Support" -msgstr "" - -#: (dynamic) -msgid "Community" -msgstr "" - -#: (dynamic) -msgid "Blog" -msgstr "" - -#: (dynamic) -msgid "Download Tor Browser" -msgstr "" - -#: (dynamic) -msgid "" -"Download Tor Browser to experience real private browsing without tracking, " -"surveillance, or censorship." -msgstr "" - -#: (dynamic) -msgid "Our mission:" -msgstr "" - -#: (dynamic) -msgid "" -"To advance human rights and freedoms by creating and deploying free and open " -"source anonymity and privacy technologies, supporting their unrestricted " -"availability and use, and furthering their scientific and popular " -"understanding." -msgstr "" - -#: (dynamic) -msgid "Jobs" -msgstr "" - -#: (dynamic) -msgid "Contact" -msgstr "" - -#: (dynamic) -msgid "Press" -msgstr "" - -#: (dynamic) -msgid "Subscribe to our Newsletter" -msgstr "" - -#: (dynamic) -msgid "Get monthly updates and opportunities from the Tor Project:" -msgstr "" - -#: (dynamic) -msgid "Sign up" -msgstr "" - -#: (dynamic) -msgid "" -"Trademark, copyright notices, and rules for use by third parties can be " -"found in our %(link_to_faq)s" -msgstr "" - #: https://gettor.torproject.org/ (content/contents+en.lr:page.title) msgid "What is GetTor?" msgstr "" @@ -133,7 +45,7 @@ msgstr "" #: https://gettor.torproject.org/ (content/contents+en.lr:page.body) msgid "" "- Step 3: Download Tor Browser from one of the providers. When done, check " -"the integrity of the downloaded files by verifying its signature." +"the integrity of the downloaded file by verifying its signature." msgstr "" #: https://gettor.torproject.org/ (content/contents+en.lr:page.body) @@ -206,22 +118,22 @@ msgstr "" #: https://gettor.torproject.org/ (content/contents+en.lr:page.body) msgid "" -"When you start TorBrowser for the first time you will be asked if you want " -"to use bridges. To use pluggable transports, click 'Configure' in the Tor " -"Launcher window that appears when you first run Tor Browser." +"When you start the Tor Browser for the first time you will be asked if you " +"want to use bridges. To use pluggable transports, click 'Configure' in the " +"Tor Launcher window that appears when you first run Tor Browser." msgstr "" #: https://gettor.torproject.org/ (content/contents+en.lr:page.body) msgid "" "You can also configure pluggable transports while Tor Browser is running by " "selecting 'Preferences' from the settings menu to the right of the address " -"bar. Once in Preferences, navigate to 'Tor Settings' from the menu on the " -"left of the screen." +"bar. Once in Preferences, navigate to 'Tor' from the menu on the left of the " +"screen." msgstr "" #: https://gettor.torproject.org/ (content/contents+en.lr:page.body) msgid "" -"Select 'Tor is censored in my country,' then click 'Select a built-in " +"On the 'Bridges' section, select 'Use a bridge' and 'Select a built-in " "bridge.' Click on the drop-down menu and select the pluggable transport " "you'd like to use." msgstr "" @@ -261,10 +173,72 @@ msgstr "" msgid "Your donation will be matched by Friends of Tor, up to $100,000." msgstr "" +#: lego/templates/banner.html:38 lego/templates/footer.html:64 +#: lego/templates/footer.html:66 lego/templates/navbar.html:18 +#: lego/templates/navbar.html:20 templates/banner.html:38 +#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18 +#: templates/navbar.html:20 +msgid "Donate Now" +msgstr "" + #: lego/templates/banner.html:40 templates/banner.html:40 msgid "DONATE NOW" msgstr "" +#: lego/templates/footer.html:13 lego/templates/footer.html:22 +#: lego/templates/navbar.html:83 templates/footer.html:13 +#: templates/footer.html:22 templates/navbar.html:83 +msgid "Download Tor Browser" +msgstr "" + +#: lego/templates/footer.html:14 templates/footer.html:14 +msgid "" +"Download Tor Browser to experience real private browsing without
[tor-commits] [gettor-web/translations] update contents
commit 0501209a4bf4a2279770515da77e5f439b3df93e Author: emma peel Date: Fri Oct 22 09:22:16 2021 +0200 update contents --- content/contents.lr | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index 15397de..2bdf161 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -13,7 +13,7 @@ The idea behind GetTor is very simple: - Step 2: GetTor will send you back a reply with links to download Tor Browser from our supported providers. -- Step 3: Download Tor Browser from one of the providers. When done, check the integrity of the downloaded files by verifying its signature. +- Step 3: Download Tor Browser from one of the providers. When done, check the integrity of the downloaded file by verifying its signature. - Step 4: If required, get some bridges! @@ -37,11 +37,11 @@ Bridge relays are Tor relays that are not listed in the public Tor directory. That means that ISPs or governments trying to block access to the Tor network can't simply block all bridges. Bridges are useful for Tor users under oppressive regimes, and for people who want an extra layer of security because they're worried somebody will recognize that they are contacting a public Tor relay IP address. -When you start TorBrowser for the first time you will be asked if you want to use bridges. To use pluggable transports, click 'Configure' in the Tor Launcher window that appears when you first run Tor Browser. +When you start the Tor Browser for the first time you will be asked if you want to use bridges. To use pluggable transports, click 'Configure' in the Tor Launcher window that appears when you first run Tor Browser. -You can also configure pluggable transports while Tor Browser is running by selecting 'Preferences' from the settings menu to the right of the address bar. Once in Preferences, navigate to 'Tor Settings' from the menu on the left of the screen. +You can also configure pluggable transports while Tor Browser is running by selecting 'Preferences' from the settings menu to the right of the address bar. Once in Preferences, navigate to 'Tor' from the menu on the left of the screen. -Select 'Tor is censored in my country,' then click 'Select a built-in bridge.' Click on the drop-down menu and select the pluggable transport you'd like to use. +On the 'Bridges' section, select 'Use a bridge' and 'Select a built-in bridge.' Click on the drop-down menu and select the pluggable transport you'd like to use. Click 'OK' to save your settings. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits