- tbb-commits - lists.torproject.org

[rbm/master] Bug 24982: update url in README.md
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 0eb1f12241ed067ef9c013ef0f72e9cca89ee5e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:00:40 2018 +0100 Bug 24982: update url in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b6862d..e3ab848 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ to allow reproducing the build. For more information, visit the website : - https://people.torproject.org/~boklm/rbm/ + https://rbm.torproject.org/

1 0

[rbm/master] Bug 24982: add script to help updating the website
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 213fad5a8fe04272359c33778626a2802efc4ebc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:01:13 2018 +0100 Bug 24982: add script to help updating the website This script will create a tarball containing the website and print commands that can be used to upload it. --- doc/make-rbm-docs-tar.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/make-rbm-docs-tar.sh b/doc/make-rbm-docs-tar.sh new file mode 100755 index 0000000..5a1b576 --- /dev/null +++ b/doc/make-rbm-docs-tar.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +docsdir=$(pwd) +tmpdir=$(mktemp -d) +make clean +make install-web webdir="$tmpdir" +cd "$tmpdir" +chmod 664 * +tar -cf "$docsdir"/rbm-docs.tar * +cd - +rm -Rf "$tmpdir" +echo "You can now update the web site with:" +echo " ssh staticiforme.torproject.org tar --overwrite -p -C /srv/rbm-master.torproject.org/htdocs -xf - < rbm-docs.tar" +echo " ssh staticiforme.torproject.org static-update-component rbm.torproject.org"

1 0

[tor-browser-build/maint-7.5] Bug 24999: Hash our *.tar.gz files as well
by boklm＠torproject.org 24 Jan '18

24 Jan '18

commit 7dfd54aab191dfc1b55250569e45840d589f7caf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 24 11:02:55 2018 +0000 Bug 24999: Hash our *.tar.gz files as well --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 3940504..a73f017 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Bug 24999: Hash our *.tar.gz files as well
by boklm＠torproject.org 24 Jan '18

24 Jan '18

commit d2dee352354ee77cd26ac37bef41322df2729ff8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 24 11:02:55 2018 +0000 Bug 24999: Hash our *.tar.gz files as well --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 3940504..a73f017 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Pick up Firefox changes
by gk＠torproject.org 19 Jan '18

19 Jan '18

commit 980115dae789978ea0050a50a8c74a9e8f745ebb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 19 07:27:58 2018 +0000 Pick up Firefox changes Use tor-browser -2 and build number bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index c433deb..4157500 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/rbm.conf b/rbm.conf index abe0547..12b1fd0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a1' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a10 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Picking up newer Firefox changes
by gk＠torproject.org 19 Jan '18

19 Jan '18

commit 61257a0f6a3a06f894dd50ca38165beab3f3f605 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 19 07:16:19 2018 +0000 Picking up newer Firefox changes Use branch -2 and build number bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 374ade7..962f340 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index a70778b..9e18b53 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.0.11 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Bump build tag
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 670dd59f827203277130d3999c9193eadb1b6022 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 12:56:44 2018 +0000 Bump build tag --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index b966705..a70778b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.0.11 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Bug 24930: update keyring path used to debootstrap precise images
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit e9fb651a29f6b649929bbeced662dcad4c1d6fc4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 18 13:24:43 2018 +0100 Bug 24930: update keyring path used to debootstrap precise images After switching the image we use for debootstrapping from 17.04 to 16.04.3 (in #24924), the path containing the keys for precise changed. --- projects/debootstrap-image/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index a06cc53..2c470be 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -44,13 +44,13 @@ targets: container: suite: precise arch: amd64 - debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg + debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg precise-i386: var: container: suite: precise arch: i386 - debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg + debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg utopic-amd64: var: container:

1 0

[tor-browser-build/master] Bump tbb build tag
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 8643124e7deac88282ce0c071e1b1c6ee7548985 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 12:05:44 2018 +0000 Bump tbb build tag --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 2d8fd60..abe0547 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5a10 project_name: tor-browser

1 0

[tor-browser-build/master] Bump browser build tag (to -build2)
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 2cba8ee37a7f189b77f6ff93ada78c0240b03deb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 11:58:08 2018 +0000 Bump browser build tag (to -build2) --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 235a552..c433deb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-1] fixup! Bug 22548: Firefox downgrades VP9 videos to VP8.
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit d93d0469d2b21b67869369063e17074563a49abf Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 10:53:20 2018 +0000 fixup! Bug 22548: Firefox downgrades VP9 videos to VP8. --- dom/media/Benchmark.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp index af0f4a562da4..2c4cf1c3e368 100644 --- a/dom/media/Benchmark.cpp +++ b/dom/media/Benchmark.cpp @@ -80,7 +80,7 @@ VP9Benchmark::IsVP9DecodeFast() uint32_t decodeFps = Preferences::GetUint(sBenchmarkFpsPref); uint32_t threshold = - Preferences::GetUint("media.benchmark.vp9.threshold", 0); + Preferences::GetUint("media.benchmark.vp9.threshold", 0U); return decodeFps >= threshold; #endif

1 0

[tor-browser-build/master] No branch -2 for nightlies anymore
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit a5d545cece11bc2a5161e9bf40460de16d2b245b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 10:57:51 2018 +0000 No branch -2 for nightlies anymore --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index d2d0bb7..235a552 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser-build/master] Release preparations for 8.0a1
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit ecffc49f5379d2d5a4208d0d5940c386510aa600 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 09:47:24 2018 +0000 Release preparations for 8.0a1 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 6 +++--- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 23 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 5 ++--- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 59a4418..d2d0bb7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,15 +1,15 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.2 + firefox_platform_version: 52.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 7.5 + torbrowser_branch: 8.0 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 34947db..ba3f3ca 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.12.6 +version: 2018.1.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cfbe26d..5ee6e37 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,26 @@ +Tor Browser 8.0a1 -- January 23 2018 + * All Platforms + * Update Firefox to 52.6.0esr + * Update Tor to 0.3.2.9 + * Update Torbutton to 1.9.8.5 + * Bug 21245: Add da translation to Torbutton and keep track of it + * Bug 24702: Remove Mozilla text from banner + * Translations update + * Update Tor Launcher to 0.2.14.3 + * Translations update + * Update HTTPS Everywhere to 2018.1.11 + * Bug 24756: Add noisebridge01 obfs4 bridge configuration + * Bug 23916: Add new MAR signing key + * Bug 22548: Firefox downgrades VP9 videos to VP8 for some users + * Windows + * Bug 24197: Fix win64 sandbox compile issues + * Build System + * Windows + * Bug 18691: switch Windows builds from precise to jessie + * Linux + * Bug 23892: Include Firefox and Tor debug files in final build directory + * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds + Tor Browser 7.5a10 -- December 19 2017 * All Platforms * Update Tor to 0.3.2.7-rc diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c048175..5f04027 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.14.2 +version: 0.2.14.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 6f01b29..df721e1 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.7-rc +version: 0.3.2.9 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index a4e8715..53d9a38 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.4 +version: 1.9.8.5 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 4b4162c..2d8fd60 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a10' + torbrowser_version: '8.0a1' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a8 - - 7.5a9 + - 7.5a10 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-1] Bug 23916: Add new MAR signing key
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit f0b673dbac3aba0c5ad6d13c4a7b04c3dd440906 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 15 14:11:32 2018 +0000 Bug 23916: Add new MAR signing key We make the certificate for the secondary key the new primary one, and add the certificate for the new key as the secondary one. This is the 2018 MAR signing key update. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1229 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1229 -> 1229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 49a7c0185f1c..cce786025698 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index cce786025698..caf3eca56804 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser-build/maint-7.5] Release preparations for 7.5
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 198ca216ffe36d01221e7883740664ce1f2e8eda Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 08:36:43 2018 +0000 Release preparations for 7.5 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 51 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 5 +-- 8 files changed, 60 insertions(+), 10 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 59a4418..374ade7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.2 + firefox_platform_version: 52.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 34947db..ba3f3ca 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.12.6 +version: 2018.1.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cfbe26d..51f0cf9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,54 @@ +Tor Browser 7.5 -- January 23 2018 + * All Platforms + * Update Firefox to 52.6.0esr + * Update Tor to 0.3.2.9 + * Update OpenSSL to 1.0.2n + * Update Torbutton to 1.9.8.5 + * Bug 21847: Update copy for security slider + * Bug 21245: Add da translation to Torbutton and keep track of it + * Bug 24702: Remove Mozilla text from banner + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update Tor Launcher to 0.2.14.3 + * Bug 23262: Implement integrated progress bar + * Bug 23261: implement configuration portion of new Tor Launcher UI + * Bug 24623: Revise "country that censors Tor" text + * Bug 24624: tbb-logo.svg may cause network access + * Bug 23240: Retrieve current bootstrap progress before showing progress bar + * Bug 24428: Bootstrap error message sometimes lost + * Bug 22232: Add README on use of bootstrap status messages + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update HTTPS Everywhere to 2018.1.11 + * Update NoScript to 5.1.8.3 + * Bug 23104: CSS line-height reveals the platform Tor Browser is running on + * Bug 24398: Plugin-container process exhausts memory + * Bug 22501: Requests via javascript: violate FPI + * Bug 24756: Add noisebridge01 obfs4 bridge configuration + * Windows + * Bug 16010: Enable content sandboxing on Windows + * Bug 23230: Fix build error on Windows 64 + * OS X + * Bug 24566: Avoid white flashes when opening dialogs in Tor Browser + * Bug 23025: Add some hardening flags to macOS build + * Linux + * Bug 23970: Make "Print to File" work with sandboxing enabled + * Bug 23016: "Print to File" is broken on some non-english Linux systems + * Bug 10089: Set middlemouse.contentLoadURL to false by default + * Bug 18101: Suppress upload file dialog proxy bypass (linux part) + * Android + * Bug 22084: Spoof network information API + * Build System + * All Platforms + * Switch from gitian/tor-browser-bundle to rbm/tor-browser-build + * Windows + * Bug 22563: Update mingw-w64 to fix W^X violations + * Bug 20929: Bump GCC version to 5.4.0 + * Linux + * Bug 20929: Bump GCC version to 5.4.0 + * Bug 23892: Include Firefox and Tor debug files in final build directory + * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds + Tor Browser 7.5a10 -- December 19 2017 * All Platforms * Update Tor to 0.3.2.7-rc diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c048175..5f04027 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.14.2 +version: 0.2.14.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 6f01b29..df721e1 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.7-rc +version: 0.3.2.9 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index a4e8715..53d9a38 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.4 +version: 1.9.8.5 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 95b7447..b966705 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a10' + torbrowser_version: '7.5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a8 - - 7.5a9 + - 7.0.11 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-7.5] Bug 24912: Remove selfrando export in release builds
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 2488ddcda9875f2c34c42fa0c3f10c9034c2b7e0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 08:12:23 2018 +0000 Bug 24912: Remove selfrando export in release builds --- projects/tor-browser/RelativeLink/start-tor-browser | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 94a8c99..0590eed 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -270,7 +270,9 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH +[% IF ! c("var/release") %] export SELFRANDO_write_layout_file= +[% END %] [% IF c("var/asan") -%] # We need to disable LSan which is enabled by default now. Otherwise we'll get

