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

[tor/master] Travis: Unroll the build matrix into matrix: include:
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 8520071f2313ae6973082ca7cb5680a9df88ce78 Author: teor <teor(a)torproject.org> Date: Thu Sep 26 17:25:17 2019 +1000 Travis: Unroll the build matrix into matrix: include: The jobs should be the same, but Travis may display them differently. Part of 31859. --- .travis.yml | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2bc6395d..b18335d74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,12 @@ cache: compiler: - gcc - - clang os: - linux - - osx -## The build matrix in the following stanza expands into builds for each -## OS and compiler. +## We don't use the build matrix cross-product, because it makes too many jobs +## Instead, we list each job under matrix: include: env: global: ## The Travis CI environment allows us two cores, so let's use both. @@ -23,15 +21,17 @@ env: ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" matrix: - ## We want to use each build option at least once - ## - ## We don't list default variable values, because we set the defaults - ## in global (or the default is unset) + ## This matrix entry is required, but it doesn't actually create any jobs - matrix: - ## include creates builds with gcc, linux + ## include creates builds with gcc, linux, unless we override those defaults include: + ## gcc is the default compiler for most jobs, so we want a clang Linux job + - compiler: clang + ## clang is the default macOS compiler, so we use it for the macOS job + - compiler: clang + os: osx ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We only want to check these build option combinations once @@ -52,18 +52,11 @@ matrix: ## https://github.com/travis-ci/travis-ci/issues/1696 # fast_finish: true - ## Careful! We use global envs, which makes it hard to exclude or - ## allow failures by env: + ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… - exclude: - ## gcc on OSX is less useful, because the default compiler is clang. - - compiler: gcc - os: osx - ## gcc on Linux with no env is redundant, because all the custom builds use - ## gcc on Linux - - compiler: gcc - os: linux - env: + # allow_failures: + # - compiler: gcc + # os: linux ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty

1 0

[tor/master] Travis: Split jobs, add essential jobs, remove redundant jobs
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 4482d6fde5b0b8a0261dd31889a23b789844a486 Author: teor <teor(a)torproject.org> Date: Tue Oct 1 17:28:26 2019 +1000 Travis: Split jobs, add essential jobs, remove redundant jobs Part of 31859 for 0.3.5. --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f555c69c..670b0536f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,15 @@ matrix: ## We run chutney on macOS, because macOS Travis has IPv6 - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx - # We clone our stem repo and run `make test-stem` + ## We clone our stem repo and run `make test-stem` - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - ## Check rust online with distcheck, to make sure we remove rust products - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - ## Check disable module dirauth with and without rust - - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" - ## Check NSS + ## We run rust on macOS, because we have seen macOS rust failures before + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + compiler: clang + os: osx + ## We check NSS - env: NSS_OPTIONS="--enable-nss" ## Allow the build to report success (with non-required sub-builds

1 0

[tor/master] Travis: Remove a redundant clang Linux job
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 4e4297830ec04da32dda1b9424847f4710cc202e Author: teor <teor(a)torproject.org> Date: Thu Sep 26 17:39:46 2019 +1000 Travis: Remove a redundant clang Linux job Part of 31859. --- .travis.yml | 2 -- changes/ticket31859 | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b18335d74..f47fe8bb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,6 @@ env: matrix: ## include creates builds with gcc, linux, unless we override those defaults include: - ## gcc is the default compiler for most jobs, so we want a clang Linux job - - compiler: clang ## clang is the default macOS compiler, so we use it for the macOS job - compiler: clang os: osx diff --git a/changes/ticket31859 b/changes/ticket31859 new file mode 100644 index 000000000..0eb8a42e9 --- /dev/null +++ b/changes/ticket31859 @@ -0,0 +1,3 @@ + o Testing: + - Remove some redundant Travis CI jobs, to speed up CI. + Closes ticket 31859.

1 0

