- tbb-commits - lists.torproject.org

[tor-launcher/master] Bump version to 0.2.5.2.
by mikeperry＠torproject.org 08 Apr '14

08 Apr '14

commit f9d7c77f71c3596a66b8026b06fe6ee6fdea00e2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 18:29:43 2014 -0700 Bump version to 0.2.5.2. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 1cd36da..f523acf 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.5.1</em:version> + <em:version>0.2.5.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/master] Really add the OpenSSL keyring.
by mikeperry＠torproject.org 07 Apr '14

07 Apr '14

commit ada623c4cbc145521980e6bce08611cff7e81cad Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:46:07 2014 -0700 Really add the OpenSSL keyring. I wonder where GPG put it last time? --- gitian/gpg/OPENSSL.gpg | Bin 0 -> 6924 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg new file mode 100644 index 0000000..d8c115b Binary files /dev/null and b/gitian/gpg/OPENSSL.gpg differ

1 0

[tor-browser-bundle/master] Update OpenSSL signing key and hashes.
by mikeperry＠torproject.org 07 Apr '14

07 Apr '14

commit 06d2d07bdfbfd2361df94ef588f1f2513b6d3d12 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:34:42 2014 -0700 Update OpenSSL signing key and hashes. --- gitian/gpg/OPENSSL.gpg | Bin 4316 -> 0 bytes gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/gpg/OPENSSL.gpg b/gitian/gpg/OPENSSL.gpg deleted file mode 100644 index 1b282b7..0000000 Binary files a/gitian/gpg/OPENSSL.gpg and /dev/null differ diff --git a/gitian/versions b/gitian/versions index 739badc..570656d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -58,7 +58,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 9a7ac2f..baee44a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.beta b/gitian/versions.beta index 4d152dc..53060ca 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6717ad2..f3f0dca 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,7 @@ PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Update OpenSSL to 1.0.1g
by mikeperry＠torproject.org 07 Apr '14

07 Apr '14

commit 0dc9b5d20c312916ffec28dd0adc014a7cfae4a9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:04:19 2014 -0700 Update OpenSSL to 1.0.1g --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ gitian/versions | 4 ++-- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4a95497..3f12ac9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser Bundle 3.5.4 -- Apr 7 2014 + * All Platforms + * Update OpenSSL to 1.0.1g + Tor Browser Bundle 3.5.3 -- Mar 19 2014 * All Platforms * Update Firefox to 24.4.0esr diff --git a/gitian/versions b/gitian/versions index f007100..739badc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.5.3 +TORBROWSER_VERSION=3.5.4 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 @@ -22,7 +22,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 176477a..9a7ac2f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.beta b/gitian/versions.beta index 4c66e6b..4d152dc 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 57157c0..6717ad2 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22

1 0

[tor-launcher/master] Bug #9665: Report error if no bridges are usable.
by brade＠torproject.org 07 Apr '14

07 Apr '14

commit 61ff5d51649158dc07353e2034473ba6287bdfe0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Apr 7 16:46:22 2014 -0400 Bug #9665: Report error if no bridges are usable. --- src/chrome/locale/en/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index a2550db..d04cac5 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identity mismatch torlauncher.bootstrapWarning.timeout=connection timeout torlauncher.bootstrapWarning.noroute=no route to host torlauncher.bootstrapWarning.ioerror=read/write error +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport

1 0

[tor-browser/tor-browser-24.4.0esr-1] fixup! Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 02 Apr '14

02 Apr '14

commit 0ae8ff689e7f6f0c07d15bfd7ad13d9f7bd54d55 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 2 04:42:20 2014 -0700 fixup! Add security enhancements suggested by Jesse Ruderman. It might be nice if I could cut and paste properly... --- browser/app/profile/000-tor-browser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 91f8697..4198843 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -143,9 +143,9 @@ pref("layers.acceleration.disabled", true); // Security enhancements // https://trac.torproject.org/projects/tor/ticket/9387#comment:17 pref("javascript.options.ion.content", false); -pref("javascripjavascript.options.baselinejit.content", false); -pref("javascripjavascript.options.asmjs", false); -pref("javascripjavascript.options.typeinference", false); +pref("javascript.options.baselinejit.content", false); +pref("javascript.options.asmjs", false); +pref("javascript.options.typeinference", false); // Version placeholder

1 0

[tor-browser-bundle/master] Bug 11240: Don't run chmod on (dangling) symlinks.
by gk＠torproject.org 02 Apr '14

02 Apr '14

commit 681b1598bbbb0704f620bc0e27624a46d6f51f89 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 2 10:30:11 2014 +0000 Bug 11240: Don't run chmod on (dangling) symlinks. --- gitian/build-helpers/dtar.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gitian/build-helpers/dtar.sh b/gitian/build-helpers/dtar.sh index 282ec2d..e8ec340 100755 --- a/gitian/build-helpers/dtar.sh +++ b/gitian/build-helpers/dtar.sh @@ -5,7 +5,8 @@ export LC_ALL=C TARFILE=$1 shift -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; +# No need to execute chmod on (possibly) dangling symlinks. +find $@ ! -type l -executable -exec chmod 700 {} \; +find $@ ! -type l ! -executable -exec chmod 600 {} \; find $@ | sort | tar --no-recursion -Jcvf $TARFILE -T -

1 0

[tor-browser/tor-browser-24.4.0esr-1] Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 8896b493c0487ac7402514257d6e4acdde00ff64 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 23:58:04 2014 -0700 Add security enhancements suggested by Jesse Ruderman. We were going to put these in the security slider, but perhaps they should be set by default. There will be a perf impact, but let's see if anyone notices and complains, at least for a beta or two. If not, maybe we can even set these in a release. --- browser/app/profile/000-tor-browser.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e2efc9..91f8697 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -140,5 +140,13 @@ pref("keyword.URL", "https://startpage.com/do/search?q="); pref("gfx.direct2d.disabled", true); pref("layers.acceleration.disabled", true); +// Security enhancements +// https://trac.torproject.org/projects/tor/ticket/9387#comment:17 +pref("javascript.options.ion.content", false); +pref("javascripjavascript.options.baselinejit.content", false); +pref("javascripjavascript.options.asmjs", false); +pref("javascripjavascript.options.typeinference", false); + + // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'linus/tools'
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit ce74f8c3a85927cb70d2f5c1dc61a445662e9c1b Merge: 9dbf4b4 f7a5306 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:13:23 2014 -0700 Merge remote-tracking branch 'linus/tools' tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 51 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 44 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 120 insertions(+)

1 0

[tor-browser-bundle/master] Invoke prune-old-builds on success.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit f7a5306138e27cc2971ac263178ba15eb980ca6a Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Mar 25 17:27:44 2014 +0100 Invoke prune-old-builds on success. --- tools/continuous-builds/park-nightly.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 1ac5b2c..dbc01e4 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -40,3 +40,5 @@ do_check $DSTDIR || exit 2 [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR cd ..; mv $DSTDIR $DIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" + +[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds ~/public_html/builds

1 0

[tor-browser-bundle/master] Use an environment variable for selecting PGP key to sign with.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit c8fe0baedb139b4798dc484e993b417a2bb1ab0f Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Mar 25 17:22:21 2014 +0100 Use an environment variable for selecting PGP key to sign with. --- tools/continuous-builds/build-tbb.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index c44e0fd..3ae1c92 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -1,6 +1,6 @@ #! /bin/sh # usage: -# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-KEY [BUILDDIR [DESTDIR [N]]]]]] +# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-SSH-KEY [BUILDDIR [DESTDIR [N]]]]]] # # Build TARGET in BUILDDIR, which will end up in DESTDIR # Try doing it N times. @@ -8,14 +8,17 @@ # TODO: # - if there's no new commits, don't build but make sure there's a symlink on perdulce +# - copy build logs to publish-host, at least when failing the build TARGET=$1; [ -z "$TARGET" ] && TARGET=nightly PUBLISH_HOST=$2; [ -z "$PUBLISH_HOST" ] && PUBLISH_HOST=perdulce.torproject.org -PUBLISH_KEY=$3; [ -z "$PUBLISH_KEY" ] && PUBLISH_KEY=~/.ssh/perdulce-upload +PUBLISH_SSH_KEY=$3; [ -z "$PUBLISH_SSH_KEY" ] && PUBLISH_SSH_KEY=~/.ssh/perdulce-upload BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET N=$6; [ -z "$N" ] && N=16 +[ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 + logfile=$(date -u +%s).log . ~/setup-gitian-build-env.sh @@ -39,10 +42,10 @@ if [ $status = done ]; then mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 sha256sum *.tar.xz *.zip *.exe > sha256sums.txt - gpg -a --clearsign --local-user 0x984496E7 sha256sums.txt || exit 2 + gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) - tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_KEY $PUBLISH_HOST | tee -a $logfile + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile fi

1 0

[tor-browser-bundle/master] Add tools directory with scripts for nightly builds.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 784bac5f84c7b4b02e11e74070d57c944d1dc291 Author: Linus Nordberg <linus(a)nordberg.se> Date: Sat Mar 15 16:42:50 2014 +0100 Add tools directory with scripts for nightly builds. --- tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 48 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 42 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 115 insertions(+) diff --git a/tools/continuous-builds/README b/tools/continuous-builds/README new file mode 100644 index 0000000..c60f19f --- /dev/null +++ b/tools/continuous-builds/README @@ -0,0 +1,14 @@ +Nightly builds can be produced and uploaded to a publishing host by +running build-tbb.sh. The checkout-tbb.sh script can be used to check +out the latest master before starting a build. + +The publishing host should handle uploaded tar file using the +park-nightly.sh script through the command option in sshd's +AuthorizedKeysFile. + + command="[ $(hostname) = perdulce ] && ~/park-nightly.sh",no-pty ssh-rsa ... + +In order to not grow the disk usage too much on the publishing host, +the following script can be run by cron: +https://github.com/boklm/prune-old-builds. + diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh new file mode 100755 index 0000000..c44e0fd --- /dev/null +++ b/tools/continuous-builds/build-tbb.sh @@ -0,0 +1,48 @@ +#! /bin/sh +# usage: +# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-KEY [BUILDDIR [DESTDIR [N]]]]]] +# +# Build TARGET in BUILDDIR, which will end up in DESTDIR +# Try doing it N times. +# Upload result to PUBLISH-HOST using SSH key PUBLISH-KEY. + +# TODO: +# - if there's no new commits, don't build but make sure there's a symlink on perdulce + +TARGET=$1; [ -z "$TARGET" ] && TARGET=nightly +PUBLISH_HOST=$2; [ -z "$PUBLISH_HOST" ] && PUBLISH_HOST=perdulce.torproject.org +PUBLISH_KEY=$3; [ -z "$PUBLISH_KEY" ] && PUBLISH_KEY=~/.ssh/perdulce-upload +BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian +DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET +N=$6; [ -z "$N" ] && N=16 + +logfile=$(date -u +%s).log + +. ~/setup-gitian-build-env.sh +cd $BUILDDIR || exit 1 +status=init +n=0 +while [ $status != done ]; do + n=$(expr $n + 1) + printf "%s: Starting build number %d. target=$TARGET.\n" $0 $n | tee -a $logfile + date | tee -a $logfile + killall qemu-system-i386 qemu-system-x86_64 + make $TARGET > build-$(date -u +%s).log && status=done + printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + TARGET=build-nightly + [ $n -ge $N ] && break +done + +if [ $status = done ]; then + NEWDESTDIR=$DESTDIR-$(date +%F) + echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile + mv $DESTDIR $NEWDESTDIR + cd $NEWDESTDIR || exit 3 + sha256sum *.tar.xz *.zip *.exe > sha256sums.txt + gpg -a --clearsign --local-user 0x984496E7 sha256sums.txt || exit 2 + cd .. + D=$(basename $NEWDESTDIR) + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_KEY $PUBLISH_HOST | tee -a $logfile +else + echo "$0: giving up after $n tries" | tee -a $logfile +fi diff --git a/tools/continuous-builds/checkout-tbb.sh b/tools/continuous-builds/checkout-tbb.sh new file mode 100755 index 0000000..f8a7929 --- /dev/null +++ b/tools/continuous-builds/checkout-tbb.sh @@ -0,0 +1,8 @@ +#! /bin/sh + +BUILDDIR=$1 +[ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian + +cd $BUILDDIR || exit 1 +git checkout master +git pull diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh new file mode 100755 index 0000000..1ac5b2c --- /dev/null +++ b/tools/continuous-builds/park-nightly.sh @@ -0,0 +1,42 @@ +#! /bin/sh +# usage: park-nightly.sh [DIR] + +V=1 #debug is enabled by default for now + +if [ "$1" = "-v" ]; then + V=1 + shift +fi + +DIR=$1 +[ -z "$DIR" ] && DIR=~/public_html/builds + +DSTDIR=tbb-nightly-$(date +%F) +[ -z "$V" ] || echo "Aiming to fill up $DSTDIR" + +do_check() { + [ -z "$1" ] || cd $1 || exit 5 + [ -z "$V" ] || echo "Verifying sha256sums.txt" + gpg -q --verify sha256sums.txt.asc > /dev/null || exit 3 + [ -z "$V" ] || echo "Checking sha256sums.txt" + sha256sum --strict --quiet -c sha256sums.txt || exit 4 +} + +if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then + [ -z "$V" ] || echo "Files already here, just doing the checking" + do_check $DIR/$DSTDIR + exit +fi + +[ -d .staging ] || mkdir .staging +chmod 700 .staging; cd .staging +[ -z "$V" ] || echo "Saving files to disk" +TAROPT=x +[ -z "$V" ] || TAROPT=${TAROPT}v +tar $TAROPT -f - || exit 6 +touch $DSTDIR/tbb-nightly.stamp + +do_check $DSTDIR || exit 2 +[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR +cd ..; mv $DSTDIR $DIR/ || exit 1 +[ -z "$V" ] || echo "All good, all good" diff --git a/tools/continuous-builds/setup-gitian-build-env.sh b/tools/continuous-builds/setup-gitian-build-env.sh new file mode 100644 index 0000000..e9f435a --- /dev/null +++ b/tools/continuous-builds/setup-gitian-build-env.sh @@ -0,0 +1,3 @@ +# source me! +export LC_ALL=C +export NUM_PROCS=10

1 0

[tor-browser-bundle/master] Document the TORSOCKS make variable.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 9dbf4b46d11d0fd28567f31c7e5247729d62ac48 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:09:19 2014 -0700 Document the TORSOCKS make variable. --- gitian/README.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index f9672d8..ece4cb6 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -16,9 +16,10 @@ QuickStart: $ make match By default, the Makefile wraps input downloads in 'torsocks'. This is done - to allow unofficial secret verifiers to remain secret by default. Removing - the 'torsocks' from the 'prep' Makefile rule should be sufficient to avoid - using Tor. + to allow unofficial secret verifiers to remain secret by default. To download + inputs without torsocks, run: + + $ make TORSOCKS= By default, 'make' will also clear out any previous partial builds. See the "Partial Rebuilds" section for information on performing partial rebuilds

1 0

[tor-browser-bundle/master] Use a TORSOCKS make variable.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 93a1c3135730f10575e6a0aa368bedd087cb4618 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 24 14:47:28 2014 -0700 Use a TORSOCKS make variable. This allows you to selectively disable torsocks from the command line using a command like make prep TORSOCKS= --- gitian/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index e483735..cec338d 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -1,3 +1,5 @@ +TORSOCKS = torsocks + all: clean prep build nightly: clean prep-nightly build-nightly @@ -31,32 +33,32 @@ build-beta: ./hash-bundles.sh versions.beta sign: - torsocks ./upload-signature.sh versions + $(TORSOCKS) ./upload-signature.sh versions sign-alpha: - torsocks ./upload-signature.sh versions.alpha + $(TORSOCKS) ./upload-signature.sh versions.alpha sign-nightly: ./upload-signature.sh versions.nightly sign-beta: - torsocks ./upload-signature.sh versions.beta + $(TORSOCKS) ./upload-signature.sh versions.beta match: - torsocks ./check-match.sh versions + $(TORSOCKS) ./check-match.sh versions match-nightly: ./check-match.sh versions.nightly match-alpha: - torsocks ./check-match.sh versions.alpha + $(TORSOCKS) ./check-match.sh versions.alpha match-beta: - torsocks ./check-match.sh versions.beta + $(TORSOCKS) ./check-match.sh versions.beta prep: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions prep-nightly: ./check-prerequisites.sh @@ -64,11 +66,11 @@ prep-nightly: prep-alpha: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha prep-beta: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta clean: rm -f ../../gitian-builder/inputs/*gbuilt*

1 0

[tor-browser-bundle/master] Use multiple flashproxy bridge lines.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit e535fe31cd518ab44f8cdf0785316bd39b962bc5 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 17 06:27:08 2014 +0000 Use multiple flashproxy bridge lines. In https://trac.torproject.org/projects/tor/ticket/10429#comment:2 we got a bit better reliability with more bridge lines. This doesn't cause flashproxy-client to send more registration methods, but it does hint to tor that if a bridge is being slow or unreliable it can try connecting again to get another. The corresponding change in the flashproxy repo is https://gitweb.torproject.org/flashproxy.git/commitdiff/51bdfe59cad37a5f2ff…. --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 9a3dfc2..47d20e8 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -11,6 +11,10 @@ pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:389 pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); +pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); +pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3"); +pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); +pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73");

1 0

[tor-browser-bundle/master] Fix up backport application so that nightlies contain unmerged patches.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 440b4c5d059acfa744f9c12c9e3b13f81bbc6140 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:02:13 2014 -0700 Fix up backport application so that nightlies contain unmerged patches. --- gitian/descriptors/linux/gitian-tor.yml | 4 ++-- gitian/descriptors/mac/gitian-tor.yml | 4 ++-- gitian/descriptors/windows/gitian-tor.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index bb795c0..698fcba 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -90,14 +90,14 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - git am ~/build/bug11200.patch fi + git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 129a3fe..30c23bb 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -101,14 +101,14 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - git am ~/build/bug11200.patch fi + git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 5cceac9..1698726 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -97,14 +97,14 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - git am ~/build/bug11200.patch fi + git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src

1 0

[tor-browser-bundle/master] Bug 11200: Prevent spurious error message prior to enabling network.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 20b1a0c82f3d29b6d23f1de3e55a18ff74f54dcf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:51:32 2014 -0700 Bug 11200: Prevent spurious error message prior to enabling network. --- gitian/descriptors/linux/gitian-tor.yml | 2 ++ gitian/descriptors/mac/gitian-tor.yml | 2 ++ gitian/descriptors/windows/gitian-tor.yml | 5 +++- gitian/patches/bug11200.patch | 39 +++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 73181a0..bb795c0 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -29,6 +29,7 @@ files: - "bug9229.patch" - "bug11156.patch" - "bug11069.patch" +- "bug11200.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -95,6 +96,7 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug11200.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 8b049b0..129a3fe 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -29,6 +29,7 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" +- "bug11200.patch" - "bug11069.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -106,6 +107,7 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug11200.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 3d05eaa..5cceac9 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -28,6 +28,7 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" +- "bug11200.patch" - "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" @@ -102,7 +103,9 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - fi fi + git am ~/build/bug11200.patch + fi + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/patches/bug11200.patch b/gitian/patches/bug11200.patch new file mode 100644 index 0000000..040309a --- /dev/null +++ b/gitian/patches/bug11200.patch @@ -0,0 +1,39 @@ +From 6770153d4ced726e54305ad38d14ea82df0d639e Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Sat, 29 Mar 2014 21:49:32 -0700 +Subject: [PATCH] should_disable_dir_fetches() now returns 1 if + DisableNetwork==1 + +This change prevents LD_BUG warnings and bootstrap failure messages +when we try to do directory fetches when starting with +DisableNetwork == 1, a consensus present, but no descriptors (or +insufficient descriptors) yet. + +Fixes bug 11200 and bug 10405. It's a bugfix on 0.2.3.9-alpha. +Thanks to mcs for walking me through the repro instructions! +--- + src/or/networkstatus.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c +index bcadc52..9a1824b 100644 +--- a/src/or/networkstatus.c ++++ b/src/or/networkstatus.c +@@ -1394,6 +1394,14 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out) + *msg_out = NULL; + } + ++ if (options->DisableNetwork) { ++ if (msg_out) { ++ *msg_out = "DisableNetwork is set."; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (DisableNetwork is set)"); ++ return 1; ++ } ++ + if (options->UseBridges) { + if (!any_bridge_descriptors_known()) { + if (msg_out) { +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Bug #11190: Switch linux PT build process to python2.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 843b30a1c9c1886feb563d151104b6e5494abd6e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:26:00 2014 -0700 Bug #11190: Switch linux PT build process to python2. Fixes arch and other distros that think 'python' should be python3. --- .../descriptors/linux/gitian-pluggable-transports.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 665c9bd..6619a1c 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -42,6 +42,7 @@ script: | export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C + export PYTHON=python2 umask 0022 # # Config options for hardening-wrapper @@ -65,41 +66,41 @@ script: | # cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. # tar xzf pycrypto.tar.gz cd pycrypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. # tar xzf argparse.tar.gz cd argparse-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. # tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. # cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin mkdir -p $INSTDIR/Docs/Obfsproxy @@ -118,8 +119,8 @@ script: | tar xzf m2crypto.tar.gz cd M2Crypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - python setup.py build --build-lib build + $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl + $PYTHON setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ cd .. #

1 0

[torbutton/master] Bug #10398: Do not create untranslatable strings.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 54c8721acf3c52855405c669ebfbdbeead69806a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 23 15:54:38 2014 -0500 Bug #10398: Do not create untranslatable strings. Our use of entities that contained trailing spaces was a bad idea: they got lost during the translation process. Instead, we now use a template that contains a snippet of HTML, with the search engine URLs as separate property strings. We did our best to preserve the existing translated strings, converting them to the new scheme and adding the missing spaces. --- src/chrome/content/aboutTor/aboutTor.xhtml | 26 ++++++++++++++++++++++++-- src/chrome/locale/af/aboutTor.dtd | 19 +------------------ src/chrome/locale/af/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ak/aboutTor.dtd | 19 +------------------ src/chrome/locale/ak/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/am/aboutTor.dtd | 19 +------------------ src/chrome/locale/am/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ar/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ar/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/arn/aboutTor.dtd | 19 +------------------ src/chrome/locale/arn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ast/aboutTor.dtd | 19 +------------------ src/chrome/locale/ast/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/az/aboutTor.dtd | 19 +------------------ src/chrome/locale/az/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/be/aboutTor.dtd | 19 +------------------ src/chrome/locale/be/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bg/aboutTor.dtd | 19 +------------------ src/chrome/locale/bg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bms/aboutTor.dtd | 19 +------------------ src/chrome/locale/bms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bn-IN/aboutTor.dtd | 19 +------------------ src/chrome/locale/bn-IN/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bn/aboutTor.dtd | 19 +------------------ src/chrome/locale/bn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bo/aboutTor.dtd | 19 +------------------ src/chrome/locale/bo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/br/aboutTor.dtd | 19 +------------------ src/chrome/locale/br/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bs/aboutTor.dtd | 19 +------------------ src/chrome/locale/bs/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ca/aboutTor.dtd | 19 +------------------ src/chrome/locale/ca/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/cs/aboutTor.dtd | 19 +------------------ src/chrome/locale/cs/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/csb/aboutTor.dtd | 19 +------------------ src/chrome/locale/csb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/cy/aboutTor.dtd | 19 +------------------ src/chrome/locale/cy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/da/aboutTor.dtd | 19 +------------------ src/chrome/locale/da/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/de/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/de/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/dz/aboutTor.dtd | 19 +------------------ src/chrome/locale/dz/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/el/aboutTor.dtd | 19 +------------------ src/chrome/locale/el/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/en/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/en/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/eo/aboutTor.dtd | 19 +------------------ src/chrome/locale/eo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/es/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/es/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/et/aboutTor.dtd | 19 +------------------ src/chrome/locale/et/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/eu/aboutTor.dtd | 19 +------------------ src/chrome/locale/eu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fa/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/fa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fi/aboutTor.dtd | 19 +------------------ src/chrome/locale/fi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fil/aboutTor.dtd | 19 +------------------ src/chrome/locale/fil/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fo/aboutTor.dtd | 19 +------------------ src/chrome/locale/fo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fr/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/fr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fur/aboutTor.dtd | 19 +------------------ src/chrome/locale/fur/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fy/aboutTor.dtd | 19 +------------------ src/chrome/locale/fy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ga/aboutTor.dtd | 19 +------------------ src/chrome/locale/ga/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gl/aboutTor.dtd | 19 +------------------ src/chrome/locale/gl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gu/aboutTor.dtd | 19 +------------------ src/chrome/locale/gu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gun/aboutTor.dtd | 19 +------------------ src/chrome/locale/gun/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ha/aboutTor.dtd | 19 +------------------ src/chrome/locale/ha/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/he/aboutTor.dtd | 19 +------------------ src/chrome/locale/he/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hi/aboutTor.dtd | 19 +------------------ src/chrome/locale/hi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hr/aboutTor.dtd | 19 +------------------ src/chrome/locale/hr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ht/aboutTor.dtd | 19 +------------------ src/chrome/locale/ht/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hu/aboutTor.dtd | 19 +------------------ src/chrome/locale/hu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hy/aboutTor.dtd | 19 +------------------ src/chrome/locale/hy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/id/aboutTor.dtd | 19 +------------------ src/chrome/locale/id/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/is/aboutTor.dtd | 19 +------------------ src/chrome/locale/is/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/it/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/it/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ja/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ja/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/jv/aboutTor.dtd | 19 +------------------ src/chrome/locale/jv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ka/aboutTor.dtd | 19 +------------------ src/chrome/locale/ka/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/km/aboutTor.dtd | 19 +------------------ src/chrome/locale/km/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/kn/aboutTor.dtd | 19 +------------------ src/chrome/locale/kn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ko/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ko/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ku/aboutTor.dtd | 19 +------------------ src/chrome/locale/ku/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/kw/aboutTor.dtd | 19 +------------------ src/chrome/locale/kw/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ky/aboutTor.dtd | 19 +------------------ src/chrome/locale/ky/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lb/aboutTor.dtd | 19 +------------------ src/chrome/locale/lb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lg/aboutTor.dtd | 19 +------------------ src/chrome/locale/lg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ln/aboutTor.dtd | 19 +------------------ src/chrome/locale/ln/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lo/aboutTor.dtd | 19 +------------------ src/chrome/locale/lo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lt/aboutTor.dtd | 19 +------------------ src/chrome/locale/lt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lv/aboutTor.dtd | 19 +------------------ src/chrome/locale/lv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mg/aboutTor.dtd | 19 +------------------ src/chrome/locale/mg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mi/aboutTor.dtd | 19 +------------------ src/chrome/locale/mi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mk/aboutTor.dtd | 19 +------------------ src/chrome/locale/mk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ml/aboutTor.dtd | 19 +------------------ src/chrome/locale/ml/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mn/aboutTor.dtd | 19 +------------------ src/chrome/locale/mn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mr/aboutTor.dtd | 19 +------------------ src/chrome/locale/mr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ms/aboutTor.dtd | 19 +------------------ src/chrome/locale/ms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mt/aboutTor.dtd | 19 +------------------ src/chrome/locale/mt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/my/aboutTor.dtd | 19 +------------------ src/chrome/locale/my/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nah/aboutTor.dtd | 19 +------------------ src/chrome/locale/nah/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nap/aboutTor.dtd | 19 +------------------ src/chrome/locale/nap/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nb/aboutTor.dtd | 19 +------------------ src/chrome/locale/nb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ne/aboutTor.dtd | 19 +------------------ src/chrome/locale/ne/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nl/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/nl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nn/aboutTor.dtd | 19 +------------------ src/chrome/locale/nn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nso/aboutTor.dtd | 19 +------------------ src/chrome/locale/nso/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/oc/aboutTor.dtd | 19 +------------------ src/chrome/locale/oc/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/or/aboutTor.dtd | 19 +------------------ src/chrome/locale/or/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pa/aboutTor.dtd | 19 +------------------ src/chrome/locale/pa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pap/aboutTor.dtd | 19 +------------------ src/chrome/locale/pap/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pl/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/pl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pms/aboutTor.dtd | 19 +------------------ src/chrome/locale/pms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ps/aboutTor.dtd | 19 +------------------ src/chrome/locale/ps/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pt-BR/aboutTor.dtd | 19 +------------------ src/chrome/locale/pt-BR/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pt/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/pt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ro/aboutTor.dtd | 19 +------------------ src/chrome/locale/ro/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ru/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ru/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sco/aboutTor.dtd | 19 +------------------ src/chrome/locale/sco/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sk/aboutTor.dtd | 19 +------------------ src/chrome/locale/sk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sl/aboutTor.dtd | 19 +------------------ src/chrome/locale/sl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/so/aboutTor.dtd | 19 +------------------ src/chrome/locale/so/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/son/aboutTor.dtd | 19 +------------------ src/chrome/locale/son/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sq/aboutTor.dtd | 19 +------------------ src/chrome/locale/sq/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sr/aboutTor.dtd | 19 +------------------ src/chrome/locale/sr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/st/aboutTor.dtd | 19 +------------------ src/chrome/locale/st/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/su/aboutTor.dtd | 19 +------------------ src/chrome/locale/su/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sv/aboutTor.dtd | 19 +------------------ src/chrome/locale/sv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sw/aboutTor.dtd | 19 +------------------ src/chrome/locale/sw/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ta/aboutTor.dtd | 19 +------------------ src/chrome/locale/ta/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/te/aboutTor.dtd | 19 +------------------ src/chrome/locale/te/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tg/aboutTor.dtd | 19 +------------------ src/chrome/locale/tg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/th/aboutTor.dtd | 19 +------------------ src/chrome/locale/th/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ti/aboutTor.dtd | 19 +------------------ src/chrome/locale/ti/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tk/aboutTor.dtd | 19 +------------------ src/chrome/locale/tk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tr/aboutTor.dtd | 19 +------------------ src/chrome/locale/tr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/uk/aboutTor.dtd | 19 +------------------ src/chrome/locale/uk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ur/aboutTor.dtd | 19 +------------------ src/chrome/locale/ur/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ve/aboutTor.dtd | 19 +------------------ src/chrome/locale/ve/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/vi/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/vi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/wa/aboutTor.dtd | 19 +------------------ src/chrome/locale/wa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/wo/aboutTor.dtd | 19 +------------------ src/chrome/locale/wo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-CN/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/zh-CN/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-HK/aboutTor.dtd | 19 +------------------ src/chrome/locale/zh-HK/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-TW/aboutTor.dtd | 19 +------------------ src/chrome/locale/zh-TW/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zu/aboutTor.dtd | 19 +------------------ src/chrome/locale/zu/aboutTor.properties | 15 +++++++++++++++ 239 files changed, 1928 insertions(+), 2264 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index ce06941..02e0c7c 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -25,6 +25,8 @@ <![CDATA[ function onLoad() { + insertPropertyStrings(); + window.addEventListener("resize", function() { resizeToolbarIconArrow(); }, false); @@ -45,6 +47,26 @@ function resizeToolbarIconArrow() rightDiv.style.width = width + "px"; } } + +function insertPropertyStrings() +{ + try { + var kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; + + Components.utils.import("resource://gre/modules/Services.jsm"); + var gStringBundle = Services.strings.createBundle(kPropertiesURL); + var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link"); + var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link"); + var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy", + [s1, s2], 2); + if (result) { + var elem = document.getElementById("searchProviderInfo"); + if (elem) + elem.innerHTML = result; + } + } catch(e) {}; +} + ]]> </script> </head> @@ -84,7 +106,7 @@ function resizeToolbarIconArrow() </div> <input name="q" autocomplete="off" id="sx" type="text"/> </div> - <h4>&aboutTor.searchSP.privacy.beforeLink.label;<a href="&aboutTor.searchSP.privacy.link;">&aboutTor.searchSP.privacy.label;</a>&aboutTor.searchSP.privacy.afterLink.label;&aboutTor.searchSP.search.beforeLink.label;<a href="&aboutTor.searchSP.search.link;">&aboutTor.searchSP.search.label;</a>&aboutTor.searchSP.search.afterLink.label;</h4> + <h4 id="searchProviderInfo" /> </form> </div> diff --git a/src/chrome/locale/af/aboutTor.dtd b/src/chrome/locale/af/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/af/aboutTor.dtd +++ b/src/chrome/locale/af/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/af/aboutTor.properties b/src/chrome/locale/af/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/af/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ak/aboutTor.dtd b/src/chrome/locale/ak/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ak/aboutTor.dtd +++ b/src/chrome/locale/ak/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ak/aboutTor.properties b/src/chrome/locale/ak/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ak/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/am/aboutTor.dtd b/src/chrome/locale/am/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/am/aboutTor.dtd +++ b/src/chrome/locale/am/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/am/aboutTor.properties b/src/chrome/locale/am/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/am/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 8b0d7cf..e02388f 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "بحث"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "بحث"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "بحث"> -<!ENTITY aboutTor.searchSP.privacy.label "بآمان"> -<!ENTITY aboutTor.searchDDG.privacy.label "بآمان"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "مع"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "مع"> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "معلومات إضافية:"> <!ENTITY aboutTor.torInfo2.label "الدولة وعنوان الإنترنت:"> diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties new file mode 100644 index 0000000..09f1f91 --- /dev/null +++ b/src/chrome/locale/ar/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=بحث <a href="%1$S">بآمان</a> مع <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=بحث <a href="%1$S">بآمان</a> مع <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/arn/aboutTor.dtd b/src/chrome/locale/arn/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/arn/aboutTor.dtd +++ b/src/chrome/locale/arn/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/arn/aboutTor.properties b/src/chrome/locale/arn/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/arn/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ast/aboutTor.dtd b/src/chrome/locale/ast/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ast/aboutTor.dtd +++ b/src/chrome/locale/ast/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ast/aboutTor.properties b/src/chrome/locale/ast/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ast/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/az/aboutTor.dtd b/src/chrome/locale/az/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/az/aboutTor.dtd +++ b/src/chrome/locale/az/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/az/aboutTor.properties b/src/chrome/locale/az/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/az/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/be/aboutTor.dtd b/src/chrome/locale/be/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/be/aboutTor.dtd +++ b/src/chrome/locale/be/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/be/aboutTor.properties b/src/chrome/locale/be/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/be/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/bg/aboutTor.dtd b/src/chrome/locale/bg/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/bg/aboutTor.dtd +++ b/src/chrome/locale/bg/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/bg/aboutTor.properties b/src/chrome/locale/bg/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/bg/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/bms/aboutTor.dtd b/src/chrome/locale/bms/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/bms/aboutTor.dtd +++ b/src/chrome/locale/bms/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/bms/aboutTor.properties b/src/chrome/locale/bms/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/bms/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/bn-IN/aboutTor.dtd b/src/chrome/locale/bn-IN/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/bn-IN/aboutTor.dtd +++ b/src/chrome/locale/bn-IN/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/bn-IN/aboutTor.properties b/src/chrome/locale/bn-IN/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/bn-IN/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/bn/aboutTor.dtd b/src/chrome/locale/bn/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/bn/aboutTor.dtd +++ b/src/chrome/locale/bn/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/bn/aboutTor.properties b/src/chrome/locale/bn/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/bn/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/bo/aboutTor.dtd b/src/chrome/locale/bo/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/bo/aboutTor.dtd +++ b/src/chrome/locale/bo/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/bo/aboutTor.properties b/src/chrome/locale/bo/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/bo/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/br/aboutTor.dtd b/src/chrome/locale/br/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/br/aboutTor.dtd +++ b/src/chrome/locale/br/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/br/aboutTor.properties b/src/chrome/locale/br/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/br/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/bs/aboutTor.dtd b/src/chrome/locale/bs/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/bs/aboutTor.dtd +++ b/src/chrome/locale/bs/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/bs/aboutTor.properties b/src/chrome/locale/bs/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/bs/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ca/aboutTor.dtd +++ b/src/chrome/locale/ca/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ca/aboutTor.properties b/src/chrome/locale/ca/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ca/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/cs/aboutTor.properties b/src/chrome/locale/cs/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/cs/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/csb/aboutTor.dtd b/src/chrome/locale/csb/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/csb/aboutTor.dtd +++ b/src/chrome/locale/csb/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/csb/aboutTor.properties b/src/chrome/locale/csb/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/csb/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/cy/aboutTor.dtd b/src/chrome/locale/cy/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/cy/aboutTor.dtd +++ b/src/chrome/locale/cy/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/cy/aboutTor.properties b/src/chrome/locale/cy/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/cy/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/da/aboutTor.properties b/src/chrome/locale/da/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/da/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index de478a2..7948f5f 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Suchen"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Suche"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Suche"> -<!ENTITY aboutTor.searchSP.privacy.label "sicher"> -<!ENTITY aboutTor.searchDDG.privacy.label "sicher"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/deu/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "mit"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "mit"> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Zusätzliche Informationen:"> <!ENTITY aboutTor.torInfo2.label "Land & IP-Adresse:"> diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties new file mode 100644 index 0000000..55f555d --- /dev/null +++ b/src/chrome/locale/de/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Suche <a href="%1$S">sicher</a> mit <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Suche <a href="%1$S">sicher</a> mit <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/dz/aboutTor.dtd b/src/chrome/locale/dz/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/dz/aboutTor.dtd +++ b/src/chrome/locale/dz/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/dz/aboutTor.properties b/src/chrome/locale/dz/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/dz/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/el/aboutTor.properties b/src/chrome/locale/el/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/el/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 89a01a2..7128bb8 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Search"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label " "> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label " "> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/en/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/eo/aboutTor.dtd b/src/chrome/locale/eo/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/eo/aboutTor.dtd +++ b/src/chrome/locale/eo/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/eo/aboutTor.properties b/src/chrome/locale/eo/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/eo/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 57f24f7..af9ff47 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Buscar"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Busque"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Busque"> -<!ENTITY aboutTor.searchSP.privacy.label "con seguridad"> -<!ENTITY aboutTor.searchDDG.privacy.label "con seguridad"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/esp/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "con"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con"> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/esp"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Información adicional:"> <!ENTITY aboutTor.torInfo2.label "País y dirección IP:"> diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties new file mode 100644 index 0000000..f8bdb1d --- /dev/null +++ b/src/chrome/locale/es/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Busque <a href="%1$S">con seguridad</a> con <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/esp/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/esp + +aboutTor.searchDDG.privacy=Busque <a href="%1$S">con seguridad</a> con <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/et/aboutTor.dtd b/src/chrome/locale/et/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/et/aboutTor.dtd +++ b/src/chrome/locale/et/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/et/aboutTor.properties b/src/chrome/locale/et/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/et/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/eu/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 08bf75c..fa8e9ae 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "جستجو"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "جستجو"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "جستجو"> -<!ENTITY aboutTor.searchSP.privacy.label "بصورت امن"> -<!ENTITY aboutTor.searchDDG.privacy.label "بصورت امن"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "اطلاعات بيشتر"> <!ENTITY aboutTor.torInfo2.label "كشور و آدرس آى پی:"> diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties new file mode 100644 index 0000000..3c1c06c --- /dev/null +++ b/src/chrome/locale/fa/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=جستجو <a href="%1$S">بصورت امن</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=جستجو <a href="%1$S">بصورت امن</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/fi/aboutTor.dtd b/src/chrome/locale/fi/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/fi/aboutTor.dtd +++ b/src/chrome/locale/fi/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/fi/aboutTor.properties b/src/chrome/locale/fi/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/fi/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/fil/aboutTor.dtd b/src/chrome/locale/fil/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/fil/aboutTor.dtd +++ b/src/chrome/locale/fil/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/fil/aboutTor.properties b/src/chrome/locale/fil/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/fil/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/fo/aboutTor.dtd b/src/chrome/locale/fo/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/fo/aboutTor.dtd +++ b/src/chrome/locale/fo/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/fo/aboutTor.properties b/src/chrome/locale/fo/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/fo/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index a0b041b..41ad3e5 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Rechercher"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Rechercher "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Rechercher "> -<!ENTITY aboutTor.searchSP.privacy.label "en toute sécurité"> -<!ENTITY aboutTor.searchDDG.privacy.label "en toute sécurité"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "avec "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "avec "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Informations supplémentaires :"> <!ENTITY aboutTor.torInfo2.label "Pays & adresse IP :"> diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties new file mode 100644 index 0000000..5bd5049 --- /dev/null +++ b/src/chrome/locale/fr/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/fur/aboutTor.dtd b/src/chrome/locale/fur/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/fur/aboutTor.dtd +++ b/src/chrome/locale/fur/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/fur/aboutTor.properties b/src/chrome/locale/fur/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/fur/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/fy/aboutTor.dtd b/src/chrome/locale/fy/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/fy/aboutTor.dtd +++ b/src/chrome/locale/fy/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/fy/aboutTor.properties b/src/chrome/locale/fy/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/fy/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ga/aboutTor.dtd +++ b/src/chrome/locale/ga/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ga/aboutTor.properties b/src/chrome/locale/ga/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ga/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/gl/aboutTor.dtd b/src/chrome/locale/gl/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/gl/aboutTor.dtd +++ b/src/chrome/locale/gl/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/gl/aboutTor.properties b/src/chrome/locale/gl/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/gl/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/gu/aboutTor.dtd b/src/chrome/locale/gu/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/gu/aboutTor.dtd +++ b/src/chrome/locale/gu/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/gu/aboutTor.properties b/src/chrome/locale/gu/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/gu/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/gun/aboutTor.dtd b/src/chrome/locale/gun/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/gun/aboutTor.dtd +++ b/src/chrome/locale/gun/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/gun/aboutTor.properties b/src/chrome/locale/gun/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/gun/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ha/aboutTor.dtd b/src/chrome/locale/ha/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ha/aboutTor.dtd +++ b/src/chrome/locale/ha/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ha/aboutTor.properties b/src/chrome/locale/ha/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ha/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/he/aboutTor.properties b/src/chrome/locale/he/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/he/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/hi/aboutTor.dtd b/src/chrome/locale/hi/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/hi/aboutTor.dtd +++ b/src/chrome/locale/hi/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/hi/aboutTor.properties b/src/chrome/locale/hi/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/hi/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/hr/aboutTor.dtd b/src/chrome/locale/hr/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/hr/aboutTor.dtd +++ b/src/chrome/locale/hr/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/hr/aboutTor.properties b/src/chrome/locale/hr/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/hr/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ht/aboutTor.dtd b/src/chrome/locale/ht/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ht/aboutTor.dtd +++ b/src/chrome/locale/ht/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ht/aboutTor.properties b/src/chrome/locale/ht/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ht/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/hu/aboutTor.dtd +++ b/src/chrome/locale/hu/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/hu/aboutTor.properties b/src/chrome/locale/hu/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/hu/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/hy/aboutTor.dtd b/src/chrome/locale/hy/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/hy/aboutTor.dtd +++ b/src/chrome/locale/hy/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/hy/aboutTor.properties b/src/chrome/locale/hy/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/hy/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/id/aboutTor.properties b/src/chrome/locale/id/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/id/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/is/aboutTor.properties b/src/chrome/locale/is/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/is/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index 57b1a42..151a7d5 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Cerca"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Cerca"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Cerca"> -<!ENTITY aboutTor.searchSP.privacy.label "in modo sicuro"> -<!ENTITY aboutTor.searchDDG.privacy.label "in modo sicuro"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ita/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "con"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "con"> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Ulteriori Info:"> <!ENTITY aboutTor.torInfo2.label "Nazione & Indirizzo IP:"> diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties new file mode 100644 index 0000000..0748189 --- /dev/null +++ b/src/chrome/locale/it/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 1f96caf..4d27e73 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "検索"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "検索"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "検索"> -<!ENTITY aboutTor.searchSP.privacy.label "安全に"> -<!ENTITY aboutTor.searchDDG.privacy.label "安全に"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "一緒に"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "一緒に"> -<!ENTITY aboutTor.searchSP.search.label "スタートページ"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "追加情報: "> <!ENTITY aboutTor.torInfo2.label "国とIPアドレス:"> diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties new file mode 100644 index 0000000..591c9ca --- /dev/null +++ b/src/chrome/locale/ja/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=検索 <a href="%1$S">安全に</a> 一緒に <a href="%2$S">スタートページ</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=検索 <a href="%1$S">安全に</a> 一緒に <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/jv/aboutTor.dtd b/src/chrome/locale/jv/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/jv/aboutTor.dtd +++ b/src/chrome/locale/jv/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/jv/aboutTor.properties b/src/chrome/locale/jv/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/jv/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ka/aboutTor.properties b/src/chrome/locale/ka/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ka/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/km/aboutTor.dtd b/src/chrome/locale/km/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/km/aboutTor.dtd +++ b/src/chrome/locale/km/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/km/aboutTor.properties b/src/chrome/locale/km/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/km/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/kn/aboutTor.dtd b/src/chrome/locale/kn/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/kn/aboutTor.dtd +++ b/src/chrome/locale/kn/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/kn/aboutTor.properties b/src/chrome/locale/kn/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/kn/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 008a804..d388ca4 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "검색"> - <!ENTITY aboutTor.searchSPPost.link ""> <!ENTITY aboutTor.searchDDGPost.link ""> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label ""> -<!ENTITY aboutTor.searchSP.privacy.label ""> -<!ENTITY aboutTor.searchDDG.privacy.label ""> -<!ENTITY aboutTor.searchSP.privacy.link ""> -<!ENTITY aboutTor.searchDDG.privacy.link ""> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchSP.search.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label ""> -<!ENTITY aboutTor.searchSP.search.label ""> -<!ENTITY aboutTor.searchDDG.search.label ""> -<!ENTITY aboutTor.searchSP.search.link ""> -<!ENTITY aboutTor.searchDDG.search.link ""> -<!ENTITY aboutTor.searchSP.search.afterLink.label " "> -<!ENTITY aboutTor.searchDDG.search.afterLink.label " "> <!ENTITY aboutTor.torInfo1.label ""> <!ENTITY aboutTor.torInfo2.label ""> diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ko/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ku/aboutTor.dtd b/src/chrome/locale/ku/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ku/aboutTor.dtd +++ b/src/chrome/locale/ku/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ku/aboutTor.properties b/src/chrome/locale/ku/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ku/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/kw/aboutTor.dtd b/src/chrome/locale/kw/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/kw/aboutTor.dtd +++ b/src/chrome/locale/kw/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/kw/aboutTor.properties b/src/chrome/locale/kw/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/kw/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ky/aboutTor.dtd b/src/chrome/locale/ky/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ky/aboutTor.dtd +++ b/src/chrome/locale/ky/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ky/aboutTor.properties b/src/chrome/locale/ky/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ky/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/lb/aboutTor.dtd b/src/chrome/locale/lb/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/lb/aboutTor.dtd +++ b/src/chrome/locale/lb/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/lb/aboutTor.properties b/src/chrome/locale/lb/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/lb/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/lg/aboutTor.dtd b/src/chrome/locale/lg/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/lg/aboutTor.dtd +++ b/src/chrome/locale/lg/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/lg/aboutTor.properties b/src/chrome/locale/lg/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/lg/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ln/aboutTor.dtd b/src/chrome/locale/ln/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ln/aboutTor.dtd +++ b/src/chrome/locale/ln/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ln/aboutTor.properties b/src/chrome/locale/ln/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ln/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/lo/aboutTor.dtd b/src/chrome/locale/lo/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/lo/aboutTor.dtd +++ b/src/chrome/locale/lo/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/lo/aboutTor.properties b/src/chrome/locale/lo/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/lo/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/lt/aboutTor.dtd b/src/chrome/locale/lt/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/lt/aboutTor.dtd +++ b/src/chrome/locale/lt/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/lt/aboutTor.properties b/src/chrome/locale/lt/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/lt/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/lv/aboutTor.dtd b/src/chrome/locale/lv/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/lv/aboutTor.dtd +++ b/src/chrome/locale/lv/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/lv/aboutTor.properties b/src/chrome/locale/lv/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/lv/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/mg/aboutTor.dtd b/src/chrome/locale/mg/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/mg/aboutTor.dtd +++ b/src/chrome/locale/mg/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/mg/aboutTor.properties b/src/chrome/locale/mg/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/mg/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/mi/aboutTor.dtd b/src/chrome/locale/mi/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/mi/aboutTor.dtd +++ b/src/chrome/locale/mi/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/mi/aboutTor.properties b/src/chrome/locale/mi/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/mi/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/mk/aboutTor.dtd b/src/chrome/locale/mk/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/mk/aboutTor.dtd +++ b/src/chrome/locale/mk/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/mk/aboutTor.properties b/src/chrome/locale/mk/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/mk/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ml/aboutTor.dtd b/src/chrome/locale/ml/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ml/aboutTor.dtd +++ b/src/chrome/locale/ml/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ml/aboutTor.properties b/src/chrome/locale/ml/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ml/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/mn/aboutTor.dtd b/src/chrome/locale/mn/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/mn/aboutTor.dtd +++ b/src/chrome/locale/mn/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/mn/aboutTor.properties b/src/chrome/locale/mn/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/mn/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/mr/aboutTor.dtd b/src/chrome/locale/mr/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/mr/aboutTor.dtd +++ b/src/chrome/locale/mr/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/mr/aboutTor.properties b/src/chrome/locale/mr/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/mr/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ms/aboutTor.dtd b/src/chrome/locale/ms/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ms/aboutTor.dtd +++ b/src/chrome/locale/ms/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ms/aboutTor.properties b/src/chrome/locale/ms/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ms/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/mt/aboutTor.dtd b/src/chrome/locale/mt/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/mt/aboutTor.dtd +++ b/src/chrome/locale/mt/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/mt/aboutTor.properties b/src/chrome/locale/mt/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/mt/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/my/aboutTor.dtd b/src/chrome/locale/my/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/my/aboutTor.dtd +++ b/src/chrome/locale/my/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/my/aboutTor.properties b/src/chrome/locale/my/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/my/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/nah/aboutTor.dtd b/src/chrome/locale/nah/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/nah/aboutTor.dtd +++ b/src/chrome/locale/nah/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/nah/aboutTor.properties b/src/chrome/locale/nah/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/nah/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/nap/aboutTor.dtd b/src/chrome/locale/nap/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/nap/aboutTor.dtd +++ b/src/chrome/locale/nap/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/nap/aboutTor.properties b/src/chrome/locale/nap/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/nap/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/nb/aboutTor.dtd +++ b/src/chrome/locale/nb/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/nb/aboutTor.properties b/src/chrome/locale/nb/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/nb/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ne/aboutTor.dtd b/src/chrome/locale/ne/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ne/aboutTor.dtd +++ b/src/chrome/locale/ne/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ne/aboutTor.properties b/src/chrome/locale/ne/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ne/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index fd73f07..980ac35 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Zoeken"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Zoeken"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Zoeken"> -<!ENTITY aboutTor.searchSP.privacy.label "veilig"> -<!ENTITY aboutTor.searchDDG.privacy.label "veilig"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/ned/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "met"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "met"> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "Startpage"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:"> <!ENTITY aboutTor.torInfo2.label "Land & IP Adres:"> diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties new file mode 100644 index 0000000..e6d6650 --- /dev/null +++ b/src/chrome/locale/nl/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Zoeken <a href="%1$S">veilig</a> met <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/ned/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Zoeken <a href="%1$S">veilig</a> met <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/nn/aboutTor.dtd b/src/chrome/locale/nn/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/nn/aboutTor.dtd +++ b/src/chrome/locale/nn/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/nn/aboutTor.properties b/src/chrome/locale/nn/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/nn/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/nso/aboutTor.dtd b/src/chrome/locale/nso/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/nso/aboutTor.dtd +++ b/src/chrome/locale/nso/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/nso/aboutTor.properties b/src/chrome/locale/nso/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/nso/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/oc/aboutTor.dtd b/src/chrome/locale/oc/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/oc/aboutTor.dtd +++ b/src/chrome/locale/oc/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/oc/aboutTor.properties b/src/chrome/locale/oc/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/oc/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/or/aboutTor.dtd b/src/chrome/locale/or/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/or/aboutTor.dtd +++ b/src/chrome/locale/or/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/or/aboutTor.properties b/src/chrome/locale/or/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/or/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/pa/aboutTor.dtd b/src/chrome/locale/pa/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/pa/aboutTor.dtd +++ b/src/chrome/locale/pa/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/pa/aboutTor.properties b/src/chrome/locale/pa/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/pa/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/pap/aboutTor.dtd b/src/chrome/locale/pap/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/pap/aboutTor.dtd +++ b/src/chrome/locale/pap/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/pap/aboutTor.properties b/src/chrome/locale/pap/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/pap/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 2ac4a75..a4813da 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Szukaj"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Szukaj"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Szukaj"> -<!ENTITY aboutTor.searchSP.privacy.label "bezpiecznie"> -<!ENTITY aboutTor.searchDDG.privacy.label "bezpiecznie"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "z"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "z"> -<!ENTITY aboutTor.searchSP.search.label "Strona startowa"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Dodatkowe informacje:"> <!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:"> diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties new file mode 100644 index 0000000..0bfea6f --- /dev/null +++ b/src/chrome/locale/pl/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Szukaj <a href="%1$S">bezpiecznie</a> z <a href="%2$S">Strona startowa</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> z <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/pms/aboutTor.dtd b/src/chrome/locale/pms/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/pms/aboutTor.dtd +++ b/src/chrome/locale/pms/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/pms/aboutTor.properties b/src/chrome/locale/pms/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/pms/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ps/aboutTor.dtd b/src/chrome/locale/ps/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ps/aboutTor.dtd +++ b/src/chrome/locale/ps/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ps/aboutTor.properties b/src/chrome/locale/ps/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ps/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/pt-BR/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd index 4cbd760..05e9d84 100644 --- a/src/chrome/locale/pt/aboutTor.dtd +++ b/src/chrome/locale/pt/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Procurar"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Procurar"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Procurar"> -<!ENTITY aboutTor.searchSP.privacy.label "de forma segura"> -<!ENTITY aboutTor.searchDDG.privacy.label "de forma segura"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "com"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "com"> -<!ENTITY aboutTor.searchSP.search.label "Página inicial"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Informação adicional:"> <!ENTITY aboutTor.torInfo2.label "País e endereço IP:"> diff --git a/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties new file mode 100644 index 0000000..153401d --- /dev/null +++ b/src/chrome/locale/pt/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Procurar <a href="%1$S">de forma segura</a> com <a href="%2$S">Página inicial</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Procurar <a href="%1$S">de forma segura</a> com <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ro/aboutTor.dtd b/src/chrome/locale/ro/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ro/aboutTor.dtd +++ b/src/chrome/locale/ro/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ro/aboutTor.properties b/src/chrome/locale/ro/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ro/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 0d53ea3..efe3ff1 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Поиск"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Поиск"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Поиск"> -<!ENTITY aboutTor.searchSP.privacy.label "безопасно"> -<!ENTITY aboutTor.searchDDG.privacy.label "безопасно"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "with"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "with"> -<!ENTITY aboutTor.searchSP.search.label "Начальная страница"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Дополнительные сведения:"> <!ENTITY aboutTor.torInfo2.label "Страна & IP-адрес"> diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties new file mode 100644 index 0000000..53e1de4 --- /dev/null +++ b/src/chrome/locale/ru/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Поиск <a href="%1$S">безопасно</a> with <a href="%2$S">Начальная страница</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Поиск <a href="%1$S">безопасно</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/sco/aboutTor.dtd b/src/chrome/locale/sco/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/sco/aboutTor.dtd +++ b/src/chrome/locale/sco/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/sco/aboutTor.properties b/src/chrome/locale/sco/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/sco/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/sk/aboutTor.dtd b/src/chrome/locale/sk/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/sk/aboutTor.dtd +++ b/src/chrome/locale/sk/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/sk/aboutTor.properties b/src/chrome/locale/sk/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/sk/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/sl/aboutTor.dtd b/src/chrome/locale/sl/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/sl/aboutTor.dtd +++ b/src/chrome/locale/sl/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/sl/aboutTor.properties b/src/chrome/locale/sl/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/sl/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/so/aboutTor.dtd b/src/chrome/locale/so/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/so/aboutTor.dtd +++ b/src/chrome/locale/so/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/so/aboutTor.properties b/src/chrome/locale/so/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/so/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/son/aboutTor.dtd b/src/chrome/locale/son/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/son/aboutTor.dtd +++ b/src/chrome/locale/son/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/son/aboutTor.properties b/src/chrome/locale/son/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/son/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/sq/aboutTor.dtd b/src/chrome/locale/sq/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/sq/aboutTor.dtd +++ b/src/chrome/locale/sq/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/sq/aboutTor.properties b/src/chrome/locale/sq/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/sq/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/sr/aboutTor.dtd b/src/chrome/locale/sr/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/sr/aboutTor.dtd +++ b/src/chrome/locale/sr/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/sr/aboutTor.properties b/src/chrome/locale/sr/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/sr/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/st/aboutTor.dtd b/src/chrome/locale/st/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/st/aboutTor.dtd +++ b/src/chrome/locale/st/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/st/aboutTor.properties b/src/chrome/locale/st/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/st/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/su/aboutTor.dtd b/src/chrome/locale/su/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/su/aboutTor.dtd +++ b/src/chrome/locale/su/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/su/aboutTor.properties b/src/chrome/locale/su/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/su/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/sv/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/sw/aboutTor.dtd b/src/chrome/locale/sw/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/sw/aboutTor.dtd +++ b/src/chrome/locale/sw/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/sw/aboutTor.properties b/src/chrome/locale/sw/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/sw/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ta/aboutTor.dtd b/src/chrome/locale/ta/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ta/aboutTor.dtd +++ b/src/chrome/locale/ta/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ta/aboutTor.properties b/src/chrome/locale/ta/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ta/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/te/aboutTor.dtd b/src/chrome/locale/te/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/te/aboutTor.dtd +++ b/src/chrome/locale/te/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/te/aboutTor.properties b/src/chrome/locale/te/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/te/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/tg/aboutTor.dtd b/src/chrome/locale/tg/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/tg/aboutTor.dtd +++ b/src/chrome/locale/tg/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/tg/aboutTor.properties b/src/chrome/locale/tg/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/tg/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/th/aboutTor.dtd b/src/chrome/locale/th/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/th/aboutTor.dtd +++ b/src/chrome/locale/th/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/th/aboutTor.properties b/src/chrome/locale/th/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/th/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ti/aboutTor.dtd b/src/chrome/locale/ti/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ti/aboutTor.dtd +++ b/src/chrome/locale/ti/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ti/aboutTor.properties b/src/chrome/locale/ti/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ti/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/tk/aboutTor.dtd b/src/chrome/locale/tk/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/tk/aboutTor.dtd +++ b/src/chrome/locale/tk/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/tk/aboutTor.properties b/src/chrome/locale/tk/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/tk/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/tr/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/uk/aboutTor.dtd b/src/chrome/locale/uk/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/uk/aboutTor.dtd +++ b/src/chrome/locale/uk/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/uk/aboutTor.properties b/src/chrome/locale/uk/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/uk/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ur/aboutTor.dtd b/src/chrome/locale/ur/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ur/aboutTor.dtd +++ b/src/chrome/locale/ur/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ur/aboutTor.properties b/src/chrome/locale/ur/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ur/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/ve/aboutTor.dtd b/src/chrome/locale/ve/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/ve/aboutTor.dtd +++ b/src/chrome/locale/ve/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/ve/aboutTor.properties b/src/chrome/locale/ve/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/ve/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 2987c1b..7aa92ba 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "Tìm kiếm"> - <!ENTITY aboutTor.searchSPPost.link ""> <!ENTITY aboutTor.searchDDGPost.link ""> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label ""> -<!ENTITY aboutTor.searchSP.privacy.label ""> -<!ENTITY aboutTor.searchDDG.privacy.label ""> -<!ENTITY aboutTor.searchSP.privacy.link ""> -<!ENTITY aboutTor.searchDDG.privacy.link ""> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchSP.search.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label ""> -<!ENTITY aboutTor.searchSP.search.label ""> -<!ENTITY aboutTor.searchDDG.search.label ""> -<!ENTITY aboutTor.searchSP.search.link ""> -<!ENTITY aboutTor.searchDDG.search.link ""> -<!ENTITY aboutTor.searchSP.search.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.search.afterLink.label ""> <!ENTITY aboutTor.torInfo1.label ""> <!ENTITY aboutTor.torInfo2.label ""> diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/vi/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/wa/aboutTor.dtd b/src/chrome/locale/wa/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/wa/aboutTor.dtd +++ b/src/chrome/locale/wa/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/wa/aboutTor.properties b/src/chrome/locale/wa/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/wa/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/wo/aboutTor.dtd b/src/chrome/locale/wo/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/wo/aboutTor.dtd +++ b/src/chrome/locale/wo/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/wo/aboutTor.properties b/src/chrome/locale/wo/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/wo/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 7a0a3d0..5d06afd 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -23,33 +23,8 @@ <!ENTITY aboutTor.search.label "搜索"> - <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "搜索"> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "搜索"> -<!ENTITY aboutTor.searchSP.privacy.label "安全"> -<!ENTITY aboutTor.searchDDG.privacy.label "安全"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> -<!ENTITY aboutTor.searchSP.search.beforeLink.label "引擎"> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label "引擎"> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "。"> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "。"> <!ENTITY aboutTor.torInfo1.label "更多信息："> <!ENTITY aboutTor.torInfo2.label "国家与 IP 地址："> diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties new file mode 100644 index 0000000..dc346d6 --- /dev/null +++ b/src/chrome/locale/zh-CN/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=搜索 <a href="%1$S">安全</a> 引擎 <a href="%2$S">Startpage</a>。 +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=搜索 <a href="%1$S">安全</a> 引擎 <a href="%2$S">DuckDuckGo</a>。 +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/zh-HK/aboutTor.dtd b/src/chrome/locale/zh-HK/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/zh-HK/aboutTor.dtd +++ b/src/chrome/locale/zh-HK/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/zh-HK/aboutTor.properties b/src/chrome/locale/zh-HK/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/zh-HK/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/zh-TW/aboutTor.properties b/src/chrome/locale/zh-TW/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/zh-TW/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ diff --git a/src/chrome/locale/zu/aboutTor.dtd b/src/chrome/locale/zu/aboutTor.dtd index 2fc51c6..9f14022 100644 --- a/src/chrome/locale/zu/aboutTor.dtd +++ b/src/chrome/locale/zu/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -24,23 +24,6 @@ <!ENTITY aboutTor.search.label "Search"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> -<!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> -<!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> -<!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> -<!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> -<!ENTITY aboutTor.searchSP.search.afterLink.label "."> -<!ENTITY aboutTor.searchDDG.search.afterLink.label "."> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/zu/aboutTor.properties b/src/chrome/locale/zu/aboutTor.properties new file mode 100644 index 0000000..02088f0 --- /dev/null +++ b/src/chrome/locale/zu/aboutTor.properties @@ -0,0 +1,15 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug10398'
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit a9a3b8f1cc3aeddbc0abc621ade08680ef09e146 Merge: 838c372 54c8721 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:18:10 2014 -0700 Merge remote-tracking branch 'brade/bug10398' Conflicts: src/chrome/content/aboutTor/aboutTor.xhtml src/chrome/locale/eu/aboutTor.dtd src/chrome/locale/fa/aboutTor.dtd src/chrome/locale/ja/aboutTor.dtd src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++++++++++- src/chrome/locale/af/aboutTor.dtd | 19 +------------------ src/chrome/locale/af/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ak/aboutTor.dtd | 19 +------------------ src/chrome/locale/ak/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/am/aboutTor.dtd | 19 +------------------ src/chrome/locale/am/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ar/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ar/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/arn/aboutTor.dtd | 19 +------------------ src/chrome/locale/arn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ast/aboutTor.dtd | 19 +------------------ src/chrome/locale/ast/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/az/aboutTor.dtd | 19 +------------------ src/chrome/locale/az/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/be/aboutTor.dtd | 19 +------------------ src/chrome/locale/be/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bg/aboutTor.dtd | 19 +------------------ src/chrome/locale/bg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bms/aboutTor.dtd | 19 +------------------ src/chrome/locale/bms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bn-IN/aboutTor.dtd | 19 +------------------ src/chrome/locale/bn-IN/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bn/aboutTor.dtd | 19 +------------------ src/chrome/locale/bn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bo/aboutTor.dtd | 19 +------------------ src/chrome/locale/bo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/br/aboutTor.dtd | 19 +------------------ src/chrome/locale/br/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bs/aboutTor.dtd | 19 +------------------ src/chrome/locale/bs/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ca/aboutTor.dtd | 19 +------------------ src/chrome/locale/ca/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/cs/aboutTor.dtd | 19 +------------------ src/chrome/locale/cs/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/csb/aboutTor.dtd | 19 +------------------ src/chrome/locale/csb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/cy/aboutTor.dtd | 19 +------------------ src/chrome/locale/cy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/da/aboutTor.dtd | 19 +------------------ src/chrome/locale/da/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/de/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/de/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/dz/aboutTor.dtd | 19 +------------------ src/chrome/locale/dz/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/el/aboutTor.dtd | 19 +------------------ src/chrome/locale/el/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/en/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/en/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/eo/aboutTor.dtd | 19 +------------------ src/chrome/locale/eo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/es/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/es/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/et/aboutTor.dtd | 19 +------------------ src/chrome/locale/et/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/eu/aboutTor.dtd | 18 +----------------- src/chrome/locale/eu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fa/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/fa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fi/aboutTor.dtd | 19 +------------------ src/chrome/locale/fi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fil/aboutTor.dtd | 19 +------------------ src/chrome/locale/fil/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fo/aboutTor.dtd | 19 +------------------ src/chrome/locale/fo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fr/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/fr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fur/aboutTor.dtd | 19 +------------------ src/chrome/locale/fur/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fy/aboutTor.dtd | 19 +------------------ src/chrome/locale/fy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ga/aboutTor.dtd | 19 +------------------ src/chrome/locale/ga/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gl/aboutTor.dtd | 19 +------------------ src/chrome/locale/gl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gu/aboutTor.dtd | 19 +------------------ src/chrome/locale/gu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gun/aboutTor.dtd | 19 +------------------ src/chrome/locale/gun/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ha/aboutTor.dtd | 19 +------------------ src/chrome/locale/ha/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/he/aboutTor.dtd | 19 +------------------ src/chrome/locale/he/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hi/aboutTor.dtd | 19 +------------------ src/chrome/locale/hi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hr/aboutTor.dtd | 19 +------------------ src/chrome/locale/hr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ht/aboutTor.dtd | 19 +------------------ src/chrome/locale/ht/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hu/aboutTor.dtd | 19 +------------------ src/chrome/locale/hu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hy/aboutTor.dtd | 19 +------------------ src/chrome/locale/hy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/id/aboutTor.dtd | 19 +------------------ src/chrome/locale/id/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/is/aboutTor.dtd | 19 +------------------ src/chrome/locale/is/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/it/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/it/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ja/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ja/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/jv/aboutTor.dtd | 19 +------------------ src/chrome/locale/jv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ka/aboutTor.dtd | 19 +------------------ src/chrome/locale/ka/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/km/aboutTor.dtd | 19 +------------------ src/chrome/locale/km/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/kn/aboutTor.dtd | 19 +------------------ src/chrome/locale/kn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ko/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ko/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ku/aboutTor.dtd | 19 +------------------ src/chrome/locale/ku/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/kw/aboutTor.dtd | 19 +------------------ src/chrome/locale/kw/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ky/aboutTor.dtd | 19 +------------------ src/chrome/locale/ky/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lb/aboutTor.dtd | 19 +------------------ src/chrome/locale/lb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lg/aboutTor.dtd | 19 +------------------ src/chrome/locale/lg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ln/aboutTor.dtd | 19 +------------------ src/chrome/locale/ln/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lo/aboutTor.dtd | 19 +------------------ src/chrome/locale/lo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lt/aboutTor.dtd | 19 +------------------ src/chrome/locale/lt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lv/aboutTor.dtd | 19 +------------------ src/chrome/locale/lv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mg/aboutTor.dtd | 19 +------------------ src/chrome/locale/mg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mi/aboutTor.dtd | 19 +------------------ src/chrome/locale/mi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mk/aboutTor.dtd | 19 +------------------ src/chrome/locale/mk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ml/aboutTor.dtd | 19 +------------------ src/chrome/locale/ml/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mn/aboutTor.dtd | 19 +------------------ src/chrome/locale/mn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mr/aboutTor.dtd | 19 +------------------ src/chrome/locale/mr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ms/aboutTor.dtd | 19 +------------------ src/chrome/locale/ms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mt/aboutTor.dtd | 19 +------------------ src/chrome/locale/mt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/my/aboutTor.dtd | 19 +------------------ src/chrome/locale/my/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nah/aboutTor.dtd | 19 +------------------ src/chrome/locale/nah/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nap/aboutTor.dtd | 19 +------------------ src/chrome/locale/nap/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nb/aboutTor.dtd | 19 +------------------ src/chrome/locale/nb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ne/aboutTor.dtd | 19 +------------------ src/chrome/locale/ne/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nl/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/nl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nn/aboutTor.dtd | 19 +------------------ src/chrome/locale/nn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nso/aboutTor.dtd | 19 +------------------ src/chrome/locale/nso/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/oc/aboutTor.dtd | 19 +------------------ src/chrome/locale/oc/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/or/aboutTor.dtd | 19 +------------------ src/chrome/locale/or/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pa/aboutTor.dtd | 19 +------------------ src/chrome/locale/pa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pap/aboutTor.dtd | 19 +------------------ src/chrome/locale/pap/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pl/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/pl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pms/aboutTor.dtd | 19 +------------------ src/chrome/locale/pms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ps/aboutTor.dtd | 19 +------------------ src/chrome/locale/ps/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pt-BR/aboutTor.dtd | 19 +------------------ src/chrome/locale/pt-BR/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pt/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/pt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ro/aboutTor.dtd | 19 +------------------ src/chrome/locale/ro/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ru/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ru/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sco/aboutTor.dtd | 19 +------------------ src/chrome/locale/sco/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sk/aboutTor.dtd | 19 +------------------ src/chrome/locale/sk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sl/aboutTor.dtd | 19 +------------------ src/chrome/locale/sl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/so/aboutTor.dtd | 19 +------------------ src/chrome/locale/so/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/son/aboutTor.dtd | 19 +------------------ src/chrome/locale/son/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sq/aboutTor.dtd | 19 +------------------ src/chrome/locale/sq/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sr/aboutTor.dtd | 19 +------------------ src/chrome/locale/sr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/st/aboutTor.dtd | 19 +------------------ src/chrome/locale/st/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/su/aboutTor.dtd | 19 +------------------ src/chrome/locale/su/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sv/aboutTor.dtd | 19 +------------------ src/chrome/locale/sv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sw/aboutTor.dtd | 19 +------------------ src/chrome/locale/sw/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ta/aboutTor.dtd | 19 +------------------ src/chrome/locale/ta/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/te/aboutTor.dtd | 19 +------------------ src/chrome/locale/te/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tg/aboutTor.dtd | 19 +------------------ src/chrome/locale/tg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/th/aboutTor.dtd | 19 +------------------ src/chrome/locale/th/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ti/aboutTor.dtd | 19 +------------------ src/chrome/locale/ti/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tk/aboutTor.dtd | 19 +------------------ src/chrome/locale/tk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tr/aboutTor.dtd | 19 +------------------ src/chrome/locale/tr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/uk/aboutTor.dtd | 19 +------------------ src/chrome/locale/uk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ur/aboutTor.dtd | 19 +------------------ src/chrome/locale/ur/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ve/aboutTor.dtd | 19 +------------------ src/chrome/locale/ve/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/vi/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/vi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/wa/aboutTor.dtd | 19 +------------------ src/chrome/locale/wa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/wo/aboutTor.dtd | 19 +------------------ src/chrome/locale/wo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-CN/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/zh-CN/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-HK/aboutTor.dtd | 19 +------------------ src/chrome/locale/zh-HK/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-TW/aboutTor.dtd | 19 +------------------ src/chrome/locale/zh-TW/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zu/aboutTor.dtd | 19 +------------------ src/chrome/locale/zu/aboutTor.properties | 15 +++++++++++++++ 239 files changed, 1927 insertions(+), 2262 deletions(-) diff --cc src/chrome/content/aboutTor/aboutTor.xhtml index 6efe617,02e0c7c..b99bc7e --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@@ -25,8 -25,10 +25,10 @@@ <![CDATA[ function onLoad() { + insertPropertyStrings(); + - window.addEventListener("resize", function() { - resizeToolbarIconArrow(); + document.addEventListener("AboutTorAdjustArrow", function() { + adjustToolbarIconArrow(); }, false); window.setTimeout( function() { @@@ -35,74 -37,36 +37,94 @@@ }, 0); } -function resizeToolbarIconArrow() +function adjustToolbarIconArrow() { var textElem = document.getElementById("updatePrompt"); - var rightDiv = document.getElementById("toolbarIconArrowRight"); - if (textElem && rightDiv) + var arrowDiv = document.getElementById("toolbarIconArrow"); + var extDiv = document.getElementById("toolbarIconArrowExtension"); + if (textElem && arrowDiv && extDiv) { - var width = textElem.offsetLeft - rightDiv.offsetLeft - 6; - rightDiv.style.width = width + "px"; + var tbXpos; + if (document.body.hasAttribute("torbutton-xpos")) + tbXpos = parseInt(document.body.getAttribute("torbutton-xpos"), 10); + + if (!tbXpos || isNaN(tbXpos) || (tbXpos < 0)) + { + arrowDiv.style.display = "none"; + extDiv.style.display = "none"; + return; + } + + // Account for content zoom and retina displays by converting to device + // independent units. + if ("devicePixelRatio" in window) // FF18+ + tbXpos /= window.devicePixelRatio; + + const kArrowMargin = 6; + arrowDiv.style.display = "block"; // Must be visible to get offsetWidth. + var arrowHalfWidth = arrowDiv.offsetWidth / 2.0; + var leftAnchor = textElem.offsetLeft - kArrowMargin - arrowHalfWidth; + var rightAnchor = textElem.offsetLeft + textElem.offsetWidth + + kArrowMargin + arrowHalfWidth; + + var arrowDisplay = "block"; + var extDisplay = "block"; + if (tbXpos < leftAnchor) + { + // Toolbar button to left of text. + arrowDiv.setAttribute("pos", "left"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + var extLeft = tbXpos + arrowHalfWidth; + extDiv.style.left = extLeft + "px"; + extDiv.style.width = (textElem.offsetLeft - extLeft - kArrowMargin) + "px"; + } + else if ((tbXpos > rightAnchor) && + (tbXpos < (window.innerWidth - arrowHalfWidth))) + { + // Toolbar button to right of text. + arrowDiv.setAttribute("pos", "right"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + var extLeft = rightAnchor - arrowHalfWidth; + extDiv.style.left = extLeft + "px"; + extDiv.style.width = (tbXpos - arrowHalfWidth - extLeft) + "px"; + } + else if ((tbXpos >= leftAnchor) && (tbXpos <= rightAnchor)) + { + // Toolbar button in middle about text; use arrow without a tail. + arrowDiv.setAttribute("pos", "middle"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + extDisplay = "none"; + } + else // Unable to display arrow (e.g., toolbar button is above sidebar). + { + arrowDisplay = "none"; + extDisplay = "none"; + } + + arrowDiv.style.display = arrowDisplay; + extDiv.style.display = extDisplay; } } + + function insertPropertyStrings() + { + try { + var kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; + + Components.utils.import("resource://gre/modules/Services.jsm"); + var gStringBundle = Services.strings.createBundle(kPropertiesURL); + var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link"); + var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link"); + var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy", + [s1, s2], 2); + if (result) { + var elem = document.getElementById("searchProviderInfo"); + if (elem) + elem.innerHTML = result; + } + } catch(e) {}; + } + ]]> </script> </head> diff --cc src/chrome/locale/eu/aboutTor.dtd index 7b07102,9f14022..157346e --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@@ -21,53 -21,27 +21,37 @@@ <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> +<!ENTITY aboutTor.search.label "Bilatu"> + + +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Bilatu"> - <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Bilatu"> - <!ENTITY aboutTor.searchSP.privacy.label "segurtasunez"> - <!ENTITY aboutTor.searchDDG.privacy.label "segurtasunez"> - <!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> - <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> - <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> - <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> - <!ENTITY aboutTor.searchSP.search.beforeLink.label "rekin"> - <!ENTITY aboutTor.searchDDG.search.beforeLink.label "rekin"> - <!ENTITY aboutTor.searchSP.search.label "Startpage"> - <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> - <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> - <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> - <!ENTITY aboutTor.searchSP.search.afterLink.label "."> - <!ENTITY aboutTor.searchDDG.search.afterLink.label "."> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.torInfo1.label "Informazio gehiago:"> +<!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:"> +<!ENTITY aboutTor.torInfo3.label "Irteera nodoa:"> +<!ENTITY aboutTor.torInfo4.label "Ostalari honek ez du bisitarien inguruko inolako informaziorik biltzen."> +<!ENTITY aboutTor.whatnextQuestion.label "Eta orain zer?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor EZ da anonimoki nabigatzeko behar duzun guztia! Baliteke zure nabigatze ohitura batzuk aldatu behar izatea zure nortasuna seguru mantentzen dela ziurtatzeko."> +<!ENTITY aboutTor.whatnext.label "Anonimo mantentzeko aholkuak »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo1.label "Lagundu dezakezu!"> +<!ENTITY aboutTor.helpInfo2.label "Tor sarea bizkorragoa eta indartsuagoa egiteko hainbat modutan lagundu dezakezu:"> +<!ENTITY aboutTor.helpInfo3.label "Tor errele nodo bat exekutatu »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.label "Zure zerbitzuak bolondrestu »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.label "Dohaintza egin »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.footer.label "The Tor Project irabazi asmorik gabeko US 501(c)(3) bat da, ikerketara, garapenera, eta onlineko anonimotasuna eta pribatutasunaren hezkuntzara zuzendutakoa."> +<!ENTITY aboutTor.learnMore.label "The Tor Projecti buruz gehiago ikasi »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[tor-browser-bundle/master] Bug #10383: Enable NIST P224 and P256 accel support for 64bit builds.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit e9a962ab77fe8f809da011dd944c965c2e038fc8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:03:50 2014 -0700 Bug #10383: Enable NIST P224 and P256 accel support for 64bit builds. --- gitian/descriptors/linux/gitian-tor.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f0cb682..73181a0 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -65,7 +65,12 @@ script: | cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf - ./config -shared --prefix=$INSTDIR/openssl #enable-ec_nistp_64_gcc_128 + if [ $GBUILD_BITS == "64" ]; + then + ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 + else + ./config -shared --prefix=$INSTDIR/openssl + fi make make install cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/

1 0

[tor-browser-bundle/master] Bug #9010: Add Turkish to beta and alpha language codes.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit ef6fdf42854b083dca7163f63ab7533326c7ccad Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 20:56:33 2014 -0700 Bug #9010: Add Turkish to beta and alpha language codes. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5adee9a..176477a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,5 @@ TORBROWSER_VERSION=4.0-alpha-1 -BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.beta b/gitian/versions.beta index c4ad3fa..4c66e6b 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,5 +1,5 @@ TORBROWSER_VERSION=3.6-beta-1 -BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1

1 0

[tor-launcher/master] Add Turkish to bundle locales.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 06d3404cc2483a54a4f88c780cfa1b67aaead24a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 20:54:19 2014 -0700 Add Turkish to bundle locales. --- localization/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 8d30a7d..32ea177 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,6 +1,6 @@ #!/bin/sh -BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru tr vi zh-CN" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[torbutton/master] Add Turkish to update locales.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 838c372986f122b2b5818deef088a98814efdb52 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 20:53:23 2014 -0700 Add Turkish to update locales. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index e1cb721..c29ed4c 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru tr vi zh-CN" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[torbutton/master] Bug #11242: Clear "update needed" after upgrade.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit b9fb03cd4ff8ac8c23a10831b11c7e50275ea6bf Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 26 14:57:39 2014 -0400 Bug #11242: Clear "update needed" after upgrade. --- src/chrome/content/torbutton.js | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index c7a8274..5642a4a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -13,7 +13,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); +const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; +const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; // status @@ -449,14 +451,32 @@ function torbutton_init() { m_tb_ff36 = false; } + var cur_version; try { - var test = m_tb_prefs.getCharPref("torbrowser.version"); + cur_version = m_tb_prefs.getCharPref("torbrowser.version"); m_tb_tbb = true; torbutton_log(3, "This is a Tor Browser"); } catch(e) { torbutton_log(3, "This is not a Tor Browser: "+e); } + // If the Tor Browser version has changed since the last time Torbutton + // was loaded, reset the version check preferences in order to avoid + // incorrectly reporting that the browser needs to be updated. + var last_version; + try { + last_version = m_tb_prefs.getCharPref(k_tb_last_browser_version_pref); + } catch (e) {} + if (cur_version != last_version) { + m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); + if (m_tb_prefs.prefHasUserValue(k_tb_last_update_check_pref)) { + m_tb_prefs.clearUserPref(k_tb_last_update_check_pref); + } + + if (cur_version) + m_tb_prefs.setCharPref(k_tb_last_browser_version_pref, cur_version); + } + // Bug 1506 P4: These vars are very important for New Identity var environ = Components.classes["@mozilla.org/process/environment;1"] .getService(Components.interfaces.nsIEnvironment); @@ -1041,12 +1061,11 @@ function torbutton_do_async_versioncheck() { } // Suppress update check if done recently. - const kLastCheckPref = "extensions.torbutton.lastUpdateCheck"; const kMinSecsBetweenChecks = 90 * 60; // 1.5 hours var now = Date.now() / 1000; var lastCheckTime; try { - lastCheckTime = parseFloat(m_tb_prefs.getCharPref(kLastCheckPref)); + lastCheckTime = parseFloat(m_tb_prefs.getCharPref(k_tb_last_update_check_pref)); if (isNaN(lastCheckTime)) lastCheckTime = undefined; } catch (e) {} @@ -1054,7 +1073,7 @@ function torbutton_do_async_versioncheck() { if (lastCheckTime && ((now - lastCheckTime) < kMinSecsBetweenChecks)) return; - m_tb_prefs.setCharPref(kLastCheckPref, now); + m_tb_prefs.setCharPref(k_tb_last_update_check_pref, now); torbutton_log(3, "Checking version with socks port: " +m_tb_prefs.getIntPref("extensions.torbutton.socks_port"));

1 0

[tor-browser-bundle/master] Another changelog fix.
by gk＠torproject.org 22 Mar '14

22 Mar '14

commit 15c52d5976f59a2fb943eee878a9aa2621739385 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Mar 22 20:29:53 2014 +0000 Another changelog fix. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 720a9ae..4a95497 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -41,7 +41,7 @@ Tor Browser Bundle 3.6-beta-1 -- Mar 17 2014 * Bug 10703: Force the default charset to avoid locale fingerprinting * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) * Mac: - * Bug 4271: Use DMG instead of ZIP for Mac packages + * Bug 4261: Use DMG instead of ZIP for Mac packages * Linux: * Bug 9353: Fix keyboard input on Ubuntu 13.10 * Bug 9896: Provide debug symbols for Tor Browser binary

1 0

[tor-browser-bundle/master] Bug 11272: Fixed wrong changelog entries.
by gk＠torproject.org 22 Mar '14

22 Mar '14

commit f876ad55aadbdfe257e26533b2d0d7e1347f721d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Mar 22 20:22:34 2014 +0000 Bug 11272: Fixed wrong changelog entries. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 865975d..720a9ae 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,7 @@ Tor Browser Bundle 3.5.3 -- Mar 19 2014 * Bug 10703: Force the default charset to avoid locale fingerprinting * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) * Linux: - * Bug 9533: Fix keyboard input on Ubuntu 13.10 + * Bug 9353: Fix keyboard input on Ubuntu 13.10 * Bug 9896: Provide debug symbols for Tor Browser binary * Bug 10472: Pass arguments to the browser from Linux startup script @@ -43,7 +43,7 @@ Tor Browser Bundle 3.6-beta-1 -- Mar 17 2014 * Mac: * Bug 4271: Use DMG instead of ZIP for Mac packages * Linux: - * Bug 9533: Fix keyboard input on Ubuntu 13.10 + * Bug 9353: Fix keyboard input on Ubuntu 13.10 * Bug 9896: Provide debug symbols for Tor Browser binary * Bug 10472: Pass arguments to the browser from Linux startup script

1 0

[tor-browser-bundle/master] Fix changelog: We don't build DMGs for 3.5.
by mikeperry＠torproject.org 17 Mar '14

17 Mar '14

commit e72925e055b78cb4a972dd6a8447baffd8aedf6e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 17 16:03:29 2014 -0700 Fix changelog: We don't build DMGs for 3.5. --- Bundle-Data/Docs/ChangeLog.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8e8fdde..865975d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -9,8 +9,6 @@ Tor Browser Bundle 3.5.3 -- Mar 19 2014 * Bug 10237: Disable the media cache to prevent disk leaks for videos * Bug 10703: Force the default charset to avoid locale fingerprinting * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) - * Mac: - * Bug 4271: Use DMG instead of ZIP for Mac packages * Linux: * Bug 9533: Fix keyboard input on Ubuntu 13.10 * Bug 9896: Provide debug symbols for Tor Browser binary

1 0

[tor-browser-bundle/master] Added changelog entry for 3.5.3.
by gk＠torproject.org 17 Mar '14

17 Mar '14

commit 8573820727cee94f516d2b2c9d4718b69a56c952 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 17 13:37:16 2014 +0000 Added changelog entry for 3.5.3. --- Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ae2cb4b..8e8fdde 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,21 @@ +Tor Browser Bundle 3.5.3 -- Mar 19 2014 + * All Platforms + * Update Firefox to 24.4.0esr + * Update Torbutton to 1.6.7.0: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + * Update NoScript to 2.6.8.17 + * Update Tor to 0.2.4.21 + * Bug 10237: Disable the media cache to prevent disk leaks for videos + * Bug 10703: Force the default charset to avoid locale fingerprinting + * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) + * Mac: + * Bug 4271: Use DMG instead of ZIP for Mac packages + * Linux: + * Bug 9533: Fix keyboard input on Ubuntu 13.10 + * Bug 9896: Provide debug symbols for Tor Browser binary + * Bug 10472: Pass arguments to the browser from Linux startup script + Tor Browser Bundle 3.6-beta-1 -- Mar 17 2014 * All Platforms * Update Firefox to 24.4.0esr

1 0

[tor-browser-bundle/master] Make it harder to mess up the Firefox langpack+version update.
by mikeperry＠torproject.org 17 Mar '14

17 Mar '14

commit 1929fd5db0802782066d52512d4c2a0fef144ed6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 17 01:12:01 2014 -0700 Make it harder to mess up the Firefox langpack+version update. --- gitian/versions | 6 ++++-- gitian/versions.alpha | 6 ++++-- gitian/versions.beta | 6 ++++-- gitian/versions.nightly | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index 8358f94..f007100 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,7 +3,9 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 +FIREFOX_VERSION=24.4.0esr + +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 @@ -22,7 +24,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.4.0esr +FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 48e4464..5adee9a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 +FIREFOX_VERSION=24.4.0esr + +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.1a TORBUTTON_TAG=1.6.7.0 @@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.4.0esr +FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index 846ddfb..c4ad3fa 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 +FIREFOX_VERSION=24.4.0esr + +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.1a TORBUTTON_TAG=1.6.7.0 @@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.4.0esr +FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8ecbebb..57157c0 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,9 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -TORBROWSER_TAG=tor-browser-24.4.0esr-1 +FIREFOX_VERSION=24.4.0esr + +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -23,7 +25,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.4.0esr +FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/master] Bump FIREFOX_LANG_VER to 24.4.0esr.
by gk＠torproject.org 17 Mar '14

17 Mar '14

commit 0f97e3208443a38537775916672fd519e84d90cd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 17 09:01:43 2014 +0000 Bump FIREFOX_LANG_VER to 24.4.0esr. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 3097b65..8358f94 100755 --- a/gitian/versions +++ b/gitian/versions @@ -22,7 +22,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.3.0esr +FIREFOX_LANG_VER=24.4.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b7f4c93..48e4464 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.3.0esr +FIREFOX_LANG_VER=24.4.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index e654784..846ddfb 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.3.0esr +FIREFOX_LANG_VER=24.4.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 7569a10..8ecbebb 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 -FIREFOX_LANG_VER=24.3.0esr +FIREFOX_LANG_VER=24.4.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/master] Update Changelog and tags for new Firefox and Tor Launcher.
by mikeperry＠torproject.org 16 Mar '14

16 Mar '14

commit e8b437c91d9a41b7c0517c6239edc7c947451dfc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 15 20:13:04 2014 -0700 Update Changelog and tags for new Firefox and Tor Launcher. --- Bundle-Data/Docs/ChangeLog.txt | 5 +++-- gitian/versions | 2 +- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b82ccd7..ae2cb4b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,9 @@ -Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014 +Tor Browser Bundle 3.6-beta-1 -- Mar 17 2014 * All Platforms + * Update Firefox to 24.4.0esr * Include Pluggable Transports by default: * Obfsproxy3 0.2.4, Flashproxy 1.6, and FTE 0.2.6 are now included - * Update Tor Launcher to 0.2.5.0 + * Update Tor Launcher to 0.2.5.1 * Bug 10418: Provide UI configuration for Pluggable Transports * Bug 10604: Allow Tor status & error messages to be translated * Bug 10894: Make bridge UI clear that helpdesk is a last resort for diff --git a/gitian/versions b/gitian/versions index 4f1d1c8..3097b65 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 +TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 83febef..b7f4c93 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,9 +4,9 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 +TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 TOR_TAG=tor-0.2.5.2-alpha -TORLAUNCHER_TAG=0.2.5.0 +TORLAUNCHER_TAG=0.2.5.1a TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 diff --git a/gitian/versions.beta b/gitian/versions.beta index fd4a715..e654784 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,9 +4,9 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 +TORBROWSER_TAG=tor-browser-24.4.0esr-1-build1 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.5.0 +TORLAUNCHER_TAG=0.2.5.1a TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index baefbae..7569a10 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -TORBROWSER_TAG=tor-browser-24.3.0esr-2 +TORBROWSER_TAG=tor-browser-24.4.0esr-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

1 0

[tor-launcher/master] Bump version.
by mikeperry＠torproject.org 16 Mar '14

16 Mar '14

commit 800f3d177e405803acddd105a2fe16ae4c8ef572 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 15 20:09:09 2014 -0700 Bump version. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index d57db8f..1cd36da 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.5.0</em:version> + <em:version>0.2.5.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-launcher/master] Update strings from transifex.
by mikeperry＠torproject.org 16 Mar '14

16 Mar '14

commit 51685778211bb0c9b51d2ac401fa4258efeac51b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 15 19:36:28 2014 -0700 Update strings from transifex. --- src/chrome/locale/ar/network-settings.dtd | 31 +++++---- src/chrome/locale/ar/progress.dtd | 2 +- src/chrome/locale/ar/torlauncher.properties | 9 ++- src/chrome/locale/de/network-settings.dtd | 31 +++++---- src/chrome/locale/de/progress.dtd | 2 +- src/chrome/locale/de/torlauncher.properties | 27 +++++--- src/chrome/locale/es/network-settings.dtd | 32 +++++---- src/chrome/locale/es/progress.dtd | 2 +- src/chrome/locale/es/torlauncher.properties | 23 ++++--- src/chrome/locale/eu/torlauncher.properties | 33 +++++++++ src/chrome/locale/fa/network-settings.dtd | 44 ++++++------ src/chrome/locale/fa/progress.dtd | 2 +- src/chrome/locale/fa/torlauncher.properties | 25 ++++--- src/chrome/locale/fr/network-settings.dtd | 33 +++++---- src/chrome/locale/fr/progress.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 19 ++++-- src/chrome/locale/it/network-settings.dtd | 31 +++++---- src/chrome/locale/it/progress.dtd | 2 +- src/chrome/locale/it/torlauncher.properties | 11 ++- src/chrome/locale/ja/network-settings.dtd | 35 +++++----- src/chrome/locale/ja/progress.dtd | 2 +- src/chrome/locale/ja/torlauncher.properties | 17 +++-- src/chrome/locale/ko/network-settings.dtd | 81 +++++++++++----------- src/chrome/locale/ko/progress.dtd | 4 +- src/chrome/locale/ko/torlauncher.properties | 45 +++++++------ src/chrome/locale/nl/network-settings.dtd | 31 +++++---- src/chrome/locale/nl/progress.dtd | 2 +- src/chrome/locale/nl/torlauncher.properties | 11 ++- src/chrome/locale/pl/network-settings.dtd | 31 +++++---- src/chrome/locale/pl/progress.dtd | 2 +- src/chrome/locale/pl/torlauncher.properties | 11 ++- src/chrome/locale/pt/network-settings.dtd | 31 +++++---- src/chrome/locale/pt/progress.dtd | 4 +- src/chrome/locale/pt/torlauncher.properties | 59 ++++++++-------- src/chrome/locale/ru/network-settings.dtd | 31 +++++---- src/chrome/locale/ru/progress.dtd | 2 +- src/chrome/locale/ru/torlauncher.properties | 9 ++- src/chrome/locale/sv/torlauncher.properties | 59 ++++++++++++---- src/chrome/locale/vi/network-settings.dtd | 85 +++++++++++++----------- src/chrome/locale/vi/progress.dtd | 6 +- src/chrome/locale/vi/torlauncher.properties | 29 ++++---- src/chrome/locale/zh-CN/network-settings.dtd | 31 +++++---- src/chrome/locale/zh-CN/progress.dtd | 2 +- src/chrome/locale/zh-CN/torlauncher.properties | 29 ++++---- 44 files changed, 609 insertions(+), 401 deletions(-) diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index fda8d64..b3f0dca 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "قبل ان تحاول حزمة متصفح تور الاتصال بشبكة تور، تحتاج إلى توفير بعض المعلومات عن اتصال الانترنت الخاص بهذا الكمبيوتر."> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "نعم"> <!ENTITY torSettings.no "لا"> <!ENTITY torSettings.firstQuestion "أي مما يلي يعتبر وصف افضل لموقفك؟"> <!ENTITY torSettings.configurePrompt1 " اتصال الإنترنت لهذا الكمبيوتر مُراقب، أو مصفى، أو يعمل ببروكسي."> -<!ENTITY torSettings.configurePrompt2 "أحتاج إلي تكوين إعدادات الشبكة."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> <!ENTITY torSettings.configure "تكوين"> <!ENTITY torSettings.connectPrompt2 "أود الاتصال مباشرة إلى شبكة تور."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "اتصل"> <!ENTITY torSettings.proxyQuestion "هل يحتاج هذا الجهاز إلي بروكسي حتي يصل إلي شبكة الإنترنت؟"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "هل اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة؟"> <!ENTITY torSettings.firewallHelp "إذا لم تكن متأكدا من كيفية الإجابة على هذا السؤال، اختار لا. إذا واجهتك مشاكل في الاتصال بشبكة تور, غيير هذا الإعداد."> <!ENTITY torSettings.enterFirewall "إدخل قائمة مفصولة بفواصل من المنافذ التي يسمح بها جدار الحماية."> -<!ENTITY torSettings.bridgeQuestion "إذا كان اتصال الإنترنت لهذا الكمبيوتر مُراقب، سوف تحتاج إلى الحصول على واستخدام جسور. إذا لم يكن مُراقب، اضغط اتصل."> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة"> <!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> <!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة"> <!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة"> -<!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور.   وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "للحصول علي بعض الجسور، زر هذه الصفحة من خلال المتصفح: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "وهناك طريقة أخرى للعثور على عناوين الجسور العامة وهي إرسال بريد إلكتروني إلى bridges(a)torproject.org يحتوي علي 'get bridges' في قلب البريد.  و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو إما yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "يمكنك إيضاً طلب الجسور يإرسال بريد إلكتروني إلي help(a)rt.torproject.org."> +<!ENTITY torsettings.bridgeHelp1 "قد يكون السبب في عدم قدرتك علي الاتصال بشبكة تورهو ان مزود خدمة الإنترنت الخاص بك (ISP) أو منظمة اخري يمنع محاولات الاتصال بشبكة تور. وغالباً، تستطيع تخطي هذا المنع عن طريق استخدام جسور تور و الجسور عبارة عن مُرحلات مخفية صعب منعها."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3 "ارسل بريد إلكتروني إلى bridges(a)torproject.org يحتوي علي 'get bridges' في قلب البريد. و حتي تضمن وصول ذلك البريد لنا بنجاح استخدم إما gmail.com أو yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/ar/progress.dtd b/src/chrome/locale/ar/progress.dtd index 78ba7f0..e12a12f 100644 --- a/src/chrome/locale/ar/progress.dtd +++ b/src/chrome/locale/ar/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "حالة تور"> <!ENTITY torprogress.openSettings "افتح الإعدادات"> <!ENTITY torprogress.heading "جاري الاتصال بشبكة تور"> -<!ENTITY torprogress.pleaseWait "سيتم فتح متصفح تور بعد إنشاء اتصال بشبكة تور."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 5a94b58..06171de 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوق torlauncher.please_restart_app=يرجي إعادة تشغيل هذا البرنامج. torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور. torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل. +torlauncher.tor_control_failed=تعذر التحكم في تور. torlauncher.tor_bootstrap_failed=فشل تور في إنشاء اتصال بشبكة تور. -torlauncher.tor_bootstrap_failed_details=%1$S فشل (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S فشل(%2$S). torlauncher.unable_to_start_tor=غير قادر علي بدء تشغيل تور.\n\n%S torlauncher.tor_missing=الملف التنفيذي لتور مفقود. @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=الرجاء التأكد أن تور يعمل torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من عنوان الانترنت IP أو عنوان مستضيف واحد و منفذ وذلك لتهيئة تور لأستخدام بروكسي حتي يستطيع الوصول إلي شبكة الانترنت. torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. +# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. + +torlauncher.recommended_bridge=(موصى به) torlauncher.connect=اتصل torlauncher.quit=إنهاء @@ -38,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=يحمل حالة الشبكة torlauncher.bootstrapStatus.loading_keys=يحمل شهادات السلطة torlauncher.bootstrapStatus.requesting_descriptors=يطلب معلومات التحويلة torlauncher.bootstrapStatus.loading_descriptors=يحمل معلومات التحويلة -torlauncher.bootstrapStatus.conn_or=يتصل بشبكة تور +torlauncher.bootstrapStatus.conn_or=جاري الاتصال بشبكة تور torlauncher.bootstrapStatus.handshake_or=ينشئ دائرة تور torlauncher.bootstrapStatus.done=تم الاتصال بشبكة تور diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 5621a3a..3275ec5 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Bevor das Tor-Browser-Paket versucht eine Verbindung zum Tor-Netzwerk herzustellen, müssen Sie Informationen über ihren Internetanschluss bereitstellen."> +<!ENTITY torsettings.prompt "Bevor Sie sich zum Tor-Netzwerk verbinden können, müssen Sie Informationen über den Internetanschluss Ihres Rechners bereitstellen."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nein"> <!ENTITY torSettings.firstQuestion "Was beschreibt Ihre Situation am besten?"> <!ENTITY torSettings.configurePrompt1 "Die Internetverbindung dieses Rechner ist zensiert, gefiltert oder vermittelt."> -<!ENTITY torSettings.configurePrompt2 "Ich muss die Netzwerkeinstellungen konfigurieren."> +<!ENTITY torSettings.configurePrompt2 "Ich muss die Einstellungen der Brücke, der Firewall oder des Vermittlungsservers einstellen."> <!ENTITY torSettings.configure "Konfigurieren"> <!ENTITY torSettings.connectPrompt2 "Ich würde gerne direkt eine Verbindung zum Tor-Netzwerk herstellen."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "Das wird in den meisten Situationen funktionieren."> <!ENTITY torSettings.connect "Verbinden"> <!ENTITY torSettings.proxyQuestion "Benötigt dieser Rechner einen Vermittlungsserver um eine Verbindung zum Internet herzustellen?"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "Benutzt die Internetverbindung dieses Rechners eine Firewall, die nur Verbindungen zu bestimmten Anschlüssen zulässt?"> <!ENTITY torSettings.firewallHelp "Wenn Sie sich nicht sicher sind, wählen Sie Nein. Wenn Sie dann Probleme haben eine Verbindung zum Tor-Netzwerk herzustellen, ändern Sie diese Einstellung."> <!ENTITY torSettings.enterFirewall "Geben Sie hier die Anschlüsse ein, die von der Firewall erlaubt werden. Trennen Sie die Anschlüsse jeweils mit einem Komma."> -<!ENTITY torSettings.bridgeQuestion "Sollte die Internetverbindung dieses Rechners zensiert werden, dann müssen Sie Brückenrelais benutzen.&#160; Falls nicht, klicken Sie einfach auf Verbinden."> +<!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?"> +<!ENTITY torSettings.bridgeHelp "Wenn Sie sich nicht sicher sind, wie Sie diese Frage beantworten sollen, wählen Sie Nr.&#160; Wenn Sie Ja wählen, werden Sie aufgefordert, die Torbrücken zu konfigurieren. Die nicht aufgeführte Relais sind, was es schwieriger macht, Verbindungen zum Tor-Netzwerk zu blockieren."> +<!ENTITY torSettings.bridgeSettingsPrompt "Sie könne den bereitgestellten Satz an Brücken verwenden oder Sie können welche erhalten, und geben einen benutzerdefinierten Satz an Brücken ein.">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Rechner geht durch eine Firewall, die nur bestimmte Anschlüsse zulässt"> <!ENTITY torsettings.firewall.allowedPorts "Erlaubte Anschlüsse:"> <!ENTITY torsettings.useBridges.checkbox "Mein Internetdienstanbieter (ISP) blockiert Verbindungen zum Tor-Netzwerk"> +<!ENTITY torsettings.useBridges.default "Mit bereitgestellten Brücken verbinden "> +<!ENTITY torsettings.useBridges.type "Transporttyp:"> +<!ENTITY torsettings.useBridges.custom "Benutzerdefinierte Brücken eingeben"> <!ENTITY torsettings.useBridges.label "Ein oder mehrere Brückenrelais eingeben (eins pro Zeile)."> -<!ENTITY torsettings.useBridges.placeholder "Adresse:Anschluss ODER Transportadresse:Anschluss"> +<!ENTITY torsettings.useBridges.placeholder "Typ Adresse:Anschluss"> <!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren"> <!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais"> -<!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.&#160; Dieses Problem kann meist mit der Benutzung von Torbrücke umgangen werden, dieses sind versteckte Relais und damit schwerer zu blocken."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "Um einige Brückenrelais zu erhalten, besuchen Sie mit einem Web-Browser folgende Seite: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Eine andere Möglichkeit öffentliche Brücken zu finden ist, eine E-Mail mit dem Inhalt »get bridges« an bridges(a)torproject.org zu schicken.&#160; Allerdings muss diese E-Mail, um es potentiellen Angreifern schwerer zu machen, von einer der folgenden Domains aus geschickt werden: gmail.com oder yahoo.com."> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "Brückenrelais können auch mit Hilfe einer E-Mail an help(a)rt.torproject.org angefordert werden."> +<!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.&#160; Dieses Problem kann meist mit der Benutzung von Torbrücken umgangen werden, das sind versteckte Relais und damit schwerer zu blocken."> +<!ENTITY torsettings.bridgeHelp1B "Sie können den vorkonfigurierten und bereitgestellten Satz an Brückenadressen verwenden, oder Sie können einen benutzerdefinierten Satz von Adressen, mit einer dieser drei Methoden erhalten:"> +<!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet"> +<!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort"> +<!ENTITY torsettings.bridgeHelp3 "Schreiben Sie eine E-Mail an bridges(a)torproject.org mit dem Nachrichteninhalt »get bridges«.&#160; Doch um es schwieriger für einen Angreifer zu machen, eine Menge von Brückenadressen zu erfahren, müssen Sie diese Anfrage von einer gmail.com oder yahoo.com E-Mail-Adresse schicken."> +<!ENTITY torsettings.bridgeHelp4Heading "Durch die Beratungsstelle"> +<!ENTITY torsettings.bridgeHelp4 "Brückenadressen können auch mit Hilfe einer höflichen E-Mail an help(a)rt.torproject.org angefordert werden.&#160; Bitte beachten Sie, dass jede Anfrage einzeln bearbeitet werden muss."> diff --git a/src/chrome/locale/de/progress.dtd b/src/chrome/locale/de/progress.dtd index 2f7e4b7..45bd6d6 100644 --- a/src/chrome/locale/de/progress.dtd +++ b/src/chrome/locale/de/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor-Status"> <!ENTITY torprogress.openSettings "Einstellungen öffnen"> <!ENTITY torprogress.heading "Mit dem Tor-Netzwerk verbinden"> -<!ENTITY torprogress.pleaseWait "Der Tor-Browser wird sich öffnen, sobald eine Verbindung zum Tor-Netzwerk hergestellt ist."> +<!ENTITY torprogress.pleaseWait "Bitte warten Sie während die Verbindung zum Tor-Netzwerk hergestellt wird."> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index e976c8e..bcbb64e 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor wurde unerwartet geschlossen. torlauncher.please_restart_app=Bitte starten Sie die Anwendung neu. torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden. torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen. +torlauncher.tor_control_failed=Fehler, die Kontrolle über Tor zu übernehmen. torlauncher.tor_bootstrap_failed=Tor konnte keine Verbindung zum Tor-Netzwerk herstellen. -torlauncher.tor_bootstrap_failed_details=%1$S fehlgeschlagen (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S gescheitert (%2$S). torlauncher.unable_to_start_tor=Tor kann nicht gestartet werden.\n\n%S torlauncher.tor_missing=Die Tor-Programmdatei ist nicht vorhanden. @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Bitte stellen Sie sicher, dass Tor läuft. torlauncher.error_proxy_addr_missing=Damit Tor einen Vermittlungsserver benutzt, um auf das Internet zuzugreifen, muss eine IP-Adresse oder ein Rechnername und eine Anschlussnummer angegeben werden. torlauncher.error_proxy_type_missing=Sie müssen eine Vermittlungstyp auswählen. torlauncher.error_bridges_missing=Sie müssen eine oder mehrere Brücken eingeben. +torlauncher.error_default_bridges_type_missing=Sie müssen eine Transporttyp für die bereitgestellten Brücken auswählen. +torlauncher.error_bridge_bad_default_type=Es sind keine bereitgestellten Brücken verfügbar, die den Transporttyp %S haben. Bitte passen Sie Ihre Einstellungen an. + +torlauncher.recommended_bridge=(empfohlen) torlauncher.connect=Verbinden torlauncher.quit=Schließen @@ -31,16 +36,16 @@ torlauncher.done=Fertig torlauncher.forAssistance=Falls Sie Hilfe benötigen, kontaktieren Sie %S -torlauncher.bootstrapStatus.conn_dir=Verbinde zu einem Verzeichnis -torlauncher.bootstrapStatus.handshake_dir=Stelle eine verschlüsselte Verbindung zu einem Verzeichnis her -torlauncher.bootstrapStatus.requesting_status=Erfrage Netzwerkstatusdatei -torlauncher.bootstrapStatus.loading_status=Lade Netzwerkstatusdatei -torlauncher.bootstrapStatus.loading_keys=Lade Zertifikate der zentralen Verzeichnisse -torlauncher.bootstrapStatus.requesting_descriptors=Fordere Verteiler-Informationen an -torlauncher.bootstrapStatus.loading_descriptors=Lade Verteiler-Informationen -torlauncher.bootstrapStatus.conn_or=Verbinde zum Tor-Netzwerk -torlauncher.bootstrapStatus.handshake_or=Erstelle einen Tor-Circuit -torlauncher.bootstrapStatus.done=Verbindung zum Tor-Netzwerk hergestellt! +torlauncher.bootstrapStatus.conn_dir=Zu einem Relaisverzeichnis wird verbunden +torlauncher.bootstrapStatus.handshake_dir=Es wird eine verschlüsselte Verbindung zu einem Verzeichnis hergestellt +torlauncher.bootstrapStatus.requesting_status=Netzwerkstatus wird abgerufen +torlauncher.bootstrapStatus.loading_status=Netzwerkstatus wird geladen +torlauncher.bootstrapStatus.loading_keys=Autorisierungszertifikate werden geladen +torlauncher.bootstrapStatus.requesting_descriptors=Relaisinformationen werden angefordert +torlauncher.bootstrapStatus.loading_descriptors=Relaisinformationen werden geladen +torlauncher.bootstrapStatus.conn_or=Zum Tor-Netzwerk wird verbinden +torlauncher.bootstrapStatus.handshake_or=Tor-Verbindung wird hergestellt +torlauncher.bootstrapStatus.done=Zum Tor-Netzwerk wird verbunden! torlauncher.bootstrapWarning.done=abgeschlossen torlauncher.bootstrapWarning.connectrefused=Verbindung verweigert diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 28b0c9e..7b1a881 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Antes de que el Paquete de Navegador Tor intente conentar con la red Tor, necesitará proporcionar información sobre la conexión a Internet de su computadora."> +<!ENTITY torsettings.prompt "Antes de que se conecte a la red Tor, necesita proporcionar información sobre la conexión a Internet de este equipo."> <!ENTITY torSettings.yes "Sí"> <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes describe mejor su situación?"> <!ENTITY torSettings.configurePrompt1 "La conexión a Internet de esta computadora está censurada, filtrada o proxificada."> -<!ENTITY torSettings.configurePrompt2 "Necesito configurar la opciones de red."> +<!ENTITY torSettings.configurePrompt2 "Necesito configurar las preferencias de repetidor puente ('bridge'), cortafuegos ('firewall'), o proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Me gustaría conectar directamente a la red Tor."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyQuestion "¿Necesita usar un proxy de acceso a Internet esta computadora ?"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "¿Va la conexión a Internet de esta computadora a través de un cortafuegos ('firewall') que sólo permite conexiones a ciertos puertos?"> <!ENTITY torSettings.firewallHelp "Si no está seguro de cómo responder a esta pregunta, elija No. Si encuentra problemas conectando a la red Tor, cambie esta configuración."> <!ENTITY torSettings.enterFirewall "Introduzca una lista de puertos separada por comas que esté permitida por el cortafuegos ('firewall')."> -<!ENTITY torSettings.bridgeQuestion "Si la conexión a Internet de esta computadora está censurada, necesitará obtener y usar repetidores puente ('bridge relays').&#160; Si no, simplemente haga clic en Conectar."> +<!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?"> +<!ENTITY torSettings.bridgeHelp "Si no está seguro como responder a esta pregunta, elija No.&#160; Si usted elige Sí, se le pedirá configurar puentes Tor, los cuales son repetidores no listados que hacen más difícil el bloqueo de conexiones hacia la red Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Puede usar el juego de repetidores puente ('bridge') proporcionado, o puede obtener e introducir un juego de puentes personalizado.">  @@ -44,16 +46,20 @@ <!ENTITY torsettings.firewall.checkbox "Esta computadora va a través de un cortafuegos ('firewall') que sólo permite conexiones a ciertos puertos"> <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:"> <!ENTITY torsettings.useBridges.checkbox "Mi Proveedor de Servicios de Internet (ISP) bloquea las conexiones a la red Tor"> +<!ENTITY torsettings.useBridges.default "Conectar con los puentes proporcionados"> +<!ENTITY torsettings.useBridges.type "Tipo de transporte:"> +<!ENTITY torsettings.useBridges.custom "Introducir puentes personalizados"> <!ENTITY torsettings.useBridges.label "Introduzca uno o más repetidores puente ('bridge', uno por línea)."> -<!ENTITY torsettings.useBridges.placeholder "dirección:puerto O dirección:puerto de transporte"> +<!ENTITY torsettings.useBridges.placeholder "ingrese dirección:puerto"> <!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles"> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')"> -<!ENTITY torsettings.bridgeHelp1 "Si no es capaz de conectar con la red Tor, podría ser que su Proveedor de Servicios de Internet (ISP), u otra agencia, esté bloqueando Tor.&#160; A menudo puede evitar este problema usando puentes Tor ('bridges'), que son repetidores 'ocultos' más difíciles de bloquear"> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "Para obtener algunas direcciones de puentes, utilice un navegador web para visitar la siguiente página: "> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Otra manera de encontrar direcciones de puentes ('bridges') públicas es mandar un correo a bridges(a)torproject.org con la línea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para ponerle más difícil a un atacante conocer muchas direcciones de puentes, debe envíar esta solicitud desde una dirección de correo electrónico de uno de los siguientes dominios (con soporte DKIM): gmail.com o yahoo.com "> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "También puede solicitar repetidores puente ('bridge relays') mandando un correo a help(a)rt.torproject.org"> +<!ENTITY torsettings.bridgeHelp1 "Si no puede conectar a la red Tor, podría ser que su proveedor de servicios de Internet (ISP) u otra agencia, esté bloqueando Tor.&#160; A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son publicitados, y es más difícil que sean bloqueados."> +<!ENTITY torsettings.bridgeHelp1B "Puede usar el juego de direcciones de repetidores puente ('bridge') preconfigurado proporcionado, o puede obtener un juego de direcciones personalizado usando uno de estos tres métodos:"> +<!ENTITY torsettings.bridgeHelp2Heading "Mediante la web"> +<!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático"> +<!ENTITY torsettings.bridgeHelp3 "Envíe un correo a bridges(a)torproject.org con la línea 'get bridges' por si misma en el cuerpo del mensaje.&#160; Sin embargo, para hacer más difícil a un atacante aprender muchas direcciones de puentes, ha de enviar esta solicitud desde una dirección de correo de gmail.com o yahoo.com ."> +<!ENTITY torsettings.bridgeHelp4Heading "Mediante el gabinete de ayuda"> +<!ENTITY torsettings.bridgeHelp4 "Como último recurso, puede pedir direcciones de repetidores puente enviando un cortés mensaje de correo a help(a)rt.torproject.org .&#160; +Por favor observe que es una persona la que tendrá que responder a cada petición."> diff --git a/src/chrome/locale/es/progress.dtd b/src/chrome/locale/es/progress.dtd index 81d5fb0..c07d8fb 100644 --- a/src/chrome/locale/es/progress.dtd +++ b/src/chrome/locale/es/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado de Tor"> <!ENTITY torprogress.openSettings "Abrir Preferencias"> <!ENTITY torprogress.heading "Conectando a la red Tor"> -<!ENTITY torprogress.pleaseWait "El Navegador Tor se abrirá después de que sea establecida una conexión con la red Tor."> +<!ENTITY torprogress.pleaseWait "Por favor, espere mientras se establece una conexión con la red Tor."> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index c58c94f..9739b50 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -7,7 +7,8 @@ torlauncher.tor_exited=Tor se cerró inesperadamente. torlauncher.please_restart_app=Por favor reinicie esta aplicación. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. -torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión de red Tor. +torlauncher.tor_control_failed=Fallo al tomar control de Tor. +torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión a la red Tor. torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor, asegúrese de que Tor se está ejec torlauncher.error_proxy_addr_missing=Debe especificar tanto una dirección IP o nombre de máquina ('hostname') como un número de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet. torlauncher.error_proxy_type_missing=Debe seleccionar el tipo de 'proxy'. torlauncher.error_bridges_missing=Debe especificar uno o más puentes ('bridges'). +torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los repetidores puente ('bridges') proporcionados. +torlauncher.error_bridge_bad_default_type=No hay disponible ningún repetidor puente proporcionado que tenga el tipo de transporte %S. Por favor ajuste sus preferencias. + +torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar torlauncher.quit=Salir @@ -31,22 +36,22 @@ torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S -torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio repetidor -torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión encriptada con el directorio -torlauncher.bootstrapStatus.requesting_status=Recuperando el estado de la red +torlauncher.bootstrapStatus.conn_dir=Conectando a un repositorio ('Directory') de repetidores ('relays') +torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión cifrada con el repositorio de repetidores +torlauncher.bootstrapStatus.requesting_status=Recopilando el estado de la red torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red torlauncher.bootstrapStatus.loading_keys=Cargando los certificados de autoridades torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información del repetidor -torlauncher.bootstrapStatus.loading_descriptors=Cargando información del repetidor +torlauncher.bootstrapStatus.loading_descriptors=Cargando la información del repetidor torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor -torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor +torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito a través de Tor torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! torlauncher.bootstrapWarning.done=terminado torlauncher.bootstrapWarning.connectrefused=conexión rechazada torlauncher.bootstrapWarning.misc=miscelánea torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes -torlauncher.bootstrapWarning.identity=no hay coincidencia de identidad +torlauncher.bootstrapWarning.identity=las identidades no coinciden torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión agotado -torlauncher.bootstrapWarning.noroute=no hay ruta hacia el host -torlauncher.bootstrapWarning.ioerror=error de escritura/lectura +torlauncher.bootstrapWarning.noroute=no hay ruta hacia el servidor ('host') +torlauncher.bootstrapWarning.ioerror=error de lectura/escritura diff --git a/src/chrome/locale/eu/torlauncher.properties b/src/chrome/locale/eu/torlauncher.properties index 0f9d081..a104c27 100644 --- a/src/chrome/locale/eu/torlauncher.properties +++ b/src/chrome/locale/eu/torlauncher.properties @@ -1,8 +1,41 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. +torlauncher.error_title=Tor abiarazlea + +torlauncher.tor_exited=Tor ustekabean irten da. +torlauncher.please_restart_app=Mesedez aplikazio hau berrabiarazi ezazu. +torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu. +torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan. +# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_bootstrap_failed=Torek huts egin du Tor sare konexio bat ezartzerakoan. torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S). +torlauncher.unable_to_start_tor=Ezin izan da Tor hasi.\n\n%S +torlauncher.tor_missing=Tor exekutagarria falta da. +torlauncher.torrc_missing=torrc fitxategia falta da. +torlauncher.datadir_missing=Tor datu direktorioa ez da existitzen. +torlauncher.password_hash_missing=Huts egin du hash-eatutako pasahitza eskuratzen. + +torlauncher.failed_to_get_settings=Ezin izan dira Tor ezarpenak berreskuratu.\n\n%S +torlauncher.failed_to_save_settings=Ezin izan dira Tor ezarpenak gorde.\n\n%S +torlauncher.ensure_tor_is_running=Mesedez egiaztatu Tor exekutatzen ari dela. + +torlauncher.error_proxy_addr_missing=Torek proxy bat erabiliz Interneten sartzeko konfiguratu nahi baduzu edo IP helbidea edo ostalari-izena edo portu zenbakia zehaztu behar duzu. +torlauncher.error_proxy_type_missing=Proxy mota hautatu behar duzu. +torlauncher.error_bridges_missing=Zubi bat edo gehiago zehaztu behar duzu. +# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. + +# torlauncher.recommended_bridge=(recommended) + +torlauncher.connect=Konektatu +torlauncher.quit=Irten +torlauncher.quit_win=Irten +torlauncher.done=Eginda + +torlauncher.forAssistance=Laguntza lortzeko, %S(r)ekin harremanetan jarri + torlauncher.bootstrapStatus.conn_dir=Errele direktorio batera konektatzen torlauncher.bootstrapStatus.handshake_dir=Enkriptatutako direktorio batera konexioa ezartzen torlauncher.bootstrapStatus.requesting_status=Sarearen egoera eskuratzen diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index d837426..8d1c25b 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -2,27 +2,29 @@  -<!ENTITY torsettings.prompt "پیش از آغاز اتصال بسته تور به شبکه تور، نیاز است شما اطلاعاتی درباره اتصال اینترنت این رایانه ارائه کنید"> +<!ENTITY torsettings.prompt "قبل از اتصال به شبکه تور، باید اطلاعاتی از نحوه اتصال این کامپیوتر به اینترنت فراهم کنید."> <!ENTITY torSettings.yes "بله"> <!ENTITY torSettings.no "نه"> <!ENTITY torSettings.firstQuestion "کدام یک از موارد زیر وضعیت شما را بهتر بیان می‌کند؟"> <!ENTITY torSettings.configurePrompt1 "اینترنت استفاده شده در این رایانه ها سانسور شده٫فیلتر شده و یا عبور کرده از روی پراکسی می باشند."> -<!ENTITY torSettings.configurePrompt2 "من نیاز به تنظیمات شبکه دارم."> +<!ENTITY torSettings.configurePrompt2 "من نیاز دارم که «پل ها»، «پروکسی» و یا «فایروال» را تنظیم کنم."> <!ENTITY torSettings.configure "پیکربندی"> <!ENTITY torSettings.connectPrompt2 "تمایل دارم مستقیما به شبکه‌ی تور متصل شوم."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "این در بیشتر مواقع کار خواهد کرد."> <!ENTITY torSettings.connect "اتصال"> <!ENTITY torSettings.proxyQuestion "آیا این رایانه برای اتصال به اینترنت نیاز به استفاده از پراکسی دارد؟">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.proxyHelp "اگر مطمئن نیستید چطور به اسن سوال پاسخ دهید، به تنظیمات سایر مرورگرهای خود نگاهی بیاندازید تا متوجه شوید که آیا باید یک پروکسی استفاده شود یا خیر."> <!ENTITY torSettings.enterProxy "تنظیمات پراکسی را وارد کنید."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect."> +<!ENTITY torSettings.firewallQuestion "آیا در مسیر ارتباط شما به اینترنت یک فایروال وجود دارد؟ و فقط اجازه اتصال از یک درگاه خاص را می دهد؟"> +<!ENTITY torSettings.firewallHelp "اگر مطمئن نیستید چه جوابی به این سوال دهید، «نه» و یا «خیر» را انتخاب کنید. سپس اگر مشکلی در ارتباط با شبکه تور داشتید، این مورد را تغییر دهید."> +<!ENTITY torSettings.enterFirewall "یک لیست جداشده با ویرگول از پورت‌هایی که توسط فایروال مجاز هستند."> +<!ENTITY torSettings.bridgeQuestion "آیا شرکتی که از آن اینترنت گرفته اید (ISP)، دسترسی به شبکه تور را فیلتر، سانسور و یا مسدود می کند؟"> +<!ENTITY torSettings.bridgeHelp "اگر مطمئن نیستید چطور به این سوال پاسخ دهید، «نه» یا انتخاب کنید.&#160; اگر «بله» را انتخاب کنید، می بایست تنظیمات مربوط به «پل های» تور را انجام دهید. پل ها مسیرهای دور زدن فیلتر هستند که لیست مشخصی از آن ها وجود ندارد و فیلتر کردن آن ها بسیار مشکل است."> +<!ENTITY torSettings.bridgeSettingsPrompt "شما می‌توانید از مجموعه‌ای از پل‌های آماده و یا پل‌های شخصی خودتان استفاده کنید.">  @@ -34,26 +36,30 @@ <!ENTITY torsettings.useProxy.checkbox "این رایانه برای اتصال به اینترنت نیاز به استفاده از پراکسی دارد."> <!ENTITY torsettings.useProxy.type "نوع پراکسی:"> <!ENTITY torsettings.useProxy.address "آدرس:"> -<!ENTITY torsettings.useProxy.address.placeholder "آدرس آی پی یا نام میزبان"> +<!ENTITY torsettings.useProxy.address.placeholder "آدرس آی‌پی یا نام میزبان"> <!ENTITY torsettings.useProxy.port "پورت:"> <!ENTITY torsettings.useProxy.username "نام کاربری:"> <!ENTITY torsettings.useProxy.password "رمز عبور"> <!ENTITY torsettings.useProxy.type.socks4 "ساکس ۴"> <!ENTITY torsettings.useProxy.type.socks5 "ساکس ۵"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد."> <!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز:"> <!ENTITY torsettings.useBridges.checkbox "‫سرویس دهنده اینترنت (ISP) من اتصال به شبکه تور را مسدود می‌کند."> +<!ENTITY torsettings.useBridges.default "اتصال از طریق پل‌های انتخاب شده"> +<!ENTITY torsettings.useBridges.type "نوع انتقال:"> +<!ENTITY torsettings.useBridges.custom "پل‌های شخصی را وارد کنید"> <!ENTITY torsettings.useBridges.label "یک یا چند پل ارتباطی را وارد نمایید. (در هر خط یکی)"> -<!ENTITY torsettings.useBridges.placeholder "address:port یا transport address:port"> +<!ENTITY torsettings.useBridges.placeholder "آدرس آی‌پی:پورت را وارد کنید"> <!ENTITY torsettings.copyLog "کپی گزارش وقایع تور"> <!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "برای بدست آوردن پل ارتباطی٫با استفاده از مرورگر وب به آدرس https://bridges.torproject.org مراجعه فرمایید."> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Another way to find public bridge addresses is to send mail to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from an email address at one of the following domains: gmail.com or yahoo.com."> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "شما میتوانید با ارسال ایمیل به help(a)rt.torproject.org درخواست پل ارتباطی نمایید."> +<!ENTITY torsettings.bridgeHelp1 "اگر نمی توانید به شبکه تور متصل شوید، ممکن است به این دلیل باشد که شرکت ارایه کننده اینترنت شما(ISP) و یا سازمان های دیگر شبکه تور را بسته اند.&#160; +غالباً می توانید این محدودیت را با استفاده از «پل» های تور دور بزنید. پل ها مسیرهای اضافی دور زدن فیلتر هستند که لیست آن در دسترس نیست و فیلتر کردن آن ها بسیار مشکل است."> +<!ENTITY torsettings.bridgeHelp1B "شما می‌توانید از پل‌های موجود استفاده کنید و یا برای به‌دست آوردن مجموعه‌ای از پل‌های شخصی از یکی از سه روش زیر بهره بگیرید:"> +<!ENTITY torsettings.bridgeHelp2Heading "از طریق اینترنت"> +<!ENTITY torsettings.bridgeHelp2 "با استفاده از یک مرورگر به آدرس https://bridges.torproject.org بروید."> +<!ENTITY torsettings.bridgeHelp3Heading "از طریق آدرس ایمیل پاسخگوی خودکار"> +<!ENTITY torsettings.bridgeHelp3 "یک ایمیل حاوی عبارت 'get bridges' به آدرس bridges(a)torproject.org ارسال کنید.&#160; برای اینکه بتوانیم جلوی فیلتر شدن پل ها را بگیریم، مجبوریم شما را محدود کنیم تا فقط از یک آدرس ایمیل yahoo.com و یا gmail.com درخواست خود را ارسال کنید. لطفاً صبور باشید. از چند دقیقه تا چند ساعت طول خواهد کشید تا به طور خودکار پل ها برای شما ارسال شوند."> +<!ENTITY torsettings.bridgeHelp4Heading "از طریق واحد کمک رسانی"> +<!ENTITY torsettings.bridgeHelp4 "اگر از طریق هیچ کدام از راه حل های فوق به نتیجه نرسیدید، یک درخواست مودبانه به آدرس help(a)rt.torproject.org ارسال کنید.&#160; در نظر داشته باشید که یک نفر باید ایمیل شما را بخواند و به آن پاسخ دهد. پس صبور باشید."> diff --git a/src/chrome/locale/fa/progress.dtd b/src/chrome/locale/fa/progress.dtd index cd7ca8d..5f8eee1 100644 --- a/src/chrome/locale/fa/progress.dtd +++ b/src/chrome/locale/fa/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "وضعیت تور"> <!ENTITY torprogress.openSettings "تنظیمات‌را باز کنید"> <!ENTITY torprogress.heading "درحال اتصال به شبکه تُر"> -<!ENTITY torprogress.pleaseWait "مرورگر تور باز می‌شود بعد از این که ارتباطی با شبکهٔ تور برقرار شده‌باشد."> +<!ENTITY torprogress.pleaseWait "لطفا برای اتصال به شبکه تور منتظر بمانید."> diff --git a/src/chrome/locale/fa/torlauncher.properties b/src/chrome/locale/fa/torlauncher.properties index ebee697..0571889 100644 --- a/src/chrome/locale/fa/torlauncher.properties +++ b/src/chrome/locale/fa/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=تور بدلیلی نامشخص خارج شد. torlauncher.please_restart_app=لطفا نرم افزار را مجددا راه اندازی نمایید. torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی باشد. torlauncher.tor_failed_to_start=خطا در راه اندازی. -torlauncher.tor_bootstrap_failed=تور برای اتصال به شبکه تور ناموفق می باشد. -torlauncher.tor_bootstrap_failed_details=%1$S ناموفق (%2$S). +torlauncher.tor_control_failed=به‌دست گرفتن کنترل تور ناموفق بود. +torlauncher.tor_bootstrap_failed=تور در برقراری یک ارتباط شبکه‌ای توری ناموفق بود. +torlauncher.tor_bootstrap_failed_details=%1$S ناموفق بود (%2$S). torlauncher.unable_to_start_tor=راه اندازی تور امکان پذیر نمی باشد.\n\n%S torlauncher.tor_missing=تور اجرا شونده یافت نشد. @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=لطفا از فعال بودن تور اطم torlauncher.error_proxy_addr_missing=شما میبایست یک آدرس آی پی یا یک نام میزبان و یک شماره درگاه برای پیکربندی تُر مشخص کنید جهت استفاده ار یک پیشکار برای دسترسی به اینترنت. torlauncher.error_proxy_type_missing=شما باید نوع پراکسی را انتخاب کنید. torlauncher.error_bridges_missing=شما باید یک یا پل های بیشتری را مشخص کنید. +torlauncher.error_default_bridges_type_missing=نوع انتقال باید برای پل‌ها مشخص گردد. +torlauncher.error_bridge_bad_default_type=هیچ پلی از نوع %S موجود نیست. لطفا تنظیمات را اصلاح کنید. + +torlauncher.recommended_bridge=(توصیه شده) torlauncher.connect=اتصال torlauncher.quit=خروج @@ -33,16 +38,16 @@ torlauncher.forAssistance=برای دریافت کمک٫ با %S تماس بگی torlauncher.bootstrapStatus.conn_dir=اتصال به یک فهرست بازپخش torlauncher.bootstrapStatus.handshake_dir=برپایی یک اتصال فهرست رمزبندی شده -torlauncher.bootstrapStatus.requesting_status=بازیابی وضعیت شبکه -torlauncher.bootstrapStatus.loading_status=بارگذاری وضعیت شبکه -torlauncher.bootstrapStatus.loading_keys=بارگذاری مجوزها -torlauncher.bootstrapStatus.requesting_descriptors=درخواست اطلاعات بازپخش +torlauncher.bootstrapStatus.requesting_status=بازیابی وضیعت شبکه +torlauncher.bootstrapStatus.loading_status=بارگذاری وضیعت شبکه +torlauncher.bootstrapStatus.loading_keys=بارگذاری مجوز ها +torlauncher.bootstrapStatus.requesting_descriptors=درخواست اطلاعات باز پخش torlauncher.bootstrapStatus.loading_descriptors=بارگذاری اطلاعات بازپخش -torlauncher.bootstrapStatus.conn_or=در حال اتصال به شبکه تور -torlauncher.bootstrapStatus.handshake_or=برپایی یک جریان تور -torlauncher.bootstrapStatus.done=وصل شده به شبکه تور +torlauncher.bootstrapStatus.conn_or=درحال اتصال به شبکه تُر +torlauncher.bootstrapStatus.handshake_or=برپایی یک جریان تُر +torlauncher.bootstrapStatus.done=متصل شده به شبکه تُر -torlauncher.bootstrapWarning.done=انجام شده +torlauncher.bootstrapWarning.done=انجام شد torlauncher.bootstrapWarning.connectrefused=اتصال ردشد torlauncher.bootstrapWarning.misc=گوناگون torlauncher.bootstrapWarning.resourcelimit=منابع ناکافی diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index edbe29e..5e6ed8c 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -2,27 +2,29 @@  -<!ENTITY torsettings.prompt "Avant que le navigateur Tor ne tente de se connecter au réseau Tor, vous devez fournir quelques informations concernant votre connexion Internet."> +<!ENTITY torsettings.prompt "Vous devez fournir des informations concernant la connexion à Internet de cet ordinateur afin que vous puissiez vous connecter au réseau Tor."> <!ENTITY torSettings.yes "Oui"> <!ENTITY torSettings.no "Non"> <!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation ?"> <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou nécessite un proxy."> -<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configurer les paramètres réseau. "> +<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configurer une passerelle, le pare-feu, ou les paramètres du proxy."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au réseau Tor."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> <!ENTITY torSettings.connect "Se connecter"> -<!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur à besoin d'un proxy pour accéder à internet ?"> +<!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur a besoin d'un proxy pour accéder à internet ?">  <!ENTITY torSettings.proxyHelp "Si vous ne savez pas comment répondre à cette question, vous pouvez regarder les paramètres de connexion d'un autre navigateur afin de voir s'il est configuré pour utiliser un proxy."> <!ENTITY torSettings.enterProxy "Entrez les paramètres de votre proxy."> <!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet est filtré par un pare-feu qui n'autorise les connexions que vers certains ports ?"> <!ENTITY torSettings.firewallHelp "Si vous ne savez par comment répondre à cette question, choisissez Non. Vous pourrez changer ce paramètre plus tard en cas de problèmes de connexion au réseau Tor."> <!ENTITY torSettings.enterFirewall "Entrez la liste de ports, séparés par des virgules, qui sont autorisés par le pare-feu."> -<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurée, il est nécessaire d'obtenir des adresses de bridges. Si ce n'est pas le cas, cliquez simplement sur « Se connecter »."> +<!ENTITY torSettings.bridgeQuestion "Est-ce que votre Fournisseur d'Accès Internet (FAI) bloque les connexions au réseau Tor ?"> +<!ENTITY torSettings.bridgeHelp "Si vous ne savez pas comment répondre à cette question, choisissez le numéro &#160; Si vous choisissez Oui, il vous sera demandé de configurer les bridges Tor qui sont des relais non listés et qui rendent plus difficile le blocage du réseau Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser les bridges fournis ou bien saisir votre liste de bridges personnels.">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui autorise uniquement les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès à Internet (FAI) bloque les connexions au réseau Tor"> +<!ENTITY torsettings.useBridges.default "Se connecter en utilisant les bridges préconfigurés"> +<!ENTITY torsettings.useBridges.type "Mode de transport:"> +<!ENTITY torsettings.useBridges.custom "Entrez vos bridges personnels"> <!ENTITY torsettings.useBridges.label "Saisir un ou davantage de bridges relais (un par ligne)."> -<!ENTITY torsettings.useBridges.placeholder "adresse:port OU adresse de transport:port"> +<!ENTITY torsettings.useBridges.placeholder "type adresse:port"> <!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier"> <!ENTITY torsettings.bridgeHelpTitle "Aide pour les bridges"> -<!ENTITY torsettings.bridgeHelp1 "S'il est impossible de se connecter au réseau Tor, cela peut être le signe que votre Fournisseur d'Accès à Internet (FAI) ou une autre entité bloque Tor. La plupart du temps, vous pouvez contourner ce problème en utilisant les « bridges » Tor. Ce sont des relais cachés qui sont plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "Pour obtenir des adresses de bridges, utilisez un navigateur web pour aller sur la page : https://bridges.torproject.org/"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Une autre manière de trouver des adresses de bridges publics est d'envoyer un mail à bridges(a)torproject.org avec la ligne "get bridges" dans le corps de l'email. Toutefois, pour que cela soit plus difficile pour un attaquant de découvrir beaucoup d'adresses, les demandes doivent provenir d'une adresse email appartenant à l'un des domaines suivants : gmail.com ou yahoo.com."> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "Vous pouvez également demander des adresses de bridges en écrivant à help-fr(a)rt.torproject.org."> +<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se pourrait que votre fournisseur d'accès à Internet (FAI) ou une autre agence bloque le Tor.&#160; Souvent, vous pouvez contourner ce problème en utilisant des ponts Tor, qui sont des relais non listés qui sont plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser les liste de bridges préconfigurés par défaut ou en obtenir une liste personnalisée d'adresses en utilisant l'une des trois méthodes ci-dessous :"> +<!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> +<!ENTITY torsettings.bridgeHelp2 "Utilisez un navigateur web pour visiter https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Par l'auto-répondeur de courrier électronique"> +<!ENTITY torsettings.bridgeHelp3 "Envoyer un email à bridges(a)torproject.org avec la ligne 'get bridges' en elle-même obtiennent dans le corps du message.&#160; Cependant, pour rendre plus difficile à un attaquant d'apprendre beaucoup d'adresses de pont, vous devez envoyer cette demande depuis une adresse électronique gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Par le bureau d'aide"> +<!ENTITY torsettings.bridgeHelp4 "En dernier ressort, vous pouvez demander des adresses de pont en envoyant un message électronique poli à help(a)rt.torproject.org.&#160; Veuillez noter qu'une personne devra répondre à chaque demande."> diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd index 1c59e1e..936d220 100644 --- a/src/chrome/locale/fr/progress.dtd +++ b/src/chrome/locale/fr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "État de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait "Le Navigateur Tor s'ouvrira après que la connexion au réseau Tor soit établie."> +<!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que la connexion au réseau Tor est établie."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 86ba52e..807e901 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue. torlauncher.please_restart_app=Veuillez redémarrer l'application. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. +torlauncher.tor_control_failed=Échec lors de la prise de contrôle de Tor. torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor. -torlauncher.tor_bootstrap_failed_details=%1$S échec (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est introuvable. @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor est lancé. torlauncher.error_proxy_addr_missing=Pour configurer Tor afin qu'il utilise un proxy, vous devez spécifier une adresse IP ou un nom d'hôte ainsi qu'un numéro de port. torlauncher.error_proxy_type_missing=Vous devez sélectionner un type de proxy. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs bridges. +torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les bridges fournis. +torlauncher.error_bridge_bad_default_type=Aucun des bridges fournis n'a le type de transport %S. Merci d'ajuster vos paramètres. + +torlauncher.recommended_bridge=(recommandé) torlauncher.connect=Se connecter torlauncher.quit=Quitter @@ -32,17 +37,17 @@ torlauncher.done=Terminé torlauncher.forAssistance=Pour obtenir de l'aide, contactez %S torlauncher.bootstrapStatus.conn_dir=Connexion à un annuaire de relais -torlauncher.bootstrapStatus.handshake_dir=Etablissement d'une connexion annuaire cryptée -torlauncher.bootstrapStatus.requesting_status=Recherche de l'état du réseau +torlauncher.bootstrapStatus.handshake_dir=Établissement d'une connexion annuaire chiffrée +torlauncher.bootstrapStatus.requesting_status=Récupération de l'état du réseau torlauncher.bootstrapStatus.loading_status=Chargement de l'état du réseau -torlauncher.bootstrapStatus.loading_keys=Chargement des certificats des authorités -torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relais +torlauncher.bootstrapStatus.loading_keys=Chargement des certificats d'autorité +torlauncher.bootstrapStatus.requesting_descriptors=Demande d'informations sur le relai torlauncher.bootstrapStatus.loading_descriptors=Chargement des informations sur le relais torlauncher.bootstrapStatus.conn_or=Connexion au réseau Tor -torlauncher.bootstrapStatus.handshake_or=Etablissement d'un circuit Tor +torlauncher.bootstrapStatus.handshake_or=Réalisation d'un circuit Tor torlauncher.bootstrapStatus.done=Connecté au réseau Tor ! -torlauncher.bootstrapWarning.done=fait +torlauncher.bootstrapWarning.done=effectué torlauncher.bootstrapWarning.connectrefused=connexion refusée torlauncher.bootstrapWarning.misc=divers torlauncher.bootstrapWarning.resourcelimit=ressources insuffisantes diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index bed89b3..54d07c3 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Prima che il pacchetto Tor Browser provi a connettersi alla rete Tor, è necessario inserire informazioni riguardo la connessione ad Internet di questo computer."> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Sì"> <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Quale delle seguenti descrizioni raffigura meglio la tua situazione?"> <!ENTITY torSettings.configurePrompt1 "La connessione ad Internet di questo computer è censurata, filtrata, o passa attraverso un proxy."> -<!ENTITY torSettings.configurePrompt2 "Devo configurare le impostazioni di rete."> +<!ENTITY torSettings.configurePrompt2 "Ho bisogno di configurare un bridge, firewall o settaggi proxy."> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connectPrompt2 "Vorrei connettermi direttamente alla rete Tor."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "Questo funzionerà nella maggior parte delle situazioni."> <!ENTITY torSettings.connect "Connetti"> <!ENTITY torSettings.proxyQuestion "Questo computer usa un proxy per accedere ad Internet?"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "La connessione ad Internet di questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte?"> <!ENTITY torSettings.firewallHelp "Se non sei sicuro su come rispondere a questa domanda, seleziona No. Nel caso in cui si verifichino problemi di connessione alla rete Tor, cambia queste impostazioni."> <!ENTITY torSettings.enterFirewall "Inserisci una lista di porte consentite dal firewall, separate da una virgola."> -<!ENTITY torSettings.bridgeQuestion "Se la connessione ad Internet di questo computer è censurata, sarà necessario ottenere ed usare dei ponti relé.&#160; Se non lo è, seleziona Connetti."> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte"> <!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> <!ENTITY torsettings.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Tipo di trasporto:"> +<!ENTITY torsettings.useBridges.custom "Inserire bridge personaizzati"> <!ENTITY torsettings.useBridges.label "Inserisci uno o più bridge relay (uno per riga)"> -<!ENTITY torsettings.useBridges.placeholder "indirzzo:porta OPPURE indirizzo:porta di trasporto"> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema"> <!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé"> -<!ENTITY torsettings.bridgeHelp1 "Se non riesci a connetterti alla rete Tor, potrebbe essere il tuo fornitore di servizi Internet (ISP), o un altro ente, che sta bloccando Tor.&#160; Spesso è possibile aggirare questo problema utilizzando i ponti Tor: si tratta di relé nascosti, più difficili da bloccare."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "Per ottenere una lista di ponti relé, visita con un browser web la seguente pagina: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Un altro modo per conoscere gli indirizzi dei ponti pubblici consiste nell'inviare una e-mail all'indirizzo bridges(a)torproject.org con il testo 'get bridges' nel corpo del messaggio.&#160; Tuttavia, per rendere più difficile ad un utente malintenzionato il rilevamento di molti indirizzi dei ponti, devi inviare la richiesta da un indirizzo e-mail appartenente ad uno dei seguenti domini: gmail.com oppure yahoo.com."> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "Una lista di ponti relé può essere ottenuta anche inviando una e-mail all'indirizzo help(a)rt.torproject.org."> +<!ENTITY torsettings.bridgeHelp1 "Se non ti riesci a connettere alla rete Tor, è possibile che il tuo Internet Service Provider (ISP) o una qualche altra agenzia stiano bloccando Tor.&#160; Spesso puoi aggirare questo problema utilizzando un Bridge Tor, che è un relay non tracciato più difficile da bloccare."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp2Heading "Attraverso il web"> +<!ENTITY torsettings.bridgeHelp2 "Usa un browser per visitare https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Attraverso l'autorisponditore Email"> +<!ENTITY torsettings.bridgeHelp3 "Manda una mail a bridges(a)torproject.org con scritto 'get bridges' nel corpo del messaggio.&#160; Tuttavia, per rendere più difficile il riconoscimento di molti indirizzi bridge, manda questa richiesta da un account gmail.com o yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Attraverso l'Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "Come ultima spiaggia, puoi richiedere un indirizzo bridge mandando una cortese mail a help(a)rt.torproject.org.&#160; Tieni conto che una persona dovrà rispondere ad ogni singola richiesta."> diff --git a/src/chrome/locale/it/progress.dtd b/src/chrome/locale/it/progress.dtd index a0e3c8a..4cab5ff 100644 --- a/src/chrome/locale/it/progress.dtd +++ b/src/chrome/locale/it/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Stato di Tor"> <!ENTITY torprogress.openSettings "Apertura impostazioni"> <!ENTITY torprogress.heading "Connessione in corso alla rete Tor"> -<!ENTITY torprogress.pleaseWait "Il Tor Browser si aprirà non appena sarà stabilita una connessione alla rete Tor."> +<!ENTITY torprogress.pleaseWait "Per favore aspettare mentre stabiliamo una connessione alla rete Tor"> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index 8f20ef3..0d71880 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor si è arrestato inaspettatamente. torlauncher.please_restart_app=Per favore riavvia questa applicazione. torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor. torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor. -torlauncher.tor_bootstrap_failed=Si è verificato un errore nello stabilire una connessione alla rete Tor. -torlauncher.tor_bootstrap_failed_details=%1$S fallito (%2$S). +torlauncher.tor_control_failed=Impossibile ottenere il controllo di Tor. +torlauncher.tor_bootstrap_failed=Tor ha fallito a stabilire una connessione Tor +torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Impossibile avviare Tor.⏎\n⏎\n%S torlauncher.tor_missing=Il file eseguibile di Tor è mancante. @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Per favore assicurati che Tor sia in esecuzion torlauncher.error_proxy_addr_missing=Affinché Tor sia configurato all'utilizzo di un proxy per l'accesso ad Internet, devi specificare sia un indirizzo IP o nome Host, sia un numero di porta. torlauncher.error_proxy_type_missing=Devi selezionare il tipo di proxy. torlauncher.error_bridges_missing=Devi specificare uno o più ponti. +torlauncher.error_default_bridges_type_missing=È necessario selezionare un tipo ti trasporto per il bridge selezionato. +torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il tipo di trasporto %S. Modificare le proprie impostazioni. + +torlauncher.recommended_bridge=(raccomandato) torlauncher.connect=Connetti torlauncher.quit=Esci @@ -38,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=Caricamento dello stato della rete torlauncher.bootstrapStatus.loading_keys=Caricamento dei certificati delle authority torlauncher.bootstrapStatus.requesting_descriptors=Richiesta di informazioni sui relay torlauncher.bootstrapStatus.loading_descriptors=Caricamento delle informazioni sui relay -torlauncher.bootstrapStatus.conn_or=Mi sto connettendo alla rete Tor +torlauncher.bootstrapStatus.conn_or=Connessione in corso alla rete Tor torlauncher.bootstrapStatus.handshake_or=Sto creando un circuito Tor torlauncher.bootstrapStatus.done=Connesso alla rete Tor! diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index d12b19f..b7ea058 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -2,27 +2,29 @@  -<!ENTITY torsettings.prompt "Tor Browser BundleがTorネットワークへ接続を試みる前に、このコンピュータのインターネット接続についての情報を提供する必要があります。"> +<!ENTITY torsettings.prompt "Tor ネットワークに接続する前に、このコンピューターのインターネット接続についての情報を提供して頂く必要があります。"> <!ENTITY torSettings.yes "はい"> <!ENTITY torSettings.no "いいえ"> <!ENTITY torSettings.firstQuestion "以下のうちあなたの状態に最も適しているのはどれですか？"> <!ENTITY torSettings.configurePrompt1 "このコンピュータのインターネット接続は検閲されているか、フィルターされているか、プロキシを通します。"> -<!ENTITY torSettings.configurePrompt2 "ネットワーク設定を構成する必要があります。"> +<!ENTITY torSettings.configurePrompt2 "ブリッジやファイアーウォール、プロキシの設定を構成する必要があります。"> <!ENTITY torSettings.configure "構成"> -<!ENTITY torSettings.connectPrompt2 "Torネットワークへ直接接続したいです。"> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt2 "Torネットワークへ直接接続します。"> +<!ENTITY torSettings.connectPrompt3 "これはほとんどの状況で動作します。"> <!ENTITY torSettings.connect "接続"> -<!ENTITY torSettings.proxyQuestion "このコンピューターはインターネットにアクセスするのにProxyが必要ですか？"> +<!ENTITY torSettings.proxyQuestion "このコンピューターはインターネットにアクセスするのにプロキシが必要ですか？">  <!ENTITY torSettings.proxyHelp "この質問にどう答えるべきか確信が持てなければ、Proxyの使用がどのように設定されているか確認するために、他のブラウザのインターネット設定を見てください。"> <!ENTITY torSettings.enterProxy "Proxy設定を入力"> <!ENTITY torSettings.firewallQuestion "このコンピュータのインターネット接続は特定のポートへの接続のみ許可するファイアーウォールを通しますか？"> <!ENTITY torSettings.firewallHelp "この質問にどう答えるべきか確信が持てなければ、いいえを選択してください。 Torネットワークへ接続する時に問題に遭遇したなら、この設定を変更してください。"> <!ENTITY torSettings.enterFirewall "ファイアーウォールによって許可されているポートのコンマ区切りのリストを入力してください。"> -<!ENTITY torSettings.bridgeQuestion "このコンピュータのインターネット接続が検閲されていれば、ブリッジリレーの入手と使用が必要になります。&#160; そうでなければ、接続をクリックするだけで結構です。"> +<!ENTITY torSettings.bridgeQuestion "あなたのインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックしているか、あるいは別のやり方で検閲していますか？"> +<!ENTITY torSettings.bridgeHelp "この質問にどう答えるべきかよくわからない場合は、いいえを選択してください。&#160; はいを選択すると、Tor ネットワークへの接続をブロックすることをさらに困難にするリスト化されていないリレーである Tor Bridges を構成することが求められます。"> +<!ENTITY torSettings.bridgeSettingsPrompt "提供されたブリッジのセットを使用するか、あるいはカスタムのブリッジのセットを取得して入力することができます。">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。"> <!ENTITY torsettings.firewall.allowedPorts "許可されたポート:"> <!ENTITY torsettings.useBridges.checkbox "私のインターネットサービスプロバイダ(ISP)はTorネットワークへの接続をブロックします"> +<!ENTITY torsettings.useBridges.default "提供されたブリッジで接続"> +<!ENTITY torsettings.useBridges.type "トランスポートタイプ:"> +<!ENTITY torsettings.useBridges.custom "カスタムブリッジを入力"> <!ENTITY torsettings.useBridges.label "1つ以上のブリッジリレーを入力してください(行あたり1つ)。"> -<!ENTITY torsettings.useBridges.placeholder "アドレス:ポートまたはトランスポートアドレス:ポート"> +<!ENTITY torsettings.useBridges.placeholder "アドレス:ポートを入力"> <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> -<!ENTITY torsettings.bridgeHelp1 "Torネットワークに接続できない場合、あなたのインターネットサービスプロバイダ(ISP)か別の代理店がTorをブロックしている可能性があります。&#160; ブロックすることをより困難にする隠しリレーであるTorブリッジを使用することで、しばしばこの問題を回避出来ます。"> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "いくつかブリッジリレーを入手するには、ウェブブラウザーを使用し、以下のページに行ってください: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "パブリックなブリッジアドレスを見つけるもう一つの方法は、本文に<b>get bridges</b>と記入したE-mailを bridges(a)torproject.org 宛に送信することです。&#160; しかし、アタッカーがたくさんのブリッジアドレスを収集するのを困難にするため、あなたは、gmail.comかyahoo.comのドメインのいずれかからこのリクエストを送らなければなりません。"> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "help@rt.torproject.org宛にメールを送信することでもブリッジリレーを要求できます。"> +<!ENTITY torsettings.bridgeHelp1 "Tor ネットワークに接続できないなら、あなたのインターネットサービスプロバイダー(ISP)や別の機関が Tor をブロックしている可能性があります。&#160; ブロックが比較的困難なリストされていないリレーである Tor ブリッジを使用することでこの問題を回避できることもあります。"> +<!ENTITY torsettings.bridgeHelp1B "事前設定された提供されたブリッジアドレスのセットを使用するか、あるいは以下の3つの方法のいずれかを用いてカスタムのアドレスのセットを取得することができます。"> +<!ENTITY torsettings.bridgeHelp2Heading "ウェブ経由"> +<!ENTITY torsettings.bridgeHelp2 "ウェブを使用して、https://bridges.torproject.orgを開く"> +<!ENTITY torsettings.bridgeHelp3Heading "メール自動応答システム経由"> +<!ENTITY torsettings.bridgeHelp3 "メッセージの本文に 'get bridges' という行を付けて bridges(a)torproject.org にメールを送信する。.&#160;ただし、攻撃者が多くのブリッジアドレスを把握するのを困難にするために、 gmail.com または yahoo.com のメールアドレスからこのリクエストを送信する必要があります。"> +<!ENTITY torsettings.bridgeHelp4Heading "ヘルプデスク経由"> +<!ENTITY torsettings.bridgeHelp4 "最後の頼みの綱として、 help(a)rt.torproject.org に丁寧なメールメッセージを送信して、ブリッジアドレスをリクエストすることができます。&#160; 人間が各リクエストに対応する必要があることにご注意ください。"> diff --git a/src/chrome/locale/ja/progress.dtd b/src/chrome/locale/ja/progress.dtd index 883f748..9d03c6b 100644 --- a/src/chrome/locale/ja/progress.dtd +++ b/src/chrome/locale/ja/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Torの状態"> <!ENTITY torprogress.openSettings "設定を開く"> <!ENTITY torprogress.heading "Torネットワークに接続しています"> -<!ENTITY torprogress.pleaseWait "Tor BrowserはTorのネットワーク接続が確立された後に開きます。"> +<!ENTITY torprogress.pleaseWait "Tor ネットワークへの接続を確立するまでの間お待ちください。"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index 80769e1..3ab1b23 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=Torは予期せず終了しました。 torlauncher.please_restart_app=このアプリケーションを再起動してください。 torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 torlauncher.tor_failed_to_start=Torは開始出来ませんでした。 -torlauncher.tor_bootstrap_failed=TorはTorネットワーク接続の確立に失敗しました。 -torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S). +torlauncher.tor_control_failed=Tor の制御に失敗しました。 +torlauncher.tor_bootstrap_failed=Tor は Tor ネットワーク接続の確立に失敗しました。 +torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Torが起動しているかご確認くださ torlauncher.error_proxy_addr_missing=インターネットのアクセスにプロキシを使用するには Tor の構成へ IP アドレスまたはホスト名とポート番号を両方指定する必要があります。 torlauncher.error_proxy_type_missing=プロキシの種類を選択する必要があります。 torlauncher.error_bridges_missing=一つ以上のブリッジを記述する必要があります。 +torlauncher.error_default_bridges_type_missing=提供されたブリッジ用のトランスポートタイプを選択する必要があります。 +torlauncher.error_bridge_bad_default_type=トランスポートタイプ %S がある提供されたブリッジに利用できるものがありません。設定を調整してください。 + +torlauncher.recommended_bridge=(推奨) torlauncher.connect=接続 torlauncher.quit=終了 @@ -31,21 +36,21 @@ torlauncher.done=完了 torlauncher.forAssistance=サポートについては、%Sにお問い合わせください -torlauncher.bootstrapStatus.conn_dir=リレーディレクトリへ接続 -torlauncher.bootstrapStatus.handshake_dir=暗号化されたディレクトリとの接続を確立 +torlauncher.bootstrapStatus.conn_dir=リレーディレクトリへ接続中 +torlauncher.bootstrapStatus.handshake_dir=暗号化されたディレクトリとの接続を確立中 torlauncher.bootstrapStatus.requesting_status=ネットワークを検索中 torlauncher.bootstrapStatus.loading_status=ネットワークを読込中 torlauncher.bootstrapStatus.loading_keys=認証局の署名を読込中 torlauncher.bootstrapStatus.requesting_descriptors=リレー情報を要求中 torlauncher.bootstrapStatus.loading_descriptors=リレー情報を読込中 -torlauncher.bootstrapStatus.conn_or=Torネットワックに接続しています +torlauncher.bootstrapStatus.conn_or=Torネットワークに接続しています torlauncher.bootstrapStatus.handshake_or=Tor回線を設置しています torlauncher.bootstrapStatus.done=Torネットワークに接続しました! torlauncher.bootstrapWarning.done=完了 torlauncher.bootstrapWarning.connectrefused=接続に失敗 torlauncher.bootstrapWarning.misc=その他 -torlauncher.bootstrapWarning.resourcelimit=資源不足 +torlauncher.bootstrapWarning.resourcelimit=リソース不足 torlauncher.bootstrapWarning.identity=識別子の不一致 torlauncher.bootstrapWarning.timeout=接続タイムアウト torlauncher.bootstrapWarning.noroute=ホストへの経路が見つかりません diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 8091319..0fc76e1 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -1,59 +1,64 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Tor 네트워크 설정">  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "예"> -<!ENTITY torSettings.no "아니도"> +<!ENTITY torSettings.no "아니오"> -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connectPrompt3 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configure "구성"> +<!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> +<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connect "연결"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "이 컴퓨터는 인터넷에 접속하는 데 프록시가 필요한가요?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "이 질문에 어떻게 대답해야 할지 확신이 서지 않으면 프록시의 사용이 어떻게 설정되어 있는지 확인하기 위해 다른 브라우저의 인터넷 설정을 보세요."> +<!ENTITY torSettings.enterProxy "프록시 설정에 들어갑니다."> +<!ENTITY torSettings.firewallQuestion "이 컴퓨터의 인터넷 연결은 방화벽을 통해서 특정 포트 접속만 허가합니까?"> +<!ENTITY torSettings.firewallHelp "이 질문에 어떻게 대답해야 할지 확신이 서지 않으면 아니오를 선택하세요. Tor 네트워크에 접속할 때 문제를 만났다면 이 설정을 변경해 주세요."> +<!ENTITY torSettings.enterFirewall "방화벽에 따라 허가되고 있는 포트 목록 입력해 주세요. 포트 번호는 콤마로 구분됩니다."> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  -<!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart "프로그램 다시 시작"> +<!ENTITY torsettings.startingTor "Tor 시작 대기 중..."> +<!ENTITY torsettings.restart "다시 시작"> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "선택"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "이 컴퓨터는 인터넷 접속에 프록시를 사용해야 합니다."> +<!ENTITY torsettings.useProxy.type "프록시 종류:"> <!ENTITY torsettings.useProxy.address "주소:"> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.address.placeholder "IP 주소 또는 호스트 네임"> <!ENTITY torsettings.useProxy.port "포트:"> <!ENTITY torsettings.useProxy.username "사용자명:"> <!ENTITY torsettings.useProxy.password "암호:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 통과하는 방화벽을 지나 연결됩니다."> <!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.useBridges.checkbox "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단합니다."> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> + +<!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기"> +<!ENTITY torsettings.bridgeHelpTitle "브릿지 중계 서버 도움말"> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/ko/progress.dtd b/src/chrome/locale/ko/progress.dtd index 4a26621..dabaa61 100644 --- a/src/chrome/locale/ko/progress.dtd +++ b/src/chrome/locale/ko/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 상태"> -<!ENTITY torprogress.openSettings ""> +<!ENTITY torprogress.openSettings "시작 설정"> <!ENTITY torprogress.heading "Tor 네트워크에 연결중"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 74aff03..3e3771f 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -1,35 +1,40 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher - -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S). - -# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -# torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. -# torlauncher.datadir_missing=The Tor data directory does not exist. -# torlauncher.password_hash_missing=Failed to get hashed password. - -# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.error_title=Tor 브라우저 Launcher + +torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. +torlauncher.please_restart_app=이 응용프로그램을 다시 시작해 주세요. +torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다. +torlauncher.tor_failed_to_start=Tor 시작 실패. +torlauncher.tor_control_failed=Tor 제어에 실패했습니다. +torlauncher.tor_bootstrap_failed=Tor 네트워크 연결 설정 실패 +torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S) + +torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S +torlauncher.tor_missing=Tor 실행 파일이 없습니다. +torlauncher.torrc_missing=torrc 파일이 없습니다. +torlauncher.datadir_missing=Tor 데이터 목록이 존재하지 않습니다. +torlauncher.password_hash_missing=해쉬 암호 획득 실패 + +torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S +torlauncher.failed_to_save_settings=Tor 설정을 저장할 수 없습니다.\n\n%S +torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시오. torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다. +# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. + +torlauncher.recommended_bridge=(권장함) -# torlauncher.connect=Connect +torlauncher.connect=연결 torlauncher.quit=끝내기 torlauncher.quit_win=종료 torlauncher.done=완료 -# torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=지원자 연결 %S torlauncher.bootstrapStatus.conn_dir=중계서버 디렉토리에 연결 torlauncher.bootstrapStatus.handshake_dir=암호화된 디렉터리 연결을 설정 diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 23caff2..8d04d0a 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Vooraleer het Tor Browser Pakket probeert om een verbinding met het Tor netwerk te maken, moet je informatie over de internetverbinding van deze computer opgeven."> +<!ENTITY torsettings.prompt "Voordat je verbind met het Tor Netwerk, moet je eerst wat meer informatie geven over deze computers internet connectie."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nee"> <!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?"> <!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer wordt gecensureerd, gefilterd of geproxyed."> -<!ENTITY torSettings.configurePrompt2 "Ik moet netwerkinstellingen configureren."> +<!ENTITY torSettings.configurePrompt2 "Ik moet bridge, firewall, of proxy instellingen wijzigen."> <!ENTITY torSettings.configure "Configureer"> <!ENTITY torSettings.connectPrompt2 "Ik zou graag rechtstreeks met het Tor netwerk verbinden."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "Dit zal in de meeste omstandigheden werken"> <!ENTITY torSettings.connect "Verbind"> <!ENTITY torSettings.proxyQuestion "Heeft deze computer een proxy nodig om met het internet te verbinden?"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "Loopt de internetverbinding van deze computer door een firewall die enkel toegang tot bepaalde poorten toestaat?"> <!ENTITY torSettings.firewallHelp "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee. Als je op problemen botst tijdens het verbinden met het Tor netwerk, verander dan deze instelling."> <!ENTITY torSettings.enterFirewall "Voer de poorten in die toegestaan zijn door de firewall, gescheiden door komma's."> -<!ENTITY torSettings.bridgeQuestion "Als de internetverbinding van deze computer gecensureerd wordt, zal je bridge relays &#160; moeten verkrijgen en gebruiken. Als dit niet het geval is, klik op Verbind."> +<!ENTITY torSettings.bridgeQuestion "Doet je Internet Service Provider (ISP) het Tor netwerk verbieden of filteren?"> +<!ENTITY torSettings.bridgeHelp "Als je niet zeker weet hoe je deze vraag moet beantwoorden, kies dan Nee.&#160; Als je Ja kiest, moet je Tor bridges instellen, die doordat ze geen bekende relays zijn het dus moeilijker maken om verbinding te maken met het Tor Netwerk. "> +<!ENTITY torSettings.bridgeSettingsPrompt "Je kunt de ingegeven bridges gebruiken, of je kunt een eigen bridge instellen. ">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die enkel verbindingen tot bepaalde poorten toestaat."> <!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:"> <!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor netwerk"> +<!ENTITY torsettings.useBridges.default "Verbind met ingestelde bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Eigen bridge instellingen"> <!ENTITY torsettings.useBridges.label "Voer een of meer bridge relays in (een per regel)"> -<!ENTITY torsettings.useBridges.placeholder "adres:poort OF transport adres:poort"> +<!ENTITY torsettings.useBridges.placeholder "type adres:poortnummer"> <!ENTITY torsettings.copyLog "Kopieer Tor log naar het klembord"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Hulp"> -<!ENTITY torsettings.bridgeHelp1 "Als je niet kan verbinden met het Tor netwerk, dan is het mogelijk dat je Internet Service Provider (ISP) of en ander agentschap Tor &#160; blokkeert. Vaak kan je dit probleem omzeilen door gebruik te maken van Tor Bridges. Dit zijn verborgen relays die moeilijker te blokkeren zijn."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "Om enkele bridge relays te verkrijgen gebruik je een web browser om de volgende pagina te bezoeken: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Een andere manier om openbare bridge addressen te verkrijgen is door e-mail te sturen naar bridges(a)torproject.org met de woorden 'get bridges' als losstaande tekst in het berichtgedeelte van de e-mail. &#160; Echter: om het moelijker te maken voor een aanvaller om veel bridge adressen te verkrijgen, moet je deze e-mail versturen vanaf een e-mailadres uit één van de volgende domeinen: gmail.com of yahoo.com."> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "Je kan ook bridge relays opvragen door een e-mail te sturen naar help(a)rt.torproject.org."> +<!ENTITY torsettings.bridgeHelp1 "Indien u geen verbinding kan maken met het Tor netwerk, zou het kunnen dat uw Internet Service Provider (ISP) of dergelijke Tor blokkeert.&#160; Vaak kan u dit voorkomen door gebruikt te maken van Tor Bridges, dit zijn ongeregistreerde routers die moeilijker te blokkeren zijn."> +<!ENTITY torsettings.bridgeHelp1B "Je kan de voor geconfigureerde bridge adres instellingen gebruiken, of je kan hier zelf een eigen adres instellen met 1 van de volgende 3 methodes: "> +<!ENTITY torsettings.bridgeHelp2Heading "Door middel van het Web"> +<!ENTITY torsettings.bridgeHelp2 "Gebruik een browser om https://bridges.torproject.org te bezoeken"> +<!ENTITY torsettings.bridgeHelp3Heading "Door middel van de E-mail Autoresponder"> +<!ENTITY torsettings.bridgeHelp3 "Zend een e-mail naar bridges(a)torproject.org met als inhoud van de mail de tekst 'get bridges'.&#160; Let wel, om het aanvallers te bemoeilijken informatie te krijgen over bridge adressen, dient u uw aanvraag te versturen van een gmail.com of yahoo.com e-mailadres."> +<!ENTITY torsettings.bridgeHelp4Heading "Door middel van de helpdesk"> +<!ENTITY torsettings.bridgeHelp4 "Als laatste redmiddel, kan u bridge adressen aanvraag door een zeer vriendelijke e-mail te sturen naar help(a)rt.torproject.org.&#160; Houd er wel rekening mee dat deze persoon elke aanvraag moet behandelen."> diff --git a/src/chrome/locale/nl/progress.dtd b/src/chrome/locale/nl/progress.dtd index c46a5f2..89b7b7c 100644 --- a/src/chrome/locale/nl/progress.dtd +++ b/src/chrome/locale/nl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor status"> <!ENTITY torprogress.openSettings "Open Instellingen"> <!ENTITY torprogress.heading "Bezig met verbinden met het Tor-netwerk"> -<!ENTITY torprogress.pleaseWait "De Tor Browser zal geopend worden zodra een verbinding met het Tor-netwerk gemaakt is."> +<!ENTITY torprogress.pleaseWait "Wacht alstublieft terwijl we een verbinding met het Tor-netwerk tot stand brengen."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index c436126..39fd76a 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor is onverwacht afgesloten. torlauncher.please_restart_app=Herstart deze applicatie alstublieft. torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort. torlauncher.tor_failed_to_start=Tor kon niet starten. -torlauncher.tor_bootstrap_failed=Tor slaagde er niet in een verbinding met het Tor netwerk te maken. -torlauncher.tor_bootstrap_failed_details=%1$S mislukt (%2$S). +torlauncher.tor_control_failed=Controle over Tor mislukt. +torlauncher.tor_bootstrap_failed=Tor kon geen Tor netwerkverbinding maken +torlauncher.tor_bootstrap_failed_details=%1$S mislukte (%2$S). torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S torlauncher.tor_missing=Het Tor uitvoerbare bestand ontbreekt. @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Controleer dat Tor actief is alstublieft. torlauncher.error_proxy_addr_missing=Je moet zowel een IP-adres of hostnaam en een poortnummer invoeren om Tor te configureren om een proxy te gebruiken om toegang te krijgen tot het internet. torlauncher.error_proxy_type_missing=Je moet het proxy-type kiezen. torlauncher.error_bridges_missing=Je moet één of meerdere bridges opgeven. +torlauncher.error_default_bridges_type_missing=U dient een transport-type te selecteren voor de verstrekte bridges. +torlauncher.error_bridge_bad_default_type=Géén van de verstrekte bridges met het transport-type %S zijn beschikbaar. Pas aub uw instellingen aan. + +torlauncher.recommended_bridge=(aanbevolen) torlauncher.connect=Verbind torlauncher.quit=Stop @@ -38,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=Laden van de netwerkstatus torlauncher.bootstrapStatus.loading_keys=Laden van de authoriteitcertificaten torlauncher.bootstrapStatus.requesting_descriptors=Opvragen van verbindingsinformatie torlauncher.bootstrapStatus.loading_descriptors=Laden van verbindingsinformatie -torlauncher.bootstrapStatus.conn_or=Verbinden met het Tor-netwerk +torlauncher.bootstrapStatus.conn_or=Bezig met verbinden met het Tor-netwerk torlauncher.bootstrapStatus.handshake_or=Maken van een Tor circuit torlauncher.bootstrapStatus.done=Verbonden met het Tor-netwerk! diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index f18352a..149647e 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Przed połączeniem z siecią Tor musisz podać informacje o połączeniu internetowym tego komputera."> +<!ENTITY torsettings.prompt "Zanim podłączysz się do sieci Tor, uzupełnij informacje o parametrach połączenia tego komputera z internetem."> <!ENTITY torSettings.yes "Tak"> <!ENTITY torSettings.no "Nie"> <!ENTITY torSettings.firstQuestion "Które z poniższych najlepiej opisuje Twoją sytuację?"> <!ENTITY torSettings.configurePrompt1 "Połączenie tego komputera jest cenzurowane, filtrowane lub przekierowywane."> -<!ENTITY torSettings.configurePrompt2 "Potrzebuję dostosować ustawienia sieci."> +<!ENTITY torSettings.configurePrompt2 "Muszę skonfigurować most, firewall lub ustawienia serwera proxy."> <!ENTITY torSettings.configure "Konfiguruj"> <!ENTITY torSettings.connectPrompt2 "Chcę połączyć się bezpośrednio z siecią Tor."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "To zadziała w większości sytuacji."> <!ENTITY torSettings.connect "Połącz"> <!ENTITY torSettings.proxyQuestion "Czy ten komputer potrzebuje proxy w celu połączenia się z Internetem?"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "Czy połączenie internetowe Twojego komputera pozwala przejść przez zaporę sieciową w celu nawiązania połączenia z ustalonymi portami?"> <!ENTITY torSettings.firewallHelp "Jeśli nie jesteś pewien jak odpowiedzieć na to pytanie, wybierz Nie. W przypadku wystąpienia problemów z połączeniem, zmień tą opcję."> <!ENTITY torSettings.enterFirewall "Wprowadź listę portów dozwolonych przez zaporę (kolejne porty oddzielaj przecinkiem)."> -<!ENTITY torSettings.bridgeQuestion "Jeśli połączenie internetowe tego komputera jest cenzurowane, wymagane będzie wykorzystanie przekaźników mostkowych.&#160; Jeśli nie, wybierz Połącz."> +<!ENTITY torSettings.bridgeQuestion "Czy Twój dostawca usług internetowych (ISP) blokuje lub ocenzurowuje połączenia sieci Tor?"> +<!ENTITY torSettings.bridgeHelp "Jeśli nie jesteś pewny odpowiedzi na to pytanie proszę wybrać odpowiedź Nie.&#160; Jeśli wybierzesz Tak, to będziesz poproszony o skonfigurowanie mostków Tora, które nie są publicznie wymienione, dzięki czemu będzie trudniej zablokować połączenia do sieci Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Możesz wybrać dostępny zestaw mostków, albo możesz uzyskać i wprowadzić niestandardowy zestaw mostów.">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami"> <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:"> <!ENTITY torsettings.useBridges.checkbox "Mój dostawca internetu blokuje połączenia do sieci Tor"> +<!ENTITY torsettings.useBridges.default "Połącz z dostępnymi mostami."> +<!ENTITY torsettings.useBridges.type "Typ Transportu:"> +<!ENTITY torsettings.useBridges.custom "Wprowadź własne mosty"> <!ENTITY torsettings.useBridges.label "Dodaj jeden lub więcej przekaźników mostowych (jeden w każdej linijce)"> -<!ENTITY torsettings.useBridges.placeholder "adres:port ALBO transport adres:port"> +<!ENTITY torsettings.useBridges.placeholder "wpisz adres:port"> <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> -<!ENTITY torsettings.bridgeHelp1 "Jeśli nie możesz połączyć się z siecią Tor możliwe jest, że Twój dostawca internetu (ISP) blokuje Ci ten dostęp&#160. Częstym rozwiązaniem jest użycie mostków Tora, w których ukryte są przekaźniki trudne do wykrycia."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "W celu uzyskania przekaźników mostkowych skorzystać ze strony https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Inną drogą do znalezienia publicznych mostków jest wysłanie e-maila do bridges(a)torproject.org z poleceniem 'get bridges' w tytule wiadomości.&#160; Jednakże, by utrudnić atakującym dostęp do wiedzy o mostkach musisz wysłać zapytanie z adresu o domenach: gmail.com lub yahoo.com."> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "Możesz zgłosić mostki wysyłając e-maila do help(a)rt.torproject.org."> +<!ENTITY torsettings.bridgeHelp1 "Jeśli nie jesteś w stanie połączyć się z siecią Tor, może to oznaczać, że Twój Dostawca Usług Internetowych (ISP) lub inna agencja blokuje dostęp do sieci Tor.&#160; Często można obejść ten problem używając Mostów Tor, które są nienotowanymi przekaźnikami, dzięki czemu trudniej je zablokować."> +<!ENTITY torsettings.bridgeHelp1B "Możesz użyć wstępnie skonfigurowany, domyślny zestaw adresów mostów lub możesz uzyskać własny zestaw adresów za pomocą jednej z tych trzech metod:"> +<!ENTITY torsettings.bridgeHelp2Heading "Za pośrednictwem sieci Web"> +<!ENTITY torsettings.bridgeHelp2 "Użyj przeglądarki internetowej do odwiedzenia https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3 "Wyślij e-mail do bridges(a)torproject.org z linią "get bridges" w treści wiadomości.&#160; Aby jednak, utrudnić napastnikom naukę o adresach mostów, należy wysłać prośbę z adresu email gmail.com lub yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Przez Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "W ostateczności, można zażądać adresów mostów, wysyłając uprzejmą wiadomość e-mail do help(a)rt.torproject.org.&#160; Należy pamiętać, że osoba będzie musiała odpowiedzieć na każde żądanie."> diff --git a/src/chrome/locale/pl/progress.dtd b/src/chrome/locale/pl/progress.dtd index d7d1ccc..f8d75cc 100644 --- a/src/chrome/locale/pl/progress.dtd +++ b/src/chrome/locale/pl/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status sieci Tor"> <!ENTITY torprogress.openSettings "Ustawienia"> <!ENTITY torprogress.heading "Łączenie z siecią Tor"> -<!ENTITY torprogress.pleaseWait "Przeglądarka Tor uruchomi się po zestawieniu połączenia z siecią Tor"> +<!ENTITY torprogress.pleaseWait "Poczekaj chwilę, aż ustanowimy połączenie z siecią Tor."> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 8a9482b..847d994 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor wyłączył się niespodziewanie. torlauncher.please_restart_app=Proszę zrestartuj tą aplikację. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. -torlauncher.tor_bootstrap_failed=Błąd w ustanowieniu połączenia przez Tora. -torlauncher.tor_bootstrap_failed_details=%1$S nie powiodło się (%2$S). +torlauncher.tor_control_failed=Nie udało się przejąć kontroli nad Tor'em. +torlauncher.tor_bootstrap_failed=Błąd Tor, nie udało się nawiązać połączenia z siecią Tora. +torlauncher.tor_bootstrap_failed_details=%1$S błąd (%2$S). torlauncher.unable_to_start_tor=Nie można wystartować aplikacji Tor.\n\n%S torlauncher.tor_missing=Brakuje pliku wykonywalnego Tora. @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Proszę upewnić się, czy Tor jest włączony torlauncher.error_proxy_addr_missing=Musisz określić adres IP lub nazwę hosta oraz numer portu, aby Tor mógł używać serwera proxy w dostępie do Internetu. torlauncher.error_proxy_type_missing=Musisz wybrać typ proxy. torlauncher.error_bridges_missing=Musisz podać jeden lub więcej mostów. (bridges) +torlauncher.error_default_bridges_type_missing=Musisz wybrać rodzaj transportu dla dostępnych mostów. +torlauncher.error_bridge_bad_default_type=Brak dostępnych mostków, które mają typ transportu %S. Proszę zmienić swoje ustawienia. + +torlauncher.recommended_bridge=(zalecane) torlauncher.connect=Połącz torlauncher.quit=Wyjście @@ -38,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=Wczytywanie stanu sieci torlauncher.bootstrapStatus.loading_keys=Wczytywanie certyfikatów torlauncher.bootstrapStatus.requesting_descriptors=Żądanie informacji o węźle torlauncher.bootstrapStatus.loading_descriptors=Wczytywanie informacji o węźle -torlauncher.bootstrapStatus.conn_or=Podłączanie do sieci Tor +torlauncher.bootstrapStatus.conn_or=Łączenie z siecią Tor torlauncher.bootstrapStatus.handshake_or=Ustanawianie ścieżki Tora torlauncher.bootstrapStatus.done=Połączony z siecią Tor! diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index e998fb1..9c5b2f1 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Antes que o Tor Browser Bundle tente ligar-se à rede Tor, é necessário fornecer algumas informações sobre a ligação à Internet deste computador."> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Sim"> <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Qual das seguintes frases melhor descreve a sua situação?"> <!ENTITY torSettings.configurePrompt1 "A ligação à Internet deste computador está a ser censurada, filtrada ou utilizada através de um proxy."> -<!ENTITY torSettings.configurePrompt2 "Preciso de configuar definições de rede."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Gostaria de me ligar diretamente à rede Tor."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Ligar"> <!ENTITY torSettings.proxyQuestion "Este computador precisa de usar um proxy para aceder a Internet?"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "A ligação à Internet deste computador atravessa um firewall que só permite algumas ligações a certas portas?"> <!ENTITY torSettings.firewallHelp "Se não tem a certeza de como responder esta questão, escolha Não. Se encontrar quaisquer problemas ao ligar-se á rede Tor, mude esta definição."> <!ENTITY torSettings.enterFirewall "Introduza uma lista de portas separada por vírgulas que são permitidas pela firewall."> -<!ENTITY torSettings.bridgeQuestion "Se a ligação à internet deste computador está a ser censurada, precisará de obter e usar bridge relays.&#160; Se não, clique apenas Ligar."> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Este computador está protegido por um firewall que permite apenas algumas ligações a algumas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "O meu Internet Service Provider (ISP) bloqueia ligações à rede Tor"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Introduza um ou mais relays bridge (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OU transport address:port"> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Copiar o Tor Log para o Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Bridge Relay"> -<!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, o seu Internet Service Provider (ISP) ou outra agência está a bloquear o Tor.&#160; Muito frequentemente poderá contornar este problema usando Bridges Tor que são relays escondidos mais difíceis de bloquear."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "Para obter alguns bridge relays, utilize um navegador web para visitar a seguinte página: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Outra forma de encontrar enderençoes de bridges públicos é enviar um e-mail para bridges(a)torproject.org com "get bridges" no corpo da mensagem.&#160; Contudo, para tornar mais difícil para um atacante descobrir muito sobre endereções bridge, deve enviar este pedido a partir de um endereço de e-mail de um dos seguintes domínios: gmail.com ou yahoo.com."> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "Também pode pedir bridge relays enviando um e-mail para help(a)rt.torproject.org."> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd index 92136c4..473438c 100644 --- a/src/chrome/locale/pt/progress.dtd +++ b/src/chrome/locale/pt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações"> -<!ENTITY torprogress.heading "Conectando à rede Tor"> -<!ENTITY torprogress.pleaseWait "O Navegador Tor vai abrir-se assim que se estabeleça uma ligação à rede Tor."> +<!ENTITY torprogress.heading "A conetar à rede Tor"> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor"> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 13008d4..08961b1 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -4,49 +4,54 @@ torlauncher.error_title=Iniciador Tor torlauncher.tor_exited=O Tor fechou-se insperadamente. -torlauncher.please_restart_app=Por favor reinicie a aplicação. -torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. +torlauncher.please_restart_app=Por favor, reinicie a aplicação. +torlauncher.tor_controlconn_failed=Não foi possível ligar ao porto de controlo do Tor. torlauncher.tor_failed_to_start=O Tor falhou a inicialização. -torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor. -torlauncher.tor_bootstrap_failed_details=%1$S Falhou (%2$S). +torlauncher.tor_control_failed=Falha ao tentar controlar o Tor +torlauncher.tor_bootstrap_failed=O Tor falhou ao estabelecer uma ligação de rede Tor. +torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). -torlauncher.unable_to_start_tor=Impossível inicializar o Tor.\n\n %S +torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. -torlauncher.torrc_missing=O ficheiro está em falta. -torlauncher.datadir_missing=A diretoria de dados do Tor não existe. -torlauncher.password_hash_missing=Falhou +torlauncher.torrc_missing=O ficheiro torrc está em falta. +torlauncher.datadir_missing=A pasta dos dados do Tor não existe. +torlauncher.password_hash_missing=Não foi possível obter a senha "hashed". -torlauncher.failed_to_get_settings=Incapaz de aceder as definições do Tor\n\n %S -torlauncher.failed_to_save_settings=Incapaz de gavar as definições do Tor\n\n %S -torlauncher.ensure_tor_is_running=Por favor confirme que o Tor está a correr. +torlauncher.failed_to_get_settings=Não é possível obter as definições do Tor\n\n %S +torlauncher.failed_to_save_settings=Não é possível guardar as definições do Tor\n\n %S +torlauncher.ensure_tor_is_running=Por favor, verifique se o Tor está em execução. -torlauncher.error_proxy_addr_missing=Deve especificar tanto um endereço IP ou nome do hospedeiro como um número de porta, para configurar o Tor para utilizar um proxy para aceder à Internet. -torlauncher.error_proxy_type_missing=Tem de seleccionar o tipo de proxy +torlauncher.error_proxy_addr_missing=Deve especificar tanto um endereço IP ou nome do hospedeiro como um número de porto, para configurar o Tor para utilizar um proxy para aceder à Internet. +torlauncher.error_proxy_type_missing=Deve selecionar o tipo de proxy. torlauncher.error_bridges_missing=Deve especificar uma ou mais pontes. +torlauncher.error_default_bridges_type_missing=Deve selecionar o tipo de transporte para as pontes fornecidas +torlauncher.error_bridge_bad_default_type=Não há pontes disponíveis que tenham o tipo de transport %S. Por favor ajuste as configurações. + +torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Ligar torlauncher.quit=Sair torlauncher.quit_win=Sair torlauncher.done=Completo -torlauncher.forAssistance=Para assistência contacte %S +torlauncher.forAssistance=Para assistência, contacte %S -torlauncher.bootstrapStatus.conn_dir=Conectando-se a uma pasta do retransmissor -torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de pasta criptografada -torlauncher.bootstrapStatus.requesting_status=A recuperar o estado da rede +torlauncher.bootstrapStatus.conn_dir=A ligar ao diretório do retransmissor +torlauncher.bootstrapStatus.handshake_dir=A estabelecer uma ligação de diretório encriptada +torlauncher.bootstrapStatus.requesting_status=A obter o estado da rede torlauncher.bootstrapStatus.loading_status=A carregar o estado da rede -torlauncher.bootstrapStatus.loading_keys=A carregar o certificados de autoridade -torlauncher.bootstrapStatus.requesting_descriptors=Pedindo informação do retransmissor -torlauncher.bootstrapStatus.loading_descriptors=Carregando informações do retransmissor -torlauncher.bootstrapStatus.conn_or=Conectando à rede Tor -torlauncher.bootstrapStatus.handshake_or=Estabelecendo um circuito Tor -torlauncher.bootstrapStatus.done=Conectado à rede Tor - -torlauncher.bootstrapWarning.done=Feito -torlauncher.bootstrapWarning.connectrefused=conexão recusada +torlauncher.bootstrapStatus.loading_keys=A carregar os certificados de autoridade +torlauncher.bootstrapStatus.requesting_descriptors=A pedir informação do retransmissor +torlauncher.bootstrapStatus.loading_descriptors=A carregar informações do retransmissor +torlauncher.bootstrapStatus.conn_or=A ligar à rede Tor +torlauncher.bootstrapStatus.handshake_or=A estabelecer um circuito Tor +torlauncher.bootstrapStatus.done=Ligado à rede Tor + +torlauncher.bootstrapWarning.done=finalizado +torlauncher.bootstrapWarning.connectrefused=ligação recusada torlauncher.bootstrapWarning.misc=diversos torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes -torlauncher.bootstrapWarning.identity=identidade incompatível +torlauncher.bootstrapWarning.identity=identidade não correspondente torlauncher.bootstrapWarning.timeout=Tempo de ligação expirado torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro torlauncher.bootstrapWarning.ioerror=Erro de leitura/escrita diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index c84d7de..e8edaf2 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Прежде чем пакет Tor Browser попытается соединиться с сетью Tor, вам нужно указать информацию об интернет-соединении этого компьютера"> +<!ENTITY torsettings.prompt "Прежде чем вы подключитесь к сети Tor, вам нужно указать информацию об интернет-соединении этого компьютера."> <!ENTITY torSettings.yes "Да"> <!ENTITY torSettings.no "Нет"> <!ENTITY torSettings.firstQuestion "Что лучше описывает вашу ситуацию?"> <!ENTITY torSettings.configurePrompt1 "Интернет-соединение этого компьютера цензурируется, фильтруется или находятся за прокси."> -<!ENTITY torSettings.configurePrompt2 "Мне нужно настроить сетевые параметры."> +<!ENTITY torSettings.configurePrompt2 "Мне требуется настроить мост, брандмауэр или прокси."> <!ENTITY torSettings.configure "Настроить"> <!ENTITY torSettings.connectPrompt2 "Я бы хотел соединиться с сетью Tor напрямую."> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "Это должно работать в большинстве ситуаций."> <!ENTITY torSettings.connect "Соединиться"> <!ENTITY torSettings.proxyQuestion "Этому компьютеру нужен прокси для доступа в Интернет?"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "Защищено ли соединение брандмауэром, разрешающим связь только через некоторые порты?"> <!ENTITY torSettings.firewallHelp "Если вы не уверены как отвечать, выберите нет. Если возникнут проблемы соединения с сетью Tor, измените эту настройку."> <!ENTITY torSettings.enterFirewall "Введите список портов через запятую, которые брандмауэр не блокирует."> -<!ENTITY torSettings.bridgeQuestion "Если интернет-соединение этого компьютера цензурируется, вам понадобится использовать ретрансляторы типа мост.&#160; Если нет, просто нажмите Соединение."> +<!ENTITY torSettings.bridgeQuestion "Ваш провайдер (ISP) блокирует или как-либо цензурирует подключения к сети Tor?"> +<!ENTITY torSettings.bridgeHelp "Если вы не знаете, как ответить на этот вопрос, выбирайте Нет.&#160; Если вы выберете Да, вас попросят настроить мосты Tor, которые являются неопубликованными маршрутизаторами, что затрудняет их блокировку."> +<!ENTITY torSettings.bridgeSettingsPrompt "Вы можете использовать предопределенный набор мостов или получить и ввести список мостов вручную.">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам"> <!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> <!ENTITY torsettings.useBridges.checkbox "Мой провайдер блокирует доступ к сети Tor"> +<!ENTITY torsettings.useBridges.default "Подключиться к предопределенным мостам"> +<!ENTITY torsettings.useBridges.type "Тип транспорта:"> +<!ENTITY torsettings.useBridges.custom "Ввести мосты вручную"> <!ENTITY torsettings.useBridges.label "Введите один или несколько ретрансляторов типа мост (один на строку)"> -<!ENTITY torsettings.useBridges.placeholder "address:port ИЛИ transport address:port"> +<!ENTITY torsettings.useBridges.placeholder "введите адрес:порт"> <!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена"> <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> -<!ENTITY torsettings.bridgeHelp1 "Если Tor по-прежнему не работает, вполне вероятно, что Ваш провайдер блокирует Tor. &#160; Очень часто это можно обойти с помощью Tor мостов - скрытых ретрансляторов, которые не так легко заблокировать."> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "Чтобы найти ретрансляторы типа мост отправляйтесь по адресу https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "Другой способ найти публичные адреса - послать письмо на адрес bridges(a)torproject.org со строкой get bridges в теле письма. В целях безопасности система принимает письма только с адресов gmail.com и yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "Вы также можете запросить список мостов отправив письмо на help(a)rt.torproject.org"> +<!ENTITY torsettings.bridgeHelp1 "Если вы не можете подключиться к сети Tor, возможно ваш провайдер (ISP) или иная организация блокирует Tor.&#160; Часто эту проблему можно обойти при помощи мостов Tor, не перечисленных в публичных списках, которые сложнее заблокировать."> +<!ENTITY torsettings.bridgeHelp1B "Вы можете использовать стандартный предопределенный набор мостов или получить и ввести список мостов вручную при помощи одного из этих трёх методов:"> +<!ENTITY torsettings.bridgeHelp2Heading "Из Веб"> +<!ENTITY torsettings.bridgeHelp2 "Откройте в веб-браузере https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Через автоответчик электронной почты"> +<!ENTITY torsettings.bridgeHelp3 "Отправьте письмо по адресу bridges(a)torproject.org со строкой 'get bridges' в теле сообщения.&#160; Однако чтобы усложнить сбор атакующими адресов всех мостов, от Вас требуется отправить запрос с адреса gmail.com или yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "В справочной службе"> +<!ENTITY torsettings.bridgeHelp4 "В крайнем случае, Вы можете вежливо попросить адреса мостов по адресу help(a)rt.torproject.org.&#160; Пожалуйста, имейте в виду, что каждый запрос обрабатывается человеком."> diff --git a/src/chrome/locale/ru/progress.dtd b/src/chrome/locale/ru/progress.dtd index 2ff1b90..47827da 100644 --- a/src/chrome/locale/ru/progress.dtd +++ b/src/chrome/locale/ru/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Статус Tor"> <!ENTITY torprogress.openSettings "Открыть Настройки"> <!ENTITY torprogress.heading "Подключение к сети Tor"> -<!ENTITY torprogress.pleaseWait "Браузер запустится после того как будет установлено сетевое соединение в сети Tor."> +<!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока будет установлено соединение с сетью Tor."> diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 20b9155..f9f81a7 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor неожиданно завершился. torlauncher.please_restart_app=Пожалуйста, перезапустите приложение torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. -torlauncher.tor_bootstrap_failed=Tor не сумел установить сетевое соединение. -torlauncher.tor_bootstrap_failed_details=%1$S не удалось (%2$S). +torlauncher.tor_control_failed=Не удалось взять контроль над Tor. +torlauncher.tor_bootstrap_failed=Тор не удалось установить подключение к сети Tor. +torlauncher.tor_bootstrap_failed_details=%1$S неудачно (%2$S). torlauncher.unable_to_start_tor=Невозможно запустить Tor.\n\n%S torlauncher.tor_missing=Исполняемый файл Tor отсутствует. @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Убедитесь что Tor запущен. torlauncher.error_proxy_addr_missing=Вы должны указать IP-адрес или имя хоста и порт, чтобы настроить Tor и использовать прокси для доступа в Интернет. torlauncher.error_proxy_type_missing=Необходимо выбрать тип прокси. torlauncher.error_bridges_missing=Необходимо задать один или несколько мостов. +torlauncher.error_default_bridges_type_missing=Вы должны выбрать тип транспорта предопределенных мостов. +torlauncher.error_bridge_bad_default_type=Предопределенные мосты не поддерживают тип транспорта %S. Пожалуйста, исправьте ваши настройки. + +torlauncher.recommended_bridge=(рекомендуемый) torlauncher.connect=Соединиться torlauncher.quit=Выйти diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 0a93939..985868c 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -1,24 +1,57 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.tor_bootstrap_failed_details=%1$S misslyckade (%2$S). +torlauncher.error_title=Tor Launcher -torlauncher.bootstrapStatus.conn_dir=Ansluter till en nodkatalog +torlauncher.tor_exited=Tor stängdes av oväntat. +torlauncher.please_restart_app=Var god starta om det här programmet. +torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. +torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades. +torlauncher.tor_control_failed=Misslyckades med att ta kontroll över Tor. +torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en anslutning till Tor-nätverket. +torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). + +torlauncher.unable_to_start_tor=Kan inte starta Tor.\n\n%S +torlauncher.tor_missing=Tors körbara programfil saknas. +torlauncher.torrc_missing=Filen torrc saknas. +torlauncher.datadir_missing=Tors data-katalog saknas. +torlauncher.password_hash_missing=Misslyckades med att hämta hashat lösenord. + +torlauncher.failed_to_get_settings=Kunde inte läsa in inställningar för Tor.\n\n%S +torlauncher.failed_to_save_settings=Kunde inte spara inställningar för Tor.\n\n%S +torlauncher.ensure_tor_is_running=Försäkra dig om att Tor är startad. + +torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller värdnamn, samt ett port-nummer för att konfigurera Tor till att använda en proxy för att nå Internet. +torlauncher.error_proxy_type_missing=Du måste välja typ av proxy. +torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor. +# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. + +torlauncher.recommended_bridge=(rekommenderas) + +torlauncher.connect=Anslut +torlauncher.quit=Avsluta +torlauncher.quit_win=Stäng +torlauncher.done=Klar + +torlauncher.forAssistance=För assistans, kontakta %S + +torlauncher.bootstrapStatus.conn_dir=Ansluter till en reläkatalog torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning -torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatusen -torlauncher.bootstrapStatus.loading_status=Laddar nätverksstatus -torlauncher.bootstrapStatus.loading_keys=Laddar auktoritära certifikat -torlauncher.bootstrapStatus.requesting_descriptors=Begär nodinformation -torlauncher.bootstrapStatus.loading_descriptors=Laddar routerinformation -torlauncher.bootstrapStatus.conn_or=Ansluter till Tor-nätverket -torlauncher.bootstrapStatus.handshake_or=Skapar en Torkrets +torlauncher.bootstrapStatus.requesting_status=Hämtar nätverksstatus +torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus +torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat +torlauncher.bootstrapStatus.requesting_descriptors=Begär reläinformation +torlauncher.bootstrapStatus.loading_descriptors=Läser in reläinformation +torlauncher.bootstrapStatus.conn_or=Ansluter till Tor nätverket +torlauncher.bootstrapStatus.handshake_or=Skapar en Tor-krets torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket! -torlauncher.bootstrapWarning.done=redo +torlauncher.bootstrapWarning.done=klar torlauncher.bootstrapWarning.connectrefused=anslutningen vägrades torlauncher.bootstrapWarning.misc=blandat torlauncher.bootstrapWarning.resourcelimit=otillräckliga resurser torlauncher.bootstrapWarning.identity=identitet felmatchad -torlauncher.bootstrapWarning.timeout=anslutningen gjorde en timeout -torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas (no route to host) -torlauncher.bootstrapWarning.ioerror=läs/skrivfel +torlauncher.bootstrapWarning.timeout=tidsgränsen överskreds +torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas +torlauncher.bootstrapWarning.ioerror=läs-/skrivfel diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index 3ac3994..e42c83b 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -1,59 +1,64 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Cài đặt mạng Tor">  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Có"> <!ENTITY torSettings.no "Không"> -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connectPrompt3 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configure "Cấu hình"> +<!ENTITY torSettings.connectPrompt2 "Tôi muốn kết nối trực tiếp đến mạng Tor,"> +<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connect "Kết nối"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Máy tính này có cần dùng proxy để kết nối đến Internet?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> +<!ENTITY torSettings.firewallHelp "Nếu như bạn không chắc chắn làm thế nào trả lời câu hỏi này, chọn Không. Nếu như bạn gặp vấn đề kết nối đến mạng Tor, thay đổi thiết lập này."> +<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> +<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  -<!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> +<!ENTITY torsettings.startingTor "Chờ đợi để Tor khởi động.."> +<!ENTITY torsettings.restart "Khởi động lại"> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "Tuỳ chọn"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "Máy chủ này cần phải dùng proxy để truy cập Internet"> +<!ENTITY torsettings.useProxy.type "Dạng proxy:"> <!ENTITY torsettings.useProxy.address "Địa chỉ:"> -<!ENTITY torsettings.useProxy.address.placeholder ""> +<!ENTITY torsettings.useProxy.address.placeholder "Địa chỉ IP hoặc hostname"> <!ENTITY torsettings.useProxy.port "Cổng:"> <!ENTITY torsettings.useProxy.username "Tên đăng nhập:"> <!ENTITY torsettings.useProxy.password "Mật khẩu:"> -<!ENTITY torsettings.useProxy.type.socks4 ""> -<!ENTITY torsettings.useProxy.type.socks5 ""> -<!ENTITY torsettings.useProxy.type.http ""> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.useProxy.type.socks4 "SOCK 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCK 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Những Cổng Được phép:"> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.useBridges.checkbox "Nhà cung cấp dịch vụ của tôi (ISP) đã chặn kết nối đến mạng Tor"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.placeholder "type address:port"> + +<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> +<!ENTITY torsettings.bridgeHelp1 "Nếu như bạn không thể kết nối đến mạng Tor, có thể là nhà cung cấp dịch vụ của bạn (ISP) hoặc cơ quan khác đã chặn kết nối đến Tor. Thông thường, bạn có thể giải quyết vấn này bằng cách sử dụng Tor Bridges, các Tor Bridges này sẽ không được liệt kê để làm cho việc ngăn chặn khó khăn hơn."> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp2Heading "Đi qua Web"> +<!ENTITY torsettings.bridgeHelp2 "Sử dụng trình duyệt web truy cập vào https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3 "Gửi email đến bridges(a)torproject.org với dòng get bridges trong phần thân của email. Tuy nhiên, để làm cho kẻ tấn công khó khăn hơn trong việc biết được địa chỉ cầu nối, bạn phải gửi yêu cầu này từ email của yahoo.com hoặc gmail.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/vi/progress.dtd b/src/chrome/locale/vi/progress.dtd index f2b867b..cbafae0 100644 --- a/src/chrome/locale/vi/progress.dtd +++ b/src/chrome/locale/vi/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title ""> -<!ENTITY torprogress.openSettings ""> +<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Kết nối với mạng Tor"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/vi/torlauncher.properties b/src/chrome/locale/vi/torlauncher.properties index 7162829..8566a15 100644 --- a/src/chrome/locale/vi/torlauncher.properties +++ b/src/chrome/locale/vi/torlauncher.properties @@ -4,30 +4,35 @@ # torlauncher.error_title=Tor Launcher # torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=Vui lòng khởi động lại ứng dụng này. # torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Chạy Tor thất bại. -torlauncher.tor_bootstrap_failed=Không thể thiết lập kết nối vào mạng Tor. -torlauncher.tor_bootstrap_failed_details=%1$S thất bại (%2$S). +# torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_bootstrap_failed=Tor đã thất bại khi thiết lập kết nối đến mạng Tor +# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). # torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -# torlauncher.tor_missing=The Tor executable is missing. -# torlauncher.torrc_missing=The torrc file is missing. -# torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.tor_missing=Tập tin thực thi của Tor bị thiếu. +torlauncher.torrc_missing=Thiếu tập tin torrc. +torlauncher.datadir_missing=Thư mục data trong Tor không tồn tại. # torlauncher.password_hash_missing=Failed to get hashed password. # torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_save_settings=Không thể lưu lại các cài đặt của Tor. +torlauncher.ensure_tor_is_running=Hãy chắc chắn rằng Tor đang chạy. torlauncher.error_proxy_addr_missing=Bạn phải xác định cả hai một địa chỉ IP hay tên máy và số cổng để cấu hình Tor để sử dụng một proxy ủy quyền truy cập vào Liên mạng -# torlauncher.error_proxy_type_missing=You must select the proxy type. -# torlauncher.error_bridges_missing=You must specify one or more bridges. +torlauncher.error_proxy_type_missing=Bạn phải chọn kiểu proxy. +torlauncher.error_bridges_missing=Bạn phải chỉ dẫn một hoặc nhiều cầu nối. +# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -# torlauncher.connect=Connect +# torlauncher.recommended_bridge=(recommended) + +torlauncher.connect=Kết nối torlauncher.quit=Thoát torlauncher.quit_win=Thoát -# torlauncher.done=Done +torlauncher.done=Hoàn thành # torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 267e4bb..8bbe5f7 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "在 Tor Browser Bundle 尝试连接互联网之前，你需要提供一些该计算机网络连接的相关信息。"> +<!ENTITY torsettings.prompt "在您连接到Tor网络之前，需要提供本机的英特网连接信息。"> <!ENTITY torSettings.yes "是"> <!ENTITY torSettings.no "否"> <!ENTITY torSettings.firstQuestion "以下哪个描述与你的情况最为匹配？"> <!ENTITY torSettings.configurePrompt1 "该计算机的网络连接受到审查或过滤，或者需要使用代理。"> -<!ENTITY torSettings.configurePrompt2 "我需要配置网络设置。"> +<!ENTITY torSettings.configurePrompt2 "我需要配置网桥、防火墙或者代理设置。"> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connectPrompt2 "我想要直接连接 Tor 网络。"> -<!ENTITY torSettings.connectPrompt3 ""> +<!ENTITY torSettings.connectPrompt3 "这在大多数情况下正常工作。"> <!ENTITY torSettings.connect "连接"> <!ENTITY torSettings.proxyQuestion "该计算机是否需要通过代理访问互联网？"> @@ -22,7 +22,9 @@ <!ENTITY torSettings.firewallQuestion "该计算机的防火墙是否仅允许特定端口的互联网连接？"> <!ENTITY torSettings.firewallHelp "如果不知道如何回答该问题，请选择否。如果连接 Tor 网络时出现问题，请更改该设置。"> <!ENTITY torSettings.enterFirewall "请输入防火墙允许的端口，中间用逗号隔开。"> -<!ENTITY torSettings.bridgeQuestion "如果该计算机的网络连接受到审查，你需要使用网桥中继，否则请直接点击“连接”。"> +<!ENTITY torSettings.bridgeQuestion "您的互联网服务提供商 (ISP) 阻挡或审查与 Tor 网络的连接吗？"> +<!ENTITY torSettings.bridgeHelp "如果您不知道此问题的答案，请选择否。&#160; 如果您选择是，您将被要求配置 Tor 网桥，它们是未被公开的中继点，可以使得 Tor 网络的连接更难以被封掉。"> +<!ENTITY torSettings.bridgeSettingsPrompt "您可以使用网桥的默认设置，您也可以获取和输入自定义的网桥地址。">  @@ -44,16 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接"> <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> <!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接"> +<!ENTITY torsettings.useBridges.default "使用提供的网桥连接"> +<!ENTITY torsettings.useBridges.type "传输类型："> +<!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "地址:端口或 obfs 网桥地址:端口"> +<!ENTITY torsettings.useBridges.placeholder "输入地址:端口"> <!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> -<!ENTITY torsettings.bridgeHelp1 "如果无法连接 Tor 网络，可能是因为互联网服务提供商 (ISP) 封锁了 Tor。通常，利用更难以封锁的隐藏中继 Tor 网桥可以应对这一问题。"> -<!ENTITY torsettings.bridgeHelp1B ""> -<!ENTITY torsettings.bridgeHelp2Heading ""> -<!ENTITY torsettings.bridgeHelp2 "如需获取网桥，请使用浏览器访问以下页面：https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading ""> -<!ENTITY torsettings.bridgeHelp3 "获取公共网桥地址还有一个方式：发送邮件至 bridges(a)torproject.xn--org,get-z36c1381b8ja265f1ods20awtw38t bridges”。不过，为了防止攻击者获得大量网桥地址，发送邮件的电子邮件地址必须来自以下域名：gmail.com 或 yahoo.com。"> -<!ENTITY torsettings.bridgeHelp4Heading ""> -<!ENTITY torsettings.bridgeHelp4 "另外，还可以发送电子邮件至 help(a)rt.torproject.org 来获取网桥中继。"> +<!ENTITY torsettings.bridgeHelp1 "如果您无法连接到 Tor 网络，可能是您的互联网服务提供商 (ISP) 或其他机构在阻挡 Tor。&#160; 通常来说，你可以使用 Tor 网桥解决此问题，因为它们是未公开的中继点，更不容易被封锁。"> +<!ENTITY torsettings.bridgeHelp1B "您可以使用预先配置好的默认设置的网桥地址；或者，您也可以使用以下三种方法之一获取自定义的地址。"> +<!ENTITY torsettings.bridgeHelp2Heading "通过万维网"> +<!ENTITY torsettings.bridgeHelp2 "使用网页浏览器访问 https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "通过电子邮件自动回复系统"> +<!ENTITY torsettings.bridgeHelp3 "发送邮件到 bridges(a)torproject.xn--org,-t85f28s26bzx6dy9kx14gz6r get bridges 行。&#160; 然而，这也可能致使攻击者获知大量网桥地址，所以你必须从 gmail.com 或者 yahoo.com 的电子邮件地址发送这一请求。"> +<!ENTITY torsettings.bridgeHelp4Heading "通过帮助台"> +<!ENTITY torsettings.bridgeHelp4 "作为最后的手段，你可以写一封礼貌的邮件发送到 help(a)rt.torproject.org 以请求网桥地址。&#160; 请注意，每个请求需要人工响应。"> diff --git a/src/chrome/locale/zh-CN/progress.dtd b/src/chrome/locale/zh-CN/progress.dtd index 75b64ec..c014812 100644 --- a/src/chrome/locale/zh-CN/progress.dtd +++ b/src/chrome/locale/zh-CN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 状态"> <!ENTITY torprogress.openSettings "打开设置"> <!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "连接至 Tor 网络后将打开浏览器。"> +<!ENTITY torprogress.pleaseWait "请等待建立Tor网络连接"> diff --git a/src/chrome/locale/zh-CN/torlauncher.properties b/src/chrome/locale/zh-CN/torlauncher.properties index 6a98bfd..adc973e 100644 --- a/src/chrome/locale/zh-CN/torlauncher.properties +++ b/src/chrome/locale/zh-CN/torlauncher.properties @@ -7,8 +7,9 @@ torlauncher.tor_exited=Tor 意外退出。 torlauncher.please_restart_app=请重启该应用程序。 torlauncher.tor_controlconn_failed=无法连接 Tor 控制端口。 torlauncher.tor_failed_to_start=Tor 无法启动。 -torlauncher.tor_bootstrap_failed=Tor 无法建立 Tor 网络连接。 -torlauncher.tor_bootstrap_failed_details=%1$S 失败 (%2$S). +torlauncher.tor_control_failed=控制 Tor 失败。 +torlauncher.tor_bootstrap_failed=Tor 建立到 Tor 网络的连接失败。 +torlauncher.tor_bootstrap_failed_details=%1$S 失败 (%2$S)。 torlauncher.unable_to_start_tor=无法启动 Tor。\n\n%S torlauncher.tor_missing=缺少 Tor 可执行文件。 @@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=请确保 Tor 正在运行。 torlauncher.error_proxy_addr_missing=为了将 Tor 配置为使用代理访问互联网，必须指定 IP 地址或主机名以及端口号。 torlauncher.error_proxy_type_missing=必须选择代理类型。 torlauncher.error_bridges_missing=必须指定一个或多个网桥。 +torlauncher.error_default_bridges_type_missing=您必须对提供的网桥选择传输类型。 +torlauncher.error_bridge_bad_default_type=没有提供传输类型为 %S 的可用网桥。请调整您的设置。 + +torlauncher.recommended_bridge=(推荐) torlauncher.connect=连接 torlauncher.quit=退出 @@ -31,18 +36,18 @@ torlauncher.done=完成 torlauncher.forAssistance=如需帮助，请联系 %S -torlauncher.bootstrapStatus.conn_dir=连接中继目录 -torlauncher.bootstrapStatus.handshake_dir=建立加密的目录连接 -torlauncher.bootstrapStatus.requesting_status=接收网络状态 -torlauncher.bootstrapStatus.loading_status=载入网络状态 -torlauncher.bootstrapStatus.loading_keys=载入授权服务器证书 -torlauncher.bootstrapStatus.requesting_descriptors=请求中继信息 -torlauncher.bootstrapStatus.loading_descriptors=载入中继信息 -torlauncher.bootstrapStatus.conn_or=连接 Tor 网络 -torlauncher.bootstrapStatus.handshake_or=建立 Tor 回路 +torlauncher.bootstrapStatus.conn_dir=正在连接中继目录 +torlauncher.bootstrapStatus.handshake_dir=正在建立加密的目录连接 +torlauncher.bootstrapStatus.requesting_status=正在接收网络状态 +torlauncher.bootstrapStatus.loading_status=正在载入网络状态 +torlauncher.bootstrapStatus.loading_keys=正在载入权威证书 +torlauncher.bootstrapStatus.requesting_descriptors=正在请求中继信息 +torlauncher.bootstrapStatus.loading_descriptors=正在载入中继信息 +torlauncher.bootstrapStatus.conn_or=正在连接 Tor 网络 +torlauncher.bootstrapStatus.handshake_or=正在建立 Tor 线路 torlauncher.bootstrapStatus.done=Tor 网络已经连接！ -torlauncher.bootstrapWarning.done=结束 +torlauncher.bootstrapWarning.done=完成 torlauncher.bootstrapWarning.connectrefused=连接被拒绝 torlauncher.bootstrapWarning.misc=杂项 torlauncher.bootstrapWarning.resourcelimit=资源不够

1 0

[tor-browser-bundle/master] Update FTE bridges to actual IPs+fingerprints.
by mikeperry＠torproject.org 14 Mar '14

14 Mar '14

commit 304ad7605db71d32bd06c2287cc32e65836cbb02 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 14 10:35:36 2014 -0700 Update FTE bridges to actual IPs+fingerprints. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index e3d6b69..9a3dfc2 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -12,4 +12,5 @@ pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:477 pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73");

1 0

[tor-launcher/master] Bug #11180: Improve the "Use Bridges" UI.
by brade＠torproject.org 13 Mar '14

13 Mar '14

commit 7e006125569a58b4793c2950fb0a22d9b196a917 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 13 13:54:35 2014 -0400 Bug #11180: Improve the "Use Bridges" UI. When the provided/custom bridges radio buttons are changed, disable the labels and controls associated with the inactive radio button. Reduce vertical space between the "Connect with provided bridges" radio button and its associated "Transport type" menu. --- src/chrome/content/network-settings-overlay.xul | 32 ++++++++------- src/chrome/content/network-settings.js | 48 +++++++++++++++++------ 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 6a85be4..4172af5 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -75,29 +75,31 @@ <groupbox id="bridgeSpecificSettings"> <hbox pack="end"> - <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px"> - <radio id="bridgeRadioDefault" - label="&torsettings.useBridges.default;" selected="true" /> - <hbox align="baseline"> - <spacer style="width: 1.9em" /> - <label value="&torsettings.useBridges.type;" - control="defaultBridgeType" /> - <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> + <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px" + oncommand="onBridgeTypeRadioChange()"> + <radio id="bridgeRadioDefault" + label="&torsettings.useBridges.default;" selected="true" /> + <hbox align="baseline" style="margin-top: -5px"> + <spacer style="width: 1.9em" /> + <label id="defaultBridgeTypeLabel" + value="&torsettings.useBridges.type;" + control="defaultBridgeType"/> + <menulist id="defaultBridgeType"> <menupopup id="defaultBridgeType_menuPopup" /> - </menulist> - <spring/> - </hbox> + </menulist> + <spring/> + </hbox> <spacer style="height: 0.5em" /> <hbox align="baseline" flex="1"> - <radio align="start" id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" - oncommand="onCustomBridges()" /> + <radio align="start" id="bridgeRadioCustom" + label="&torsettings.useBridges.custom;" /> <button align="end" dlgtype="help" oncommand="onOpenHelp()" /> - </hbox> + </hbox> </radiogroup> </hbox> <vbox id="bridgeCustomEntry"> - <label style="margin-top:0px;" + <label id="bridgeListLabel" style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> <textbox id="bridgeList" multiline="true" rows="3" oninput="onCustomBridgesTextInput();" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index de7259f..07526c8 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -249,14 +249,19 @@ function onCustomBridgesTextInput() var customBridges = document.getElementById(kCustomBridgesRadio); if (customBridges) customBridges.control.selectedItem = customBridges; + onBridgeTypeRadioChange(); } -function onCustomBridges() +function onBridgeTypeRadioChange() { - var bridgeList = document.getElementById(kBridgeList); - if (bridgeList) - bridgeList.focus(); + var useCustom = getElemValue(kCustomBridgesRadio, false); + enableElemWithLabel(kDefaultBridgeTypeMenuList, !useCustom); + enableElemWithLabel(kBridgeList + "Label", useCustom); + var focusElemID = (useCustom) ? kBridgeList : kDefaultBridgeTypeMenuList; + var elem = document.getElementById(focusElemID); + if (elem) + elem.focus(); } @@ -470,13 +475,14 @@ function setButtonAttr(aID, aAttr, aValue) } -function enableTextBox(aID, aEnable) +// Enables / disables aID as well as optional aID+"Label" element. +function enableElemWithLabel(aID, aEnable) { if (!aID) return; - var textbox = document.getElementById(aID); - if (textbox) + var elem = document.getElementById(aID); + if (elem) { var label = document.getElementById(aID + "Label"); if (aEnable) @@ -484,17 +490,34 @@ function enableTextBox(aID, aEnable) if (label) label.removeAttribute("disabled"); - textbox.removeAttribute("disabled"); - var s = textbox.getAttribute("origPlaceholder"); - if (s) - textbox.setAttribute("placeholder", s); + elem.removeAttribute("disabled"); } else { if (label) label.setAttribute("disabled", true); - textbox.setAttribute("disabled", true); + elem.setAttribute("disabled", true); + } + } +} + + +// Removes placeholder text when disabled. +function enableTextBox(aID, aEnable) +{ + enableElemWithLabel(aID, aEnable); + var textbox = document.getElementById(aID); + if (textbox) + { + if (aEnable) + { + var s = textbox.getAttribute("origPlaceholder"); + if (s) + textbox.setAttribute("placeholder", s); + } + else + { textbox.setAttribute("origPlaceholder", textbox.placeholder); textbox.removeAttribute("placeholder"); } @@ -804,6 +827,7 @@ function initBridgeSettings() var radio = document.getElementById(radioID); if (radio) radio.control.selectedItem = radio; + onBridgeTypeRadioChange(); return true; }

1 0

[tor-launcher/master] Bug #10418: Increase dialog height on Windows.
by brade＠torproject.org 13 Mar '14

13 Mar '14

commit 32ba7dee797e51199bbd214031fc264d5d515be9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 13 13:45:36 2014 -0400 Bug #10418: Increase dialog height on Windows. This is necessary so that the bridges help text can be displayed without a vertical scrollbar. --- src/chrome/skin/network-settings.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 4873ca8..b1f7f92 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -13,6 +13,7 @@ dialog { dialog.os-windows { width: 49em; + height: 42em; } wizard {

1 0

[tor-browser-bundle/master] Update and add additional Tor patch backports.
by mikeperry＠torproject.org 13 Mar '14

13 Mar '14

commit f8d4e17956f34936129e47e9865fb4919324e3a6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 12 20:53:34 2014 -0700 Update and add additional Tor patch backports. --- Bundle-Data/Docs/ChangeLog.txt | 2 + gitian/descriptors/linux/gitian-tor.yml | 6 +- gitian/descriptors/mac/gitian-tor.yml | 6 +- gitian/descriptors/windows/gitian-tor.yml | 6 +- gitian/patches/bug11069.patch | 164 ++++++++++++++++++----------- gitian/patches/bug11156.patch | 164 +++++++++++++++++++++++++++++ gitian/patches/bug5018.patch | 64 ++++++++--- gitian/patches/bug9229.patch | 46 ++++++++ 8 files changed, 376 insertions(+), 82 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ccf31b0..b82ccd7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -17,7 +17,9 @@ Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014 * Update Tor to 0.2.4.21 * Backport Pending Tor Patches: * Bug 5018: Don't launch Pluggable Transport helpers if not in use + * Bug 9229: Eliminate 60 second stall during bootstrap with some PTs * Bug 11069: Detect and report Pluggable Transport bootstrap failures + * Bug 11156: Prevent spurious warning about missing pluggable transports * Bug 10237: Disable the media cache to prevent disk leaks for videos * Bug 10703: Force the default charset to avoid locale fingerprinting * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index a83d8a4..f0cb682 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -26,6 +26,8 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.patch" - "dzip.sh" - "openssl.tar.gz" @@ -82,10 +84,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 1596c8e..8b049b0 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,6 +27,8 @@ files: - "openssl.tar.gz" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -98,10 +100,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 9033939..3d05eaa 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -26,6 +26,8 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" @@ -94,10 +96,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug11069.patch b/gitian/patches/bug11069.patch index 563aafb..b6032e9 100644 --- a/gitian/patches/bug11069.patch +++ b/gitian/patches/bug11069.patch @@ -1,16 +1,24 @@ -From 404cc6095e31ce47af9287cdda1e4d3ff449b387 Mon Sep 17 00:00:00 2001 +From 67c70b2566fc9bef4527fb8a0c24ce7d8c4d0647 Mon Sep 17 00:00:00 2001 From: George Kadianakis <desnacked(a)riseup.net> -Date: Fri, 28 Feb 2014 15:19:30 +0000 -Subject: [PATCH] Throw control port warning if we failed connecting to briges. +Date: Mon, 10 Mar 2014 22:52:07 +0000 +Subject: [PATCH] Throw control port warning if we failed to connect to all our + bridges. +Conflicts: + src/or/connection.c + src/or/control.c + src/or/control.h + src/test/test_extorport.c --- - changes/bug11069 | 4 ++++ - src/or/connection.c | 41 ++++++++++++++++++++++++++++++++--------- - src/or/connection.h | 2 ++ - src/or/control.c | 7 ++++--- - src/or/entrynodes.c | 21 --------------------- - src/or/entrynodes.h | 1 - - 6 files changed, 42 insertions(+), 34 deletions(-) + changes/bug11069 | 4 ++++ + src/or/connection.c | 25 +++++++++++++++++++++++++ + src/or/connection.h | 2 ++ + src/or/connection_or.c | 8 +++++--- + src/or/control.c | 13 ++++++++----- + src/or/control.h | 3 ++- + src/or/entrynodes.c | 21 --------------------- + src/or/entrynodes.h | 1 - + 8 files changed, 46 insertions(+), 31 deletions(-) create mode 100644 changes/bug11069 diff --git a/changes/bug11069 b/changes/bug11069 @@ -24,57 +32,27 @@ index 0000000..5aa3085 + connect to all of our bridges. Fixes bug 11069; bugfix on + tor-0.2.1.2-alpha. diff --git a/src/or/connection.c b/src/or/connection.c -index 77565ee..12f2b01 100644 +index 4f74a1d..ba28d81 100644 --- a/src/or/connection.c +++ b/src/or/connection.c -@@ -3129,15 +3129,6 @@ connection_handle_read_impl(connection_t *conn) - before = buf_datalen(conn->inbuf); - if (connection_read_to_buf(conn, &max_to_read, &socket_error) < 0) { - /* There's a read error; kill the connection.*/ -- if (conn->type == CONN_TYPE_OR) { -- connection_or_notify_error(TO_OR_CONN(conn), -- socket_error != 0 ? -- errno_to_orconn_end_reason(socket_error) : -- END_OR_CONN_REASON_CONNRESET, -- socket_error != 0 ? -- tor_socket_strerror(socket_error) : -- "(unknown, errno was 0)"); -- } - if (CONN_IS_EDGE(conn)) { - edge_connection_t *edge_conn = TO_EDGE_CONN(conn); - connection_edge_end_errno(edge_conn); -@@ -3152,6 +3143,19 @@ connection_handle_read_impl(connection_t *conn) - * connection_or_notify_error() above. - */ - connection_mark_for_close_internal(conn); -+ -+ /* If it's an OR connection, notify the other components of its -+ failure. */ -+ if (conn->type == CONN_TYPE_OR) { -+ connection_or_notify_error(TO_OR_CONN(conn), -+ socket_error != 0 ? -+ errno_to_orconn_end_reason(socket_error) : -+ END_OR_CONN_REASON_CONNRESET, -+ socket_error != 0 ? -+ tor_socket_strerror(socket_error) : -+ "(unknown, errno was 0)"); -+ } -+ - return -1; - } - n_read += buf_datalen(conn->inbuf) - before; -@@ -4164,6 +4168,25 @@ connection_dir_get_by_purpose_and_resource(int purpose, +@@ -3846,6 +3846,31 @@ connection_get_by_type_purpose(int type, int purpose) return NULL; } -+/** Return 1 if there are any active OR connections. We use this to -+ * guess if we should tell the controller that we didn't manage to -+ * connect to any of our bridges. */ ++/** Return 1 if there are any active OR connections apart from ++ * <b>this_conn</b>. ++ * ++ * We use this to guess if we should tell the controller that we ++ * didn't manage to connect to any of our bridges. */ +int -+any_active_or_conns(void) ++any_other_active_or_conns(const or_connection_t *this_conn) +{ + smartlist_t *conns = get_connection_array(); + SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { ++ if (conn == TO_CONN(this_conn)) { /* don't consider this conn */ ++ continue; ++ } ++ + if (conn->type == CONN_TYPE_OR && + !conn->marked_for_close) { + log_debug(LD_DIR, "%s: Found an OR connection: %s", @@ -90,23 +68,71 @@ index 77565ee..12f2b01 100644 int connection_is_listener(connection_t *conn) diff --git a/src/or/connection.h b/src/or/connection.h -index fa07650..47c70c5 100644 +index c78fe6e..9bd5f88 100644 --- a/src/or/connection.h +++ b/src/or/connection.h -@@ -187,6 +187,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, +@@ -180,6 +180,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, dir_connection_t *connection_dir_get_by_purpose_and_resource( int state, const char *resource); -+int any_active_or_conns(void); ++int any_other_active_or_conns(const or_connection_t *this_conn); + #define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR) int connection_is_listener(connection_t *conn); int connection_state_is_open(connection_t *conn); +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 8e7cd9e..8684f18 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -645,7 +645,8 @@ connection_or_about_to_close(or_connection_t *or_conn) + reason); + if (!authdir_mode_tests_reachability(options)) + control_event_bootstrap_problem( +- orconn_end_reason_to_control_string(reason), reason); ++ orconn_end_reason_to_control_string(reason), ++ reason, or_conn); + } + } + } else if (conn->hold_open_until_flushed) { +@@ -1008,7 +1009,7 @@ connection_or_connect_failed(or_connection_t *conn, + { + control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, reason); + if (!authdir_mode_tests_reachability(get_options())) +- control_event_bootstrap_problem(msg, reason); ++ control_event_bootstrap_problem(msg, reason, conn); + } + + /** <b>conn</b> got an error in connection_handle_read_impl() or +@@ -1638,7 +1639,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn, + if (!authdir_mode_tests_reachability(options)) + control_event_bootstrap_problem( + "Unexpected identity in router certificate", +- END_OR_CONN_REASON_OR_IDENTITY); ++ END_OR_CONN_REASON_OR_IDENTITY, ++ conn); + return -1; + } + if (authdir_mode_tests_reachability(options)) { diff --git a/src/or/control.c b/src/or/control.c -index 05ff9a6..198fb18 100644 +index a88de12..cd2c55c 100644 --- a/src/or/control.c +++ b/src/or/control.c -@@ -4898,9 +4898,10 @@ control_event_bootstrap_problem, (const char *warn, int reason)) +@@ -4696,10 +4696,12 @@ control_event_bootstrap(bootstrap_status_t status, int progress) + + /** Called when Tor has failed to make bootstrapping progress in a way + * that indicates a problem. <b>warn</b> gives a hint as to why, and +- * <b>reason</b> provides an "or_conn_end_reason" tag. ++ * <b>reason</b> provides an "or_conn_end_reason" tag. <b>or_conn</b> ++ * is the connection that caused this problem. + */ + void +-control_event_bootstrap_problem(const char *warn, int reason) ++control_event_bootstrap_problem(const char *warn, int reason, ++ const or_connection_t *or_conn) + { + int status = bootstrap_percent; + const char *tag, *summary; +@@ -4721,9 +4723,10 @@ control_event_bootstrap_problem(const char *warn, int reason) if (reason == END_OR_CONN_REASON_NO_ROUTE) recommendation = "warn"; @@ -116,15 +142,29 @@ index 05ff9a6..198fb18 100644 + /* If we are using bridges and all our OR connections are now + closed, it means that we totally failed to connect to our + bridges. Throw a warning. */ -+ if (get_options()->UseBridges && !any_active_or_conns()) ++ if (get_options()->UseBridges && !any_other_active_or_conns(or_conn)) recommendation = "warn"; if (we_are_hibernating()) +diff --git a/src/or/control.h b/src/or/control.h +index 61062da..1d90a90 100644 +--- a/src/or/control.h ++++ b/src/or/control.h +@@ -85,7 +85,8 @@ void enable_control_logging(void); + void monitor_owning_controller_process(const char *process_spec); + + void control_event_bootstrap(bootstrap_status_t status, int progress); +-void control_event_bootstrap_problem(const char *warn, int reason); ++void control_event_bootstrap_problem(const char *warn, int reason, ++ const or_connection_t *or_conn); + + void control_event_clients_seen(const char *controller_str); + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c -index d463303..17c5b13 100644 +index 2aa063c..b145c94 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c -@@ -2213,27 +2213,6 @@ any_bridge_descriptors_known(void) +@@ -2134,27 +2134,6 @@ any_bridge_descriptors_known(void) return choose_random_entry(NULL) != NULL; } @@ -153,10 +193,10 @@ index d463303..17c5b13 100644 * (bridge or member of EntryNodes) and all descriptors we know are * down. Else return 0. If <b>act</b> is 1, then mark the down guards diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h -index 772c666..73ac017 100644 +index 52b8dc0..f6c07d9 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h -@@ -105,7 +105,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); +@@ -104,7 +104,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); void fetch_bridge_descriptors(const or_options_t *options, time_t now); void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); int any_bridge_descriptors_known(void); diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch new file mode 100644 index 0000000..ba6e266 --- /dev/null +++ b/gitian/patches/bug11156.patch @@ -0,0 +1,164 @@ +From af42f9b9125fb3f50f7383e63fb02bab1df82db9 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Wed, 12 Mar 2014 20:25:05 -0700 +Subject: [PATCH] Don't do directory fetches before all PTs have been + configured. + +--- + src/or/microdesc.c | 2 +- + src/or/networkstatus.c | 36 ++++++++++++++++++++++++++++++------ + src/or/networkstatus.h | 2 +- + src/or/nodelist.c | 8 ++++---- + src/or/routerlist.c | 6 +++--- + 5 files changed, 39 insertions(+), 15 deletions(-) + +diff --git a/src/or/microdesc.c b/src/or/microdesc.c +index 90ac0ac..1f12347 100644 +--- a/src/or/microdesc.c ++++ b/src/or/microdesc.c +@@ -725,7 +725,7 @@ update_microdesc_downloads(time_t now) + smartlist_t *missing; + digestmap_t *pending; + +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (directory_too_idle_to_fetch_descriptors(options, now)) + return; +diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c +index 1b5c6db..bcadc52 100644 +--- a/src/or/networkstatus.c ++++ b/src/or/networkstatus.c +@@ -31,6 +31,7 @@ + #include "router.h" + #include "routerlist.h" + #include "routerparse.h" ++#include "transports.h" + + /* For tracking v2 networkstatus documents. Only caches do this now. */ + +@@ -1380,14 +1381,37 @@ update_consensus_networkstatus_fetch_time(time_t now) + + /** Return 1 if there's a reason we shouldn't try any directory + * fetches yet (e.g. we demand bridges and none are yet known). +- * Else return 0. */ ++ * Else return 0. ++ ++ * If we return 1 and <b>msg_out</b> is provided, set <b>msg_out</b> ++ * to an explanation of why directory fetches are delayed. (If we ++ * return 0, we set msg_out to NULL.) ++ */ + int +-should_delay_dir_fetches(const or_options_t *options) ++should_delay_dir_fetches(const or_options_t *options, const char **msg_out) + { +- if (options->UseBridges && !any_bridge_descriptors_known()) { +- log_info(LD_DIR, "delaying dir fetches (no running bridges known)"); +- return 1; ++ if (msg_out) { ++ *msg_out = NULL; + } ++ ++ if (options->UseBridges) { ++ if (!any_bridge_descriptors_known()) { ++ if (msg_out) { ++ *msg_out = "No running bridges"; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (no running bridges known)"); ++ return 1; ++ } ++ ++ if (pt_proxies_configuration_pending()) { ++ if (msg_out) { ++ *msg_out = "Pluggable transport proxies still configuring"; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (pt proxies still configuring)"); ++ return 1; ++ } ++ } ++ + return 0; + } + +@@ -1397,7 +1421,7 @@ void + update_networkstatus_downloads(time_t now) + { + const or_options_t *options = get_options(); +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (authdir_mode_any_main(options) || options->FetchV2Networkstatus) + update_v2_networkstatus_cache_downloads(now); +diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h +index 761f8e7..f50f6f1 100644 +--- a/src/or/networkstatus.h ++++ b/src/or/networkstatus.h +@@ -69,7 +69,7 @@ int networkstatus_nickname_is_unnamed(const char *nickname); + void networkstatus_consensus_download_failed(int status_code, + const char *flavname); + void update_consensus_networkstatus_fetch_time(time_t now); +-int should_delay_dir_fetches(const or_options_t *options); ++int should_delay_dir_fetches(const or_options_t *options,const char **msg_out); + void update_networkstatus_downloads(time_t now); + void update_certificate_downloads(time_t now); + int consensus_is_waiting_for_certs(void); +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index 178f084..600a1fd 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1439,6 +1439,7 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; ++ const char *delay_fetches_msg = NULL; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1451,10 +1452,9 @@ update_router_have_minimum_dir_info(void) + goto done; + } + +- if (should_delay_dir_fetches(get_options())) { +- log_notice(LD_DIR, "no known bridge descriptors running yet; stalling"); +- strlcpy(dir_info_status, "No live bridge descriptors.", +- sizeof(dir_info_status)); ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg); ++ strlcpy(dir_info_status, "%s", sizeof(dir_info_status)); + res = 0; + goto done; + } +diff --git a/src/or/routerlist.c b/src/or/routerlist.c +index cb39729..d78c7bb 100644 +--- a/src/or/routerlist.c ++++ b/src/or/routerlist.c +@@ -684,7 +684,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) + char id_digest_str[2*DIGEST_LEN+1]; + char sk_digest_str[2*DIGEST_LEN+1]; + +- if (should_delay_dir_fetches(get_options())) ++ if (should_delay_dir_fetches(get_options(), NULL)) + return; + + pending_cert = fp_pair_map_new(); +@@ -4901,7 +4901,7 @@ void + update_router_descriptor_downloads(time_t now) + { + const or_options_t *options = get_options(); +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (!we_fetch_router_descriptors(options)) + return; +@@ -4925,7 +4925,7 @@ update_extrainfo_downloads(time_t now) + int n_no_ei = 0, n_pending = 0, n_have = 0, n_delay = 0; + if (! options->DownloadExtraInfo) + return; +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (!router_have_minimum_dir_info()) + return; +-- +1.8.1.2 + diff --git a/gitian/patches/bug5018.patch b/gitian/patches/bug5018.patch index 4784027..b0ac8e6 100644 --- a/gitian/patches/bug5018.patch +++ b/gitian/patches/bug5018.patch @@ -1,14 +1,14 @@ -From e967595b931c92650250cc385ef7f6aeabd887f5 Mon Sep 17 00:00:00 2001 +From 3394daa34842a397561e65002a33c13355df651d Mon Sep 17 00:00:00 2001 From: George Kadianakis <desnacked(a)riseup.net> Date: Thu, 28 Feb 2013 18:58:36 +0200 -Subject: [PATCH 1/3] Only launch transport proxies that provide useful +Subject: [PATCH 1/4] Only launch transport proxies that provide useful transports. --- - changes/bug5018 | 3 +++ - src/or/config.c | 20 ++++++++++++++++---- - src/or/entrynodes.c | 23 +++++++++++++++++++++++ - src/or/entrynodes.h | 1 + + changes/bug5018 | 3 +++ + src/or/config.c | 20 ++++++++++++++++---- + src/or/entrynodes.c | 23 +++++++++++++++++++++++ + src/or/entrynodes.h | 1 + 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 changes/bug5018 @@ -22,7 +22,7 @@ index 0000000..c5c12ef + - Don't launch pluggable transport proxies that contribute + transports we don't need. Resolves ticket 5018. diff --git a/src/or/config.c b/src/or/config.c -index 3984755..5f905d5 100644 +index ef02946..47510c5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4242,7 +4242,8 @@ parse_client_transport_line(const char *line, int validate_only) @@ -118,17 +118,17 @@ index 52b8dc0..b02cd48 100644 double pathbias_get_close_success_count(entry_guard_t *guard); -- -1.7.9.5 +1.8.1.2 -From d222f04e3a4093efc7be19f43def04d9c0704653 Mon Sep 17 00:00:00 2001 +From 54f75531a9613ee7b964be93b0051bc75322e7e3 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> Date: Sat, 26 Oct 2013 14:34:48 -0700 -Subject: [PATCH 2/3] Simplify transport_is_needed. +Subject: [PATCH 2/4] Simplify transport_is_needed. By Roger at https://trac.torproject.org/projects/tor/ticket/5018#comment:11. --- - src/or/entrynodes.c | 14 ++++---------- + src/or/entrynodes.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c @@ -163,21 +163,21 @@ index 4062cee..98a01c5 100644 /** Remember a new bridge at <b>addr</b>:<b>port</b>. If <b>digest</b> -- -1.7.9.5 +1.8.1.2 -From c1e396e66773813e051e8c96df86b585031a833b Mon Sep 17 00:00:00 2001 +From 936ff64974b00a898fa0e77e3fd6f9b2df57f448 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> Date: Sat, 26 Oct 2013 14:37:50 -0700 -Subject: [PATCH 3/3] Document that unneeded transports are ignored. +Subject: [PATCH 3/4] Document that unneeded transports are ignored. Suggested by Roger in https://trac.torproject.org/projects/tor/ticket/5018#comment:11. --- - src/or/config.c | 3 ++- + src/or/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c -index 5f905d5..3ae0216 100644 +index 47510c5..435d981 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4220,7 +4220,8 @@ parse_bridge_line(const char *line, int validate_only) @@ -191,5 +191,35 @@ index 5f905d5..3ae0216 100644 * our internal transport list. * - If it's a managed proxy line, launch the managed proxy. */ -- -1.7.9.5 +1.8.1.2 + +From a4cf8514af1d2dbfd15857af83076577b7dcc4ee Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Mon, 10 Mar 2014 22:05:31 +0000 +Subject: [PATCH 4/4] Tone down the log message for when we don't need a PT + proxy. + +Conflicts: + changes/bug5018 +--- + src/or/config.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/or/config.c b/src/or/config.c +index 435d981..914c3de 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -4295,8 +4295,8 @@ parse_client_transport_line(const char *line, int validate_only) + + if (is_managed) { /* managed */ + if (!validate_only && is_useless_proxy) { +- log_warn(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " +- "any needed transports and will not be launched.", line); ++ log_notice(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " ++ "any needed transports and will not be launched.", line); + } + + /* If we are not just validating, use the rest of the line as the +-- +1.8.1.2 diff --git a/gitian/patches/bug9229.patch b/gitian/patches/bug9229.patch new file mode 100644 index 0000000..6b1115c --- /dev/null +++ b/gitian/patches/bug9229.patch @@ -0,0 +1,46 @@ +From db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 10 Mar 2014 15:01:27 -0400 +Subject: [PATCH] Update ns downloads when we receive a bridge descriptor + +This prevents long stalls when we're starting with a state file but +with no bridge descriptors. Fixes bug 9229. I believe this bug has +been present since 0.2.0.3-alpha. +--- + changes/bug9229 | 5 +++++ + src/or/entrynodes.c | 6 +++++- + 2 files changed, 10 insertions(+), 1 deletion(-) + create mode 100644 changes/bug9229 + +diff --git a/changes/bug9229 b/changes/bug9229 +new file mode 100644 +index 0000000..ad7fd22 +--- /dev/null ++++ b/changes/bug9229 +@@ -0,0 +1,5 @@ ++ o Minor bugfixes: ++ - Avoid 60-second delays in the bootstrapping process when Tor ++ is launching for a second time while using bridges. Fixes bug 9229; ++ bugfix on 0.2.0.3-alpha. ++ +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index 2aa063c..59770fa 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) + * our entry node list */ + entry_guard_register_connect_status(ri->cache_info.identity_digest, + 1, 0, now); +- if (first) ++ if (first) { ++ /* XXXX apparently, this is never called. See bug #9229. */ + routerlist_retry_directory_downloads(now); ++ } ++ ++ update_networkstatus_downloads(now); + } + } + } +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Install argparse in windows pluggable-transports.
by mikeperry＠torproject.org 13 Mar '14

13 Mar '14

commit e68a2db0e6753f3d1d6839c17b88ba987c1c8f14 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 2 04:25:52 2014 +0000 Install argparse in windows pluggable-transports. coderman on IRC noticed that the building of obfsproxy in the windows pluggable transports descriptor was downloading argparse: Processing dependencies for obfsproxy==unknown Searching for argparse Reading https://pypi.python.org/simple/argparse/ Application tried to create a window, but no driver could be loaded. Make sure that your X server is running and that $DISPLAY is set correctly. err:systray:initialize_systray Could not create tray window fixme:toolhelp:CreateToolhelp32Snapshot Unimplemented: heap list snapshot fixme:toolhelp:Heap32ListFirst : stub Best match: argparse 1.2.1 Downloading http://argparse.googlecode.com/files/argparse-1.2.1.tar.gz#md5=2fbef8cb61e5… Processing argparse-1.2.1.tar.gz argparse was already being installed in the linux and mac descriptors. It was not needed in the windows descriptor, because the windows build uses Python 2.7, and Python 2.7 has argparse in the standard library; and the "py2exe" target was able to find the standard module. However commit 8f8a4cd59bfe07e5b8c12e3990627544d9caeab4 changed obfsproxy to additionally call the "install" target (so that fteproxy could use obfsproxy), and apparently "install" can't find argparse. (Maybe because it's a .py file instead of a directory or an egg?) --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 48efba5..9b0e8ec 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -31,6 +31,7 @@ files: - "gmp.tar.bz2" - "setuptools.tar.gz" - "pycrypto.tar.gz" +- "argparse.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -156,6 +157,12 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install cd .. # + tar xzf argparse.tar.gz + cd argparse-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME"

1 0

[tor-launcher/master] Remove passive voice from progress bar description.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit 37adb31f73235869a278d84249087983fedb6575 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 11 15:09:14 2014 -0700 Remove passive voice from progress bar description. Also make it less confusing. We're making just "a" connection, not a new "network connection" or virtual network interface. --- src/chrome/locale/en/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index f4395cf..ebd9cef 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while a connection to the Tor network is established."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">

1 0

[tor-launcher/master] Bug #10418: Increase dialog height; fix typo.
by brade＠torproject.org 11 Mar '14

11 Mar '14

commit 60c933d5e260303a32df3417332357c2950f439b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 11 15:36:14 2014 -0400 Bug #10418: Increase dialog height; fix typo. --- src/chrome/content/network-settings-overlay.xul | 2 +- src/chrome/skin/network-settings.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index dc88655..6a85be4 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -81,7 +81,7 @@ <hbox align="baseline"> <spacer style="width: 1.9em" /> <label value="&torsettings.useBridges.type;" - control="firewallAllowedPorts"/> + control="defaultBridgeType" /> <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> <menupopup id="defaultBridgeType_menuPopup" /> </menulist> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index d34adcf..4873ca8 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -7,7 +7,7 @@ dialog { width: 45em; - height: 39em; + height: 41em; font: -moz-dialog; } @@ -17,7 +17,7 @@ dialog.os-windows { wizard { width: 43em; - height: 33em; + height: 34em; font: -moz-dialog; padding-top: 0px; }

1 0

[tor-launcher/master] Generalize Tor Browser strings to be independent of app.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit a634ce616ddc88745c9da0447e055e693ca8523c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 11 11:07:37 2014 -0700 Generalize Tor Browser strings to be independent of app. We want to allow Tor Launcher to work in Tor Browser, Tails, Thunderbird, and Instantbird with minimal modifications. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/en/progress.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index a779d9a..a346274 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,8 +1,8 @@ -<!ENTITY torsettings.dialog.title "Tor Browser Network Settings"> +<!ENTITY torsettings.dialog.title "Tor Network Settings">  -<!ENTITY torsettings.prompt "Before the Tor Browser tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> <!ENTITY torSettings.no "No"> diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index 16491f9..f4395cf 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> +<!ENTITY torprogress.pleaseWait "Please wait while a connection to the Tor network is established.">

1 0

[tor-launcher/master] Change "default bridges" to "provided bridges" everywhere.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit 280646446dd3844185d30d1f9586070af19ff95f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 10 23:18:32 2014 -0700 Change "default bridges" to "provided bridges" everywhere. Sorry translation team, but it is better to do this now than later. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/en/torlauncher.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 62afab4..a779d9a 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -24,7 +24,7 @@ <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -55,7 +55,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 38d314a..a2550db 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=You must select the proxy type. torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges. -torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(recommended)

1 0

[tor-launcher/master] Bug 10418: Improve layout and strings
by mikeperry＠torproject.org 10 Mar '14

10 Mar '14

commit 8748fdb1006a811eb5864be36108be4f2b5d0a8a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 10 16:27:11 2014 -0700 Bug 10418: Improve layout and strings The layout may still need some work, but at least these strings are in better shape in terms of usability and future changes like #11071. --- src/chrome/content/network-settings-overlay.xul | 23 +++++++++++++---------- src/chrome/locale/en/network-settings.dtd | 9 +++++---- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 29c3bb3..dc88655 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -76,25 +76,28 @@ <groupbox id="bridgeSpecificSettings"> <hbox pack="end"> <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px"> - <hbox align="center"> <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" /> - <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> + <hbox align="baseline"> + <spacer style="width: 1.9em" /> + <label value="&torsettings.useBridges.type;" + control="firewallAllowedPorts"/> + <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> <menupopup id="defaultBridgeType_menuPopup" /> - </menulist> - <spring/> - </hbox> + </menulist> + <spring/> + </hbox> <spacer style="height: 0.5em" /> - <radio id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" + <hbox align="baseline" flex="1"> + <radio align="start" id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" oncommand="onCustomBridges()" /> + <button align="end" dlgtype="help" oncommand="onOpenHelp()" /> + </hbox> </radiogroup> - <vbox pack="start"> - <button dlgtype="help" oncommand="onOpenHelp()" /> - </vbox> </hbox> <vbox id="bridgeCustomEntry"> - <label style="margin-top:0px;" + <label style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> <textbox id="bridgeList" multiline="true" rows="3" oninput="onCustomBridgesTextInput();" diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 4e21541..62afab4 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,8 +1,8 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor Browser Network Settings">  -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Before the Tor Browser tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> <!ENTITY torSettings.no "No"> @@ -46,8 +46,9 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Use default bridges of type"> -<!ENTITY torsettings.useBridges.custom "Use custom bridges"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port">

1 0

[tor-launcher/master] Bug #10418: Use Sentence case for radio button labels.
by brade＠torproject.org 10 Mar '14

10 Mar '14

commit 848d698d8c832a88c5c0bc26d87a786cf6f4b6c1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 10 14:35:59 2014 -0400 Bug #10418: Use Sentence case for radio button labels. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index dca8d53..4e21541 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -46,8 +46,8 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type"> -<!ENTITY torsettings.useBridges.custom "Use Custom Bridges"> +<!ENTITY torsettings.useBridges.default "Use default bridges of type"> +<!ENTITY torsettings.useBridges.custom "Use custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port">

1 0

[tor-browser-bundle/master] Bug 4261: Fix DMG permissions to work from /Applications
by mikeperry＠torproject.org 08 Mar '14

08 Mar '14

commit fb9453c51306ad39d261617e2cb3ba8e18368574 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 8 13:46:23 2014 -0800 Bug 4261: Fix DMG permissions to work from /Applications Only seems to matter on some Mac versions... Very odd. --- gitian/build-helpers/ddmg.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index 468d6be..c37a1fd 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,14 +5,17 @@ export LC_ALL=C DMGFILE=$1 shift -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; +# We need group readability for some Macs to be able to handle /Applications +# installation. Still unclear exactly why this is -- it is not dependent on +# OSX version... +find $@ -executable -exec chmod 750 {} \; +find $@ ! -executable -exec chmod 640 {} \; cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt -mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -dir-mode 0700 -new-dir-mode 0700 +mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd ~/build

1 0

[tor-browser-bundle/master] Add a changelog entry for 3.6-beta-1.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f0fa0845fd19cdba5c1cdc2751d1fbe4e682684e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:27:25 2014 -0800 Add a changelog entry for 3.6-beta-1. --- Bundle-Data/Docs/ChangeLog.txt | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 657db38..ccf31b0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,33 @@ +Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014 + * All Platforms + * Include Pluggable Transports by default: + * Obfsproxy3 0.2.4, Flashproxy 1.6, and FTE 0.2.6 are now included + * Update Tor Launcher to 0.2.5.0 + * Bug 10418: Provide UI configuration for Pluggable Transports + * Bug 10604: Allow Tor status & error messages to be translated + * Bug 10894: Make bridge UI clear that helpdesk is a last resort for + bridges + * Bug 10610: Clarify wizard UI text describing obstacles/blocking + * Bug 11074: Support Tails use case (XULRunner and optional + customizations) + * Update Torbutton to 1.6.7.0: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + * Update NoScript to 2.6.8.17 + * Update Tor to 0.2.4.21 + * Backport Pending Tor Patches: + * Bug 5018: Don't launch Pluggable Transport helpers if not in use + * Bug 11069: Detect and report Pluggable Transport bootstrap failures + * Bug 10237: Disable the media cache to prevent disk leaks for videos + * Bug 10703: Force the default charset to avoid locale fingerprinting + * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) + * Mac: + * Bug 4271: Use DMG instead of ZIP for Mac packages + * Linux: + * Bug 9533: Fix keyboard input on Ubuntu 13.10 + * Bug 9896: Provide debug symbols for Tor Browser binary + * Bug 10472: Pass arguments to the browser from Linux startup script + Tor Browser Bundle 3.5.2.1 -- Feb 14 2014 * All Platforms * Bug 10895: Fix broken localized bundles

1 0

[tor-browser-bundle/master] Update tags for Torbutton and Tor Browser.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit ffd28013c92b64a73ba985b708f47aa30e450063 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:52:06 2014 -0800 Update tags for Torbutton and Tor Browser. --- gitian/versions | 6 +++--- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions b/gitian/versions index 7f367a0..4f1d1c8 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,12 +1,12 @@ -TORBROWSER_VERSION=3.5.2.1 +TORBROWSER_VERSION=3.5.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 76182b7..83febef 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,10 +4,10 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.0 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.beta b/gitian/versions.beta index 94ada7c..fd4a715 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,10 +4,10 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.0 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-launcher/master] Bugs 10867, 10900: Bug Add eu, sv, and ja to extra locales
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f9759b66e964c05188b9bd0adced5e06c005f09d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 13 16:55:37 2014 +0000 Bugs 10867,10900: Bug Add eu, sv, and ja to extra locales I swear I committed eu and ja before as bug #10687.. --- localization/import-translations.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 3096168..8d30a7d 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,6 +1,13 @@ #!/bin/sh -BUNDLE_LOCALES="ar de es fa fr it ja ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru vi zh-CN" + +# XXX: Basque (eu) by request in #10687. +# This is not used for official builds, but should remain +# so Basque XPIs can be build independently. We can do +# this for other languages too, if anyone requests this +# and translations are available. +BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv" if [ -d translation ]; then

1 0

[torbutton/master] Changelog and version bump for 1.6.7.0.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 4a9d180fc8b97f38c51089a85305da2d6765eb15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:48:54 2014 -0800 Changelog and version bump for 1.6.7.0. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index acbc736..321e2b9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.7.0: + 7 Mar 2014: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + 1.6.6.0: 3 Feb 2014 * Bug #10800: Prevent exception in New Identity diff --git a/src/install.rdf b/src/install.rdf index e183f91..0c8c486 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.6.0</em:version> + <em:version>1.6.7.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Properly check the Tor tag before applying backport patches.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 2edf15136f5bbc939b4420537b779ab80a8c955c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 11:28:41 2014 -0800 Properly check the Tor tag before applying backport patches. Also only aply #5018 for PT-enabled bundles. --- gitian/descriptors/linux/gitian-tor.yml | 7 +++++-- gitian/descriptors/mac/gitian-tor.yml | 7 +++++-- gitian/descriptors/windows/gitian-tor.yml | 8 +++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 8a50ed4..a83d8a4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -77,13 +77,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index d2aab2f..1596c8e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -93,13 +93,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 00b1f9a..9033939 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -89,14 +89,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch - fi + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh

1 0

[tor-browser-bundle/master] Bump versions for NoScript and for Tor.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f5484a13da65bf9138f2566326e9624178a376ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 11:47:44 2014 -0800 Bump versions for NoScript and for Tor. --- gitian/versions | 6 +++--- gitian/versions.alpha | 6 +++--- gitian/versions.beta | 6 +++--- gitian/versions.nightly | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gitian/versions b/gitian/versions index f0e8c42..7f367a0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,7 +4,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.4.20 +TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -37,7 +37,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -61,7 +61,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d6838dc..76182b7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,7 +5,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.5.1-alpha +TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.beta b/gitian/versions.beta index 402b8a9..94ada7c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -5,7 +5,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.4.20 +TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8a2924a..baefbae 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bug 10369: For now, at least download+verify the old OSX compiler.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f1a4621f0c453b0f32752b940271aaa1cf4af8fc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 6 23:20:20 2014 -0800 Bug 10369: For now, at least download+verify the old OSX compiler. We still need it for Tor and Pluggable Transports. --- gitian/fetch-inputs.sh | 4 ++-- gitian/versions | 3 +++ gitian/versions.alpha | 3 +++ gitian/versions.beta | 3 +++ gitian/versions.nightly | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c2bf811..0bc217e 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -151,7 +151,7 @@ do fi done -for i in TOOLCHAIN4 OSXSDK MSVCR100 +for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -217,7 +217,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 11eb1db..f0e8c42 100755 --- a/gitian/versions +++ b/gitian/versions @@ -39,6 +39,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -59,6 +60,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -74,6 +76,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 85ffd95..d6838dc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index a2c91b9..402b8a9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 3288c7e..8a2924a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 4261: Make uncompressed DMG creation reproducible.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 82f061f118519c318ddf0aaa7dc4fcbd8290536e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 14:21:30 2014 -0800 Bug 4261: Make uncompressed DMG creation reproducible. genisoimage was non-deterministic, and libdmg was using unitialized memory in a stack struct. --- gitian/build-helpers/ddmg.sh | 25 +++++++------------ gitian/descriptors/mac/gitian-bundle.yml | 6 +++++ gitian/patches/libdmg.patch | 39 ++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index f9f54da..468d6be 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,24 +5,17 @@ export LC_ALL=C DMGFILE=$1 shift -# Attempt to normalize inode ordering.. -# XXX: the genisoimage -path-list argument seems broken -mkdir -p ~/build/tmp/dmg +find $@ -executable -exec chmod 700 {} \; +find $@ ! -executable -exec chmod 600 {} \; + cd $@ -for i in `find . | sort` -do - if [ -d $i ]; - then - mkdir -p ~/build/tmp/dmg/$i - else - cp --parents -d --preserve=all $i ~/build/tmp/dmg/ - fi -done +find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt +find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt + +mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -dir-mode 0700 -new-dir-mode 0700 -find ~/build/tmp/dmg -executable -exec chmod 700 {} \; -find ~/build/tmp/dmg ! -executable -exec chmod 600 {} \; +cd ~/build -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o tbb-uncompressed.dmg ~/build/tmp/dmg/ ~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE rm tbb-uncompressed.dmg -rm -rf ~/build/tmp/dmg/ +rm ~/build/filelist.txt diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 63c0a96..55a6777 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "noscript(a)noscript.net.xpi" - "dzip.sh" - "ddmg.sh" +- "libdmg.patch" - "bare-version" - "bundle.inputs" - "versions" @@ -141,6 +142,7 @@ script: | # # Set up DMG skeleton cd libdmg-hfsplus + git am ~/build/libdmg.patch cmake CMakeLists.txt cd dmg make @@ -162,6 +164,10 @@ script: | ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app rm -rf ~/build/${TORBROWSER_NAME}_en-US.app else + # XXX: We need to insert these placeholders because otherwise mkisofs won't + # include these otherwise empty dirs: + touch ~/build/$TORBROWSER_NAME.app/Data/Browser/Caches/placeholder.txt + touch ~/build/$TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/defaults/preferences/placeholder.txt cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg rm -rf ~/build/dmg/$TORBROWSER_APP.app diff --git a/gitian/patches/libdmg.patch b/gitian/patches/libdmg.patch new file mode 100644 index 0000000..a84ac3e --- /dev/null +++ b/gitian/patches/libdmg.patch @@ -0,0 +1,39 @@ +From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Thu, 6 Mar 2014 19:47:05 -0800 +Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. + +Some of the struct padding and fields contained unitialized memory, which +caused two successive invocations to produce archives that differed in some +bytes. +--- + dmg/dmglib.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/dmg/dmglib.c b/dmg/dmglib.c +index f481b1f..b74e50b 100644 +--- a/dmg/dmglib.c ++++ b/dmg/dmglib.c +@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { + ChecksumToken dataForkToken; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + off_t plistOffset; + uint32_t plistSize; + uint32_t dataForkChecksum; +@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { + uint64_t numSectors; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + char partitionName[512]; + + off_t fileLength; +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Bug #11069: Detect PT bootstrap failures.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit bfb553da6b2d1978c369361950079297a8628fbf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 6 17:05:04 2014 -0800 Bug #11069: Detect PT bootstrap failures. --- gitian/descriptors/linux/gitian-tor.yml | 4 + gitian/descriptors/mac/gitian-tor.yml | 4 + gitian/descriptors/windows/gitian-tor.yml | 4 + gitian/patches/bug11069.patch | 169 +++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index ce9372b..8a50ed4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -81,6 +82,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index c2c2bf6..d2aab2f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,6 +27,7 @@ files: - "openssl.tar.gz" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -97,6 +98,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 6900a14..00b1f9a 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -93,6 +94,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/patches/bug11069.patch b/gitian/patches/bug11069.patch new file mode 100644 index 0000000..563aafb --- /dev/null +++ b/gitian/patches/bug11069.patch @@ -0,0 +1,169 @@ +From 404cc6095e31ce47af9287cdda1e4d3ff449b387 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Fri, 28 Feb 2014 15:19:30 +0000 +Subject: [PATCH] Throw control port warning if we failed connecting to briges. + +--- + changes/bug11069 | 4 ++++ + src/or/connection.c | 41 ++++++++++++++++++++++++++++++++--------- + src/or/connection.h | 2 ++ + src/or/control.c | 7 ++++--- + src/or/entrynodes.c | 21 --------------------- + src/or/entrynodes.h | 1 - + 6 files changed, 42 insertions(+), 34 deletions(-) + create mode 100644 changes/bug11069 + +diff --git a/changes/bug11069 b/changes/bug11069 +new file mode 100644 +index 0000000..5aa3085 +--- /dev/null ++++ b/changes/bug11069 +@@ -0,0 +1,4 @@ ++ o Minor bugfixes (clients): ++ - Fix tor so that it raises a control port warning when we fail to ++ connect to all of our bridges. Fixes bug 11069; bugfix on ++ tor-0.2.1.2-alpha. +diff --git a/src/or/connection.c b/src/or/connection.c +index 77565ee..12f2b01 100644 +--- a/src/or/connection.c ++++ b/src/or/connection.c +@@ -3129,15 +3129,6 @@ connection_handle_read_impl(connection_t *conn) + before = buf_datalen(conn->inbuf); + if (connection_read_to_buf(conn, &max_to_read, &socket_error) < 0) { + /* There's a read error; kill the connection.*/ +- if (conn->type == CONN_TYPE_OR) { +- connection_or_notify_error(TO_OR_CONN(conn), +- socket_error != 0 ? +- errno_to_orconn_end_reason(socket_error) : +- END_OR_CONN_REASON_CONNRESET, +- socket_error != 0 ? +- tor_socket_strerror(socket_error) : +- "(unknown, errno was 0)"); +- } + if (CONN_IS_EDGE(conn)) { + edge_connection_t *edge_conn = TO_EDGE_CONN(conn); + connection_edge_end_errno(edge_conn); +@@ -3152,6 +3143,19 @@ connection_handle_read_impl(connection_t *conn) + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); ++ ++ /* If it's an OR connection, notify the other components of its ++ failure. */ ++ if (conn->type == CONN_TYPE_OR) { ++ connection_or_notify_error(TO_OR_CONN(conn), ++ socket_error != 0 ? ++ errno_to_orconn_end_reason(socket_error) : ++ END_OR_CONN_REASON_CONNRESET, ++ socket_error != 0 ? ++ tor_socket_strerror(socket_error) : ++ "(unknown, errno was 0)"); ++ } ++ + return -1; + } + n_read += buf_datalen(conn->inbuf) - before; +@@ -4164,6 +4168,25 @@ connection_dir_get_by_purpose_and_resource(int purpose, + return NULL; + } + ++/** Return 1 if there are any active OR connections. We use this to ++ * guess if we should tell the controller that we didn't manage to ++ * connect to any of our bridges. */ ++int ++any_active_or_conns(void) ++{ ++ smartlist_t *conns = get_connection_array(); ++ SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { ++ if (conn->type == CONN_TYPE_OR && ++ !conn->marked_for_close) { ++ log_debug(LD_DIR, "%s: Found an OR connection: %s", ++ __func__, conn->address); ++ return 1; ++ } ++ } SMARTLIST_FOREACH_END(conn); ++ ++ return 0; ++} ++ + /** Return 1 if <b>conn</b> is a listener conn, else return 0. */ + int + connection_is_listener(connection_t *conn) +diff --git a/src/or/connection.h b/src/or/connection.h +index fa07650..47c70c5 100644 +--- a/src/or/connection.h ++++ b/src/or/connection.h +@@ -187,6 +187,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, + dir_connection_t *connection_dir_get_by_purpose_and_resource( + int state, const char *resource); + ++int any_active_or_conns(void); ++ + #define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR) + int connection_is_listener(connection_t *conn); + int connection_state_is_open(connection_t *conn); +diff --git a/src/or/control.c b/src/or/control.c +index 05ff9a6..198fb18 100644 +--- a/src/or/control.c ++++ b/src/or/control.c +@@ -4898,9 +4898,10 @@ control_event_bootstrap_problem, (const char *warn, int reason)) + if (reason == END_OR_CONN_REASON_NO_ROUTE) + recommendation = "warn"; + +- if (get_options()->UseBridges && +- !any_bridge_descriptors_known() && +- !any_pending_bridge_descriptor_fetches()) ++ /* If we are using bridges and all our OR connections are now ++ closed, it means that we totally failed to connect to our ++ bridges. Throw a warning. */ ++ if (get_options()->UseBridges && !any_active_or_conns()) + recommendation = "warn"; + + if (we_are_hibernating()) +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index d463303..17c5b13 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -2213,27 +2213,6 @@ any_bridge_descriptors_known(void) + return choose_random_entry(NULL) != NULL; + } + +-/** Return 1 if there are any directory conns fetching bridge descriptors +- * that aren't marked for close. We use this to guess if we should tell +- * the controller that we have a problem. */ +-int +-any_pending_bridge_descriptor_fetches(void) +-{ +- smartlist_t *conns = get_connection_array(); +- SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { +- if (conn->type == CONN_TYPE_DIR && +- conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC && +- TO_DIR_CONN(conn)->router_purpose == ROUTER_PURPOSE_BRIDGE && +- !conn->marked_for_close && +- conn->linked && +- conn->linked_conn && !conn->linked_conn->marked_for_close) { +- log_debug(LD_DIR, "found one: %s", conn->address); +- return 1; +- } +- } SMARTLIST_FOREACH_END(conn); +- return 0; +-} +- + /** Return 1 if we have at least one descriptor for an entry guard + * (bridge or member of EntryNodes) and all descriptors we know are + * down. Else return 0. If <b>act</b> is 1, then mark the down guards +diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h +index 772c666..73ac017 100644 +--- a/src/or/entrynodes.h ++++ b/src/or/entrynodes.h +@@ -105,7 +105,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); + void fetch_bridge_descriptors(const or_options_t *options, time_t now); + void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); + int any_bridge_descriptors_known(void); +-int any_pending_bridge_descriptor_fetches(void); + int entries_known_but_down(const or_options_t *options); + void entries_retry_all(const or_options_t *options); + +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Switch the install shortcut location to /Applications.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 02d79a009b0a13d7e115d5f8c71e1298b4982ff9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 23:31:00 2014 -0800 Switch the install shortcut location to /Applications. Mac users still get lost by a default install location to Desktop.. :/ In case we decide to do more extensive A/B testing: Keep skeletons for both Desktop and Application DMG templates around. --- Bundle-Data/mac-applications.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-applications.dmg/.VolumeIcon.icns | Bin 0 -> 242224 bytes Bundle-Data/mac-applications.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 | Bin 0 -> 173 bytes Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 + Bundle-Data/mac-applications.dmg/Applications | 1 + Bundle-Data/mac-desktop.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-desktop.dmg/._Desktop | Bin 0 -> 303592 bytes Bundle-Data/mac-desktop.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-desktop.dmg/Desktop | Bin 0 -> 300120 bytes Bundle-Data/mac.dmg/.DS_Store | Bin 12292 -> 0 bytes Bundle-Data/mac.dmg/._Desktop | Bin 303592 -> 0 bytes Bundle-Data/mac.dmg/.background/background.png | Bin 50020 -> 0 bytes Bundle-Data/mac.dmg/Desktop | Bin 300120 -> 0 bytes gitian/descriptors/mac/gitian-bundle.yml | 5 +++-- gitian/mkbundle-mac.sh | 9 ++++++--- 16 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/mac-applications.dmg/.DS_Store b/Bundle-Data/mac-applications.dmg/.DS_Store new file mode 100644 index 0000000..aeb3104 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns new file mode 100644 index 0000000..481914f Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns differ diff --git a/Bundle-Data/mac-applications.dmg/.background/background.png b/Bundle-Data/mac-applications.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 new file mode 100644 index 0000000..e21068d Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid new file mode 100644 index 0000000..538367d --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid @@ -0,0 +1 @@ +B29020CB-1603-4E1C-8C56-5C8A4434D120 \ No newline at end of file diff --git a/Bundle-Data/mac-applications.dmg/Applications b/Bundle-Data/mac-applications.dmg/Applications new file mode 120000 index 0000000..bd2d47f --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/Applications @@ -0,0 +1 @@ +/Applications \ No newline at end of file diff --git a/Bundle-Data/mac-desktop.dmg/.DS_Store b/Bundle-Data/mac-desktop.dmg/.DS_Store new file mode 100644 index 0000000..9bec18c Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-desktop.dmg/._Desktop b/Bundle-Data/mac-desktop.dmg/._Desktop new file mode 100644 index 0000000..a1e0b7f Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/._Desktop differ diff --git a/Bundle-Data/mac-desktop.dmg/.background/background.png b/Bundle-Data/mac-desktop.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-desktop.dmg/Desktop b/Bundle-Data/mac-desktop.dmg/Desktop new file mode 100644 index 0000000..3c88450 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/Desktop differ diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store deleted file mode 100644 index 9bec18c..0000000 Binary files a/Bundle-Data/mac.dmg/.DS_Store and /dev/null differ diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop deleted file mode 100644 index a1e0b7f..0000000 Binary files a/Bundle-Data/mac.dmg/._Desktop and /dev/null differ diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png deleted file mode 100644 index 94e4584..0000000 Binary files a/Bundle-Data/mac.dmg/.background/background.png and /dev/null differ diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop deleted file mode 100644 index 3c88450..0000000 Binary files a/Bundle-Data/mac.dmg/Desktop and /dev/null differ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 55a6777..4325a1b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -36,7 +36,8 @@ files: - "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" -- "mac-dmg.zip" +- "dmg-applications.tar.xz" +- "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" - "dzip.sh" @@ -148,7 +149,7 @@ script: | make cd ../../ cd dmg - unzip ~/build/mac-dmg.zip + tar -Jxvf ~/build/dmg-applications.tar.xz # FIXME: Desktop or Application as dest? cd .. # # FF24 puts the prefs in the browser jar: diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 18e0f8a..a9cbacb 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -63,9 +63,12 @@ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . -cd ../mac.dmg -rm -f $GITIAN_DIR/inputs/mac-dmg.zip -$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip . +cd ../mac-desktop.dmg +rm -f $GITIAN_DIR/inputs/dmg-desktop.tar.xz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-desktop.tar.xz . +cd ../mac-applications.dmg +rm -f $GITIAN_DIR/inputs/dmg-applications.tar-gz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-applications.tar.xz . cd $WRAPPER_DIR

1 0

[tor-browser-bundle/master] Bug 11042: Remove Build-ID from Firefox libs.
by mikeperry＠torproject.org 02 Mar '14

02 Mar '14

commit 9c37c9fcc639c02e9dd7b81741bbf95a24f47a31 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 14:13:50 2014 -0800 Bug 11042: Remove Build-ID from Firefox libs. It is sometimes non-deterministic (particularly for libxul.so). --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3ee8eef..282ea49 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -100,6 +100,8 @@ script: | cd $INSTDIR for LIB in Browser/*.so Browser/webapprt-stub Browser/mozilla-xremote-client Browser/firefox Browser/plugin-container Browser/components/*.so # Browser/updater do + # Build-ID is sometimes non-deterministic, and we use debuglink anyway + objcopy --remove-section=.note.gnu.build-id $LIB objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB

1 0

[tor-browser-bundle/master] Set flag to build PT bundles for alpha and nightly.
by mikeperry＠torproject.org 02 Mar '14

02 Mar '14

commit 6ae73509c55eb0385b7dd0520fdee04ca3ad84e5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 13:54:45 2014 -0800 Set flag to build PT bundles for alpha and nightly. --- gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 2 files changed, 2 insertions(+) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b6ee2c2..85ffd95 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,6 @@ TORBROWSER_VERSION=4.0-alpha-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 436536e..3288c7e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -1,5 +1,6 @@ TORBROWSER_VERSION=tbb-nightly BUNDLE_LOCALES="ar ru zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=0

1 0

[tor-browser-bundle/master] Append bridge lines to PT bundles.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f29ec39f7bd73fcadf83f051c9add246e4d0c4f4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:11:16 2014 -0800 Append bridge lines to PT bundles. --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ gitian/mkbundle-linux.sh | 3 ++- gitian/mkbundle-mac.sh | 3 ++- gitian/mkbundle-windows.sh | 3 ++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 36c2efc..3fa79cc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -31,6 +31,7 @@ files: - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" - "torrc-defaults-appendix-linux" +- "bridge_prefs.js" - "relativelink-src.zip" - "linux-skeleton.zip" - "linux-langpacks.zip" @@ -106,6 +107,7 @@ script: | if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi chmod 700 Data/Browser chmod 700 Data/Tor diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index da7e918..63c0a96 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -33,6 +33,7 @@ files: - "tor-mac32-gbuilt.zip" - "pluggable-transports-mac32-gbuilt.zip" - "torrc-defaults-appendix-mac" +- "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" - "mac-dmg.zip" @@ -125,6 +126,7 @@ script: | unzip ~/build/tbb-docs.zip if [ $BUILD_PT_BUNDLES ]; then cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 8cf2f05..c8b29c9 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -28,6 +28,7 @@ files: - "tor-win32-gbuilt.zip" - "pluggable-transports-win32-gbuilt.zip" - "torrc-defaults-appendix-windows" +- "bridge_prefs.js" - "relativelink-src.zip" - "windows-skeleton.zip" - "win32-langpacks.zip" @@ -108,6 +109,7 @@ script: | if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-win32-gbuilt.zip cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi cd .. # diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 34485ae..b4e635d 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux +cp PTConfigs/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cd linux rm -f $GITIAN_DIR/inputs/linux-skeleton.zip diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index d6bffce..18e0f8a 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 037b031..7ab0aa6 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -58,7 +58,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows +cp PTConfigs/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cd windows rm -f $GITIAN_DIR/inputs/windows-skeleton.zip

1 0

[tor-browser-bundle/master] Relocate bridges from torrc appendices to a prefs file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 3279db32f147479af225d7106949e8dddd360dbb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:02:10 2014 -0800 Relocate bridges from torrc appendices to a prefs file. --- Bundle-Data/beta/bridge_prefs.js | 15 ++++++++ Bundle-Data/beta/linux/torrc-defaults-appendix | 40 +++++----------------- Bundle-Data/beta/mac/torrc-defaults-appendix | 23 ------------- Bundle-Data/beta/windows/torrc-defaults-appendix | 22 ------------ 4 files changed, 23 insertions(+), 77 deletions(-) diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/beta/bridge_prefs.js @@ -0,0 +1,15 @@ +# Tor Launcher preferences (default bridges): +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); + +// Default bridges. +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); + +pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); + +pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index b43cd59..d0f621e 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -1,35 +1,11 @@ - ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed - - -## flash proxy configuration -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index d3e211d..e1ada73 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -1,34 +1,11 @@ - ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed ## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - ## flash proxy configuration # -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding). diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index 965b98a..049d2ff 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -1,33 +1,11 @@ ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - ## flash proxy configuration # -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding).

1 0

[tor-browser-bundle/master] Rename 'beta' to PTConfigs.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f8e7d91b4ed2e2d8f263b8b9898ce31ac28abfba Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:04:36 2014 -0800 Rename 'beta' to PTConfigs. --- Bundle-Data/PTConfigs/bridge_prefs.js | 15 +++++++++++++++ Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 11 +++++++++++ Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/beta/bridge_prefs.js | 15 --------------- Bundle-Data/beta/linux/torrc-defaults-appendix | 11 ----------- Bundle-Data/beta/mac/torrc-defaults-appendix | 12 ------------ Bundle-Data/beta/windows/torrc-defaults-appendix | 12 ------------ 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -0,0 +1,15 @@ +# Tor Launcher preferences (default bridges): +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); + +// Default bridges. +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); + +pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); + +pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix new file mode 100644 index 0000000..d0f621e --- /dev/null +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -0,0 +1,11 @@ +## fteproxy configuration +ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix new file mode 100644 index 0000000..e1ada73 --- /dev/null +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed + +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix new file mode 100644 index 0000000..049d2ff --- /dev/null +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed + +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js deleted file mode 100644 index e3d6b69..0000000 --- a/Bundle-Data/beta/bridge_prefs.js +++ /dev/null @@ -1,15 +0,0 @@ -# Tor Launcher preferences (default bridges): -pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); - -// Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); -pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); -pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); - -pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); - -pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix deleted file mode 100644 index d0f621e..0000000 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ /dev/null @@ -1,11 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix deleted file mode 100644 index e1ada73..0000000 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix deleted file mode 100644 index 049d2ff..0000000 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec Tor\PluggableTransports\flashproxy-client --register :0 :9000

1 0

[tor-browser-bundle/master] Specify a tag for fteproxy for all builds.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit d4470583ce2d681589e1f56b73fbbef83c3510be Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 09:39:48 2014 -0800 Specify a tag for fteproxy for all builds. --- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/versions b/gitian/versions index 389e3e1..11eb1db 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f190d5a..b6ee2c2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0c7f50d..436536e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master +FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Remove a diff file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit ec7da09f018252ff92d3728eb22e27e0934f83d1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 05:25:35 2014 -0800 Remove a diff file. It got added during a conflict resolution that got squashed. --- gitian/versions.diff | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/gitian/versions.diff b/gitian/versions.diff deleted file mode 100644 index 69001a8..0000000 --- a/gitian/versions.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/gitian/versions.nightly b/gitian/versions.nightly -index b9b5835..f3dfe9d 100755 ---- a/gitian/versions.nightly -+++ b/gitian/versions.nightly -@@ -12,13 +12,14 @@ NSIS_TAG=v0.1 - ZLIB_TAG=v1.2.8 - LIBEVENT_TAG=release-2.0.21-stable - MINGW_REV=6184 --PYPTLIB_TAG=pyptlib-0.0.4 --OBFSPROXY_TAG=obfsproxy-0.2.3 -+PYPTLIB_TAG=pyptlib-0.0.5 -+OBFSPROXY_TAG=obfsproxy-0.2.4 - FLASHPROXY_TAG=1.6 - - GITIAN_TAG=tor-browser-builder-3.0-4 - - OPENSSL_VER=1.0.1f -+GMP_VER=5.1.3 - FIREFOX_LANG_VER=24.3.0esr - BINUTILS_VER=2.22 - GCC_VER=4.6.3 -@@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 - - ## File names for the source packages - OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -+GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 - NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi - TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz - OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb -@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz - - # Hashes for packages with weak sigs or no sigs - OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a -+GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 - OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 - NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 -@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 - - ## Non-git package URLs - OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} -+GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} - TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… - OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… - BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 9353: Fix ibus issues on some Linux systems.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit c05c7728ef352e598750993190b76485addc26a2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 28 09:55:55 2014 +0000 Bug 9353: Fix ibus issues on some Linux systems. --- RelativeLink/RelativeLink.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 9bab08c..0d25a28 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -189,6 +189,13 @@ fi mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" +# This is a fix for an ibus issue on some Linux systems. See #9353 for more +# details. The symlink needs to be created before we change HOME. +if [ ! -d ".config/ibus" ]; then + mkdir -p .config/ibus + ln -nsf ~/.config/ibus/bus .config/ibus +fi + # If ${PWD} results in a zero length HOME, we can try something else... if [ ! "${PWD}" ]; then # "hacking around some braindamage"

1 0

[tor-browser-bundle/master] Bug #10104: Use new rebased gitian checkout.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 014725628fdb30d612c5276581eb70202d1d1c59 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 26 12:56:47 2014 -0800 Bug #10104: Use new rebased gitian checkout. Should fix LXC builds. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index a29a4ba..389e3e1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 55efa38..87b68ca 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -17,7 +17,7 @@ OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index 241e855..d68854a 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -19,7 +19,7 @@ FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5a8fcd0..0c7f50d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ OBFSPROXY_TAG=master FLASHPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Use versions file itself to decide which locales to build.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 3618f8600080f675a4592c5a7667c349bb3364a2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 21:53:10 2014 -0800 Use versions file itself to decide which locales to build. --- gitian/descriptors/linux/gitian-bundle.yml | 6 +++--- gitian/descriptors/windows/gitian-bundle.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 958fb65..36c2efc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -134,11 +134,11 @@ script: | # unzip linux-langpacks.zip cd linux-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` + xpi=$LANG.xpi cp -a ../tor-browser ../tor-browser_$LANG - cp $i ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cp $xpi ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. # FF24 puts the prefs in a different jar: diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index f8e6d1b..8cf2f05 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -131,10 +131,10 @@ script: | # unzip ../win32-langpacks.zip cd win32-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` - cp $i ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + xpi=$LANG.xpi + cp $xpi ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. # FF24 puts the prefs in a different jar:

1 0

[tor-browser-bundle/master] Bump versions for Tor Launcher.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fb91914f6901509eab2daaa11b607a789646393d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 21:46:23 2014 -0800 Bump versions for Tor Launcher. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 87b68ca..f190d5a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,7 +5,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.5.1-alpha -TORLAUNCHER_TAG=0.2.4.4 +TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 diff --git a/gitian/versions.beta b/gitian/versions.beta index d68854a..a2c91b9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6-beta-2 +TORBROWSER_VERSION=3.6-beta-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" BUILD_PT_BUNDLES=1 @@ -6,7 +6,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 -TORLAUNCHER_TAG=0.2.4.4 +TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1

1 0

[tor-browser-bundle/master] Bug #4261: Generate DMGs for MacOS.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 535c7ebbdcdc0c5def8ec640e2f8626fb7396f78 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 26 10:45:24 2014 -0800 Bug #4261: Generate DMGs for MacOS. Compressed with bzip2 (UDBZ) and complete with a background and desktop shortcut! --- Bundle-Data/mac.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac.dmg/._Desktop | Bin 0 -> 303592 bytes Bundle-Data/mac.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac.dmg/Desktop | Bin 0 -> 300120 bytes gitian/build-helpers/ddmg.sh | 28 ++++++ gitian/descriptors/mac/gitian-bundle.yml | 108 ++++++++++++++++-------- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-mac.sh | 7 +- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.diff | 45 ++++++++++ gitian/versions.nightly | 1 + 13 files changed, 156 insertions(+), 37 deletions(-) diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store new file mode 100644 index 0000000..9bec18c Binary files /dev/null and b/Bundle-Data/mac.dmg/.DS_Store differ diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop new file mode 100644 index 0000000..a1e0b7f Binary files /dev/null and b/Bundle-Data/mac.dmg/._Desktop differ diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac.dmg/.background/background.png differ diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop new file mode 100644 index 0000000..3c88450 Binary files /dev/null and b/Bundle-Data/mac.dmg/Desktop differ diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh new file mode 100755 index 0000000..f9f54da --- /dev/null +++ b/gitian/build-helpers/ddmg.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# Crappy deterministic dmg wrapper +export LC_ALL=C + +DMGFILE=$1 +shift + +# Attempt to normalize inode ordering.. +# XXX: the genisoimage -path-list argument seems broken +mkdir -p ~/build/tmp/dmg +cd $@ +for i in `find . | sort` +do + if [ -d $i ]; + then + mkdir -p ~/build/tmp/dmg/$i + else + cp --parents -d --preserve=all $i ~/build/tmp/dmg/ + fi +done + +find ~/build/tmp/dmg -executable -exec chmod 700 {} \; +find ~/build/tmp/dmg ! -executable -exec chmod 600 {} \; + +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o tbb-uncompressed.dmg ~/build/tmp/dmg/ +~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE +rm tbb-uncompressed.dmg +rm -rf ~/build/tmp/dmg/ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 428dbee..da7e918 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -12,6 +12,11 @@ packages: - "nsis" - "faketime" - "python" +- "hfsprogs" +- "genisoimage" +- "cmake" +- "zlib1g-dev" +- "libbz2-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -20,6 +25,8 @@ remotes: "dir": "torbutton" - "url": "https://git.torproject.org/https-everywhere.git" "dir": "https-everywhere" +- "url": "https://github.com/vasi/libdmg-hfsplus.git" + "dir": "libdmg-hfsplus" files: # TODO: Can we use an env for this file+version?? - "tor-browser-mac32-gbuilt.zip" @@ -28,9 +35,11 @@ files: - "torrc-defaults-appendix-mac" - "relativelink-src.zip" - "mac-skeleton.zip" +- "mac-dmg.zip" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" - "dzip.sh" +- "ddmg.sh" - "bare-version" - "bundle.inputs" - "versions" @@ -46,12 +55,20 @@ script: | export TORBROWSER_VERSION=`cat bare-version` export LC_ALL=C umask 0022 + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + export TORBROWSER_APP="TorBrowserBundle" + export TORBROWSER_NAME="TorBrowserBundle" + else + export TORBROWSER_APP="TorBrowser" + export TORBROWSER_NAME="TorBrowserBundle" + fi # mkdir -p $OUTDIR/ - mkdir -p TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org - mkdir -p TorBrowserBundle.app/Data/Browser/Caches - mkdir -p TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ - mkdir -p TorBrowserBundle.app/Docs/sources + mkdir -p dmg + mkdir -p $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p $TORBROWSER_NAME.app/Data/Browser/Caches + mkdir -p $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + mkdir -p $TORBROWSER_NAME.app/Docs/sources # cd tor-launcher make clean @@ -62,7 +79,7 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . - mv ../tor-launcher(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi + mv ../tor-launcher(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi cd ../../../ # cd torbutton @@ -74,7 +91,7 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . - mv ../torbutton(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi + mv ../torbutton(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi cd ../../../ # cd https-everywhere @@ -82,11 +99,11 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh - cp ./pkg/*.xpi ../TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + cp ./pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # - cp *.xpi ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/ - cd ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/ + cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ + cd ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi @@ -95,14 +112,14 @@ script: | # unzip relativelink-src.zip cd RelativeLink - cp RelativeLinkOSX.sh ../TorBrowserBundle.app/Contents/MacOS/TorBrowserBundle + cp RelativeLinkOSX.sh ../$TORBROWSER_NAME.app/Contents/MacOS/TorBrowserBundle cd .. # unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip fi - cd TorBrowserBundle.app + cd $TORBROWSER_NAME.app unzip ~/build/mac-skeleton.zip sed -i -e "s/TORBROWSER_VERSION/$TORBROWSER_VERSION/" Contents/Info.plist unzip ~/build/tbb-docs.zip @@ -117,40 +134,54 @@ script: | cd ../../../ # # Copy reproducibility info - cp versions TorBrowserBundle.app/Docs/sources/ - cp bundle.inputs TorBrowserBundle.app/Docs/sources/bundle.inputs + cp versions $TORBROWSER_NAME.app/Docs/sources/ + cp bundle.inputs $TORBROWSER_NAME.app/Docs/sources/bundle.inputs # - # FF24 puts the prefs in a different jar: - if [ -f TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then - pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ - else - pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ - fi + # Set up DMG skeleton + cd libdmg-hfsplus + cmake CMakeLists.txt + cd dmg + make + cd ../../ + cd dmg + unzip ~/build/mac-dmg.zip + cd .. + # + # FF24 puts the prefs in the browser jar: + pushd $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd - # XXX: DMG plz - cp -a TorBrowserBundle.app TorBrowserBundle_en-US.app - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip TorBrowserBundle_en-US.app - rm -rf TorBrowserBundle_en-US.app + # + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + cp -a ~/build/$TORBROWSER_NAME.app ~/build/${TORBROWSER_NAME}_en-US.app + ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app + rm -rf ~/build/${TORBROWSER_NAME}_en-US.app + else + cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg + rm -rf ~/build/dmg/$TORBROWSER_APP.app + fi + mv $TORBROWSER_NAME.app ${TORBROWSER_NAME}_plain.app # unzip mac-langpacks.zip cd mac-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` - cp -a ../TorBrowserBundle.app ../TorBrowserBundle_$LANG.app - cp $i ../TorBrowserBundle_$LANG.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi - cd .. - - # FF24 puts the prefs in a different jar: - if [ -f TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then - pushd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ + xpi=$LANG.xpi + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + DEST=${TORBROWSER_APP}_$LANG else - pushd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + DEST=$TORBROWSER_APP fi + cp -a ../${TORBROWSER_NAME}_plain.app ~/build/dmg/$DEST.app + cp $xpi ~/build/dmg/$DEST.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cd .. + + # FF24 puts the prefs in the browser jar: + pushd ~/build/dmg/$DEST.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js @@ -158,8 +189,15 @@ script: | zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip TorBrowserBundle_$LANG.app - rm -rf TorBrowserBundle_$LANG.app + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + pushd ~/build/dmg/ + ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip $DEST.app + rm -rf TorBrowserBundle_$LANG.app + popd + else + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ + rm -rf ~/build/dmg/$DEST.app + fi cd mac-langpacks done cd .. diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index d757f4d..c2bf811 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -292,6 +292,7 @@ pyptlib https://git.torproject.org/pluggable-transports/pyptlib.gi obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git flashproxy https://git.torproject.org/flashproxy.git fteproxy https://github.com/kpdyer/fteproxy.git +libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG EOF exit 0 diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index e8b3aa1..d6bffce 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -62,6 +62,9 @@ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . +cd ../mac.dmg +rm -f $GITIAN_DIR/inputs/mac-dmg.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip . cd $WRAPPER_DIR @@ -155,7 +158,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -164,7 +167,7 @@ then #cp -a build/out/*.dmg $WRAPPER_DIR mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch $GITIAN_DIR/inputs/bundle-mac.gbuilt else echo diff --git a/gitian/versions b/gitian/versions index f3dfe9d..a29a4ba 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0741b8f..55efa38 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.beta b/gitian/versions.beta index 6ac5a34..241e855 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -17,6 +17,7 @@ PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.diff b/gitian/versions.diff new file mode 100644 index 0000000..69001a8 --- /dev/null +++ b/gitian/versions.diff @@ -0,0 +1,45 @@ +diff --git a/gitian/versions.nightly b/gitian/versions.nightly +index b9b5835..f3dfe9d 100755 +--- a/gitian/versions.nightly ++++ b/gitian/versions.nightly +@@ -12,13 +12,14 @@ NSIS_TAG=v0.1 + ZLIB_TAG=v1.2.8 + LIBEVENT_TAG=release-2.0.21-stable + MINGW_REV=6184 +-PYPTLIB_TAG=pyptlib-0.0.4 +-OBFSPROXY_TAG=obfsproxy-0.2.3 ++PYPTLIB_TAG=pyptlib-0.0.5 ++OBFSPROXY_TAG=obfsproxy-0.2.4 + FLASHPROXY_TAG=1.6 + + GITIAN_TAG=tor-browser-builder-3.0-4 + + OPENSSL_VER=1.0.1f ++GMP_VER=5.1.3 + FIREFOX_LANG_VER=24.3.0esr + BINUTILS_VER=2.22 + GCC_VER=4.6.3 +@@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 + + ## File names for the source packages + OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz ++GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 + NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi + TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz + OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz + + # Hashes for packages with weak sigs or no sigs + OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a ++GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 + OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc + TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 + NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 + + ## Non-git package URLs + OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} ++GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} + TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… + OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… + BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5e6bc6f..5a8fcd0 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4

1 0

[tor-browser-bundle/master] Put the "Tor" subdirectory at the head of PATH for DLL access.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fadb9d2edb3ded8b66e7b2da3182bf78af329339 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Feb 20 19:15:17 2014 +0000 Put the "Tor" subdirectory at the head of PATH for DLL access. Pluggable transport executables are in their own subdirectory, PluggableTransports, but they need to have access to the OpenSSL DLLs. Adding the directory containing the DLLs to PATH makes them visible. I put the directory at the front of PATH and not the end, just in case there is a libeay32.dll or ssleay32.dll somewhere else on the system. https://trac.torproject.org/projects/tor/ticket/10845 --- RelativeLink/RelativeLink.c | 123 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-) diff --git a/RelativeLink/RelativeLink.c b/RelativeLink/RelativeLink.c index bae4647..9a6c9f5 100755 --- a/RelativeLink/RelativeLink.c +++ b/RelativeLink/RelativeLink.c @@ -1,4 +1,6 @@ #include <windows.h> +#include <stdio.h> +#include <tchar.h> // // RelativeLink.c @@ -22,8 +24,119 @@ // Put it in the proper place. // -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +// Get the absolute path to a subdirectory of the current directory; i.e. +// "C:\cwd\reldir". Returns a malloc-allocated string or NULL on error. +LPTSTR GetSubdirectory(LPCTSTR reldir) +{ + DWORD bufsize, n; + int len; + LPTSTR cwd, subdir; + + cwd = NULL; + subdir = NULL; + + // The first call to GetCurrentDirectory gets the buffer size; the second + // fills the buffer. + bufsize = GetCurrentDirectory(0, NULL); + if (bufsize == 0) + goto bail; + cwd = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (cwd == NULL) + goto bail; + n = GetCurrentDirectory(bufsize, cwd); + if (n == 0 || n >= bufsize) + goto bail; + + bufsize = _tcslen(cwd) + 1 + _tcslen(reldir) + 1; + subdir = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (subdir == NULL) + goto bail; + len = _sntprintf(subdir, bufsize, "%s\\%s", cwd, reldir); + if (len < 0 || (DWORD) len >= bufsize) + goto bail; + + free(cwd); + return subdir; + +bail: + if (cwd != NULL) + free(cwd); + if (subdir != NULL) + free(subdir); + return NULL; +} + +// Add a directory to the beginning of the PATH environment variable. Returns 0 +// on failure, nonzero on success. +// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682009%28v=vs.85%… +DWORD PrependToPath(LPCTSTR dir) +{ + DWORD bufsize, n, rc, err; + int len; + LPTSTR path, value; + + path = NULL; + value = NULL; + + // First find out how big a buffer we need. + bufsize = GetEnvironmentVariable(TEXT ("PATH"), NULL, 0); + if (bufsize == 0) + { + err = GetLastError(); + if (err == ERROR_ENVVAR_NOT_FOUND) + // If the variable doesn't yet exist, just set it and return. + return SetEnvironmentVariable(TEXT ("PATH"), dir); + else + goto bail; + } + // Now that we know the buffer size, get the value. + path = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (path == NULL) + goto bail; + n = GetEnvironmentVariable(TEXT ("PATH"), path, bufsize); + if (n == 0 || n >= bufsize) + goto bail; + + bufsize = _tcslen(dir) + 1 + _tcslen(path) + 1; + value = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (value == NULL) + goto bail; + len = _sntprintf(value, bufsize, "%s;%s", dir, path); + if (len < 0 || (DWORD) len >= bufsize) + goto bail; + + rc = SetEnvironmentVariable(TEXT ("PATH"), value); + if (rc == 0) + goto bail; + + free(path); + free(value); + return 1; + +bail: + if (path != NULL) + free(path); + if (value != NULL) + free(value); + return 0; +} + +// Returns 0 on failure and nonzero on success. +DWORD StartTorBrowser(void) { + TCHAR *TorDir; + DWORD rc; + // Put the Tor subdirectory at the beginning of PATH so that pluggable + // transports (in their own subdirectory) can access DLLs. + // https://trac.torproject.org/projects/tor/ticket/10845 + TorDir = GetSubdirectory(TEXT ("Tor")); + if (TorDir == NULL) + return 0; + rc = PrependToPath(TorDir); + free(TorDir); + if (rc == 0) + return 0; + STARTUPINFO si; PROCESS_INFORMATION pi; @@ -34,8 +147,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine TCHAR *ProgramToStart; ProgramToStart = TEXT ("Browser\\firefox.exe -no-remote -profile .\\Data\\Browser\\profile.default\\"); - if( !CreateProcess( - NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + return CreateProcess( NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); +} + +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + if (!StartTorBrowser()) { MessageBox ( NULL, TEXT ("Unable to start Tor Browser"), NULL, MB_OK); return -1;

1 0

[tor-browser-bundle/master] Add GMP to all version files.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 44ae9c486d59692b1f7f72b2b8a8ae45506a579a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 18:37:06 2014 -0800 Add GMP to all version files. Otherwise fetch-inputs barfs. --- gitian/versions | 8 ++++++-- gitian/versions.alpha | 8 ++++++-- gitian/versions.nightly | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index b9b5835..f3dfe9d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -12,13 +12,14 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.4 -OBFSPROXY_TAG=obfsproxy-0.2.3 +PYPTLIB_TAG=pyptlib-0.0.5 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2172e63..0741b8f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -12,13 +12,14 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.4 -OBFSPROXY_TAG=obfsproxy-0.2.3 +PYPTLIB_TAG=pyptlib-0.0.5 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e2ab7aa..5e6bc6f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -19,6 +19,7 @@ FLASHPROXY_TAG=master GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 @@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Bump Tor Browser version.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fa3c928577a505978a8eba11904b6038cb4809fa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 18:06:24 2014 -0800 Bump Tor Browser version. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 21307e9..b9b5835 100755 --- a/gitian/versions +++ b/gitian/versions @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0c34485..2172e63 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -3,7 +3,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.5.1-alpha TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 diff --git a/gitian/versions.beta b/gitian/versions.beta index 97bf8ca..6ac5a34 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.5.2.1-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0

1 0

[tor-browser/tor-browser-24.3.0esr-2] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 57cf06d283e268b328a7287afc9e4216400808c7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:46:40 2014 -0800 fixup! Tor Browser's Firefox preference overrides. Bug #10237: Disable the media cache to prevent disk leaks. Bug #10703: Force the default charset to avoid locale fingerprinting. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 93725ee..7e2efc9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -30,6 +30,7 @@ pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); pref("signon.autofillForms", false); pref("browser.sessionstore.privacy_level", 2); +pref("media.cache_size", 0); // Misc privacy: Remote pref("browser.send_pings", false); @@ -70,6 +71,7 @@ pref("general.useragent.vendorSub", ""); pref("dom.enable_performance", false); pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); +pref("intl.charset.default", "windows-1252"); // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser/tor-browser-24.3.0esr-2] fixup! Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit bff9f4e61b654013dce9086b1d63cb91587d3857 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:43:18 2014 -0800 fixup! Tor Browser's official .mozconfigs. Bug #9896: Disable strip to allow debuginfo file creation. Also re-disable the updater. How did that get enabled... --- .mozconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mozconfig b/.mozconfig index a71084b..e9a9432 100755 --- a/.mozconfig +++ b/.mozconfig @@ -9,10 +9,12 @@ mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -ac_add_options --enable-strip +ac_add_options --disable-strip +ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-maintenance-service +ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes

1 0

[tor-browser-bundle/master] Bug #10472: Pass arguments to the browser from Linux startup script.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit b712a8c8e9374e13e913f42aa105af76ae06ddf2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 16:34:40 2014 -0800 Bug #10472: Pass arguments to the browser from Linux startup script. Patch by gacar. --- RelativeLink/RelativeLink.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 4a10c58..9bab08c 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -118,10 +118,12 @@ fi debug=0 usage_message="usage: $0 [--debug]" -if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then +# !!! We may have more than one argument, changed -eq to -ge in if & elif clauses below +if [ "$#" -ge 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1 + shift # pop the debug argument printf "\nDebug enabled.\n\n" -elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then +elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then echo "$usage_message" exit 0 fi @@ -216,7 +218,9 @@ printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" # XXX Someday we should pass whatever command-line arguments we got # (probably filenames or URLs) to Firefox. -./Browser/firefox -no-remote -profile Data/Browser/profile.default +# !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox. +# !!! Use at your own risk! +./Browser/firefox -no-remote -profile Data/Browser/profile.default ${@} exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Tor Browser exited abnormally. Exit code: $exitcode"

1 0

[tor-browser/tor-browser-24.3.0esr-1] fixup! Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 82964ade9250fee290710080c04b0786d818e834 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:43:18 2014 -0800 fixup! Tor Browser's official .mozconfigs. Bug #9896: Disable strip to allow debuginfo file creation. Also re-disable the updater. How did that get enabled... --- .mozconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mozconfig b/.mozconfig index a71084b..e9a9432 100755 --- a/.mozconfig +++ b/.mozconfig @@ -9,10 +9,12 @@ mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -ac_add_options --enable-strip +ac_add_options --disable-strip +ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-maintenance-service +ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes

1 0

[tor-browser/tor-browser-24.3.0esr-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 8ba9d8e371ce794f49cdd06128c6889c15563b17 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:46:40 2014 -0800 fixup! Tor Browser's Firefox preference overrides. Bug #10237: Disable the media cache to prevent disk leaks. Bug #10703: Force the default charset to avoid locale fingerprinting. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 93725ee..7e2efc9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -30,6 +30,7 @@ pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); pref("signon.autofillForms", false); pref("browser.sessionstore.privacy_level", 2); +pref("media.cache_size", 0); // Misc privacy: Remote pref("browser.send_pings", false); @@ -70,6 +71,7 @@ pref("general.useragent.vendorSub", ""); pref("dom.enable_performance", false); pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); +pref("intl.charset.default", "windows-1252"); // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser-bundle/master] missing files from initial fteproxy commit
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 01cd8b3cda018d85e8dbd4bd60f1b8c6ab48e42f Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Feb 9 12:07:05 2014 -0800 missing files from initial fteproxy commit --- Bundle-Data/beta/mac/torrc-defaults-appendix | 5 +++++ Bundle-Data/beta/windows/torrc-defaults-appendix | 4 ++++ Bundle-Data/mac-tor.sh | 1 + 3 files changed, 10 insertions(+) diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index 3738142..d3e211d 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -1,4 +1,9 @@ +## fteproxy configuration +# Bridge fte bridges.fteproxy.org:8080 + +ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed + ## obfsproxy configuration # # Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index 550e7b5..965b98a 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -1,3 +1,7 @@ +## fteproxy configuration +# Bridge fte bridges.fteproxy.org:8080 + +ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration # diff --git a/Bundle-Data/mac-tor.sh b/Bundle-Data/mac-tor.sh index fb9c4f4..9a22096 100755 --- a/Bundle-Data/mac-tor.sh +++ b/Bundle-Data/mac-tor.sh @@ -2,6 +2,7 @@ # Compiled Python modules require a compatible Python, which means 32-bit 2.6. export VERSIONER_PYTHON_VERSION=2.6 export VERSIONER_PYTHON_PREFER_32_BIT=yes +export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH # Set the current working directory to the directory containing this executable, # so that pluggable transport executables can be given with relative paths. This # works around a change in OS X 10.9, where the current working directory is

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'kpdyer/fte'
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 61e89f20a8d8ff5c8eda89526a70ae11769723af Merge: 7db9add 83a3d0f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 13:48:46 2014 -0800 Merge remote-tracking branch 'kpdyer/fte' Conflicts: gitian/mkbundle-linux.sh gitian/mkbundle-mac.sh gitian/mkbundle-windows.sh gitian/versions.beta Bundle-Data/beta/linux/torrc-defaults-appendix | 5 +++ Bundle-Data/beta/mac/torrc-defaults-appendix | 5 +++ Bundle-Data/beta/windows/torrc-defaults-appendix | 4 ++ Bundle-Data/mac-tor.sh | 1 + gitian/build-helpers/wine-wrappers/g++.py | 39 +++++++++++++++++++ gitian/build-helpers/wine-wrappers/setup.py | 2 +- .../linux/gitian-pluggable-transports.yml | 22 +++++++++++ .../mac/gitian-pluggable-transports.yml | 28 ++++++++++++- .../windows/gitian-pluggable-transports.yml | 41 +++++++++++++++++++- gitian/fetch-inputs.sh | 8 ++-- gitian/gpg/GMP.gpg | Bin 0 -> 1527 bytes gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.beta | 9 ++++- 15 files changed, 159 insertions(+), 11 deletions(-) diff --cc gitian/descriptors/windows/gitian-pluggable-transports.yml index de105b1,c03c46d..48efba5 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@@ -193,12 -201,32 +212,32 @@@ script: cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client/py2exe-flashproxy.zip - cp -an dist/flashproxy-client/{*.pyd,*.exe,*.zip} $PTDIR/ + py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip + cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy - cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy + cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # + cd fteproxy + cp $INSTDIR/gmp/bin/*dll* . + cp $INSTDIR/gmp/lib/*dll* . + ln -s $INSTDIR/gmp thirdparty/gmp + find -type f | xargs touch --date="$REFERENCE_DATETIME" + make win32 + make thirdparty/re2/obj/libre2.a + LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace + LD_PRELOAD= $INSTPYTHON setup.py py2exe + py2exe_zip_timestomp dist/fteproxy.zip + mkdir -p $PTDIR/fte + mkdir -p $PTDIR/fte/tests + cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ + cp -an fte/VERSION $PTDIR/fte + cp -ran fte/defs $PTDIR/fte + cp -ran fte/tests/dfas $PTDIR/fte/tests + mkdir -p $INSTDIR/Docs/fteproxy + cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy + cd .. + # # http://bugs.winehq.org/show_bug.cgi?id=3591 cp -a $INSTDIR/python/python27.dll $PTDIR/ # diff --cc gitian/mkbundle-linux.sh index c7e730a,d2901d8..34485ae --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@@ -134,7 -129,7 +134,7 @@@ the echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml ++ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --cc gitian/mkbundle-mac.sh index 6c0fb52,1f5eb18..e8b3aa1 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@@ -131,7 -126,7 +131,7 @@@ the echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml ++ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --cc gitian/mkbundle-windows.sh index e6d2cf9,c30ccf1..037b031 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@@ -132,7 -127,7 +132,7 @@@ the echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml ++ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --cc gitian/versions.beta index 3977261,775d7f9..97bf8ca --- a/gitian/versions.beta +++ b/gitian/versions.beta @@@ -13,9 -13,10 +13,10 @@@ NSIS_TAG=v0. ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 - PYPTLIB_TAG=pyptlib-0.0.4 - OBFSPROXY_TAG=obfsproxy-0.2.3 + PYPTLIB_TAG=pyptlib-0.0.5 + OBFSPROXY_TAG=obfsproxy-0.2.4 -FLASHPROXY_TAG=1.4 +FLASHPROXY_TAG=1.6 + FTEPROXY_TAG=0.2.6 GITIAN_TAG=tor-browser-builder-3.0-4

1 0

[tor-browser-bundle/master] GMP gpg key
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 1492e883352a749e3ef08d3439a47dc65d64d066 Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Feb 9 12:30:05 2014 -0800 GMP gpg key --- gitian/gpg/GMP.gpg | Bin 0 -> 1527 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/GMP.gpg b/gitian/gpg/GMP.gpg new file mode 100644 index 0000000..3423dbe Binary files /dev/null and b/gitian/gpg/GMP.gpg differ

1 0

[tor-browser-bundle/master] Initial fteproxy integration
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 8f8a4cd59bfe07e5b8c12e3990627544d9caeab4 Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Feb 9 11:47:03 2014 -0800 Initial fteproxy integration --- Bundle-Data/beta/linux/torrc-defaults-appendix | 5 +++ gitian/build-helpers/wine-wrappers/g++.py | 39 +++++++++++++++++++ gitian/build-helpers/wine-wrappers/setup.py | 2 +- .../linux/gitian-pluggable-transports.yml | 22 +++++++++++ .../mac/gitian-pluggable-transports.yml | 28 ++++++++++++- .../windows/gitian-pluggable-transports.yml | 41 +++++++++++++++++++- gitian/fetch-inputs.sh | 8 ++-- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.beta | 9 ++++- 11 files changed, 149 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index 2f5ad32..b43cd59 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -1,4 +1,9 @@ +## fteproxy configuration +# Bridge fte bridges.fteproxy.org:8080 + +ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed + ## obfsproxy configuration # # Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D diff --git a/gitian/build-helpers/wine-wrappers/g++.py b/gitian/build-helpers/wine-wrappers/g++.py new file mode 100755 index 0000000..4738420 --- /dev/null +++ b/gitian/build-helpers/wine-wrappers/g++.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python + +# A wrapper for i686-w64-mingw32-g++ that removes -mno-cygwin and converts +# Windows paths to Unix paths, so that the w64-mingw32 g++ can be called by +# Python distutils. + +import os +import subprocess +import sys + +import common + +args = ["/usr/bin/i686-w64-mingw32-g++"] +sys.argv.pop(0) +while sys.argv: + a = sys.argv.pop(0) + if not a.startswith("-"): + args.append(common.winepath(a)) + continue + if a == "-mno-cygwin": + continue + if a == "--output-lib": + o = sys.argv.pop(0) + a = "-out-implib="+o + if a in ("-I", "-L"): + args.append(a) + args.append(common.winepath(sys.argv.pop(0))) + continue + o = common.search_startswith(a, ("-I", "-L")) + if o is not None: + path = a[len(o):] + args.append("%s%s" % (o, common.winepath(path))) + continue + args.append(a) +p = common.popen_faketime(args, stderr=subprocess.PIPE) +stderr = p.stderr.read() +sys.stderr.write(stderr) +if " error: " in stderr: + sys.exit(1) diff --git a/gitian/build-helpers/wine-wrappers/setup.py b/gitian/build-helpers/wine-wrappers/setup.py index 797015e..77a9526 100644 --- a/gitian/build-helpers/wine-wrappers/setup.py +++ b/gitian/build-helpers/wine-wrappers/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import py2exe setup( - console=["gcc.py", "dllwrap.py", "swig.py"], + console=["gcc.py", "g++.py", "dllwrap.py", "swig.py"], zipfile=None, options={"py2exe": {"bundle_files": 1, "compressed": True}} ) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 9aafc57..c6c65dd 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -10,6 +10,7 @@ packages: - "unzip" - "zip" - "swig" +- "m4" - "python-setuptools" - "python-dev" - "faketime" @@ -22,8 +23,11 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/fteproxy.git" + "dir": "fteproxy" files: - "openssl.tar.gz" +- "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" @@ -50,6 +54,15 @@ script: | mkdir -p $PTDIR mkdir -p $INSTDIR/Debug/ # + tar xvf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cp -an $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor + cd .. + # cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build @@ -118,6 +131,15 @@ script: | cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # + cd fteproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" make + cp -a bin/fteproxy $PTDIR/ + cp -ra fte $PTDIR/ + mkdir -p $INSTDIR/Docs/fteproxy + cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy + cd .. + # cd $INSTDIR # ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d44193c..5aaf364 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -9,7 +9,9 @@ packages: - "unzip" - "zip" - "swig" +- "m4" - "python-setuptools" +- "python-dev" - "faketime" - "libtool" #- "libssl0.9.8" @@ -21,8 +23,11 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/fteproxy.git" + "dir": "fteproxy" files: - "openssl.tar.gz" +- "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" @@ -47,10 +52,13 @@ script: | #export CXXFLAGS=$CFLAGS #export LDFLAGS=$CFLAGS export PATH="$PATH:/usr/apple-osx/bin/" + export AR=/usr/apple-osx/bin/i686-apple-darwin11-ar export CC=/usr/apple-osx/bin/i686-apple-darwin11-gcc + export CXX=/usr/apple-osx/bin/i686-apple-darwin11-g++ # http://bugs.python.org/issue9437 export LDSHARED="$CC -pthread -shared" - export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" + export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" + export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" # mkdir -p $PTDIR/ @@ -63,6 +71,15 @@ script: | # For OpenSSL sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc # + tar xvf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --host=i686-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cp $INSTDIR/gmp/lib/*dylib* $INSTDIR/TorBrowserBundle.app/Tor/ + cd .. + # cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build @@ -141,6 +158,15 @@ script: | cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cd .. # + cd fteproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make + cp -a bin/fteproxy $PTDIR/ + cp -ra fte $PTDIR/ + mkdir -p $INSTDIR/Docs/fteproxy + cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy + cd .. + # cd $INSTDIR ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index a8535c6..92dddeb 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -10,7 +10,10 @@ packages: - "zip" - "swig" - "p7zip-full" +- "m4" - "mingw-w64" +- "g++-mingw-w64" +- "python-dev" - "faketime" - "libtool" reference_datetime: "2000-01-01 00:00:00" @@ -21,8 +24,11 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/fteproxy.git" + "dir": "fteproxy" files: - "openssl.tar.gz" +- "gmp.tar.bz2" - "setuptools.tar.gz" - "pycrypto.tar.gz" - "zope.interface.zip" @@ -71,6 +77,18 @@ script: | rm -rf "$tmpdir" } # + # + tar xvf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared + make + make install + cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor + cp -an $INSTDIR/gmp/lib/*dll* $INSTDIR/Tor + cd .. + # + # # Install a Wine new enough to have a fix for http://bugs.winehq.org/show_bug.cgi?id=29764; # otherwise Python run under Wine constantly crashes in _PyVerify_fd, which is # called by such common operations as io.open and os.fstat (anything involving @@ -103,7 +121,7 @@ script: | mkdir -p build/bdist.win32/winexe/bundle-2.7/ cp -a $INSTDIR/python/python27.dll build/bdist.win32/winexe/bundle-2.7/ LD_PRELOAD= $INSTPYTHON setup.py py2exe - cp -a dist/gcc.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ + cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ cd .. # tar xzf setuptools.tar.gz @@ -156,6 +174,7 @@ script: | cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe + LD_PRELOAD= $INSTPYTHON setup.py install py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/ mkdir -p $INSTDIR/Docs/Obfsproxy @@ -188,6 +207,26 @@ script: | cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # + cd fteproxy + cp $INSTDIR/gmp/bin/*dll* . + cp $INSTDIR/gmp/lib/*dll* . + ln -s $INSTDIR/gmp thirdparty/gmp + find -type f | xargs touch --date="$REFERENCE_DATETIME" + make win32 + make thirdparty/re2/obj/libre2.a + LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace + LD_PRELOAD= $INSTPYTHON setup.py py2exe + mkdir -p $PTDIR/fte + mkdir -p $PTDIR/fte/tests + cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ + cp -an fte/VERSION $PTDIR/fte + cp -ran fte/defs $PTDIR/fte + cp -ran fte/tests/dfas $PTDIR/fte/tests + cp -an thirdparty/gmp/bin/*.dll $PTDIR/ + mkdir -p $INSTDIR/Docs/fteproxy + cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy + cd .. + # # http://bugs.winehq.org/show_bug.cgi?id=3591 cp -a $INSTDIR/python/python27.dll $PTDIR/ # diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index d4eda0e..d757f4d 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,7 +132,7 @@ do fi done -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI +for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" @@ -151,7 +151,6 @@ do fi done - for i in TOOLCHAIN4 OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" @@ -195,6 +194,7 @@ do exit 1 fi done + cd .. # NoScript and PDF.JS are magikal and special: @@ -217,7 +217,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -265,6 +265,7 @@ ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz +ln -sf "$GMP_PACKAGE" gmp.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. @@ -290,6 +291,7 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git flashproxy https://git.torproject.org/flashproxy.git +fteproxy https://github.com/kpdyer/fteproxy.git EOF exit 0 diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 960d33c..d2901d8 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -129,7 +129,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 21e88d2..1f5eb18 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -126,7 +126,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 3760b01..c30ccf1 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -127,7 +127,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/versions.beta b/gitian/versions.beta index 7cb474e..775d7f9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -13,13 +13,15 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.4 -OBFSPROXY_TAG=obfsproxy-0.2.3 +PYPTLIB_TAG=pyptlib-0.0.5 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.4 +FTEPROXY_TAG=0.2.6 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -34,6 +36,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -53,6 +56,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 @@ -68,6 +72,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Ensure we call py2exe_zip_timestomp for fteproxy.zip
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 83a3d0f1bbd2f15c33691bd9082dff3e44a00fd9 Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Wed Feb 12 10:00:46 2014 -0800 Ensure we call py2exe_zip_timestomp for fteproxy.zip --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 92dddeb..c03c46d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -216,13 +216,13 @@ script: | make thirdparty/re2/obj/libre2.a LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace LD_PRELOAD= $INSTPYTHON setup.py py2exe + py2exe_zip_timestomp dist/fteproxy.zip mkdir -p $PTDIR/fte mkdir -p $PTDIR/fte/tests cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ cp -an fte/VERSION $PTDIR/fte cp -ran fte/defs $PTDIR/fte cp -ran fte/tests/dfas $PTDIR/fte/tests - cp -an thirdparty/gmp/bin/*.dll $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy cd ..

1 0

[tor-browser-bundle/master] Bug 11040: Avoid hard-coding MIRROR_HOST.
by gk＠torproject.org 24 Feb '14

24 Feb '14

commit 7db9add35d69e69e3366ff803234c2f9cfc6d3af Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 24 20:42:45 2014 +0000 Bug 11040: Avoid hard-coding MIRROR_HOST. MIRROR_HOST is hard-coded to "10.0.2.2". This breaks building the TBB with LXC. We use the same technique as in gitian-builder to determine the proper network interface to use when building the pluggable transports part for Windows. --- .../descriptors/windows/gitian-pluggable-transports.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index a453f14..de105b1 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -44,8 +44,19 @@ script: | export LC_ALL=C export CFLAGS="-mwindows" export LDFLAGS="-mwindows" - # This is correct only for kvm. - MIRROR_HOST=10.0.2.2 + + # We need at least Wine 1.5.29 which is not in Ubuntu's main repository (see + # below). Thus, we resort to a PPA and need therefore to determine the correct + # network interface depending on the virtualization we use. + ip=`hostname --all-ip-addresses | cut -d ' ' -f1 | cut -d. -f1-3` + if [ $ip = "10.0.3" ]; then + # LXC + MIRROR_HOST=10.0.3.1 + else + # KVM + MIRROR_HOST=10.0.2.2 + fi + WINEROOT=$HOME/.wine/drive_c # XXX: Hardening options cause the exe's to crash.. not sure why #export CFLAGS="-mwindows -fstack-protector-all -fPIE -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security"

1 0

[tor-browser-bundle/master] Bug 10558: Fix bug in LXC VM creation process.
by gk＠torproject.org 24 Feb '14

24 Feb '14

commit 8b2c44aa756ab67b45366676d0200f1ba3b1a2f9 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 24 13:37:25 2014 +0000 Bug 10558: Fix bug in LXC VM creation process. --- gitian/make-vms.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index d4902ce..a3b43b5 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -29,11 +29,13 @@ build_and_test_vm() { then if [ "z$USE_LXC" = "z1" ]; then + export LXC_SUITE=$dist + export LXC_ARCH=$arch ./bin/make-base-vm --suite $dist --lxc --arch $arch else ./bin/make-base-vm --suite $dist --arch $arch fi - + make-clean-vm --suite $dist --arch $arch if [ $? -ne 0 ]; then

1 0

[tor-browser-bundle/master] Bug 10992: Allow customization of VM RAM.
by gk＠torproject.org 24 Feb '14

24 Feb '14

commit de213e51ef4c793a5561e3a14351108efe3a277e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 21 12:22:49 2014 +0000 Bug 10992: Allow customization of VM RAM. --- gitian/README.build | 6 +++++- gitian/mkbundle-linux.sh | 13 +++++++++---- gitian/mkbundle-mac.sh | 13 +++++++++---- gitian/mkbundle-windows.sh | 13 +++++++++---- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 157d948..f9672d8 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -31,9 +31,13 @@ QuickStart: To set the number of make processes and virtual CPUs to use inside the VMs to four (the default is two), use: - + $ export NUM_PROCS=4 + To set the amount of RAM to use inside the VMs to 4000 MiB (the default is + 2000 MiB), use: + + $ export VM_MEMORY=4000 Detailed Explanation of Scripts: diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 960d33c..c7e730a 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -32,6 +32,11 @@ then export NUM_PROCS=2 fi +if [ -z "$VM_MEMORY" ]; +then + export VM_MEMORY=2000 +fi + ./make-vms.sh cd $GITIAN_DIR @@ -83,7 +88,7 @@ then echo "****** Starting Tor Component of Linux Bundle (1/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -107,7 +112,7 @@ then echo "****** Starting TorBrowser Component of Linux Bundle (2/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -129,7 +134,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -153,7 +158,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 21e88d2..6c0fb52 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -32,6 +32,11 @@ then export NUM_PROCS=2 fi +if [ -z "$VM_MEMORY" ]; +then + export VM_MEMORY=2000 +fi + ./make-vms.sh cd $GITIAN_DIR @@ -84,7 +89,7 @@ then echo "****** Starting Tor Component of Mac Bundle (1/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -105,7 +110,7 @@ then echo "****** Starting TorBrowser Component of Mac Bundle (2/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -126,7 +131,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -150,7 +155,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 3760b01..e6d2cf9 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -33,6 +33,11 @@ then export NUM_PROCS=2 fi +if [ -z "$VM_MEMORY" ]; +then + export VM_MEMORY=2000 +fi + ./make-vms.sh cd $GITIAN_DIR @@ -85,7 +90,7 @@ then echo "****** Starting Tor Component of Windows Bundle (1/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` @@ -106,7 +111,7 @@ then echo "****** Starting Torbrowser Component of Windows Bundle (2/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/windows/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-win32.log.`date +%Y%m%d%H%M%S` @@ -127,7 +132,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` @@ -151,7 +156,7 @@ then cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Use flashproxy 1.6 (master in nightly).
by gk＠torproject.org 24 Feb '14

24 Feb '14

commit 594fd98fad931aee764aa9cdd991e2ff60f37d73 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 22 06:17:50 2014 +0000 Use flashproxy 1.6 (master in nightly). Since 1.4, common code was moved into a Python module, which now has to be copied along with the programs. The dist-exe target also changed it default output directory. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 2 +- gitian/descriptors/mac/gitian-pluggable-transports.yml | 2 +- gitian/descriptors/windows/gitian-pluggable-transports.yml | 6 +++--- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 9aafc57..52f9af9 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -113,7 +113,7 @@ script: | cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ + cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d44193c..6f758d8 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -136,7 +136,7 @@ script: | cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client - cp -a dist/flashproxy-client/{flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ + cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cd .. diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index a8535c6..a453f14 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -182,10 +182,10 @@ script: | cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client/py2exe-flashproxy.zip - cp -an dist/flashproxy-client/{*.pyd,*.exe,*.zip} $PTDIR/ + py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip + cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy - cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy + cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # # http://bugs.winehq.org/show_bug.cgi?id=3591 diff --git a/gitian/versions b/gitian/versions index 60d8b5a..21307e9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.4 OBFSPROXY_TAG=obfsproxy-0.2.3 -FLASHPROXY_TAG=1.4 +FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index cc673e0..0c34485 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.4 OBFSPROXY_TAG=obfsproxy-0.2.3 -FLASHPROXY_TAG=1.4 +FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.beta b/gitian/versions.beta index b556ffe..3977261 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -15,7 +15,7 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.4 OBFSPROXY_TAG=obfsproxy-0.2.3 -FLASHPROXY_TAG=1.4 +FLASHPROXY_TAG=1.6 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6a604d2..e2ab7aa 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,7 +14,7 @@ LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master -FLASHPROXY_TAG=1.4 # XXX: Archive and make targets changed in master... +FLASHPROXY_TAG=master GITIAN_TAG=tor-browser-builder-3.0-4

1 0