1 0

[tor-browser-build/master] Bug 24912: Remove selfrando export in release builds
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit a647027d20ee95355f1a5452f2b4586aeb54c68c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 08:12:23 2018 +0000 Bug 24912: Remove selfrando export in release builds --- projects/tor-browser/RelativeLink/start-tor-browser | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 94a8c99..0590eed 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -270,7 +270,9 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH +[% IF ! c("var/release") %] export SELFRANDO_write_layout_file= +[% END %] [% IF c("var/asan") -%] # We need to disable LSan which is enabled by default now. Otherwise we'll get

1 0

[tor-browser-build/maint-7.5] Bug 24924: update ubuntu images to 16.04.3
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 32d20f6cf656f3504bc4567b92b85e7559884d57 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 17 22:02:59 2018 +0100 Bug 24924: update ubuntu images to 16.04.3 --- projects/debootstrap-image/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index ecb7f2d..a06cc53 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/ar pkg_type: build var: - ubuntu_version: 17.04 + ubuntu_version: 16.04.3 container: use_container: 1 @@ -67,5 +67,5 @@ targets: input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: df2c8fd540e474b8e1e29c0db8ed6b43a932918f1b9a8149bb82104a7c07ba2a + sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2

1 0

[tor-browser-build/master] Bug 24924: update ubuntu images to 16.04.3
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit ebd3b6efb51aa803474b56c7798db584be4d96e3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 17 22:02:59 2018 +0100 Bug 24924: update ubuntu images to 16.04.3 --- projects/debootstrap-image/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index ecb7f2d..a06cc53 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/ar pkg_type: build var: - ubuntu_version: 17.04 + ubuntu_version: 16.04.3 container: use_container: 1 @@ -67,5 +67,5 @@ targets: input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: df2c8fd540e474b8e1e29c0db8ed6b43a932918f1b9a8149bb82104a7c07ba2a + sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2

1 0