[tor/master] Merge branch 'bug31859_029' into bug31859_035
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit f368f5bc370d23f2e1888faeeceecb1cea290242 Merge: 02840169d 1e0e23c1e Author: teor <teor(a)torproject.org> Date: Tue Oct 1 17:20:16 2019 +1000 Merge branch 'bug31859_029' into bug31859_035 While merging: * leave out some redundant jobs and build matrix entries .travis.yml | 68 ++++++++++++++++++----------------------------------- changes/ticket30860 | 3 +++ changes/ticket31859 | 3 +++ 3 files changed, 29 insertions(+), 45 deletions(-) diff --cc .travis.yml index ef2e41998,564c97dbf..1f555c69c --- a/.travis.yml +++ b/.travis.yml @@@ -30,69 -21,40 +28,49 @@@ env ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" matrix: - ## We want to use each build option at least once - ## - ## We don't list default variable values, because we set the defaults - ## in global (or the default is unset) + ## This matrix entry is required, but it doesn't actually create any jobs - - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true matrix: - ## include creates builds with gcc, linux + ## include creates builds with gcc, linux, unless we override those defaults include: - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" - ## We only want to check these build option combinations once - ## (they shouldn't vary by compiler or OS) - ## We run rust and coverage with hardening off, which seems like enough - # - env: HARDENING_OPTIONS="" + ## We run basic tests on macOS + - compiler: clang + os: osx + ## We run chutney on Linux, because it's faster than chutney on macOS + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" ## We check asciidoc with distcheck, to make sure we remove doc products - ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - # We also try running a hardened clang build with chutney on Linux. - - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" -- compiler: clang + ## We include a single coverage build with the best options for coverage + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + ## We run chutney on macOS, because macOS Travis has IPv6 + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx + # We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ## Check rust online with distcheck, to make sure we remove rust products + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + ## Check disable module dirauth with and without rust + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## Check NSS + - env: NSS_OPTIONS="--enable-nss" - ## Uncomment to allow the build to report success (with non-required - ## sub-builds continuing to run) if all required sub-builds have - ## succeeded. This is somewhat buggy currently: it can cause - ## duplicate notifications and prematurely report success if a - ## single sub-build has succeeded. See - ## https://github.com/travis-ci/travis-ci/issues/1696 - # fast_finish: true + ## Allow the build to report success (with non-required sub-builds + ## continuing to run) if all required sub-builds have succeeded. + fast_finish: true - ## Careful! We use global envs, which makes it hard to exclude or - ## allow failures by env: + ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… allow_failures: + ## macOS chutney is very slow, so we let the build finish before it's done + ## We'd like to fast finish, but still eventually show failures. + ## But Travis doesn't have that option. + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - exclude: - ## gcc on OSX is less useful, because the default compiler is clang. - - compiler: gcc - os: osx - ## gcc on Linux with no env is redundant, because all the custom builds use - ## gcc on Linux - - compiler: gcc - os: linux - env: - ## offline rust builds for gcc on Linux are redundant, because we do an - ## online rust build for gcc on Linux - - compiler: gcc - os: linux - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty

1 0

