- tor-commits - lists.torproject.org

[tor/maint-0.3.5] test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit f7688cb179e5114c5b24b71acd0b57bbd6d3d4ad Author: teor <teor(a)torproject.org> Date: Fri Mar 22 13:20:23 2019 +1000 test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9 We need a recent test-network.sh to use new chutney features in CI. Fixes bug 29703; bugfix on 0.2.9.1-alpha. --- changes/bug29703 | 4 + src/test/test-network.sh | 187 +++++++++++++---------------------------------- 2 files changed, 54 insertions(+), 137 deletions(-) diff --git a/changes/bug29703 b/changes/bug29703 new file mode 100644 index 000000000..0e17ee45e --- /dev/null +++ b/changes/bug29703 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Backport the 0.3.4 src/test/test-network.sh to 0.2.9. + We need a recent test-network.sh to use new chutney features in CI. + Fixes bug 29703; bugfix on 0.2.9.1-alpha. diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 4d9776822..6e0f28657 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,103 +1,45 @@ -#! /bin/sh +#!/bin/sh -# Please do not modify this script, it has been moved to chutney/tools +# This script calls the equivalent script in chutney/tools -ECHO_N="/bin/echo -n" +# If we already know CHUTNEY_PATH, don't bother with argument parsing +TEST_NETWORK="$CHUTNEY_PATH/tools/test-network.sh" +# Call the chutney version of this script, if it exists, and we can find it +if [ -d "$CHUTNEY_PATH" -a -x "$TEST_NETWORK" ]; then + # we can't produce any output, because we might be --quiet + # this preserves arguments with spaces correctly + exec "$TEST_NETWORK" "$@" +fi + +# We need to go looking for CHUTNEY_PATH +# Do we output anything at all? +ECHO="${ECHO:-echo}" # Output is prefixed with the name of the script myname=$(basename $0) -# We need to find CHUTNEY_PATH, so that we can call the version of this script -# in chutney/tools. And we want to pass any arguments to that script as well. -# So we source this script, which processes its arguments to find CHUTNEY_PATH. - -# Avoid recursively sourcing this script, and don't call the chutney version -# while recursing, either -if [ "$TEST_NETWORK_RECURSING" != true ]; then - # Process the arguments into environmental variables with this script - # to make sure $CHUTNEY_PATH is set - # When we switch to using test-network.sh in chutney/tools, --dry-run - # can be removed, because this script will find chutney, then pass all - # arguments to chutney's test-network.sh - echo "$myname: Parsing command-line arguments to find \$CHUTNEY_PATH" - export TEST_NETWORK_RECURSING=true - . "$0" --dry-run "$@" - - # Call the chutney version of this script, if it exists, and we can find it - if [ -d "$CHUTNEY_PATH" -a -x "$CHUTNEY_PATH/tools/test-network.sh" ]; then - unset NETWORK_DRY_RUN - echo "$myname: Calling newer chutney script \ -$CHUTNEY_PATH/tools/test-network.sh" - "$CHUTNEY_PATH/tools/test-network.sh" "$@" - exit $? - else - echo "$myname: This script has moved to chutney/tools." - echo "$myname: Please update your chutney using 'git pull'." - # When we switch to using test-network.sh in chutney/tools, we should - # exit with a very loud failure here - echo "$myname: Falling back to the old tor version of the script." - fi -fi +# Save the arguments before we destroy them +# This might not preserve arguments with spaces in them +ORIGINAL_ARGS="$@" +# We need to find CHUTNEY_PATH, so that we can call the version of this script +# in chutney/tools with the same arguments. We also need to respect --quiet. until [ -z "$1" ] do case "$1" in --chutney-path) - export CHUTNEY_PATH="$2" + CHUTNEY_PATH="$2" shift ;; --tor-path) - export TOR_DIR="$2" - shift - ;; - # When we switch to using test-network.sh in chutney/tools, only the - # --chutney-path and --tor-path arguments need to be processed by this - # script, everything else can be handled by chutney's test-network.sh - --flavor|--flavour|--network-flavor|--network-flavour) - export NETWORK_FLAVOUR="$2" - shift - ;; - --delay|--sleep|--bootstrap-time|--time) - export BOOTSTRAP_TIME="$2" - shift - ;; - # Environmental variables used by chutney verify performance tests - # Send this many bytes per client connection (10 KBytes) - --data|--data-bytes|--data-byte|--bytes|--byte) - export CHUTNEY_DATA_BYTES="$2" + TOR_DIR="$2" shift ;; - # Make this many connections per client (1) - # Note: If you create 7 or more connections to a hidden service from - # a single Tor 0.2.7 client, you'll likely get a verification failure due - # to #15937. This is fixed in 0.2.8. - --connections|--connection|--connection-count|--count) - export CHUTNEY_CONNECTIONS="$2" - shift + --quiet) + ECHO=true ;; - # Make each client connect to each HS (0) - # 0 means a single client connects to each HS - # 1 means every client connects to every HS - --hs-multi-client|--hs-multi-clients|--hs-client|--hs-clients) - export CHUTNEY_HS_MULTI_CLIENT="$2" - shift - ;; - --coverage) - export USE_COVERAGE_BINARY=true - ;; - --dry-run) - # process arguments, but don't call any other scripts - export NETWORK_DRY_RUN=true - ;; *) - echo "$myname: Sorry, I don't know what to do with '$1'." - echo "$myname: Maybe chutney's test-network.sh understands '$1'." - echo "$myname: Please update your chutney using 'git pull', and set \ -\$CHUTNEY_PATH" - # continue processing arguments during a dry run - if [ "$NETWORK_DRY_RUN" != true ]; then - exit 2 - fi + # maybe chutney's test-network.sh can handle it ;; esac shift @@ -106,22 +48,22 @@ done # optional: $TOR_DIR is the tor build directory # it's used to find the location of tor binaries # if it's not set: -# - set it ro $BUILDDIR, or +# - set it to $BUILDDIR, or # - if $PWD looks like a tor build directory, set it to $PWD, or # - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH if [ ! -d "$TOR_DIR" ]; then if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then # Choose the build directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$BUILDDIR" - export TOR_DIR="$BUILDDIR" + $ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR" + TOR_DIR="$BUILDDIR" elif [ -d "$PWD/src/or" -a -d "$PWD/src/tools" ]; then # Guess the tor directory is the current directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$PWD" - export TOR_DIR="$PWD" + $ECHO "$myname: \$TOR_DIR not set, trying \$PWD" + TOR_DIR="$PWD" else - echo "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" + $ECHO "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" unset TOR_DIR fi fi @@ -133,63 +75,34 @@ fi # - fail and tell the user how to clone the chutney repository if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then if [ -x "$PWD/chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" - export CHUTNEY_PATH="$PWD" + $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" + CHUTNEY_PATH="$PWD" elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ -x "$TOR_DIR/../chutney/chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" - export CHUTNEY_PATH="$TOR_DIR/../chutney" + $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" + CHUTNEY_PATH="$TOR_DIR/../chutney" else - # TODO: work out how to package and install chutney, - # so users can find it in $PATH - echo "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" - echo "$myname: Get chutney: git clone https://git.torproject.org/\ + $ECHO "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" + $ECHO "$myname: Get chutney: git clone https://git.torproject.org/\ chutney.git" - echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ + $ECHO "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ CHUTNEY_PATH=\`pwd\`/chutney" unset CHUTNEY_PATH exit 1 fi fi -# When we switch to using test-network.sh in chutney/tools, this comment and -# everything below it can be removed - -# For picking up the right tor binaries. -# If these varibles aren't set, chutney looks for tor binaries in $PATH -if [ -d "$TOR_DIR" ]; then - tor_name=tor - tor_gencert_name=tor-gencert - if [ "$USE_COVERAGE_BINARY" = true ]; then - tor_name=tor-cov - fi - export CHUTNEY_TOR="${TOR_DIR}/src/or/${tor_name}" - export CHUTNEY_TOR_GENCERT="${TOR_DIR}/src/tools/${tor_gencert_name}" -fi - -# Set the variables for the chutney network flavour -export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} -export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR - -# And finish up if we're doing a dry run -if [ "$NETWORK_DRY_RUN" = true ]; then - # we can't exit here, it breaks argument processing - return +TEST_NETWORK="$CHUTNEY_PATH/tools/test-network.sh" +# Call the chutney version of this script, if it exists, and we can find it +if [ -d "$CHUTNEY_PATH" -a -x "$TEST_NETWORK" ]; then + $ECHO "$myname: Calling newer chutney script $TEST_NETWORK" + # this may fail if some arguments have spaces in them + # if so, set CHUTNEY_PATH before calling test-network.sh, and spaces + # will be handled correctly + exec "$TEST_NETWORK" $ORIGINAL_ARGS +else + $ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH." + $ECHO "$myname: Please update your chutney using 'git pull'." + # We have failed to do what the user asked + exit 1 fi - -cd "$CHUTNEY_PATH" -./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2 - -# Sleep some, waiting for the network to bootstrap. -# TODO: Add chutney command 'bootstrap-status' and use that instead. -BOOTSTRAP_TIME=${BOOTSTRAP_TIME:-35} -$ECHO_N "$myname: sleeping for $BOOTSTRAP_TIME seconds" -n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do - sleep 1; n=$(expr $n - 1); $ECHO_N . -done; echo "" -./chutney verify $CHUTNEY_NETWORK -VERIFY_EXIT_STATUS=$? -# work around a bug/feature in make -j2 (or more) -# where make hangs if any child processes are still alive -./chutney stop $CHUTNEY_NETWORK -exit $VERIFY_EXIT_STATUS

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.4
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 74775b2dfd1a30abf75f2989195ec6c1bbe95fc0 Merge: 6d057c56f f7688cb17 Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:13 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit 0418d4081acd2708a16dd757af4aac4777658da9 Merge: 3280e9a11 74775b2df Author: teor <teor(a)torproject.org> Date: Tue Apr 2 11:45:22 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/bug29703 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/maint-0.4.0] test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9
by teor＠torproject.org 02 Apr '19