[torbutton/master] Release preparations for 1.9.8.5
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 411f9537ea6b79ac7690348b15ad61d31ea5e51e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 07:53:07 2018 +0000 Release preparations for 1.9.8.5 Translations update, CHANGELOG update, and version bump --- src/CHANGELOG | 5 +++++ src/chrome/locale/ar/aboutDialog.dtd | 4 ++-- src/chrome/locale/ar/aboutTor.properties | 6 +++--- src/chrome/locale/ar/torbutton.dtd | 4 ++-- src/chrome/locale/es/torbutton.dtd | 8 ++++---- src/chrome/locale/it/torbutton.dtd | 8 ++++---- src/chrome/locale/nl/torbutton.dtd | 2 +- src/chrome/locale/pl/torbutton.dtd | 12 ++++++------ src/chrome/locale/pt-BR/torbutton.dtd | 10 +++++----- src/chrome/locale/sv/torbutton.dtd | 20 ++++++++++---------- src/chrome/locale/sv/torbutton.properties | 12 ++++++------ src/chrome/locale/zh-CN/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/zh-CN/torbutton.dtd | 26 +++++++++++++------------- src/install.rdf | 2 +- 14 files changed, 70 insertions(+), 65 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 08a5a14..79ce7a0 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.9.8.5 + * Bug 21245: Add da translation to Torbutton and keep track of it + * Bug 24702: Remove Mozilla text from banner + * Translations update + 1.9.8.4 * Bug 21847: Update copy for security slider * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) diff --git a/src/chrome/locale/ar/aboutDialog.dtd b/src/chrome/locale/ar/aboutDialog.dtd index fa1ebec..5046d11 100644 --- a/src/chrome/locale/ar/aboutDialog.dtd +++ b/src/chrome/locale/ar/aboutDialog.dtd @@ -9,11 +9,11 @@ <!ENTITY help.or "أو">  <!ENTITY help.getInvolvedLink "شارك"> -<!ENTITY help.end "علامة تعجب"> +<!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "أية أسئلة؟">  -<!ENTITY bottomLinks.grow "ساعد شبكة تور على النمو"> +<!ENTITY bottomLinks.grow "ساعد شبكة تور على النمو !">  <!ENTITY bottomLinks.license "معلومات الترخيص"> <!ENTITY tor.TrademarkStatement ""تور" و "شعار البصلة" علامات تجارية مسجلة باسم شركة مشروع تور المحدودة"> diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties index 63cf16b..8b3d02e 100644 --- a/src/chrome/locale/ar/aboutTor.properties +++ b/src/chrome/locale/ar/aboutTor.properties @@ -8,13 +8,13 @@ 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/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=تبرع الآن ! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=تور : دعم الصمود الرقمي aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 aboutTor.donationBanner.tagline2=Networking Freedom Worldwide aboutTor.donationBanner.tagline3=Freedom Online aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=تحمي خصوصية الملايين من الأشخاص كل يوم diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 3de2586..9e85fcf 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -12,7 +12,7 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "انقر لبدء زر تور"> <!ENTITY torbutton.prefs.security_settings "إعدادات الأمان لمتصفح طور"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> +<!ENTITY torbutton.prefs.restore_defaults "إعادة التعيين"> <!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> <!ENTITY torbutton.cookiedialog.title "إدارة إعدادت الحماية لملفات تعريف الارتباط"> <!ENTITY torbutton.cookiedialog.lockCol "محمية"> @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Safest"> <!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more"> +<!ENTITY torbutton.prefs.sec_learn_more_label "تعرّف على المزيد"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 7a4fd41..5408736 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -3,7 +3,7 @@ <!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este sitio"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.preferences "Configuración de seguridad..."> -<!ENTITY torbutton.context_menu.preferences.key "C"> +<!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configuración de red Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "R"> <!ENTITY torbutton.context_menu.downloadUpdate "Comprobar actualización del Navegador Tor..."> @@ -26,7 +26,7 @@ <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> -<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "T"> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Mantén marcada esta casilla para evitar que diversas características del navegador se puedan usar para rastrear tu navegación por la web. Las características modificadas incluyen URLs blob (a objetos binarios internos), BroadcastChannel (comunicación interna dentro del mismo origen), caché del navegador, cookies, favicons, cabeceras Auth de HTTP (autentificación básica), preconexiones de enlaces, objetos localStorage (almacenamiento local para aplicaciones web), URLs de objetos MediaSource (audiovisuales), peticiones OCSP (estado de certificados), SharedWorkers (subprocesos compartidos), y tickets de sesión TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que te distinguen de otros usuarios del Navegador Tor"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H"> @@ -36,7 +36,7 @@ <!ENTITY torbutton.prefs.sec_standard_label "Estándar"> <!ENTITY torbutton.prefs.sec_standard_description "Están habilitadas todas las características de Navegador Tor y sitio web."> <!ENTITY torbutton.prefs.sec_safer_label "Más segura"> -<!ENTITY torbutton.prefs.sec_safer_description "Deshabilita características de sitio web que a menudo son peligrosas, lo que causa que algunos sitios pierdan funcionalidad."> +<!ENTITY torbutton.prefs.sec_safer_description "Deshabilita características del sitio web que a menudo son peligrosas, lo que causa que algunos sitios pierdan funcionalidad."> <!ENTITY torbutton.prefs.sec_safer_list_label "En la configuración 'más segura':"> <!ENTITY torbutton.prefs.sec_safest_label "La más segura"> <!ENTITY torbutton.prefs.sec_safest_description "Sólo permite las características de sitio web requeridas para sitios estáticos y servicios básicos. Estos cambios afectan a imágenes, medios, y scripts."> @@ -46,5 +46,5 @@ <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está deshabilitado por defecto en todos los sitios."> <!ENTITY torbutton.prefs.sec_limit_typography "Algunas fuentes y símbolos matemáticos están deshabilitados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunas fuentes, iconos, símbolos matemáticos, e imágenes están deshabilitados."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y vídeo (medios HTML5) están dipuestos para reproducir-al-pulsar."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y vídeo (medios HTML5) son de tipo pulsar-para-reproducir."> <!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 7276923..746ead5 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -6,14 +6,14 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Impostazioni della rete Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Controllando gli aggiornamenti di Tor Browser..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Controllo degli aggiornamenti di Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> <!ENTITY torbutton.context_menu.cookieProtections "Protezioni dei Cookie..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> <!ENTITY torbutton.prefs.security_settings "Impostazioni di Sicurezza Tor Browser"> <!ENTITY torbutton.prefs.restore_defaults "Ripristina impostazioni iniziali"> -<!ENTITY torbutton.prefs.custom_warning "Le tue impostazioni del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti."> +<!ENTITY torbutton.prefs.custom_warning "Le tue impostazioni personalizzate del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti."> <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protetto"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -27,10 +27,10 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lascia questo box selezionato per evitare che diverse funzionalità del browser possano essere utilizzate per tracciare la tua navigazione. Le funzionalità modificate includono URL blob, canali di trasmissione, la cache del browser, cookie, favicon, intestazioni di Auth HTTP, link a cui ti sei connesso, localStorage, URL mediaSource, richieste OCSP, SharedWorkers, a ticket di sessioni TLS."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lascia questo box selezionato per evitare che diverse funzionalità del browser possano essere utilizzate per tracciare la tua navigazione. Le funzionalità modificate includono URL blob, canali di trasmissione, la cache del browser, cookie, favicon, intestazioni di Auth HTTP, link a cui ti sei precedentemente connesso, localStorage, URL mediaSource, richieste OCSP, SharedWorkers e ticket di sessioni TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lascia questa casella selezionata per nascondere ai siti web alcune cose che potrebbero essere uniche per te, incluse le prestazioni del computer, la disposizione della tastiera, la lingua, il percorso dei plugin installati, l'elenco dei plugin installati, lo stato di rete, l'orientamento dello schermo, le dimensioni dello schermo, i livelli di zoom per ogni sito, i tipi di file supportati, i colori di sistema e le funzionalità WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lascia questa casella selezionata per nascondere ai siti web alcuni elementi che potrebbero essere unicamente riconducibili a te, incluse le prestazioni del computer, la disposizione della tastiera, la lingua, il percorso dei plugin installati, l'elenco dei plugin installati, lo stato di rete, l'orientamento dello schermo, le dimensioni dello schermo, i livelli di zoom per ogni sito, i tipi di file supportati, i colori di sistema e le funzionalità WebGL."> <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Il Security Slider ti permette di disabilitare determinate funzionalità del browser che potrebbero renderlo più vulnerabile a tentativi di attacco."> <!ENTITY torbutton.prefs.sec_standard_label "Standard"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index dcb3d1e..7cba67c 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -1,4 +1,4 @@ -<!ENTITY torbutton.context_menu.new_identity "Nieuwe Identiteit"> +<!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nieuw Tor-circuit voor deze website"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 5ea9250..b1af8a5 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -34,17 +34,17 @@ <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeństwa"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Suwak poziomu bezpieczeństwa pozwala na wyłączenie pewnych funkcji przeglądarki, które mogą uczynić ten program bardziej narażonym na próby ataku hakerskiego."> <!ENTITY torbutton.prefs.sec_standard_label "Standard"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> +<!ENTITY torbutton.prefs.sec_standard_description "Wszystkie funkcje Przeglądarki Tor i strony zostały włączone."> <!ENTITY torbutton.prefs.sec_safer_label "Safer"> <!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> <!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> <!ENTITY torbutton.prefs.sec_safest_label "Safest"> <!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> +<!ENTITY torbutton.prefs.sec_learn_more_label "Dowiedz się więcej"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Obsługa skryptów Java na stronach bez HTTPS jest wyłączona."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript jest domyślnie wyłączona na wszystkich stronach."> +<!ENTITY torbutton.prefs.sec_limit_typography "Niektóre fonty i symbole są wyłączone."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Niektóre fonty, ikony, symbole i obrazki są wyłączone."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> <!ENTITY torbutton.circuit_display.title "Obwód Tor dla tej strony"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 174df63..2798ee0 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -8,7 +8,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Procurar Atualizações do Navegador Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Proteções contra Cookies..."> +<!ENTITY torbutton.context_menu.cookieProtections "Proteções de Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton"> <!ENTITY torbutton.prefs.security_settings "Configurações de Segurança do Navegador Tor"> @@ -37,14 +37,14 @@ <!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos."> <!ENTITY torbutton.prefs.sec_safer_label "Mais seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> +<!ENTITY torbutton.prefs.sec_safer_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Algumas fontes e símbolos matemáticos estão desativados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algumas fontes, ícones, símbolos matemáticas e imagens estão desativadas."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Clicar para tocar ou ver áudio ou vídeo (mídia HTML5)."> <!ENTITY torbutton.circuit_display.title "Circuito Tor para este site"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index f407136..aac0ea8 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -34,17 +34,17 @@ <!ENTITY torbutton.prefs.sec_caption "Säkerhetsnivå"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Säkerhetsreglaget låter dig stänga av vissa webbläsarfunktioner som kan göra din webbläsare mer sårbar mot intrångsförsök."> <!ENTITY torbutton.prefs.sec_standard_label "Standard"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> +<!ENTITY torbutton.prefs.sec_standard_description "Alla funktioner för Tor Browser och webbplatsfunktioner är aktiverade."> <!ENTITY torbutton.prefs.sec_safer_label "Säkrare"> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> +<!ENTITY torbutton.prefs.sec_safer_description "Inaktiverar webbplatsfunktioner som ofta är farliga, vilket gör att vissa webbplatser förlorar funktionalitet."> +<!ENTITY torbutton.prefs.sec_safer_list_label "I den säkrare inställningen:"> <!ENTITY torbutton.prefs.sec_safest_label "Säkrast"> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> +<!ENTITY torbutton.prefs.sec_safest_description "Tillåt endast webbplatsfunktioner som krävs för statiska webbplatser och grundläggande tjänster. Dessa förändringar påverkar bilder, media och skript."> +<!ENTITY torbutton.prefs.sec_safest_list_label "I den säkraste inställningen:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Läs mer"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript är inaktiverat på webbplatser utan HTTPS."> +<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript är inaktiverat som standard på alla webbplatser."> +<!ENTITY torbutton.prefs.sec_limit_typography "Vissa typsnitt och matte symboler är inaktiverade."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Vissa typsnitt, ikoner, matte symboler och bilder är inaktiverade."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Ljud och video (HTML5-media) är klicka-för-att-spel."> <!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbplatsen"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 2656cc1..7f0765d 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -21,23 +21,23 @@ torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen torbutton.popup.prompted_language = För ett bättre integritetsskydd kan Torbutton begära den engelska versionen av webbplatser. Detta kan göra att webbplatser som du föredrar att läsa på ditt modersmål visas på engelska istället.\\\n\\\n Vill du visa sidor på engelska för att få ett bättre integritetsskydd? torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? torbutton.title.prompt_torbrowser = Viktig information om Torbutton -torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Tor Browser.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar din integritet bättre än vanliga Firefox, även när Firefox används med Tor Button.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton. torbutton.popup.short_torbrowser = Viktig information om Torbutton!\n\nTorbutton är nu alltid aktiverad.\n\nKlicka på Torbutton för mer information. -torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra din anonymitet och personliga integritet.\n\nDe kan också kringgå Tor för att avslöja var du befinner dig och vad din IP-adress är.\n\nÄr du säker på att du vill aktivera insticksmoduler?\n\n +torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra din anonymitet och personliga integritet.\n\nDe kan också kringgå Tor för att avslöja var du befinner dig och vad din IP-adress är.\n\nÄr du säker på att du vill aktivera plugins?\n\n torbutton.popup.never_ask_again = Fråga aldrig igen torbutton.popup.confirm_newnym = Tor Browser kommer att stänga alla fönster och flikar. Alla webbplatssessioner kommer att gå förlorade.\n\nStarta om Tor Browser nu för att återställa din identitet?\n\n -torbutton.slider_notification = Den gröna onion menyn har nu en säkerhetsinställning. Kolla in den! +torbutton.slider_notification = Den gröna onion menyn har nu en säkerhetsinställning som gör det möjligt att ändra din säkerhets nivå. Kolla in den! torbutton.slider_notification_button = Öppna säkerhetsinställningar -torbutton.maximize_warning = Att maximera Tor Browser kan ge webbsajter möjlighet att upptäcka din monitors storlek, vilket kan användas för att spåra dig. Vi rekommenderar att du lämnar Tor Browser fönstret i dess ursprungliga storlek. +torbutton.maximize_warning = Att maximera Tor Browser kan ge webbplatser möjlighet att upptäcka din skärmstorlek, vilket kan användas för att spåra dig. Vi rekommenderar att du lämnar Tor Browser fönstret i dess ursprungliga storlek. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Denna webbplats (%S) försökte komma åt HTML5-bilddata på ett kanvas, som skulle kunna användas för att identifiera just din dator.\n\nSka Tor Browser tillåta den här webbplatsen att använda HTML5-bilddata på kanvas? canvas.notNow=Inte just nu canvas.notNowAccessKey=N -canvas.allow=Ja, tillåt alltid +canvas.allow=Tillåt i framtiden canvas.allowAccessKey=A canvas.never=Aldrig för denna sida (rekommenderas) canvas.neverAccessKey=e @@ -46,6 +46,6 @@ canvas.neverAccessKey=e # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=%S Profilproblem profileReadOnly=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till ett annat ställe innan användning. -profileReadOnlyMac=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till Skrivbordet eller Applications-katalogen innan användning. +profileReadOnlyMac=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till Skrivbordet eller Applications-mapp innan användning. profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen ändra dina rättigheter i filsystemet och försök igen! profileMigrationFailed=Migrering av din befintliga %S profil misslyckades.\nNya inställningar kommer att användas. diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties index 32beeb1..9c0bb80 100644 --- a/src/chrome/locale/zh-CN/aboutTor.properties +++ b/src/chrome/locale/zh-CN/aboutTor.properties @@ -8,13 +8,13 @@ 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/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=立即捐助！ -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor:提供数据防护 +aboutTor.donationBanner.mozilla=现在捐助，Mozilla会满足你的礼物！ -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=自2006年起，为记者，线人及活动家提供庇护 +aboutTor.donationBanner.tagline2=世界范围内的网络自由 +aboutTor.donationBanner.tagline3=网络自由 +aboutTor.donationBanner.tagline4=促成世界范围的言论自由 +aboutTor.donationBanner.tagline5=每日保护百万人的隐私 diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 6bfd4ea..95cb470 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -33,18 +33,18 @@ <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "勾选此选项以避免网站获取您的浏览器指纹信息，包括您的计算机性能、键盘布局、系统语言、安装插件的位置、已安装插件列表、您的网络状态、屏幕方向、屏幕尺寸、特定网站缩放级别、支持的文件类型、系统颜色、WebGL 功能。"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_caption_tooltip "安全滑块可禁用某些浏览器功能，避免因这些功能导致的漏洞而受到攻击。"> -<!ENTITY torbutton.prefs.sec_standard_label "Standard"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Safer"> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> +<!ENTITY torbutton.prefs.sec_standard_label "正式的"> +<!ENTITY torbutton.prefs.sec_standard_description "将启用所有Tor浏览器与网站功能。"> +<!ENTITY torbutton.prefs.sec_safer_label "中等安全性"> +<!ENTITY torbutton.prefs.sec_safer_description "禁用网站功能通常是危险的，这会导致一些站不能正常运作。"> +<!ENTITY torbutton.prefs.sec_safer_list_label "在中等安全性设置下："> +<!ENTITY torbutton.prefs.sec_safest_label "最高安全性"> +<!ENTITY torbutton.prefs.sec_safest_description "只允许网站请求静态网页与基本服务。这将会影响图片，媒体与脚本。"> +<!ENTITY torbutton.prefs.sec_safest_list_label "在最高安全性设置下："> <!ENTITY torbutton.prefs.sec_learn_more_label "更多详情"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "在非HTTPS网站，JavaScripts被禁用。"> +<!ENTITY torbutton.prefs.sec_js_disabled "在所有网站上默认禁用JavaScript。"> +<!ENTITY torbutton.prefs.sec_limit_typography "一些字体与数学符号被禁用。"> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "一些字体，图标，数学符号与图片被禁用。"> +<!ENTITY torbutton.prefs.sec_click_to_play_media "点击播放音频或视频（HTML5 媒体）。"> <!ENTITY torbutton.circuit_display.title "为此站点使用的 Tor 线路"> diff --git a/src/install.rdf b/src/install.rdf index 41c8f8a..73e9055 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.9.8.4</em:version> + <em:version>1.9.8.5</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[tor-launcher/master] Release preparations for 0.2.14.3
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 34d78bedb0ee0676f7cd8b40e4164be20d68711e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 07:46:27 2018 +0000 Release preparations for 0.2.14.3 Translations update and version bump --- src/chrome/locale/et/network-settings.dtd | 24 +++---- src/chrome/locale/et/torlauncher.properties | 2 +- src/chrome/locale/mk/network-settings.dtd | 80 +++++++++++------------ src/chrome/locale/mk/torlauncher.properties | 96 ++++++++++++++-------------- src/chrome/locale/nb/network-settings.dtd | 2 +- src/chrome/locale/pt-BR/network-settings.dtd | 2 +- src/install.rdf | 2 +- 7 files changed, 104 insertions(+), 104 deletions(-) diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index bba3761..5da8262 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -1,43 +1,43 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor võrgu seaded"> <!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.configure "Tor võrgu seaded"> <!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Veebilehitseja keel"> +<!ENTITY torlauncher.localePicker.prompt "Palun vali keel.">  <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Häälesta"> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Ühenda">  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> <!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Seadista uuesti"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "Eemalda seaded ja ühenda"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Valikuline"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proksi tüüp:"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "Kasutajanimi:"> +<!ENTITY torsettings.useProxy.password "Parool:"> <!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 "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> +<!ENTITY torsettings.firewall.allowedPorts "Lubatud pordid:"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> diff --git a/src/chrome/locale/et/torlauncher.properties b/src/chrome/locale/et/torlauncher.properties index 039ff73..d7a7d3a 100644 --- a/src/chrome/locale/et/torlauncher.properties +++ b/src/chrome/locale/et/torlauncher.properties @@ -31,7 +31,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.bridge_suffix.meek-amazon=(works in China) torlauncher.bridge_suffix.meek-azure=(works in China) -torlauncher.connect=Connect +torlauncher.connect=Ühenda torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Välju diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 8cd5042..469c62a 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -1,58 +1,58 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.dialog.title "Tor мрежни поставки"> +<!ENTITY torsettings.wizard.title.default "Поврзи се на Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor мрежни поставки"> +<!ENTITY torsettings.wizard.title.connecting "Воспоставување на врска">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Tor Прелистувач јазик"> +<!ENTITY torlauncher.localePicker.prompt "Одберете јазик.">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connectPrompt "Кликнете "Поврзи" да се поврзете на Tor."> +<!ENTITY torSettings.configurePrompt "Кликни на "Постави" да ги поставите мрежните поставки ако сте во земја која го цензурира Tor (како Египет, Кина, Турција) или ако се поврзувате од приватна мрежа која бара прокси."> +<!ENTITY torSettings.configure "Постави"> +<!ENTITY torSettings.connect "Поврзи">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "Почекај за стартување на Tor..."> +<!ENTITY torsettings.restartTor "Повторно стартување на Tor"> +<!ENTITY torsettings.reconfigTor "Промени поставки"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Имате поставено Tor мостови или имате внесено локални прокси поставки.  Директно да се поврзете на Tor мрежата, овие поставки мораат да бидат избришани."> +<!ENTITY torsettings.discardSettings.proceed "Избриши ги поставките и Поврзи се"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Опционално"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.checkbox "Користам прокси за поврзување на Интернет"> +<!ENTITY torsettings.useProxy.type "Тип на прокси:"> +<!ENTITY torsettings.useProxy.type.placeholder "одбери тип на прокси"> +<!ENTITY torsettings.useProxy.address "Адреси:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP адреси или име на хост"> <!ENTITY torsettings.useProxy.port "Порта:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!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 "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> - -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку огнен ѕид кој дозволува конекции до одредени порти"> +<!ENTITY torsettings.firewall.allowedPorts "Дозволени порти:"> +<!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран во мојата држава"> +<!ENTITY torsettings.useBridges.default "Одбери вграден мост"> +<!ENTITY torsettings.useBridges.default.placeholder "селектирај мост"> +<!ENTITY torsettings.useBridges.custom "Обезбеди мост кој го знам"> +<!ENTITY torsettings.useBridges.label "Внесете информации за мост од доверлив извор."> +<!ENTITY torsettings.useBridges.placeholder "внеси адреса:порта (по една во секој ред)"> + +<!ENTITY torsettings.copyLog "Внеси го Tor логот за залепување"> + +<!ENTITY torsettings.proxyHelpTitle "Прокси помош"> +<!ENTITY torsettings.proxyHelp1 "Локален прокси е потребен кога се приклучувате преку компанија, училиште, или универзитетска морежа.  Ако не сте сигурни како да одговорите на ова прашање, погледнете во Интернет поставките во друг Интернет прелистувач или проверете ги вашите системски мрежни поставки да видите дали е потребен прокси."> + +<!ENTITY torsettings.bridgeHelpTitle "Мост јазол помош"> +<!ENTITY torsettings.bridgeHelp1 "Мостовите се инеизлистани јазли кои го прават потешко блокирањето на врските кон Tor мрежата.  Секој тип на мост користи различен метод за избегнување на цензурирањето.  obfs мостот го прави протокот на информации да изгледа нормален, како од е од некој стандарден прелистувач наместо од Tor."> +<!ENTITY torsettings.bridgeHelp2 "Поради колку конкретно државите се обидуваат да го блокираат Tor, конкретни мостови работат во едни конкретни држави но не и во други.  Ако не си сигурен кои мостови работат во твојата држава, посети torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави конекција со Тор мрежата.  Ова може да потрае неколку минути."> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 88f19ad..14b0309 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -1,64 +1,64 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor стартувач -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_exited_during_startup=Tor се исклучи за време на вклучувањето. Ова може да е поради грашка во вашата torrc датотека, грешка во Tor или друга програма во вашиот систем, или проблем со хардеверот. Додека не го поправите проблемот кој го предизвикува ова, и повторно не го вклучите Tor, Tor прелистувачот нема да се стартува. +torlauncher.tor_exited=Tor неочекувано се исклучи. Ова може да е до грешка во самиот Tor, друга програма во системот, или проблем со харверот. Додека повторно го стартувате Tor, Tor прелистувачот нема да може да ја отвори било која веб страна. Ако проблемот остане, ве молиме испратете копија од вашиот Tor лог на тимот за поддршка. +torlauncher.tor_exited2=Повротното старување на Tor нема да ви ги затвори табовите во вашиот прелистувач. +torlauncher.tor_controlconn_failed=Не може да се поврзе на Tor контролната порта. +torlauncher.tor_failed_to_start=Tor не успеа да се стартува. +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=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. +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=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_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=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 provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +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.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(работи во Кина) +torlauncher.bridge_suffix.meek-azure=(работи во Кина) -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.connect=Поврзи +torlauncher.restart_tor=Повторно стартување на Tor +torlauncher.quit=Откажи torlauncher.quit_win=Излез torlauncher.done=Завршено -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=За асистенција, контактирајте %S +torlauncher.forAssistance2=За помош, посетете %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Копирај комплетно. %S Tor лог пораките се подготвени да бидат залепени во уредувач на текст или во порака за е-пошта. -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +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=Поврзување на Тор мрежата -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.handshake_or=Воспоставување на Tor круг +torlauncher.bootstrapStatus.done=Поврзан на Tor мрежата. -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -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 +torlauncher.bootstrapWarning.done=завршено +torlauncher.bootstrapWarning.connectrefused=врската е одбиена +torlauncher.bootstrapWarning.misc=разно +torlauncher.bootstrapWarning.resourcelimit=недоволни ресурси +torlauncher.bootstrapWarning.identity=идентитетско несогласување +torlauncher.bootstrapWarning.timeout=времето за врска истече +torlauncher.bootstrapWarning.noroute=нема рута до хост +torlauncher.bootstrapWarning.ioerror=грешка при читајње/запишување +torlauncher.bootstrapWarning.pt_missing=недостасува вклучувакчи транспорт diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 190b56e..24649f9 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klikk "koble til" for å koble til Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Klikk "Sett opp" for å justere nettverksinnstillinger hvis du er i et land som sensurerer Tor (som Egypt, Kina, Tyrkia,) eller hvis du kobler til fra et privat nettverk som krever en mellomtjener."> <!ENTITY torSettings.configure "Sett opp"> <!ENTITY torSettings.connect "Koble til"> diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index a301a99..6037717 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Clique em “Conectar-se” para conectarse ao Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Clique em “Configurar” para definir as configurações de rede caso esteja um país em que o uso de Tor é impossibilitado (Egito, China e Turquia, por exemplo) ou esteja conectando-se por meio de uma rede privada que requeira um proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar"> diff --git a/src/install.rdf b/src/install.rdf index ba2640e..382966c 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.14.2</em:version> + <em:version>0.2.14.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Update translations
by gk＠torproject.org 17 Jan '18