[tor/master] Travis: Keep the macOS Rust job, but don't wait for it to finish
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 632e707397ce95632f4c059a0d285870624eaa33 Author: teor <teor(a)torproject.org> Date: Tue Oct 1 17:32:46 2019 +1000 Travis: Keep the macOS Rust job, but don't wait for it to finish Since Rust on macOS is slow, don't wait for the macOS Rust job to finish. Instead, split rust into slow rust (macOS) and fast rust (Linux). And allow the build to finish before slow rust finishes. Also make sure that we have: * a Rust build on each platform, * a Rust build with each compiler, and * a check on all our Rust builds. Finally, sort builds: allow fail last, macOS first, slowest first. Closes 31859 for 0.3.5. --- .travis.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 670b0536f..65088d556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,25 +37,30 @@ matrix: ## We run basic tests on macOS - compiler: clang os: osx + ## We check NSS + ## NSS is a fast job, clang is slower on Linux, so we do NSS clang + - env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - ## We check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" - ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx - ## We clone our stem repo and run `make test-stem` - - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ## We run rust on Linux, because it's faster than rust on macOS + ## We check rust offline + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + ## We check asciidoc with distcheck, to make sure we remove doc products + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" ## We run rust on macOS, because we have seen macOS rust failures before - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang os: osx - ## We check NSS - - env: NSS_OPTIONS="--enable-nss" + ## We run chutney on macOS, because macOS Travis has IPv6 + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx + ## We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. @@ -64,9 +69,12 @@ matrix: ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… allow_failures: - ## macOS chutney is very slow, so we let the build finish before it's done - ## We'd like to fast finish, but still eventually show failures. - ## But Travis doesn't have that option. + ## macOS rust and chutney are very slow, so we let the build finish before + ## they are done. We'd like to fast finish, but still eventually show + ## any failures in the build status. But Travis doesn't have that ability. + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + compiler: clang + os: osx - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx ## test-stem sometimes hangs on Travis

1 0

[tor/master] Merge branch 'bug31859_035' into bug31859_040
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 07db4141abb228bc6848e520b6faa75b0015af72 Merge: 9e674d0eb 632e70739 Author: teor <teor(a)torproject.org> Date: Tue Oct 1 23:46:28 2019 +1000 Merge branch 'bug31859_035' into bug31859_040 .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)

1 0

[tor/master] Merge branch 'bug31859_040' into bug31859_041
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit e5dda7f66477dad699c654c54978bbad9a999847 Merge: 6f3f93d86 07db4141a Author: teor <teor(a)torproject.org> Date: Tue Oct 1 23:50:24 2019 +1000 Merge branch 'bug31859_040' into bug31859_041 Merge TOR_TEST_RNG_SEED in maint-0.4.1 into the coverage line from bug31859_040. .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-) diff --cc .travis.yml index bbba0e204,b3b8cb977..909a3d28d --- a/.travis.yml +++ b/.travis.yml @@@ -30,50 -28,55 +28,55 @@@ env ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" matrix: - ## We want to use each build option at least once - ## - ## We don't list default variable values, because we set the defaults - ## in global (or the default is unset) + ## This matrix entry is required, but it doesn't actually create any jobs - - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true matrix: - ## include creates builds with gcc, linux + ## include creates builds with gcc, linux, unless we override those defaults include: + ## We run basic tests on macOS + - compiler: clang + os: osx + ## We check NSS + ## NSS is a fast job, clang is slower on Linux, so we do NSS clang + - env: NSS_OPTIONS="--enable-nss" + compiler: clang + ## We run chutney on Linux, because it's faster than chutney on macOS + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765" - ## We only want to check these build option combinations once - ## (they shouldn't vary by compiler or OS) - ## We run rust and coverage with hardening off, which seems like enough - # - env: HARDENING_OPTIONS="" + ## We run rust on Linux, because it's faster than rust on macOS + ## We check rust offline + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - # We also try running a hardened clang build with chutney on Linux. - - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" + ## We check disable module dirauth + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## We run rust on macOS, because we have seen macOS rust failures before + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang - # We clone our stem repo and run `make test-stem` + os: osx + ## We run chutney on macOS, because macOS Travis has IPv6 + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx + ## We clone our stem repo and run `make test-stem` - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - ## Check rust online with distcheck, to make sure we remove rust products - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - ## Check disable module dirauth with and without rust - - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - - env: MODULES_OPTIONS="--disable-module-dirauth" - ## Check NSS - - env: NSS_OPTIONS="--enable-nss" - ## Uncomment to allow the build to report success (with non-required - ## sub-builds continuing to run) if all required sub-builds have - ## succeeded. This is somewhat buggy currently: it can cause - ## duplicate notifications and prematurely report success if a - ## single sub-build has succeeded. See - ## https://github.com/travis-ci/travis-ci/issues/1696 - # fast_finish: true + ## Allow the build to report success (with non-required sub-builds + ## continuing to run) if all required sub-builds have succeeded. + fast_finish: true - ## Careful! We use global envs, which makes it hard to exclude or - ## allow failures by env: + ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… allow_failures: + ## macOS rust and chutney are very slow, so we let the build finish before + ## they are done. We'd like to fast finish, but still eventually show + ## any failures in the build status. But Travis doesn't have that ability. + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + compiler: clang + os: osx + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx ## test-stem sometimes hangs on Travis - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"