02 Apr '19

commit f7688cb179e5114c5b24b71acd0b57bbd6d3d4ad Author: teor <teor(a)torproject.org> Date: Fri Mar 22 13:20:23 2019 +1000 test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9 We need a recent test-network.sh to use new chutney features in CI. Fixes bug 29703; bugfix on 0.2.9.1-alpha. --- changes/bug29703 | 4 + src/test/test-network.sh | 187 +++++++++++++---------------------------------- 2 files changed, 54 insertions(+), 137 deletions(-) diff --git a/changes/bug29703 b/changes/bug29703 new file mode 100644 index 000000000..0e17ee45e --- /dev/null +++ b/changes/bug29703 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Backport the 0.3.4 src/test/test-network.sh to 0.2.9. + We need a recent test-network.sh to use new chutney features in CI. + Fixes bug 29703; bugfix on 0.2.9.1-alpha. diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 4d9776822..6e0f28657 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,103 +1,45 @@ -#! /bin/sh +#!/bin/sh -# Please do not modify this script, it has been moved to chutney/tools +# This script calls the equivalent script in chutney/tools -ECHO_N="/bin/echo -n" +# If we already know CHUTNEY_PATH, don't bother with argument parsing +TEST_NETWORK="$CHUTNEY_PATH/tools/test-network.sh" +# Call the chutney version of this script, if it exists, and we can find it +if [ -d "$CHUTNEY_PATH" -a -x "$TEST_NETWORK" ]; then + # we can't produce any output, because we might be --quiet + # this preserves arguments with spaces correctly + exec "$TEST_NETWORK" "$@" +fi + +# We need to go looking for CHUTNEY_PATH +# Do we output anything at all? +ECHO="${ECHO:-echo}" # Output is prefixed with the name of the script myname=$(basename $0) -# We need to find CHUTNEY_PATH, so that we can call the version of this script -# in chutney/tools. And we want to pass any arguments to that script as well. -# So we source this script, which processes its arguments to find CHUTNEY_PATH. - -# Avoid recursively sourcing this script, and don't call the chutney version -# while recursing, either -if [ "$TEST_NETWORK_RECURSING" != true ]; then - # Process the arguments into environmental variables with this script - # to make sure $CHUTNEY_PATH is set - # When we switch to using test-network.sh in chutney/tools, --dry-run - # can be removed, because this script will find chutney, then pass all - # arguments to chutney's test-network.sh - echo "$myname: Parsing command-line arguments to find \$CHUTNEY_PATH" - export TEST_NETWORK_RECURSING=true - . "$0" --dry-run "$@" - - # Call the chutney version of this script, if it exists, and we can find it - if [ -d "$CHUTNEY_PATH" -a -x "$CHUTNEY_PATH/tools/test-network.sh" ]; then - unset NETWORK_DRY_RUN - echo "$myname: Calling newer chutney script \ -$CHUTNEY_PATH/tools/test-network.sh" - "$CHUTNEY_PATH/tools/test-network.sh" "$@" - exit $? - else - echo "$myname: This script has moved to chutney/tools." - echo "$myname: Please update your chutney using 'git pull'." - # When we switch to using test-network.sh in chutney/tools, we should - # exit with a very loud failure here - echo "$myname: Falling back to the old tor version of the script." - fi -fi +# Save the arguments before we destroy them +# This might not preserve arguments with spaces in them +ORIGINAL_ARGS="$@" +# We need to find CHUTNEY_PATH, so that we can call the version of this script +# in chutney/tools with the same arguments. We also need to respect --quiet. until [ -z "$1" ] do case "$1" in --chutney-path) - export CHUTNEY_PATH="$2" + CHUTNEY_PATH="$2" shift ;; --tor-path) - export TOR_DIR="$2" - shift - ;; - # When we switch to using test-network.sh in chutney/tools, only the - # --chutney-path and --tor-path arguments need to be processed by this - # script, everything else can be handled by chutney's test-network.sh - --flavor|--flavour|--network-flavor|--network-flavour) - export NETWORK_FLAVOUR="$2" - shift - ;; - --delay|--sleep|--bootstrap-time|--time) - export BOOTSTRAP_TIME="$2" - shift - ;; - # Environmental variables used by chutney verify performance tests - # Send this many bytes per client connection (10 KBytes) - --data|--data-bytes|--data-byte|--bytes|--byte) - export CHUTNEY_DATA_BYTES="$2" + TOR_DIR="$2" shift ;; - # Make this many connections per client (1) - # Note: If you create 7 or more connections to a hidden service from - # a single Tor 0.2.7 client, you'll likely get a verification failure due - # to #15937. This is fixed in 0.2.8. - --connections|--connection|--connection-count|--count) - export CHUTNEY_CONNECTIONS="$2" - shift + --quiet) + ECHO=true ;; - # Make each client connect to each HS (0) - # 0 means a single client connects to each HS - # 1 means every client connects to every HS - --hs-multi-client|--hs-multi-clients|--hs-client|--hs-clients) - export CHUTNEY_HS_MULTI_CLIENT="$2" - shift - ;; - --coverage) - export USE_COVERAGE_BINARY=true - ;; - --dry-run) - # process arguments, but don't call any other scripts - export NETWORK_DRY_RUN=true - ;; *) - echo "$myname: Sorry, I don't know what to do with '$1'." - echo "$myname: Maybe chutney's test-network.sh understands '$1'." - echo "$myname: Please update your chutney using 'git pull', and set \ -\$CHUTNEY_PATH" - # continue processing arguments during a dry run - if [ "$NETWORK_DRY_RUN" != true ]; then - exit 2 - fi + # maybe chutney's test-network.sh can handle it ;; esac shift @@ -106,22 +48,22 @@ done # optional: $TOR_DIR is the tor build directory # it's used to find the location of tor binaries # if it's not set: -# - set it ro $BUILDDIR, or +# - set it to $BUILDDIR, or # - if $PWD looks like a tor build directory, set it to $PWD, or # - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH if [ ! -d "$TOR_DIR" ]; then if [ -d "$BUILDDIR/src/or" -a -d "$BUILDDIR/src/tools" ]; then # Choose the build directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$BUILDDIR" - export TOR_DIR="$BUILDDIR" + $ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR" + TOR_DIR="$BUILDDIR" elif [ -d "$PWD/src/or" -a -d "$PWD/src/tools" ]; then # Guess the tor directory is the current directory # But only if it looks like one - echo "$myname: \$TOR_DIR not set, trying \$PWD" - export TOR_DIR="$PWD" + $ECHO "$myname: \$TOR_DIR not set, trying \$PWD" + TOR_DIR="$PWD" else - echo "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" + $ECHO "$myname: no \$TOR_DIR, chutney will use \$PATH for tor binaries" unset TOR_DIR fi fi @@ -133,63 +75,34 @@ fi # - fail and tell the user how to clone the chutney repository if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then if [ -x "$PWD/chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" - export CHUTNEY_PATH="$PWD" + $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" + CHUTNEY_PATH="$PWD" elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ -x "$TOR_DIR/../chutney/chutney" ]; then - echo "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" - export CHUTNEY_PATH="$TOR_DIR/../chutney" + $ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney" + CHUTNEY_PATH="$TOR_DIR/../chutney" else - # TODO: work out how to package and install chutney, - # so users can find it in $PATH - echo "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" - echo "$myname: Get chutney: git clone https://git.torproject.org/\ + $ECHO "$myname: missing 'chutney' in \$CHUTNEY_PATH ($CHUTNEY_PATH)" + $ECHO "$myname: Get chutney: git clone https://git.torproject.org/\ chutney.git" - echo "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ + $ECHO "$myname: Set \$CHUTNEY_PATH to a non-standard location: export \ CHUTNEY_PATH=\`pwd\`/chutney" unset CHUTNEY_PATH exit 1 fi fi -# When we switch to using test-network.sh in chutney/tools, this comment and -# everything below it can be removed - -# For picking up the right tor binaries. -# If these varibles aren't set, chutney looks for tor binaries in $PATH -if [ -d "$TOR_DIR" ]; then - tor_name=tor - tor_gencert_name=tor-gencert - if [ "$USE_COVERAGE_BINARY" = true ]; then - tor_name=tor-cov - fi - export CHUTNEY_TOR="${TOR_DIR}/src/or/${tor_name}" - export CHUTNEY_TOR_GENCERT="${TOR_DIR}/src/tools/${tor_gencert_name}" -fi - -# Set the variables for the chutney network flavour -export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"} -export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR - -# And finish up if we're doing a dry run -if [ "$NETWORK_DRY_RUN" = true ]; then - # we can't exit here, it breaks argument processing - return +TEST_NETWORK="$CHUTNEY_PATH/tools/test-network.sh" +# Call the chutney version of this script, if it exists, and we can find it +if [ -d "$CHUTNEY_PATH" -a -x "$TEST_NETWORK" ]; then + $ECHO "$myname: Calling newer chutney script $TEST_NETWORK" + # this may fail if some arguments have spaces in them + # if so, set CHUTNEY_PATH before calling test-network.sh, and spaces + # will be handled correctly + exec "$TEST_NETWORK" $ORIGINAL_ARGS +else + $ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH." + $ECHO "$myname: Please update your chutney using 'git pull'." + # We have failed to do what the user asked + exit 1 fi - -cd "$CHUTNEY_PATH" -./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2 - -# Sleep some, waiting for the network to bootstrap. -# TODO: Add chutney command 'bootstrap-status' and use that instead. -BOOTSTRAP_TIME=${BOOTSTRAP_TIME:-35} -$ECHO_N "$myname: sleeping for $BOOTSTRAP_TIME seconds" -n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do - sleep 1; n=$(expr $n - 1); $ECHO_N . -done; echo "" -./chutney verify $CHUTNEY_NETWORK -VERIFY_EXIT_STATUS=$? -# work around a bug/feature in make -j2 (or more) -# where make hangs if any child processes are still alive -./chutney stop $CHUTNEY_NETWORK -exit $VERIFY_EXIT_STATUS