17 Jan '18

commit f48999a75488e5e146b2383fd6329a85a93c98ac Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 17 11:10:37 2018 +0000 Update translations --- src/chrome/locale/ar/network-settings.dtd | 18 ++++----- src/chrome/locale/ar/torlauncher.properties | 4 +- src/chrome/locale/bg/network-settings.dtd | 2 +- src/chrome/locale/br/network-settings.dtd | 2 +- src/chrome/locale/br/torlauncher.properties | 2 +- src/chrome/locale/ca/network-settings.dtd | 2 +- src/chrome/locale/da/network-settings.dtd | 2 +- src/chrome/locale/el/network-settings.dtd | 4 +- src/chrome/locale/es/network-settings.dtd | 2 +- src/chrome/locale/fa/network-settings.dtd | 6 +-- src/chrome/locale/ga/network-settings.dtd | 2 +- src/chrome/locale/ja/network-settings.dtd | 22 +++++------ src/chrome/locale/mk/network-settings.dtd | 2 +- src/chrome/locale/mk/torlauncher.properties | 2 +- src/chrome/locale/ms-MY/network-settings.dtd | 2 +- src/chrome/locale/ms-MY/torlauncher.properties | 54 +++++++++++++------------- src/chrome/locale/nl/network-settings.dtd | 2 +- src/chrome/locale/pt/network-settings.dtd | 16 ++++---- src/chrome/locale/ro/network-settings.dtd | 36 ++++++++--------- src/chrome/locale/ro/torlauncher.properties | 4 +- src/chrome/locale/ru/network-settings.dtd | 36 ++++++++--------- src/chrome/locale/sv/network-settings.dtd | 6 +-- src/chrome/locale/sv/torlauncher.properties | 2 +- src/chrome/locale/th/network-settings.dtd | 2 +- src/chrome/locale/th/torlauncher.properties | 14 +++---- src/chrome/locale/tr/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/network-settings.dtd | 2 +- src/chrome/locale/zh-TW/network-settings.dtd | 36 ++++++++--------- 28 files changed, 143 insertions(+), 143 deletions(-) diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 6c13156..ecc7e71 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "إعدادات شبكة تور"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "إتصل بشبكة تور"> +<!ENTITY torsettings.wizard.title.configure "إعدادات شبكة تور"> +<!ENTITY torsettings.wizard.title.connecting "عملية الربط جارية">  <!ENTITY torlauncher.localePicker.title "لغة متصفح تور"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "اختياري"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "إنني أستخدم وكيلا للبروكسي للإتصال بالأنترنت"> <!ENTITY torsettings.useProxy.type "نوع البروكسي:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "إختر نوع البروكسي"> <!ENTITY torsettings.useProxy.address "العنوان:"> <!ENTITY torsettings.useProxy.address.placeholder "عنوان الإنترنت IP أو اسم المضيف"> <!ENTITY torsettings.useProxy.port "المنفذ:"> @@ -38,10 +38,10 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة"> <!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> +<!ENTITY torsettings.useBridges.checkbox "تور محجوب في بلدي"> +<!ENTITY torsettings.useBridges.default "إختر جسرا مُدمَجا في البرنامج"> +<!ENTITY torsettings.useBridges.default.placeholder "إختر جسرا"> +<!ENTITY torsettings.useBridges.custom "إدخال عنوان جسرٍ أعرفه"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index a7f14b5..13dca84 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد torlauncher.error_default_bridges_type_missing=يجب عليك تحديد نوع الجسور المقدمة مع المتصفح. torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر بداخل الجسور المقدمة مع المتصفح. الرجاء تعديل إعداداتك. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(شغال في الصين) +torlauncher.bridge_suffix.meek-azure=(شغال في الصين) torlauncher.connect=اتصل torlauncher.restart_tor=إعادة تشغيل تور diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 9887b54..9fbdd14 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Натиснете "Свързване", за да се свържете с Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Натиснете "Настройки", за да зададете мрежови настройки ако сте в страна, която цензурира Tor(като Египет, Китай, Турция) или ако се свързвате от лична мрежа, която изисква прокси."> <!ENTITY torSettings.configure "Конфигурирай"> <!ENTITY torSettings.connect "Свържи се"> diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index 85645d7..7406124 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -55,4 +55,4 @@ <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Gortozit mar plij ma tiazefemp ur gevreadenn ouzh ar genrouedad Tor.   Gellout a rafe kemer meur a vunutenn."> diff --git a/src/chrome/locale/br/torlauncher.properties b/src/chrome/locale/br/torlauncher.properties index b09753e..8b87e76 100644 --- a/src/chrome/locale/br/torlauncher.properties +++ b/src/chrome/locale/br/torlauncher.properties @@ -49,7 +49,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=O kevreañ d'ar genrouedad Tor torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index cf44305..0f379c5 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Feu clic a "Connectar" per a connectar a Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Feu clic a "Configura" per ajustar la configuració de la xarxa si esteu en un país que censura Tor (com ara Egipte, Xina, Turquia) o si esteu connectant des d'una xarxa privada que requereix un servidor intermediari."> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connect "Conecta't"> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 689af5c..e803d6d 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klik på “Opret forbindelse” for at oprette forbindelse til Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Klik på “Konfigurer” for at justere netværksindstillinger hvis du er i et land som censurerer Tor (såsom Egypten, Kina, Tyrkiet) eller hvis du opretter forbindelse fra et privat netværk som kræver en proxy."> <!ENTITY torSettings.configure "Indstil"> <!ENTITY torSettings.connect "Tilslut"> diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 5d69b11..5cf7654 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -1,6 +1,6 @@ <!ENTITY torsettings.dialog.title "Tor Ρυθμίσεις Δικτύου "> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "Σύνδεση στο Tor"> +<!ENTITY torsettings.wizard.title.configure "Ρυθμίσεις δικτύου Tor"> <!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index a9850f7..101ff12 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Pincha en "Connect" para conectar con Tor"> -<!ENTITY torSettings.configurePrompt "Pulse "Configurar" para ajustar la configuración de red si está en un país que censura Tor (como Egipto, China, Turquía) o si está conectando desde una red privada que requiere un proxy."> +<!ENTITY torSettings.configurePrompt "Pulsa "Configurar" para ajustar la configuración de red si estás en un país que censura Tor (como Egipto, China, Turquía) o si estás conectando desde una red privada que requiera un proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar"> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index f2e3d2b..728bf00 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -1,6 +1,6 @@ <!ENTITY torsettings.dialog.title "تنظیمات شبکه تور"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.default "اتصال به تور"> +<!ENTITY torsettings.wizard.title.configure "تنظیمات شبکه Tor"> <!ENTITY torsettings.wizard.title.connecting "Establishing a Connection">  @@ -47,7 +47,7 @@ <!ENTITY torsettings.copyLog "کپی گزارش وقایع تور"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelpTitle "کمک پروکسی"> <!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> <!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی"> diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index 63ac611..9ee7bea 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Cliceáil “Ceangail” chun ceangal a bhunú le Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Cliceáil “Cumraigh” chun na socruithe líonra a athrú má tá tú i do chónaí i dtír a dhéanann cinsireacht ar Tor (mar shampla san Éigipt, sa tSín, nó sa Tuirc), nó má tá tú ag ceangal ó líonra príobháideach a úsáideann seachfhreastalaí."> <!ENTITY torSettings.configure "Cumraigh"> <!ENTITY torSettings.connect "Ceangail"> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index e2cd7d7..f14590e 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Torネットワーク設定"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Tor に接続する"> +<!ENTITY torsettings.wizard.title.configure "Tor ネットワーク設定"> +<!ENTITY torsettings.wizard.title.connecting "接続を確立しています">  <!ENTITY torlauncher.localePicker.title "Tor ブラウザー言語"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "「接続」をクリックすると Tor に接続します。"> +<!ENTITY torSettings.configurePrompt "Tor による通信を検閲する国（エジプト、中国、トルコ等）にいる場合やプロキシを要求するプライベートネットワークから接続する場合、「設定」をクリックしてネットワーク設定を調整します。"> <!ENTITY torSettings.configure "構成"> <!ENTITY torSettings.connect "接続"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "オプション"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "インターネットに接続するのにプロキシを使用します"> <!ENTITY torsettings.useProxy.type "Proxyの種類:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "プロキシの種類を選択"> <!ENTITY torsettings.useProxy.address "アドレス:"> <!ENTITY torsettings.useProxy.address.placeholder "IPアドレスまたはホストネーム"> <!ENTITY torsettings.useProxy.port "ポート"> @@ -38,17 +38,17 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。"> <!ENTITY torsettings.firewall.allowedPorts "許可されたポート:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.checkbox "Tor は私の国では検閲されています"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.placeholder "アドレス:ポートを入力（1行につきひとつ）"> <!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "プロキシヘルプ"> +<!ENTITY torsettings.proxyHelp1 "会社、学校、大学等のネットワークを通して接続する場合、ローカルプロクシが必要になります。 もしこの質問にどう答えればよいかわからない場合は、他のブラウザのインターネット設定を見るか、システムのネットワーク設定を確認するかして、プロクシが必要であるかを調べてください。"> <!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 951952e..8cd5042 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -55,4 +55,4 @@ <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави конекција со Тор мрежата.  Ова може да потрае неколку минути."> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index cb2fd69..88f19ad 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -49,7 +49,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=Поврзување на Тор мрежата torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index d2b8962..43d7d2f 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klik "Sambung" untuk bersambung dengan Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt ".Klik "Konfigur" untuk laraskan tetapan rangkaian jika anda berada di negara yang melarang penggunaan Tor (seperti Mesir, China, Turki) atau jika anda menyambung dengan rangkaian persendirian yang memerlukan proksi"> <!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connect "Sambung"> diff --git a/src/chrome/locale/ms-MY/torlauncher.properties b/src/chrome/locale/ms-MY/torlauncher.properties index 2706398..786a165 100644 --- a/src/chrome/locale/ms-MY/torlauncher.properties +++ b/src/chrome/locale/ms-MY/torlauncher.properties @@ -8,14 +8,14 @@ torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in To torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Tidak dapat menyambung ke port kawalan Tor. torlauncher.tor_failed_to_start=Tor gagal untuk bermula. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_control_failed=Gagal mengambil alih Tor. +torlauncher.tor_bootstrap_failed=Tor gagal untuk mewujudkan sambungan rangkaian Tor. +torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S). torlauncher.unable_to_start_tor=Tidak dapat memulakan Tor.\n\n%S torlauncher.tor_missing=Tor executable hilang. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=Fail torrc hilang dan tidak dapat dicipta. +torlauncher.datadir_missing=Direktori data Tor tidak wujud dan tidak dapat dicipta. torlauncher.password_hash_missing=Gagal untuk mendapatkan kata laluan hashes. torlauncher.failed_to_get_settings=Gagal mendapatkan tetapan Tor.\n\n%S @@ -25,11 +25,11 @@ torlauncher.ensure_tor_is_running=Sila pastikan bahawa Tor telah berjalan. torlauncher.error_proxy_addr_missing=Anda mesti nyatakan kedua-dua alamat IP atau nama hos dan nombor port bagi mengkonfigur Tor untuk menggunakan proksi yang dapat mencapai Internet. torlauncher.error_proxy_type_missing=Anda mesti pilih jenis proksi. torlauncher.error_bridges_missing=Anda mesti nyatakan satu atau lebih titi. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_default_bridges_type_missing=Anda mesti pilih jenis angkutan untuk titi yang disediakan. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(berfungsi di China) +torlauncher.bridge_suffix.meek-azure=(berfungsi di China) torlauncher.connect=Sambung torlauncher.restart_tor=Mula Semula Tor @@ -38,27 +38,27 @@ torlauncher.quit_win=Keluar torlauncher.done=Selesai torlauncher.forAssistance=Untuk bantuan, hubungi %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Untuk dapatkan bantuan, lawati %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_dir=Menyambung dengan direktori geganti +torlauncher.bootstrapStatus.handshake_dir=Menjalinkan sambungan direktori tersulit +torlauncher.bootstrapStatus.requesting_status=Memperoleh status rangkaian +torlauncher.bootstrapStatus.loading_status=Memuatkan status rangkaian +torlauncher.bootstrapStatus.loading_keys=Memuatkan sijil kuasa +torlauncher.bootstrapStatus.requesting_descriptors=Meminta maklumat geganti +torlauncher.bootstrapStatus.loading_descriptors=Memuatkan maklumat geganti torlauncher.bootstrapStatus.conn_or=Menyambung ke rangkaian Tor -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.handshake_or=Menjalinkan litar Tor +torlauncher.bootstrapStatus.done=Bersambung dengan rangkaian Tor! -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -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 +torlauncher.bootstrapWarning.done=selesai +torlauncher.bootstrapWarning.connectrefused=sambungan dinafikan +torlauncher.bootstrapWarning.misc=pelbagai +torlauncher.bootstrapWarning.resourcelimit=sumber tidak mencukupi +torlauncher.bootstrapWarning.identity=identiti tidak sepadan +torlauncher.bootstrapWarning.timeout=sambungan tamat masa +torlauncher.bootstrapWarning.noroute=tiada hala dihoskan +torlauncher.bootstrapWarning.ioerror=ralat baca/tulis +torlauncher.bootstrapWarning.pt_missing=angkutan boleh palam hilang diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index a1e2a83..45619c3 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klik "Verbind" om met Tor te verbinden."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Klik op "Configureren" om de netwerkinstellingen aan te passen als u zich in een land bevindt waar Tor gecensureerd wordt (zoals Egypte, China, Turkije) of als u verbinding maakt via een particulier netwerk waarvoor een proxy vereist is."> <!ENTITY torSettings.configure "Configureren"> <!ENTITY torSettings.connect "Verbinden"> diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 2c4e38d..1dcd596 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Configurações da Rede Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Ligar ao Tor"> +<!ENTITY torsettings.wizard.title.configure "Definições da Rede Tor"> +<!ENTITY torsettings.wizard.title.connecting "A Estabelecer a Ligação">  <!ENTITY torlauncher.localePicker.title "Idioma do Navegador Tor"> @@ -9,7 +9,7 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.connectPrompt "Clique em 'Ligar' para se ligar ao Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Ligar"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Opcional"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Eu utilizo um proxy para ligar à Internet"> <!ENTITY torsettings.useProxy.type "Tipo de proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "selecionar um tipo de proxy"> <!ENTITY torsettings.useProxy.address "Endereço:"> <!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do hospedeiro"> <!ENTITY torsettings.useProxy.port "Porta:"> @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.checkbox "Tor é censurado no meu país"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> @@ -47,7 +47,7 @@ <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelpTitle "Ajuda de Proxy"> <!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> <!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte"> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 80338f7..855e3e0 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Setări rețea Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Conectare la Tor"> +<!ENTITY torsettings.wizard.title.configure "Setări Rețea Tor"> +<!ENTITY torsettings.wizard.title.connecting "Stabilire Conexiune">  <!ENTITY torlauncher.localePicker.title "Limba pentru Tor Browser"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Apasă "Conectare" pentru a te conecta la Tor"> +<!ENTITY torSettings.configurePrompt "Apasă "Configurare" pentru a modifica setările de rețea dacă te afli într-o țară care blochează Tor (cum ar fi Egipt, China, Turcia) sau dacă te conectezi dintr-o rețea privată care necesită un proxy."> <!ENTITY torSettings.configure "Configuraţi "> <!ENTITY torSettings.connect "Conectare"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Opțional"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Folosesc un proxy pentru a mă conecta la Internet"> <!ENTITY torsettings.useProxy.type "Tip proxy:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "alege un tip de proxy"> <!ENTITY torsettings.useProxy.address "Adresă:"> <!ENTITY torsettings.useProxy.address.placeholder "Adresă IP sau hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Acest computer iese printr-un firewall care permite doar conexiuni către anumite porturi"> <!ENTITY torsettings.firewall.allowedPorts "Porturi permise:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor este cenzurat în țara mea"> +<!ENTITY torsettings.useBridges.default "Selectează o punte integrată"> +<!ENTITY torsettings.useBridges.default.placeholder "selectează o punte"> +<!ENTITY torsettings.useBridges.custom "Furnizează o punte pe care o știu"> +<!ENTITY torsettings.useBridges.label "Introdu informația despre punte dintr-o sursă de încredere"> +<!ENTITY torsettings.useBridges.placeholder "scrie adresă:port (una pe linie)"> <!ENTITY torsettings.copyLog "Copiați jurnalul Tor în Clipboard"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Ajutor Proxy"> +<!ENTITY torsettings.proxyHelp1 "Un proxy local este necesar la conectarea din rețeaua unei companii, școli sau universități. Dacă nu ești sigur cum să răspunzi la întrebare, vezi setările pentru Internet în alt navigator web sau verifică setările de rețea pentru a vedea dacă o setare de proxy e necesară."> <!ENTITY torsettings.bridgeHelpTitle "Ajutor Bridge Relay"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Punțile sunt relee ne-listate care fac mai dificilă blocarea conexiunilor spre Rețeaua Tor.   Fiecare tip de punte folosește o altă metodă pentru a evita cenzura.   Cele obfs fac traficul tău să semene cu zgomot aleatoriu, iar cele meek fac traficul să pară că se conectează la acel serviciu în loc de Tor."> +<!ENTITY torsettings.bridgeHelp2 "Datorită modului în care diverse țări încearcă să blocheze Tor, unele punți funcționează doar în anumite țări și nu în altele.   Dacă nu ești sigur ce punți funcționează în țara ta, vizitează torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Te rugăm să aștepți până ce stabilim o conexiune cu rețeaua Tor.   Aceasta poate dura mai multe minute."> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index f02d004..3e2e312 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Trebuie sa specifici una sau mai multe poduri. torlauncher.error_default_bridges_type_missing=Trebuie să alegeți un tip de transport pentru punțile oferite torlauncher.error_bridge_bad_default_type=Nici una din punțile oferite care să ofere transport tip %S este disponibilă. Ajutați setările. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(funcționează în China) +torlauncher.bridge_suffix.meek-azure=(funcționează în China) torlauncher.connect=Conectare torlauncher.restart_tor=Repornește Tor diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index fcbdfc7..febae80 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Настройки сети Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "Подключиться к Tor"> +<!ENTITY torsettings.wizard.title.configure "Сетевые настройки Tor"> +<!ENTITY torsettings.wizard.title.connecting "Создать подключение">  <!ENTITY torlauncher.localePicker.title "Язык браузера Tor"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "Нажмите "Подключиться", чтобы подключиться к Tor."> +<!ENTITY torSettings.configurePrompt "Нажмите "Настроить", чтобы уточнить настройки сети, если вы находитесь в стране, запрещающей Tor (такие как Египет, Китай, Турция), или если вы подключаетесь из приватной сети, требующей прокси."> <!ENTITY torSettings.configure "Настроить"> <!ENTITY torSettings.connect "Соединиться"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "Необязательно"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Я использую прокси для подключения к Интернет"> <!ENTITY torsettings.useProxy.type "Тип Прокси:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "выбрать тип прокси"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или имя узла"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам"> <!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "Tor запрещён в моей стране"> +<!ENTITY torsettings.useBridges.default "Выбрать встроенный мост"> +<!ENTITY torsettings.useBridges.default.placeholder "выбрать мост"> +<!ENTITY torsettings.useBridges.custom "Указать мост, который я знаю"> +<!ENTITY torsettings.useBridges.label "Введите информацию о мосте от доверенного источника."> +<!ENTITY torsettings.useBridges.placeholder "напечатайте адрес:порт (по одному в строке)"> <!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "Помощь по прокси"> +<!ENTITY torsettings.proxyHelp1 "Локальный прокси нужен при подключении из корпоративной, школьной или вузовской сети. Если вы уверены в ответе на этот вопрос, посмотрите на настройки Интернета в другом браузере или проверьте ваши системные настройки сети, чтобы увидеть, нужен ли прокси."> <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "Мосты - это незарегистрированные реле, которые затрудняют блокировку соединений с сетью Tor.&#160 Каждый тип моста использует отличный от других метод, чтобы избежать блокировки цезорами. Обходные устройства делают ваш трафик похожим на случайный шум и имитируют то, что он подключается к этой службе вместо Tor."> +<!ENTITY torsettings.bridgeHelp2 "Из-за того, как именно страны пытаются блокировать Tor, определённые мосты работают в одних странах, но не работают в других.  Если вы не уверены в том, какие мосты сработает в вашей стране, посетите torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут."> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index d158134..927532c 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -42,7 +42,7 @@ <!ENTITY torsettings.useBridges.default "Välj en inbyggd brygga"> <!ENTITY torsettings.useBridges.default.placeholder "Välj en brygga"> <!ENTITY torsettings.useBridges.custom "Använd en egen brygga"> -<!ENTITY torsettings.useBridges.label "Ange brygg informationen från en trodd källa"> +<!ENTITY torsettings.useBridges.label "Ange brygg informationen från en betrodd källa"> <!ENTITY torsettings.useBridges.placeholder "skriv adress:port (en per rad)"> <!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet"> @@ -50,8 +50,8 @@ <!ENTITY torsettings.proxyHelpTitle "Proxy hjälp"> <!ENTITY torsettings.proxyHelp1 "En lokal proxy behövs när du ansluter via ett företag, skola eller universitets nätverk.   Om du inte är säker på hur du ska svara på denna frågan, se Internet inställningar i en annan webbläsaren eller kolla ditt systems nätverks inställningar för att se ifall en proxy behövs."> -<!ENTITY torsettings.bridgeHelpTitle "Hjälp om bryggor"> -<!ENTITY torsettings.bridgeHelp1 "Bryggor är olistade reläer som gör det svårare att blockera anslutningar till Tor nätverket.   Var typ av brygga använder sig av olika metoder för att unvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor."> +<!ENTITY torsettings.bridgeHelpTitle "Hjälp om relä bryggor"> +<!ENTITY torsettings.bridgeHelp1 "Bryggor är olistade reläer som gör det svårare att blockera anslutningar till Tor nätverket.   Var typ av brygga använder sig av olika metoder för att undvika censur.   Obfs gör att din trafik ser ut som brus och meek gör att din trafik ser ut som att du ansluter till tjänsten istället för Tor."> <!ENTITY torsettings.bridgeHelp2 "I och med att vissa länder försöker blockera Tor fungerar inte alla bryggor i alla länder.   Ifall du är osäker på vilka bryggor som fungerar i ditt land besök torproject.org/about/contact.html#support">  diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 7d7bdf1..f9e8686 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -50,7 +50,7 @@ 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.handshake_or=Etablerar en Tor-krets torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket! torlauncher.bootstrapWarning.done=klar diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index cdf5a9b..1ad7ebc 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -55,4 +55,4 @@ <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "กรุณรอระหว่างที่เรากำลังสร้างการเชื่อมต่อไปยังเครือข่าย Tor   นี่อาจจะใช้เวลาสักสองสามนาที"> diff --git a/src/chrome/locale/th/torlauncher.properties b/src/chrome/locale/th/torlauncher.properties index 6c13fdf..6cfe64d 100644 --- a/src/chrome/locale/th/torlauncher.properties +++ b/src/chrome/locale/th/torlauncher.properties @@ -9,8 +9,8 @@ torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=ไม่สามารถเชื่อมต่อกับพอร์ตควบคุมของ Tor ได้ torlauncher.tor_failed_to_start=การเริ่ม Tor ล้มเหลว torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +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 ขาดหายไป @@ -28,8 +28,8 @@ 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.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(ใช้งานได้ในประเทศจีน) +torlauncher.bridge_suffix.meek-azure=(ใช้งานได้ในประเทศจีน) torlauncher.connect=เชื่อมต่อ torlauncher.restart_tor=เริ่มการทำงานของ Tor ใหม่ @@ -38,7 +38,7 @@ torlauncher.quit_win=ออก torlauncher.done=สำเร็จ torlauncher.forAssistance=ต้องการคำแนะนำ ติดต่อ %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=สำหรับความช่วยเหลือ ดูที่ %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. @@ -47,8 +47,8 @@ torlauncher.bootstrapStatus.handshake_dir=กำลังสร้างกา torlauncher.bootstrapStatus.requesting_status=กำลังตรวจสถานะเครือข่าย torlauncher.bootstrapStatus.loading_status=กำลังดึงข้อมูลสถานะเครือข่าย torlauncher.bootstrapStatus.loading_keys=กำลังดึง ใบรับรองการให้สิทธิ (authority certificates) -torlauncher.bootstrapStatus.requesting_descriptors=กำลังร้องขอ ข้อมูล relay -torlauncher.bootstrapStatus.loading_descriptors=กำลังดึง ข้อมูล relay +torlauncher.bootstrapStatus.requesting_descriptors=กำลังร้องขอข้อมูล relay +torlauncher.bootstrapStatus.loading_descriptors=กำลังดึงข้อมูล relay torlauncher.bootstrapStatus.conn_or=กำลังเชื่อมต่อสู่เครือข่าย Tor torlauncher.bootstrapStatus.handshake_or=กำลังสร้างวงจรเชื่อมต่อ Tor torlauncher.bootstrapStatus.done=เชื่อมต่อสู่เครือข่าย Tor เรียบร้อย! diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 6111cfb..9e3cbe1 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Tor ağına bağlanmak için "Bağlan" üzerine tıklayın."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Tor ağını engelleyen bir ülkedeyseniz (Çin, İran, Suriye gibi) ya da vekil sunucu kullanılması gereken özel bir ağdan bağlanıyorsanız, ağ ayarlarını yapmak için "Yapılandır" üzerine tıklayın."> <!ENTITY torSettings.configure "Yapılandır"> <!ENTITY torSettings.connect "Bağlan"> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index fe4f697..046d26d 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "请点击“连接”以连接至 Tor 网络。"> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "如果您所在的国家（如埃及，中国，土耳其）对Tor进行审查，或者您处于私人网络需要代理。请点击“配置”，对网络设置进行调整。"> <!ENTITY torSettings.configure "配置"> <!ENTITY torSettings.connect "连接"> diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index c579112..3de752f 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "洋蔥路由網路設定"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.default "連結 Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor 網路設定"> +<!ENTITY torsettings.wizard.title.connecting "建立 Tor 連線">  <!ENTITY torlauncher.localePicker.title "洋蔥路由瀏覽器之語言"> @@ -9,8 +9,8 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "點擊"連接"來連上 Tor "> +<!ENTITY torSettings.configurePrompt "如果您處於會監視tor網絡的國家（例如埃及，中國，土耳其）或者您位於私人網絡中，需要代理訪問互聯網。請點擊“配置”更改網絡設置。"> <!ENTITY torSettings.configure "設定"> <!ENTITY torSettings.connect "連接"> @@ -25,9 +25,9 @@ <!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "使用代理服務連線到網際網路"> <!ENTITY torsettings.useProxy.type "代理伺服器類型："> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "選擇代理伺服器類型"> <!ENTITY torsettings.useProxy.address "位址："> <!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱"> <!ENTITY torsettings.useProxy.port "連接埠："> @@ -38,21 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連線埠的防火牆"> <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠："> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.checkbox "我的國家中 Tor 受到審查"> +<!ENTITY torsettings.useBridges.default "選擇內建的橋接"> +<!ENTITY torsettings.useBridges.default.placeholder "選擇網橋"> +<!ENTITY torsettings.useBridges.custom "提供一個認識的橋接 "> +<!ENTITY torsettings.useBridges.label "從信任的來源輸入橋接資訊"> +<!ENTITY torsettings.useBridges.placeholder "種類地址:端口 (一行一個)"> <!ENTITY torsettings.copyLog "將洋蔥路由的訊息記錄複製到剪貼簿"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelpTitle "代理協助"> +<!ENTITY torsettings.proxyHelp1 "當您通過公司，學校或者大學網絡進行連接時，您需要一個本地代理。如果您不確定如何回答這個問題，請參考其他瀏覽器的網絡設置或者系統網絡設置，來決定是否需要本地代理。"> <!ENTITY torsettings.bridgeHelpTitle "橋接中繼器之說明"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "網橋是未位於列表的中繼，可以使得tor網絡更難被屏蔽。 不同類別的網橋使用不同方法規避審查。.  obfs使您的通訊類似隨機發出的雜音，meek使您的通訊看起來是訪問他們的服務而不是tor。"> +<!ENTITY torsettings.bridgeHelp2 "因為某些國家嘗試屏蔽tor，一些特定的網橋只能在特定的國家生效在其他地區則會失活。 如果您不確定哪些網橋在您的國家生效，請訪問torproj…">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "請耐心等候，我們正在建立tor網絡。 這個過程將會需要幾分鐘的時間。">