1 0

[translation/torbutton-browseronboardingproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties_completed
by translation＠torproject.org 17 Oct '19

17 Oct '19

commit c1d6461336ab030e26ed1834b536c86d373da21a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 03:52:00 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- ja/browserOnboarding.properties | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ja/browserOnboarding.properties b/ja/browserOnboarding.properties index 2cfe67e07..04a6c0a67 100644 --- a/ja/browserOnboarding.properties +++ b/ja/browserOnboarding.properties @@ -15,6 +15,8 @@ # onboarding.tour-tor-network=Tor Network # onboarding.tour-tor-network.title=Travel a decentralized network. # onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +# onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. +# onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings # onboarding.tour-tor-network.button=Go to Circuit Display # onboarding.tour-tor-circuit-display=Circuit Display @@ -47,12 +49,11 @@ # onboarding.tour-tor-update.prefix-updated=Updated # onboarding.tour-tor-toolbar=Toolbar -# onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout -# 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-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. +# onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. +# onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. +# onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. +# onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +# onboarding.tour-tor-toolbar-update-9.0.next-button=Go to Tor Network # Circuit Display onboarding. # onboarding.tor-circuit-display.next=Next

1 0

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 17 Oct '19

17 Oct '19

commit ea6b8ee683c9a913b58bb38d38ebaece2b8b60b4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 17 03:51:54 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- ja/browserOnboarding.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ja/browserOnboarding.properties b/ja/browserOnboarding.properties index e1241ee53..1a3b88460 100644 --- a/ja/browserOnboarding.properties +++ b/ja/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Tor ネットワークへ onboarding.tour-tor-network=Tor ネットワーク onboarding.tour-tor-network.title=分散型ネットワークを旅する。 onboarding.tour-tor-network.description=Tor Browser は、世界中の何千人ものボランティアによって運営されている Tor ネットワークにあなたを接続します。 VPN とは異なり、インターネットをプライベートに楽しむために信頼する必要があるのは、1つの障害点や1つの存在ではありません。 -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=新規：Torネットワーク設定。環境設定に追加され、Torが検問されている地域でブリッジをリクエストすることができます。 +onboarding.tour-tor-network.action-button=Torネットワーク設定を設定する onboarding.tour-tor-network.button=サーキットディスプレイへ onboarding.tour-tor-circuit-display=サーキットディスプレイ @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=新機能 onboarding.tour-tor-update.prefix-updated=更新 onboarding.tour-tor-toolbar=ツールバー -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. -onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.title= グッバイ、Onion Button。 +onboarding.tour-tor-toolbar-update-9.0.description=あなたのTorのすべてのデータをTor Browserに完全に移行したいと考えています。 +onboarding.tour-tor-toolbar-update-9.0.description-para2=そのため、今では、Onion buttonを使用せずに、URLバーの[ i ]をクリックしてTorサーキットを表示し、「このサイトに新しいサーキットを使用」をクリックするか、または[≡]メニューの「新しい識別子」をクリックして新しい識別子を要求することができます。 +onboarding.tour-tor-toolbar-update-9.0.button=新しい識別子をリクエストする方法 onboarding.tour-tor-toolbar-update-9.0.next-button=Tor ネットワークへ # Circuit Display onboarding.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1419'
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit e6bb23434e86f65b72b51f4c1d1bb886cbb79d37 Merge: 2c97cf3ad 11b5946e4 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 13:47:42 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1419' Obviously correct fixes to code that's already been reviewed. scripts/git/git-merge-forward.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0