1 0

[translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
by translation＠torproject.org 02 Apr '19

02 Apr '19

commit 08ee8fffcfdc8892f1170c939d4caec35c00ab55 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 23:17:45 2019 +0000 Update translations for tba-torbrowserstringsdtd_completed --- nl/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/android_strings.dtd b/nl/android_strings.dtd index 7769e1cae..67a5bda7a 100644 --- a/nl/android_strings.dtd +++ b/nl/android_strings.dtd @@ -20,6 +20,6 @@ <!ENTITY firstrun_tips_message "Met alle door Tor geboden beveiligings- en privacyfuncties kan uw ervaring tijdens het webbrowsen een beetje anders zijn. Dingen gaan misschien iets langzamer, en afhankelijk van het door u gekozen beveiligingsniveau zullen bepaalde elementen misschien niet werken of worden geladen. Er kan ook worden gevraagd te bewijzen dat u een mens bent en geen robot."> <!ENTITY firstrun_tips_next "Volgende"> <!ENTITY firstrun_onionservices_tab_title "Onions"> -<!ENTITY firstrun_onionservices_title "Onion-services"> +<!ENTITY firstrun_onionservices_title "Onion-services."> <!ENTITY firstrun_onionservices_message "Onion-services zijn websites die op .onion eindigen en extra bescherming bieden voor publicisten en bezoekers, waaronder toegevoegde beschermingsmechanismen tegen censuur. Via Onion-services kan iedereen anoniem inhoud en diensten aanbieden."> <!ENTITY firstrun_onionservices_next "Ga verkennen">

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 02 Apr '19

02 Apr '19

commit 4447b801c37a4cbc0e599ebc6e9eacb43ff6c587 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 23:17:39 2019 +0000 Update translations for tba-torbrowserstringsdtd --- nl/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/android_strings.dtd b/nl/android_strings.dtd index 7769e1cae..67a5bda7a 100644 --- a/nl/android_strings.dtd +++ b/nl/android_strings.dtd @@ -20,6 +20,6 @@ <!ENTITY firstrun_tips_message "Met alle door Tor geboden beveiligings- en privacyfuncties kan uw ervaring tijdens het webbrowsen een beetje anders zijn. Dingen gaan misschien iets langzamer, en afhankelijk van het door u gekozen beveiligingsniveau zullen bepaalde elementen misschien niet werken of worden geladen. Er kan ook worden gevraagd te bewijzen dat u een mens bent en geen robot."> <!ENTITY firstrun_tips_next "Volgende"> <!ENTITY firstrun_onionservices_tab_title "Onions"> -<!ENTITY firstrun_onionservices_title "Onion-services"> +<!ENTITY firstrun_onionservices_title "Onion-services."> <!ENTITY firstrun_onionservices_message "Onion-services zijn websites die op .onion eindigen en extra bescherming bieden voor publicisten en bezoekers, waaronder toegevoegde beschermingsmechanismen tegen censuur. Via Onion-services kan iedereen anoniem inhoud en diensten aanbieden."> <!ENTITY firstrun_onionservices_next "Ga verkennen">

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 02 Apr '19

02 Apr '19

commit 5cd76dc16eb91b5cc76ca56ae16433fffddaf635 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 22:49:22 2019 +0000 Update translations for torbutton-aboutdialogdtd_completed --- nl/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/aboutdialog.dtd b/nl/aboutdialog.dtd index cd39e658d..9418edeca 100644 --- a/nl/aboutdialog.dtd +++ b/nl/aboutdialog.dtd @@ -13,7 +13,7 @@  <!ENTITY bottomLinks.questions "Vragen?">  -<!ENTITY bottomLinks.grow "Help het Tor-netwerk te groeien."> +<!ENTITY bottomLinks.grow "Help het Tor-netwerk te groeien!">  <!ENTITY bottomLinks.license "Licentie-informatie"> -<!ENTITY tor.TrademarkStatement "'Tor' en het 'Ui-logo' zijn geregistreerde handelsmerken van het Tor Project, Inc."> +<!ENTITY tor.TrademarkStatement "‘Tor’ en het ‘Onion-logo’ zijn geregistreerde handelsmerken van het Tor Project, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 02 Apr '19

02 Apr '19

commit ef690459fce7796873aab8d37860ec21824e6993 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 22:49:16 2019 +0000 Update translations for torbutton-aboutdialogdtd --- nl/aboutdialog.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/aboutdialog.dtd b/nl/aboutdialog.dtd index cd39e658d..9418edeca 100644 --- a/nl/aboutdialog.dtd +++ b/nl/aboutdialog.dtd @@ -13,7 +13,7 @@  <!ENTITY bottomLinks.questions "Vragen?">  -<!ENTITY bottomLinks.grow "Help het Tor-netwerk te groeien."> +<!ENTITY bottomLinks.grow "Help het Tor-netwerk te groeien!">  <!ENTITY bottomLinks.license "Licentie-informatie"> -<!ENTITY tor.TrademarkStatement "'Tor' en het 'Ui-logo' zijn geregistreerde handelsmerken van het Tor Project, Inc."> +<!ENTITY tor.TrademarkStatement "‘Tor’ en het ‘Onion-logo’ zijn geregistreerde handelsmerken van het Tor Project, Inc.">

1 0

[translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed
by translation＠torproject.org 02 Apr '19

02 Apr '19

commit 59bd1c2d049089a63e89c61e81a94f3754e95bad Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 22:47:45 2019 +0000 Update translations for tba-torbrowserstringsdtd_completed --- nl/android_strings.dtd | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nl/android_strings.dtd b/nl/android_strings.dtd index ce8b8a98e..7769e1cae 100644 --- a/nl/android_strings.dtd +++ b/nl/android_strings.dtd @@ -1,25 +1,25 @@  <!ENTITY firstrun_welcome_tab_title "Welkom"> -<!ENTITY firstrun_welcome_title "Je bent klaar."> -<!ENTITY firstrun_welcome_message "Tor Browser biedt het hoogste privacy- en beveiligingsniveau terwijl het op het web surft. Je bent nu beveiligd tegen volgen, surveillance, en censuur. Deze snelle "aan boord" toont je hoe."> -<!ENTITY firstrun_welcome_next "Begin nu"> +<!ENTITY firstrun_welcome_title "U bent klaar."> +<!ENTITY firstrun_welcome_message "Tor Browser biedt de hoogste standaard aan privacy en beveiliging tijdens het websurfen. U bent nu beschermd tegen volgen, bewaking en censuur. Deze snelle onboarding toont hoe dit werkt."> +<!ENTITY firstrun_welcome_next "Nu starten"> <!ENTITY firstrun_privacy_tab_title "Privacy"> <!ENTITY firstrun_privacy_title "Snub volgers en neuzers."> -<!ENTITY firstrun_privacy_message "Tor Browser isoleert cookies en verwijdrt jouw browser historie na jouw sessie. Deze wijzigingen waarborgen dat jouw privacy en veiligheid beschermd zijn in de browser. Klik 'Tor Netwerk" om te leren hoe we jou op netwerk niveau beveiligen."> -<!ENTITY firstrun_privacy_next "Ga naar het Tor Netwerk"> -<!ENTITY firstrun_tornetwork_tab_title "Tor Netwerk"> +<!ENTITY firstrun_privacy_message "Tor Browser isoleert cookies en verwijdert uw browsergeschiedenis na uw sessie. Deze wijzigingen zorgen ervoor dat uw privacy en veiligheid in de browser zijn beschermd. Klik op ‘Tor-netwerk’ om te lezen hoe we u op netwerkniveau beschermen."> +<!ENTITY firstrun_privacy_next "Naar Tor-netwerk"> +<!ENTITY firstrun_tornetwork_tab_title "Tor-netwerk"> <!ENTITY firstrun_tornetwork_title "Reis over een gedecentraliseerd netwerk."> -<!ENTITY firstrun_tornetwork_message "Tor browser verbindt je met het Tor netwerk dat door duizenden vrijwilligers over de wereld in stand wordt gehouden. Niet zoals een VPN, is er geen faalpunt or gecentraliseerde eenehid die je moet vertrouwen om prive van het internet te genieten."> +<!ENTITY firstrun_tornetwork_message "Tor Browser verbindt u met het Tor-netwerk, mogelijk gemaakt door duizenden vrijwilligers over de hele wereld. Anders dan bij een VPN is er geen sprake van één zwakke plek of centrale autoriteit die u moet vertrouwen om privé van het internet gebruik te maken."> <!ENTITY firstrun_tornetwork_next "Volgende"> <!ENTITY firstrun_secsettings_tab_title "Beveiliging"> -<!ENTITY firstrun_secsettings_title "Kies jouw ervaring."> -<!ENTITY firstrun_secsettings_message "Veiligheidsinstellingen bieden je de mogelijkheid om elementen te blokkeren die anders gebruikt zouden kunnen worden om jouw computer aan te vallen."> +<!ENTITY firstrun_secsettings_title "Kies uw ervaring."> +<!ENTITY firstrun_secsettings_message "We bieden ook aanvullende instellingen om de beveiliging van uw browser te verhogen. Via onze Beveiligingsinstellingen kunt u elementen blokkeren die kunnen worden gebruikt om uw computer aan te vallen."> <!ENTITY firstrun_secsettings_next "Volgende"> <!ENTITY firstrun_tips_tab_title "Tips"> -<!ENTITY firstrun_tips_title "Ervaar Tips."> -<!ENTITY firstrun_tips_message "Met alle beveiligings- en privacyfuncties die door Tor worden geboden kan jouw surfervaring iets anders zijn. Het kan iets langzamer gaan en afhankelijk van jouw beveiligingsniveau werken sommige elementen mogelijk niet, of ze worden niet geladen. Je kunt ook de vraag krijgen om aan te tonen dat je een mens bent en niet een robot."> +<!ENTITY firstrun_tips_title "Ervaringstips."> +<!ENTITY firstrun_tips_message "Met alle door Tor geboden beveiligings- en privacyfuncties kan uw ervaring tijdens het webbrowsen een beetje anders zijn. Dingen gaan misschien iets langzamer, en afhankelijk van het door u gekozen beveiligingsniveau zullen bepaalde elementen misschien niet werken of worden geladen. Er kan ook worden gevraagd te bewijzen dat u een mens bent en geen robot."> <!ENTITY firstrun_tips_next "Volgende"> -<!ENTITY firstrun_onionservices_tab_title "Uien"> -<!ENTITY firstrun_onionservices_title "Ui diensten"> -<!ENTITY firstrun_onionservices_message "Onion diensten zijn sites welke eindigen op .onion. Deze bieden extra bescherming voor publicisten en bezoekers, inclusief toegevoegde beveiligingsmechanismes tegen censuur. Onion diensten stellen iedereen in staat om content en diensten in anonimiteit aan te bieden."> +<!ENTITY firstrun_onionservices_tab_title "Onions"> +<!ENTITY firstrun_onionservices_title "Onion-services"> +<!ENTITY firstrun_onionservices_message "Onion-services zijn websites die op .onion eindigen en extra bescherming bieden voor publicisten en bezoekers, waaronder toegevoegde beschermingsmechanismen tegen censuur. Via Onion-services kan iedereen anoniem inhoud en diensten aanbieden."> <!ENTITY firstrun_onionservices_next "Ga verkennen">

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 02 Apr '19

02 Apr '19

commit ea8ebe4cc1e31144fc9904a20077b1a7158beadb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 22:47:40 2019 +0000 Update translations for tba-torbrowserstringsdtd --- nl/android_strings.dtd | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nl/android_strings.dtd b/nl/android_strings.dtd index ce8b8a98e..7769e1cae 100644 --- a/nl/android_strings.dtd +++ b/nl/android_strings.dtd @@ -1,25 +1,25 @@  <!ENTITY firstrun_welcome_tab_title "Welkom"> -<!ENTITY firstrun_welcome_title "Je bent klaar."> -<!ENTITY firstrun_welcome_message "Tor Browser biedt het hoogste privacy- en beveiligingsniveau terwijl het op het web surft. Je bent nu beveiligd tegen volgen, surveillance, en censuur. Deze snelle "aan boord" toont je hoe."> -<!ENTITY firstrun_welcome_next "Begin nu"> +<!ENTITY firstrun_welcome_title "U bent klaar."> +<!ENTITY firstrun_welcome_message "Tor Browser biedt de hoogste standaard aan privacy en beveiliging tijdens het websurfen. U bent nu beschermd tegen volgen, bewaking en censuur. Deze snelle onboarding toont hoe dit werkt."> +<!ENTITY firstrun_welcome_next "Nu starten"> <!ENTITY firstrun_privacy_tab_title "Privacy"> <!ENTITY firstrun_privacy_title "Snub volgers en neuzers."> -<!ENTITY firstrun_privacy_message "Tor Browser isoleert cookies en verwijdrt jouw browser historie na jouw sessie. Deze wijzigingen waarborgen dat jouw privacy en veiligheid beschermd zijn in de browser. Klik 'Tor Netwerk" om te leren hoe we jou op netwerk niveau beveiligen."> -<!ENTITY firstrun_privacy_next "Ga naar het Tor Netwerk"> -<!ENTITY firstrun_tornetwork_tab_title "Tor Netwerk"> +<!ENTITY firstrun_privacy_message "Tor Browser isoleert cookies en verwijdert uw browsergeschiedenis na uw sessie. Deze wijzigingen zorgen ervoor dat uw privacy en veiligheid in de browser zijn beschermd. Klik op ‘Tor-netwerk’ om te lezen hoe we u op netwerkniveau beschermen."> +<!ENTITY firstrun_privacy_next "Naar Tor-netwerk"> +<!ENTITY firstrun_tornetwork_tab_title "Tor-netwerk"> <!ENTITY firstrun_tornetwork_title "Reis over een gedecentraliseerd netwerk."> -<!ENTITY firstrun_tornetwork_message "Tor browser verbindt je met het Tor netwerk dat door duizenden vrijwilligers over de wereld in stand wordt gehouden. Niet zoals een VPN, is er geen faalpunt or gecentraliseerde eenehid die je moet vertrouwen om prive van het internet te genieten."> +<!ENTITY firstrun_tornetwork_message "Tor Browser verbindt u met het Tor-netwerk, mogelijk gemaakt door duizenden vrijwilligers over de hele wereld. Anders dan bij een VPN is er geen sprake van één zwakke plek of centrale autoriteit die u moet vertrouwen om privé van het internet gebruik te maken."> <!ENTITY firstrun_tornetwork_next "Volgende"> <!ENTITY firstrun_secsettings_tab_title "Beveiliging"> -<!ENTITY firstrun_secsettings_title "Kies jouw ervaring."> -<!ENTITY firstrun_secsettings_message "Veiligheidsinstellingen bieden je de mogelijkheid om elementen te blokkeren die anders gebruikt zouden kunnen worden om jouw computer aan te vallen."> +<!ENTITY firstrun_secsettings_title "Kies uw ervaring."> +<!ENTITY firstrun_secsettings_message "We bieden ook aanvullende instellingen om de beveiliging van uw browser te verhogen. Via onze Beveiligingsinstellingen kunt u elementen blokkeren die kunnen worden gebruikt om uw computer aan te vallen."> <!ENTITY firstrun_secsettings_next "Volgende"> <!ENTITY firstrun_tips_tab_title "Tips"> -<!ENTITY firstrun_tips_title "Ervaar Tips."> -<!ENTITY firstrun_tips_message "Met alle beveiligings- en privacyfuncties die door Tor worden geboden kan jouw surfervaring iets anders zijn. Het kan iets langzamer gaan en afhankelijk van jouw beveiligingsniveau werken sommige elementen mogelijk niet, of ze worden niet geladen. Je kunt ook de vraag krijgen om aan te tonen dat je een mens bent en niet een robot."> +<!ENTITY firstrun_tips_title "Ervaringstips."> +<!ENTITY firstrun_tips_message "Met alle door Tor geboden beveiligings- en privacyfuncties kan uw ervaring tijdens het webbrowsen een beetje anders zijn. Dingen gaan misschien iets langzamer, en afhankelijk van het door u gekozen beveiligingsniveau zullen bepaalde elementen misschien niet werken of worden geladen. Er kan ook worden gevraagd te bewijzen dat u een mens bent en geen robot."> <!ENTITY firstrun_tips_next "Volgende"> -<!ENTITY firstrun_onionservices_tab_title "Uien"> -<!ENTITY firstrun_onionservices_title "Ui diensten"> -<!ENTITY firstrun_onionservices_message "Onion diensten zijn sites welke eindigen op .onion. Deze bieden extra bescherming voor publicisten en bezoekers, inclusief toegevoegde beveiligingsmechanismes tegen censuur. Onion diensten stellen iedereen in staat om content en diensten in anonimiteit aan te bieden."> +<!ENTITY firstrun_onionservices_tab_title "Onions"> +<!ENTITY firstrun_onionservices_title "Onion-services"> +<!ENTITY firstrun_onionservices_message "Onion-services zijn websites die op .onion eindigen en extra bescherming bieden voor publicisten en bezoekers, waaronder toegevoegde beschermingsmechanismen tegen censuur. Via Onion-services kan iedereen anoniem inhoud en diensten aanbieden."> <!ENTITY firstrun_onionservices_next "Ga verkennen">

1 0