1 0

[tor-browser/tor-browser-52.5.2esr-8.0-1] Bug 1403412 - disable VP9 estimizer on Mac; r=jya
by gk＠torproject.org 17 Jan '18

17 Jan '18

commit deaabb54809b2de56b2b5ce98a0f629c1455fcf5 Author: Kaku Kuo <kaku(a)mozilla.com> Date: Thu Sep 28 00:17:29 2017 +0800 Bug 1403412 - disable VP9 estimizer on Mac; r=jya MozReview-Commit-ID: 8RTe7lVSRwl --HG-- extra : rebase_source : 5e67fae9fa287c4188402d8956d90e4ce47e1f32 --- dom/media/Benchmark.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp index 2364ac2fa79c..af0f4a562da4 100644 --- a/dom/media/Benchmark.cpp +++ b/dom/media/Benchmark.cpp @@ -34,7 +34,8 @@ VP9Benchmark::IsVP9DecodeFast() { MOZ_ASSERT(NS_IsMainThread()); -#ifdef MOZ_WIDGET_ANDROID + // Disable VP9 estimizer on Mac, see bug 1400787. +#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_APPLEMEDIA) return false; #else bool hasPref = Preferences::HasUserValue(sBenchmarkFpsPref);

1 0

[tor-browser/tor-browser-52.5.2esr-8.0-1] Bug 22548: Firefox downgrades VP9 videos to VP8.
by gk＠torproject.org 17 Jan '18

17 Jan '18

commit 9080c51a22a03aaf8e49d5552253ed716414c760 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Sat Jan 6 21:26:05 2018 +0100 Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". --- browser/app/profile/000-tor-browser.js | 2 ++ dom/media/Benchmark.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 32922418b12f..1302d2e2d6be 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -160,6 +160,8 @@ pref("javascript.use_us_english_locale", true); // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton // Disable video statistics fingerprinting vector (bug 15757) pref("media.video_stats.enabled", false); +// Set video VP9 to 0 for everyone (bug 22548) +pref("media.benchmark.vp9.threshold", 0); // Disable device sensors as possible fingerprinting vector (bug 15758) pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp index a4761f1b1ec8..2364ac2fa79c 100644 --- a/dom/media/Benchmark.cpp +++ b/dom/media/Benchmark.cpp @@ -79,7 +79,7 @@ VP9Benchmark::IsVP9DecodeFast() uint32_t decodeFps = Preferences::GetUint(sBenchmarkFpsPref); uint32_t threshold = - Preferences::GetUint("media.benchmark.vp9.threshold", 150); + Preferences::GetUint("media.benchmark.vp9.threshold", 0); return decodeFps >= threshold; #endif

1 0

[tor-browser-build/master] Bug 18691: switch Windows builds from precise to jessie
by gk＠torproject.org 17 Jan '18

17 Jan '18

commit d6eb63ecc91d3227fce195af5e003c9928958e9f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 10 13:22:31 2018 +0100 Bug 18691: switch Windows builds from precise to jessie --- projects/argparse/build | 4 +- projects/argparse/config | 3 +- projects/binutils/build | 2 + projects/binutils/config | 2 + projects/binutils/fix-warning-bfd.patch | 186 ++++++++++++++++++++++++++++++++ projects/fteproxy/build | 2 +- projects/fteproxy/config | 3 +- projects/libfte/build | 4 +- projects/libfte/config | 2 +- projects/obfsproxy/build | 4 +- projects/obfsproxy/config | 3 +- projects/parsley/build | 4 +- projects/parsley/config | 3 +- projects/pycrypto/build | 2 +- projects/pycrypto/config | 2 +- projects/pyptlib/build | 2 +- projects/pyptlib/config | 3 +- projects/pyyaml/build | 4 +- projects/pyyaml/config | 3 +- projects/twisted/build | 4 +- projects/twisted/config | 2 +- projects/txsocksx/build | 4 +- projects/txsocksx/config | 3 +- projects/winpython/build | 4 +- projects/winpython/config | 4 +- projects/zope.interface/build | 4 +- projects/zope.interface/config | 2 +- rbm.conf | 32 +----- 28 files changed, 234 insertions(+), 63 deletions(-) diff --git a/projects/argparse/build b/projects/argparse/build index 29e4221..3d5b424 100644 --- a/projects/argparse/build +++ b/projects/argparse/build @@ -13,8 +13,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] python2 setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ diff --git a/projects/argparse/config b/projects/argparse/config index c4d9dec..730a4f1 100644 --- a/projects/argparse/config +++ b/projects/argparse/config @@ -15,7 +15,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/binutils/build b/projects/binutils/build index aa0d752..ee6db1a 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -25,6 +25,8 @@ cd [% project %]-[% c("version") %] patch -p1 < ../peXXigen.patch # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch + # fix "right-hand operand of comma expression has no effect" warning + patch -p1 < ../fix-warning-bfd.patch [% END -%] [% IF c('var/windows-x86_64') -%] patch -p1 < ../64bit-fixups.patch diff --git a/projects/binutils/config b/projects/binutils/config index 25417c0..5c35588 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -19,6 +19,8 @@ input_files: - project: container-image - filename: enable-reloc-section-ld.patch enable: '[% c("var/windows") %]' + - filename: fix-warning-bfd.patch + enable: '[% c("var/windows") %]' - filename: 64bit-fixups.patch enable: '[% c("var/windows-x86_64") %]' - filename: peXXigen.patch diff --git a/projects/binutils/fix-warning-bfd.patch b/projects/binutils/fix-warning-bfd.patch new file mode 100644 index 0000000..fa04405 --- /dev/null +++ b/projects/binutils/fix-warning-bfd.patch @@ -0,0 +1,186 @@ +From 27b829ee701e29804216b3803fbaeb629be27491 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc(a)redhat.com> +Date: Wed, 29 Jan 2014 13:46:39 +0000 +Subject: [PATCH] Following up on Tom's suggestion I am checking in a patch to + replace the various bfd_xxx_set macros with static inline functions, so that + we can avoid compile time warnings about comma expressions with unused + values. + + * bfd-in.h (bfd_set_section_vma): Delete. + (bfd_set_section_alignment): Delete. + (bfd_set_section_userdata): Delete. + (bfd_set_cacheable): Delete. + * bfd.c (bfd_set_cacheable): New static inline function. + * section.c (bfd_set_section_userdata): Likewise. + (bfd_set_section_vma): Likewise. + (bfd_set_section_alignment): Likewise. + * bfd-in2.h: Regenerate. +--- + bfd/bfd-in.h | 5 ----- + bfd/bfd-in2.h | 41 +++++++++++++++++++++++++++++++++++------ + bfd/bfd.c | 8 ++++++++ + bfd/section.c | 26 ++++++++++++++++++++++++++ + 5 files changed, 81 insertions(+), 11 deletions(-) + +diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h +index 3afd71b..c7c5a7d 100644 +--- a/bfd/bfd-in.h ++++ b/bfd/bfd-in.h +@@ -292,9 +292,6 @@ typedef struct bfd_section *sec_ptr; + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +@@ -517,8 +514,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); + + #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) + +-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) +- + extern bfd_boolean bfd_cache_close + (bfd *abfd); + /* NB: This declaration should match the autogenerated one in libbfd.h. */ +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 71996db..b5aeb40 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -299,9 +299,6 @@ typedef struct bfd_section *sec_ptr; + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +@@ -524,8 +521,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); + + #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) + +-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) +- + extern bfd_boolean bfd_cache_close + (bfd *abfd); + /* NB: This declaration should match the autogenerated one in libbfd.h. */ +@@ -1029,7 +1024,7 @@ bfd *bfd_openr (const char *filename, const char *target); + + bfd *bfd_fdopenr (const char *filename, const char *target, int fd); + +-bfd *bfd_openstreamr (const char *, const char *, void *); ++bfd *bfd_openstreamr (const char * filename, const char * target, void * stream); + + bfd *bfd_openr_iovec (const char *filename, const char *target, + void *(*open_func) (struct bfd *nbfd, +@@ -1596,6 +1591,32 @@ struct relax_table { + int size; + }; + ++/* Note: the following are provided as inline functions rather than macros ++ because not all callers use the return value. A macro implementation ++ would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++ compilers will complain about comma expressions that have no effect. */ ++static inline bfd_boolean ++bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++{ ++ ptr->userdata = val; ++ return TRUE; ++} ++ ++static inline bfd_boolean ++bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++{ ++ ptr->vma = ptr->lma = val; ++ ptr->user_set_vma = TRUE; ++ return TRUE; ++} ++ ++static inline bfd_boolean ++bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++{ ++ ptr->alignment_power = val; ++ return TRUE; ++} ++ + /* These sections are global, and are managed by BFD. The application + and target back end are not permitted to change the values in + these sections. */ +@@ -6415,6 +6436,14 @@ struct bfd + unsigned int selective_search : 1; + }; + ++/* See note beside bfd_set_section_userdata. */ ++static inline bfd_boolean ++bfd_set_cacheable (bfd * abfd, bfd_boolean val) ++{ ++ abfd->cacheable = val; ++ return TRUE; ++} ++ + typedef enum bfd_error + { + bfd_error_no_error = 0, +diff --git a/bfd/bfd.c b/bfd/bfd.c +index 8d0580c..2d174f3 100644 +--- a/bfd/bfd.c ++++ b/bfd/bfd.c +@@ -311,6 +311,14 @@ CODE_FRAGMENT + . unsigned int selective_search : 1; + .}; + . ++.{* See note beside bfd_set_section_userdata. *} ++.static inline bfd_boolean ++.bfd_set_cacheable (bfd * abfd, bfd_boolean val) ++.{ ++. abfd->cacheable = val; ++. return TRUE; ++.} ++. + */ + + #include "sysdep.h" +diff --git a/bfd/section.c b/bfd/section.c +index fb19d8c..a661228 100644 +--- a/bfd/section.c ++++ b/bfd/section.c +@@ -542,6 +542,32 @@ CODE_FRAGMENT + . int size; + .}; + . ++.{* Note: the following are provided as inline functions rather than macros ++. because not all callers use the return value. A macro implementation ++. would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++. compilers will complain about comma expressions that have no effect. *} ++.static inline bfd_boolean ++.bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++.{ ++. ptr->userdata = val; ++. return TRUE; ++.} ++. ++.static inline bfd_boolean ++.bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++.{ ++. ptr->vma = ptr->lma = val; ++. ptr->user_set_vma = TRUE; ++. return TRUE; ++.} ++. ++.static inline bfd_boolean ++.bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++.{ ++. ptr->alignment_power = val; ++. return TRUE; ++.} ++. + .{* These sections are global, and are managed by BFD. The application + . and target back end are not permitted to change the values in + . these sections. *} +-- +2.1.4 + diff --git a/projects/fteproxy/build b/projects/fteproxy/build index 0d9baf1..310c9a5 100644 --- a/projects/fteproxy/build +++ b/projects/fteproxy/build @@ -12,7 +12,7 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" $PYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ diff --git a/projects/fteproxy/config b/projects/fteproxy/config index 6a13e0d..d58095e 100644 --- a/projects/fteproxy/config +++ b/projects/fteproxy/config @@ -18,7 +18,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/libfte/build b/projects/libfte/build index 62c8fce..9493f30 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -16,12 +16,12 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] pydir=$distdir/python export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" export LD_PRELOAD= - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" # FTE only needs libgmp-10.dll and no libgmpxx anymore. cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll . cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll $distdir/TorBrowser/Tor/ WINDOWS_BUILD=1 CROSS_COMPILE=1 make - $PYTHON setup.py install --prefix=$(winepath -w "$pydir") + $PYTHON setup.py install --prefix=$(wine winepath -w "$pydir") $PYTHON setup.py install [% ELSE -%] export PYTHON=python2 diff --git a/projects/libfte/config b/projects/libfte/config index 4c34116..3b33cf6 100644 --- a/projects/libfte/config +++ b/projects/libfte/config @@ -17,8 +17,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: + - wine - faketime input_files: diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build index 9d64aa9..2c87e95 100644 --- a/projects/obfsproxy/build +++ b/projects/obfsproxy/build @@ -21,9 +21,9 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" $PYTHON setup_py2exe.py py2exe - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/ # http://bugs.winehq.org/show_bug.cgi?id=3591 diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config index 9134de1..9286c61 100644 --- a/projects/obfsproxy/config +++ b/projects/obfsproxy/config @@ -20,7 +20,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/parsley/build b/projects/parsley/build index 1d52f9a..7b6e632 100644 --- a/projects/parsley/build +++ b/projects/parsley/build @@ -13,8 +13,8 @@ cd /var/tmp/build/Parsley-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/parsley/config b/projects/parsley/config index b788899..f305822 100644 --- a/projects/parsley/config +++ b/projects/parsley/config @@ -15,7 +15,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/pycrypto/build b/projects/pycrypto/build index 51ec5ce..084939f 100644 --- a/projects/pycrypto/build +++ b/projects/pycrypto/build @@ -27,7 +27,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-w64-mingw32 export LD_PRELOAD= $PYTHON setup.py build_ext -c mingw32 - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] export PYTHON=python2 ./configure --build=i686-linux-gnu [% c("var/configure_opt") %] diff --git a/projects/pycrypto/config b/projects/pycrypto/config index ca314c8..c55844b 100644 --- a/projects/pycrypto/config +++ b/projects/pycrypto/config @@ -15,9 +15,9 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: - faketime + - wine input_files: - project: container-image diff --git a/projects/pyptlib/build b/projects/pyptlib/build index de70c5b..fa6d78d 100644 --- a/projects/pyptlib/build +++ b/projects/pyptlib/build @@ -14,7 +14,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p "$pydir" - $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) + $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) [% ELSE -%] export PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/pyptlib/config b/projects/pyptlib/config index 7ae1d68..36a6037 100644 --- a/projects/pyptlib/config +++ b/projects/pyptlib/config @@ -19,7 +19,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/pyyaml/build b/projects/pyyaml/build index d3d60d7..72dc553 100644 --- a/projects/pyyaml/build +++ b/projects/pyyaml/build @@ -13,8 +13,8 @@ cd /var/tmp/build/PyYAML-[% c('version') %] [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install --prefix=$(winepath -w $pydir) + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] export PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/pyyaml/config b/projects/pyyaml/config index 8d43bf6..f2b928e 100644 --- a/projects/pyyaml/config +++ b/projects/pyyaml/config @@ -15,7 +15,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/twisted/build b/projects/twisted/build index 0d9154f..077143c 100644 --- a/projects/twisted/build +++ b/projects/twisted/build @@ -24,8 +24,8 @@ cd /var/tmp/build/Twisted-[% c('version') %] # the -c option, so we set the compiler in a configuration file. echo $'[build_ext]\ncompiler=mingw32' > setup.cfg mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) [% ELSE -%] export PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/twisted/config b/projects/twisted/config index 2f35166..4dbbb26 100644 --- a/projects/twisted/config +++ b/projects/twisted/config @@ -15,10 +15,10 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: - p7zip-full - faketime + - wine input_files: - project: container-image diff --git a/projects/txsocksx/build b/projects/txsocksx/build index 31d7b18..3491d11 100644 --- a/projects/txsocksx/build +++ b/projects/txsocksx/build @@ -18,8 +18,8 @@ mkdir vcversioner-1.14.1.1-py2.7.egg [% IF c("var/windows") -%] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" - $PYTHON setup.py install_lib --install-dir=$(winepath -w "$pydir/Lib/site-packages") + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install_lib --install-dir=$(wine winepath -w "$pydir/Lib/site-packages") [% ELSE -%] export PYTHON=python2 $PYTHON setup.py build --build-lib build diff --git a/projects/txsocksx/config b/projects/txsocksx/config index 18fc4a8..061af53 100644 --- a/projects/txsocksx/config +++ b/projects/txsocksx/config @@ -17,7 +17,8 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - wine input_files: - project: container-image diff --git a/projects/winpython/build b/projects/winpython/build index 5f53b9c..db78a0f 100644 --- a/projects/winpython/build +++ b/projects/winpython/build @@ -5,8 +5,8 @@ set -e distdir="/var/tmp/dist/[% project %]" mkdir -p $distdir WINEROOT=$HOME/.wine/drive_c -wineboot -i -msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir +wine wineboot -i +wine msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $distdir/Lib/distutils/cygwinccompiler.py tar xf setuptools-*.tar.gz rm setuptools-*.tar.gz diff --git a/projects/winpython/config b/projects/winpython/config index dcd21f6..9f884c0 100644 --- a/projects/winpython/config +++ b/projects/winpython/config @@ -4,10 +4,10 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: compiler: mingw-w64 - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: - p7zip-full - faketime + - wine container: use_container: 1 setup: | @@ -17,7 +17,7 @@ var: export HOME=/var/tmp/home mkdir -p $HOME WINEROOT=$HOME/.wine/drive_c - wineboot -i + wine wineboot -i cp -a /var/tmp/dist/winpython/wineroot/windows/* $WINEROOT/windows/ export PYTHON="wine /var/tmp/dist/winpython/python.exe" diff --git a/projects/zope.interface/build b/projects/zope.interface/build index 29406fb..b126989 100644 --- a/projects/zope.interface/build +++ b/projects/zope.interface/build @@ -15,10 +15,10 @@ cd /var/tmp/build/[% project %]-[% c('version') %] find -type f -print0 | xargs -0 [% c("var/touch") %] pydir="$distdir/python" mkdir -p $pydir/Lib/site-packages - export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" LD_PRELOAD= $PYTHON setup.py build_ext -c mingw32 - $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) + $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) # Must create this file in order for py2exe to find the package. touch $pydir/Lib/site-packages/zope/__init__.py [% ELSE -%] diff --git a/projects/zope.interface/config b/projects/zope.interface/config index 4ae3cff..ffba3df 100644 --- a/projects/zope.interface/config +++ b/projects/zope.interface/config @@ -15,9 +15,9 @@ targets: windows-i686: var: compiler: winpython - post_pkginst: '[% c("var/install_wine_ppa") %]' arch_deps: - faketime + - wine input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index 95b7447..4b4162c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -194,6 +194,7 @@ targets: osname: windows-x86_64 container: arch: amd64 + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 windows-i686: arch: i686 var: @@ -201,6 +202,7 @@ targets: osname: windows-i686 container: arch: i386 + faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1 setarch: | if test -z "$RBM_SETARCH" then @@ -212,7 +214,7 @@ targets: var: windows: 1 container: - suite: precise + suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' @@ -226,34 +228,6 @@ targets: - libtool - zip - unzip - faketime_path: /usr/lib/faketime/libfaketime.so.1 - install_wine_ppa: | - # 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 a file descriptor - # number). Ubuntu's main repository only has wine1.4, and the issue was fixed - # in 1.5.29. - echo 'deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu precise main' >> /etc/apt/sources.list - # This key is from https://launchpad.net/~ubuntu-wine/+archive/ppa and - # http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9CB8D…. - apt-key add - << EOF - -----BEGIN PGP PUBLIC KEY BLOCK----- - Version: GnuPG v1 - - mI0ESXVzlQEEAN1BxiR961SiFrJ7tacrAImCmDdxs4OSifgpBAp8q0fe0iLcSeAo - WdS7H+7Y4T+/2t3XEw7+3cD831WBu8c/Pv0ldx5TyDyOQmEtUBlMqy33WdKVxsci - rnag8ShrNM9PtG/vAQU/JtfQl68dXfD3BsCtrXVrjqcO2AxNYBSvd9hpABEBAAG0 - IkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBXaW5lIFRlYW2ItgQTAQIAIAUCSXVz - lQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFqaBq75y42wflcD/jLMihWM - zRCO60S/a7SqD0QNqV/nAYEOsma/Y2C/uhQ44j0np+iOB6+PDRbyJ8GVgIjpaIbt - l4sReXcf7bS9Dhhn5Gbe/n6VQr7xoMr1Io0PrXdmWpmsOfCuebWU4bV1w+YBvHFF - qTu5QF2Y0Fj9bRxQdQ1M2HcnXOiLq82hKlb+ - =Z9DY - -----END PGP PUBLIC KEY BLOCK----- - EOF - apt-get update - apt-get --no-install-recommends -y install wine torbrowser-osx-x86_64: - osx-x86_64

1 0