- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Update download URL
by gk＠torproject.org 02 Aug '15

02 Aug '15

commit 67811626aba4ac9f63194cb48bbfcd4319d5d40f Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 2 10:50:09 2015 +0000 Update download URL --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 1917187..5a4d965 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -26,7 +26,7 @@ versions: 5.0a4: platformVersion: 38.1.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0a3 + download_url: https://www.torproject.org/dist/torbrowser/5.0a4 incremental_from: - 5.0a3 migrate_archs:

1 0

[tor-browser-bundle/master] Update update responses for 5.0a4.
by mikeperry＠torproject.org 30 Jul '15

30 Jul '15

commit 335c3eed9a919977275b6da29a203cbc3ca9d971 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 29 20:55:55 2015 -0700 Update update responses for 5.0a4. --- tools/update-responses/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 77d8e46..1917187 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.0a3 + alpha: 5.0a4 release: 4.5.2 versions: 4.5.2: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.0a3: + 5.0a4: platformVersion: 38.1.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/5.0a3 incremental_from: - - 5.0a2 + - 5.0a3 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Fix the tor version checks when applying backported patches.
by mikeperry＠torproject.org 29 Jul '15

29 Jul '15

commit abb0ef2e192c4268980a2e670fdfac6c3715c4c5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 29 09:11:11 2015 -0700 Fix the tor version checks when applying backported patches. --- gitian/descriptors/linux/gitian-tor.yml | 7 +++---- gitian/descriptors/mac/gitian-tor.yml | 7 +++---- gitian/descriptors/windows/gitian-tor.yml | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index bfd0e18..906077b 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -79,14 +79,13 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG::9} == "tor-0.2.5" ]; + if [ ${TOR_TAG::9} == "tor-0.2.6" ]; then - git am ~/build/bug8405.patch - git am ~/build/bug8402-master.patch - else git am ~/build/bug15482.patch git am ~/build/bug16430.patch git am ~/build/bug16674.patch + else + git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index c755851..8e64922 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -57,14 +57,13 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG::9} == "tor-0.2.5" ]; + if [ ${TOR_TAG::9} == "tor-0.2.6" ]; then - git am ~/build/bug8405.patch - git am ~/build/bug8402-master.patch - else git am ~/build/bug15482.patch git am ~/build/bug16430.patch git am ~/build/bug16674.patch + else + git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index a6be6b4..7320a65 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -57,14 +57,13 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG::9} == "tor-0.2.5" ]; + if [ ${TOR_TAG::9} == "tor-0.2.6" ]; then - git am ~/build/bug8405.patch - git am ~/build/bug8402-master.patch - else git am ~/build/bug15482.patch git am ~/build/bug16430.patch git am ~/build/bug16674.patch + else + git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src

1 0

[tor-browser-bundle/master] Update 5.0a4 changelog wrt backported patches.
by mikeperry＠torproject.org 29 Jul '15

29 Jul '15

commit cf409e6812da564f57880150303933f4ccc8a078 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jul 29 09:12:16 2015 -0700 Update 5.0a4 changelog wrt backported patches. --- Bundle-Data/Docs/ChangeLog.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8a563cf..fd6d158 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,7 @@ Tor Browser 5.0a4 -- August 3 2015 * All Platforms - * Update Tor to 0.2.7.2-alpha with backported patches: - * Bug 16674: Allow trailing '.' in FQDNs - * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com) + * Update Tor to 0.2.7.2-alpha with patches: + * Bug 15482: Don't allow circuits to change while a site is in use * Update OpenSSL to 1.0.1p * Update HTTPS-Everywhere to 5.0.7 * Update NoScript to 2.6.9.31

1 0

[tor-browser-bundle/master] Changelog clarifications
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit d4fd73c796feb6db0091f0f38af32959e46997f6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 28 16:39:01 2015 -0700 Changelog clarifications --- Bundle-Data/Docs/ChangeLog.txt | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0e38362..8a563cf 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,32 +1,31 @@ Tor Browser 5.0a4 -- August 3 2015 * All Platforms - * Update Tor to 0.2.7.2 + * Update Tor to 0.2.7.2-alpha with backported patches: + * Bug 16674: Allow trailing '.' in FQDNs + * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com) * Update OpenSSL to 1.0.1p * Update HTTPS-Everywhere to 5.0.7 * Update NoScript to 2.6.9.31 - * Tor patch backport - * Bug 16674: Allow trailing '.' in FQDNs - * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com) * Update Torbutton to 1.9.3.1 * Bug 16268: Show Tor Browser logo on About page * Bug 16639: Check for Updates menu item can cause update download failure * Bug 15781: Remove the sessionstore filter * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref * Translation updates - * Bug 16884: Prefer IPv6 if available in Tor Browser - * Bug 16488: Remove "Sign in to Sync" from the menu - * Bug 13313: Enable bundle fonts + * Bug 16884: Prefer IPv6 when supported by the current Tor exit + * Bug 16488: Remove "Sign in to Sync" from the browser menu + * Bug 13313: Bundle a fixed set of fonts to defend against fingerprinting * Bug 16662: Enable network.http.spdy.* prefs in meek-http-helper * Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent (fixup) * Bug 15703: Isolate mediasource URIs and media streams to first party * Bug 16429+16416: Isolate blob URIs to first party - * Bug 16632: Turn on the background updater - * Bug 16528: Prevent indexedDB Modernizr breakage - * Bug 16523: Chrome JavaScript debugger is broken + * Bug 16632: Turn on the background updater and restart prompting + * Bug 16528: Prevent indexedDB Modernizr site breakage on Twitter and elsewhere + * Bug 16523: Fix in-browser JavaScript debugger * Bug 16236: Windows updater: avoid writing to the registry * Bug 16005: Restrict WebGL minimal mode a bit (fixup) - * Bug 16625: Fully disable network prediction - * Bug 16495: Tor Browser 5.0a3 crashes with security level set to "High" + * Bug 16625: Fully disable network connection prediction + * Bug 16495: Fix SVG crash when security level is set to "High" * Build System * Bug 15864: rename sha256sums.txt to sha256sums-unsigned-build.txt

1 0

[tor-browser-bundle/master] Changelog fixes
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 24d59c66d99b194015722b12e70cb51dd7a948c9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 23:31:19 2015 +0000 Changelog fixes --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 887f4a0..0e38362 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -6,9 +6,10 @@ Tor Browser 5.0a4 -- August 3 2015 * Update NoScript to 2.6.9.31 * Tor patch backport * Bug 16674: Allow trailing '.' in FQDNs + * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com) * Update Torbutton to 1.9.3.1 * Bug 16268: Show Tor Browser logo on About page - * Bug 16639: Check for Updates menu item can cause update failure + * Bug 16639: Check for Updates menu item can cause update download failure * Bug 15781: Remove the sessionstore filter * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref * Translation updates

1 0

[tor-browser-bundle/master] Fixed typo in verify-tags.sh
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 5aa2590903abee0cc1dd01690fde3d4e3316cf3a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 23:19:47 2015 +0000 Fixed typo in verify-tags.sh --- gitian/verify-tags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index f801b32..b8fc0e0 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -118,7 +118,7 @@ ed25519 $GOED25519_TAG siphash $GOSIPHASH_TAG goxcrypto $GO_X_CRYPTO_TAG goxnet $GO_X_NET_TAG -noto-fonts $NOTO_FONTS_TAG +noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages

1 0

[tor-browser-bundle/master] Adding gk's new subkey to torbutton.gpg
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 3cf76e656decc3e7c327335b426113cd57e01bea Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 23:13:52 2015 +0000 Adding gk's new subkey to torbutton.gpg --- gitian/gpg/torbutton.gpg | Bin 44645 -> 49582 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index ebc37d7..b60a95e 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/master] Changelog fixup
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit aa51f2712766d2701af3aeedc7ef861f1f209d81 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 23:06:13 2015 +0000 Changelog fixup --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7b3852f..887f4a0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -15,6 +15,7 @@ Tor Browser 5.0a4 -- August 3 2015 * Bug 16884: Prefer IPv6 if available in Tor Browser * Bug 16488: Remove "Sign in to Sync" from the menu * Bug 13313: Enable bundle fonts + * Bug 16662: Enable network.http.spdy.* prefs in meek-http-helper * Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent (fixup) * Bug 15703: Isolate mediasource URIs and media streams to first party * Bug 16429+16416: Isolate blob URIs to first party

1 0

[tor-browser-bundle/master] Bump alpha versions and changelog
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 494065edd86a3d1b1b159ca4f21210079501b19c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 22:49:46 2015 +0000 Bump alpha versions and changelog --- Bundle-Data/Docs/ChangeLog.txt | 30 ++++++++++++++++++++++++++++++ gitian/versions.alpha | 16 ++++++++-------- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 27d8294..7b3852f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,33 @@ +Tor Browser 5.0a4 -- August 3 2015 + * All Platforms + * Update Tor to 0.2.7.2 + * Update OpenSSL to 1.0.1p + * Update HTTPS-Everywhere to 5.0.7 + * Update NoScript to 2.6.9.31 + * Tor patch backport + * Bug 16674: Allow trailing '.' in FQDNs + * Update Torbutton to 1.9.3.1 + * Bug 16268: Show Tor Browser logo on About page + * Bug 16639: Check for Updates menu item can cause update failure + * Bug 15781: Remove the sessionstore filter + * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref + * Translation updates + * Bug 16884: Prefer IPv6 if available in Tor Browser + * Bug 16488: Remove "Sign in to Sync" from the menu + * Bug 13313: Enable bundle fonts + * Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent (fixup) + * Bug 15703: Isolate mediasource URIs and media streams to first party + * Bug 16429+16416: Isolate blob URIs to first party + * Bug 16632: Turn on the background updater + * Bug 16528: Prevent indexedDB Modernizr breakage + * Bug 16523: Chrome JavaScript debugger is broken + * Bug 16236: Windows updater: avoid writing to the registry + * Bug 16005: Restrict WebGL minimal mode a bit (fixup) + * Bug 16625: Fully disable network prediction + * Bug 16495: Tor Browser 5.0a3 crashes with security level set to "High" + * Build System + * Bug 15864: rename sha256sums.txt to sha256sums-unsigned-build.txt + Tor Browser 5.0a3 -- June 30 2015 * All Platforms * Update Firefox to 38.1.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6f8b4eb..d4dece0 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,11 +8,11 @@ FIREFOX_VERSION=38.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 -TOR_TAG=tor-0.2.7.1-alpha +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build3 +TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.6 -TORBUTTON_TAG=1.9.3.0 -HTTPSE_TAG=5.0.5 +TORBUTTON_TAG=1.9.3.1 +HTTPSE_TAG=5.0.7 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -36,7 +36,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1o +OPENSSL_VER=1.0.1p GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -59,7 +59,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.27-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.31-sm+fn+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -83,13 +83,13 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 +OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=a59a2150a4fa03091afd670d86333b60b6516ccd104bcef918afe99460fb436a +NOSCRIPT_HASH=151339f3ba663a527b2bf7ce88a4ea1379833b7ac3b6277cdf67f6ab5a33af1b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 16884: Prefer IPv6 if available in Tor Browser
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 1f39acfbe083e3fac156345253b76ba785147ea9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 22:45:03 2015 +0000 Bug 16884: Prefer IPv6 if available in Tor Browser --- Bundle-Data/linux/Data/Tor/torrc-defaults | 2 +- Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 2 +- Bundle-Data/windows/Data/Tor/torrc-defaults | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 819b9e8..e4c8920 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -5,6 +5,6 @@ AvoidDiskWrites 1 Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9150 +SocksPort 9150 IPv6Traffic PreferIPv6 ControlPort 9151 CookieAuthentication 1 diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index 819b9e8..e4c8920 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -5,6 +5,6 @@ AvoidDiskWrites 1 Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9150 +SocksPort 9150 IPv6Traffic PreferIPv6 ControlPort 9151 CookieAuthentication 1 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 819b9e8..e4c8920 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -5,6 +5,6 @@ AvoidDiskWrites 1 Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9150 +SocksPort 9150 IPv6Traffic PreferIPv6 ControlPort 9151 CookieAuthentication 1

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'pc/bug16488-01' into tor-browser-38.1.0esr-5.0-1
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 522558c8211987bcfd79685e633d47a455407355 Merge: 2a36205 1bde413 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 22:13:26 2015 +0000 Merge remote-tracking branch 'pc/bug16488-01' into tor-browser-38.1.0esr-5.0-1 browser/app/profile/000-tor-browser.js | 1 + browser/base/content/browser-fxaccounts.js | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug 16488: Remove "Sign in to Sync" from the menu.
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 1bde4135dc8dad312e3f8823480545f61af47171 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 28 17:11:12 2015 -0400 Bug 16488: Remove "Sign in to Sync" from the menu. By default, hide the "Sign in to Sync" item (aka the Firefox Sync status item) within the hamburger menu. Unhide by setting the pref. services.sync.ui.hidden to false. --- browser/app/profile/000-tor-browser.js | 1 + browser/base/content/browser-fxaccounts.js | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8188855..d57a3e2 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -60,6 +60,7 @@ pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmar pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); +pref("services.sync.ui.hidden", true); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ pref("browser.newtabpage.directory.ping", "data:text/plain,"); // Bug 16316 - Avoid potential confusion over tiles for now. pref("browser.newtabpage.directory.source", "data:text/plain,"); // Bug 16316 - Avoid potential confusion over tiles for now. diff --git a/browser/base/content/browser-fxaccounts.js b/browser/base/content/browser-fxaccounts.js index d6cbccc..760f261 100644 --- a/browser/base/content/browser-fxaccounts.js +++ b/browser/base/content/browser-fxaccounts.js @@ -5,6 +5,7 @@ let gFxAccounts = { PREF_SYNC_START_DOORHANGER: "services.sync.ui.showSyncStartDoorhanger", + PREF_SYNC_UI_HIDDEN: "services.sync.ui.hidden", DOORHANGER_ACTIVATE_DELAY_MS: 5000, SYNC_MIGRATION_NOTIFICATION_TITLE: "fxa-migration", @@ -80,6 +81,8 @@ let gFxAccounts = { Services.obs.addObserver(this, topic, false); } + Services.prefs.addObserver(this.PREF_SYNC_UI_HIDDEN, this, false); + addEventListener("activate", this); gNavToolbox.addEventListener("customizationstarting", this); gNavToolbox.addEventListener("customizationending", this); @@ -102,6 +105,8 @@ let gFxAccounts = { Services.obs.removeObserver(this, topic); } + Services.prefs.removeObserver(this.PREF_SYNC_UI_HIDDEN, this); + this._initialized = false; }, @@ -126,6 +131,9 @@ let gFxAccounts = { this.fxaMigrator.recordTelemetry(this.fxaMigrator.TELEMETRY_DECLINED); } break; + case this.PREF_SYNC_UI_HIDDEN: + this.updateAppMenuItem(); + break; default: this.updateUI(); break; @@ -203,7 +211,11 @@ let gFxAccounts = { } // Bail out if FxA is disabled. - if (!this.weave.fxAccountsEnabled) { + let hideSyncUI = false; + try { + hideSyncUI = Services.prefs.getBoolPref(this.PREF_SYNC_UI_HIDDEN); + } catch (e) {} + if (hideSyncUI || !this.weave.fxAccountsEnabled) { // When migration transitions from needs-verification to the null state, // fxAccountsEnabled is false because migration has not yet finished. In // that case, hide the button. We'll get another notification with a null

1 0

[torbutton/master] bump version and update changelog
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit d400aecd466dd7397397857d8bb31e5730e1a125 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 20:49:09 2015 +0000 bump version and update changelog --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index c49bea3..ccee56d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +1.9.3.1 + * Bug 16268: Show Tor Browser logo on About page + * Bug 16639: Check for Updates menu item can cause update failure + * Bug 15781: Remove the sessionstore filter + * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref + 1.9.3.0 * Bug 16427: Use internal update URL * Bug 16200: Update Cache API usage and prefs for FF38 diff --git a/src/install.rdf b/src/install.rdf index 488d039..4fd6fbe 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.3.0</em:version> + <em:version>1.9.3.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] update translations
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit ff0affb312a1da2c71e44db3ba240848013ee7f7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 19:51:38 2015 +0000 update translations --- src/chrome/locale/ar/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/ar/aboutTor.properties | 10 ++++++++-- src/chrome/locale/ar/brand.dtd | 2 +- src/chrome/locale/de/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/de/aboutTor.dtd | 2 +- src/chrome/locale/de/aboutTor.properties | 10 ++++++++-- src/chrome/locale/es/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/es/aboutTor.properties | 16 +++++++++++----- src/chrome/locale/eu/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/eu/aboutTor.properties | 6 ++++++ src/chrome/locale/fa/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/fa/aboutTor.properties | 10 ++++++++-- src/chrome/locale/fr/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/fr/aboutTor.properties | 10 ++++++++-- src/chrome/locale/it/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/it/aboutTor.properties | 8 +++++++- src/chrome/locale/ja/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/ja/aboutTor.properties | 10 ++++++++-- src/chrome/locale/ko/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/ko/aboutTor.properties | 6 ++++++ src/chrome/locale/ko/torbutton.dtd | 26 +++++++++++++------------- src/chrome/locale/nl/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/nl/aboutTor.properties | 10 ++++++++-- src/chrome/locale/pl/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/pl/aboutTor.dtd | 2 +- src/chrome/locale/pl/aboutTor.properties | 10 ++++++++-- src/chrome/locale/pt/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/pt/aboutTor.properties | 10 ++++++++-- src/chrome/locale/pt/torbutton.dtd | 16 ++++++++-------- src/chrome/locale/ru/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/ru/aboutTor.properties | 10 ++++++++-- src/chrome/locale/sv/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/sv/aboutTor.properties | 10 ++++++++-- src/chrome/locale/sv/torbutton.properties | 2 +- src/chrome/locale/tr/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/tr/aboutTor.properties | 8 +++++++- src/chrome/locale/vi/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/vi/aboutTor.properties | 6 ++++++ src/chrome/locale/zh-CN/aboutDialog.dtd | 19 +++++++++++++++++++ src/chrome/locale/zh-CN/aboutTor.properties | 10 ++++++++-- src/chrome/locale/zh-CN/torbutton.properties | 2 +- 41 files changed, 480 insertions(+), 55 deletions(-) diff --git a/src/chrome/locale/ar/aboutDialog.dtd b/src/chrome/locale/ar/aboutDialog.dtd new file mode 100644 index 0000000..2d808e6 --- /dev/null +++ b/src/chrome/locale/ar/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; is developed by "> + +<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.end "لاتهدف للربح تعمل على حماية خصوصيتك وحريتك على الأنترنت"> + +<!ENTITY help.start "هل ترغب في المساعدة؟"> + +<!ENTITY help.donateLink "تبرع"> +<!ENTITY help.or "أو"> + +<!ENTITY help.getInvolvedLink "شارك"> +<!ENTITY help.end "علامة تعجب"> + +<!ENTITY bottomLinks.questions "أى أسئلة؟"> + +<!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 09f1f91..d607324 100644 --- a/src/chrome/locale/ar/aboutTor.properties +++ b/src/chrome/locale/ar/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=بحث <a href="%1$S">بآمان</a> مع <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=بحث <a href="%1$S">بآمان</a> مع <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/ar/brand.dtd b/src/chrome/locale/ar/brand.dtd index 21125fc..654dc6a 100644 --- a/src/chrome/locale/ar/brand.dtd +++ b/src/chrome/locale/ar/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShorterName "متصفح تور"> <!ENTITY brandShortName "متصفح تور"> <!ENTITY brandFullName "متصفح تور"> <!ENTITY vendorShortName "مشروع تور"> diff --git a/src/chrome/locale/de/aboutDialog.dtd b/src/chrome/locale/de/aboutDialog.dtd new file mode 100644 index 0000000..649f543 --- /dev/null +++ b/src/chrome/locale/de/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; wird entwickelt von "> + +<!ENTITY project.tpoLink "das &vendorShortName;"> +<!ENTITY project.end ", eine gemeinnützige Organisation, um Ihre Privatsphäre und Freiheit im Internet zu verteidigen."> + +<!ENTITY help.start "Möchten Sie helfen? "> + +<!ENTITY help.donateLink "Spenden"> +<!ENTITY help.or "oder"> + +<!ENTITY help.getInvolvedLink "machen Sie mit"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Fragen?"> + +<!ENTITY bottomLinks.grow "Helfen Sie beim Ausweiten des Tor-Netzwerks!"> + +<!ENTITY bottomLinks.license "Lizenzinformationen"> +<!ENTITY tor.TrademarkStatement ""Tor" und das "Onion-Logo" sind eingetragene Warenzeichen von Tor Project, Inc."> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 68dcc78..955ac10 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -25,7 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Zusätzliche Informationen:"> <!ENTITY aboutTor.torInfo2.label "Land & IP-Adresse:"> diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties index 55f555d..b7fc4bf 100644 --- a/src/chrome/locale/de/aboutTor.properties +++ b/src/chrome/locale/de/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Suche <a href="%1$S">sicher</a> mit <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Suche <a href="%1$S">sicher</a> mit <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/es/aboutDialog.dtd b/src/chrome/locale/es/aboutDialog.dtd new file mode 100644 index 0000000..26ab18e --- /dev/null +++ b/src/chrome/locale/es/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; está desarrollado por"> + +<!ENTITY project.tpoLink "el/la &vendorShortName;"> +<!ENTITY project.end ", una organización sin ánimo de lucro que trabaja para defender su privacidad y libertad en línea."> + +<!ENTITY help.start "¿Quiere ayudar?"> + +<!ENTITY help.donateLink "Donar"> +<!ENTITY help.or "o"> + +<!ENTITY help.getInvolvedLink "implíquese"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "¿Preguntas?"> + +<!ENTITY bottomLinks.grow "¡Colabore a que la red Tor crezca!"> + +<!ENTITY bottomLinks.license "Información de licencia"> +<!ENTITY tor.TrademarkStatement "'Tor' y el 'Onion Logo' (logo de la cebolla) son marcas registradas de la Tor Project, Inc."> diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties index f8bdb1d..fb92251 100644 --- a/src/chrome/locale/es/aboutTor.properties +++ b/src/chrome/locale/es/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Busque <a href="%1$S">con seguridad</a> con <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/esp/protect-privacy.ht… # The following string is a link which replaces %2$S above. -aboutTor.searchSP.search.link=https://startpage.com/esp +aboutTor.searchSP.search.link=https://startpage.com/esp/ -aboutTor.searchDDG.privacy=Busque <a href="%1$S">con seguridad</a> con <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. -aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy?kl=-es # The following string is a link which replaces %2$S above. -aboutTor.searchDDG.search.link=https://duckduckgo.com/ +aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es + +aboutTor.searchDC.privacy=Busque <a href="%1$S">de forma segura</a> con <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/eu/aboutDialog.dtd b/src/chrome/locale/eu/aboutDialog.dtd new file mode 100644 index 0000000..93819b7 --- /dev/null +++ b/src/chrome/locale/eu/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; is developed by "> + +<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> + +<!ENTITY help.start "Lagundu nahi duzu?"> + +<!ENTITY help.donateLink "Egizu dohaintza"> +<!ENTITY help.or " or "> + +<!ENTITY help.getInvolvedLink "egizu bat"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Galderarik?"> + +<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> + +<!ENTITY bottomLinks.license "Lizentziei Buruzko Informazioa"> +<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties index 02088f0..d607324 100644 --- a/src/chrome/locale/eu/aboutTor.properties +++ b/src/chrome/locale/eu/aboutTor.properties @@ -13,3 +13,9 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S 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.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/fa/aboutDialog.dtd b/src/chrome/locale/fa/aboutDialog.dtd new file mode 100644 index 0000000..3be4887 --- /dev/null +++ b/src/chrome/locale/fa/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; توسعه یافته توسط"> + +<!ENTITY project.tpoLink " &vendorShortName;"> +<!ENTITY project.end "، یک کار غیر انتفاعی برای دفاع از حریم خصوصی شما و آزادی آنلاین است."> + +<!ENTITY help.start "آیا کمک می خواهید؟"> + +<!ENTITY help.donateLink "اهدا"> +<!ENTITY help.or "یا"> + +<!ENTITY help.getInvolvedLink "درگیر شدن"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "پرسش؟"> + +<!ENTITY bottomLinks.grow "کمک به رشد شبکه Tor!"> + +<!ENTITY bottomLinks.license "صدور مجوز اطلاعات"> +<!ENTITY tor.TrademarkStatement "'Tor' و 'Onion Logo' علامت های تجاری ثبت شده از پروژه Tor هستند"> diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties index 3c1c06c..54e04d9 100644 --- a/src/chrome/locale/fa/aboutTor.properties +++ b/src/chrome/locale/fa/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=جستجو <a href="%1$S">بصورت امن</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">صفحه شروع</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=جستجو <a href="%1$S">بصورت امن</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=جستجو <a href="%1$S">ایمن</a> با <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd new file mode 100644 index 0000000..bd4f2f1 --- /dev/null +++ b/src/chrome/locale/fr/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; est développé par"> + +<!ENTITY project.tpoLink "le &vendorShortName;"> +<!ENTITY project.end ", une organisation à but non lucratif travaillant à défendre votre vie privée et liberté en ligne."> + +<!ENTITY help.start "voulez-vous aider ?"> + +<!ENTITY help.donateLink "Faire une donation"> +<!ENTITY help.or "ou"> + +<!ENTITY help.getInvolvedLink "s'engager"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Des questions ?"> + +<!ENTITY bottomLinks.grow "Aider le réseau Tor à grandir !"> + +<!ENTITY bottomLinks.license "Information sur les licences"> +<!ENTITY tor.TrademarkStatement ""Tor" et le "Logo Oignon" sont des marques déposés du Projet Tor, Inc."> diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index 5bd5049..ec59d81 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/it/aboutDialog.dtd b/src/chrome/locale/it/aboutDialog.dtd new file mode 100644 index 0000000..d7425ce --- /dev/null +++ b/src/chrome/locale/it/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; è sviluppato da"> + +<!ENTITY project.tpoLink "il &vendorShortName;"> +<!ENTITY project.end ", un lavoro no profit per difendere la tua privacy e la tua libertà online."> + +<!ENTITY help.start "Vuoi aiutare?"> + +<!ENTITY help.donateLink "Dona"> +<!ENTITY help.or "o"> + +<!ENTITY help.getInvolvedLink "partecipa"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Domande?"> + +<!ENTITY bottomLinks.grow "Aiuta la rete Tor a crescere!"> + +<!ENTITY bottomLinks.license "Informazioni sulla licenza"> +<!ENTITY tor.TrademarkStatement "'Tor' e 'Onion Logo' sono marchi registrati su Tor Project, Inc."> diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties index 0748189..db49b15 100644 --- a/src/chrome/locale/it/aboutTor.properties +++ b/src/chrome/locale/it/aboutTor.properties @@ -2,7 +2,7 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Cerca <a href="%1$S"> in sicurezza</a>con<a href="%2$S">Starpage</a> # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.ht… # The following string is a link which replaces %2$S above. @@ -13,3 +13,9 @@ aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href=" 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.searchDC.privacy=Cerca <a href="%1$S"> in sicurezza </a> con <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/ja/aboutDialog.dtd b/src/chrome/locale/ja/aboutDialog.dtd new file mode 100644 index 0000000..53c012c --- /dev/null +++ b/src/chrome/locale/ja/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; は"> + +<!ENTITY project.tpoLink "&vendorShortName; によって開発されました。"> +<!ENTITY project.end "あなたのオンラインでのプライバシーと自由を守る非営利団体です。"> + +<!ENTITY help.start "支援に興味がありますか？"> + +<!ENTITY help.donateLink "寄付"> +<!ENTITY help.or "や"> + +<!ENTITY help.getInvolvedLink "参加"> +<!ENTITY help.end "で支援してください！"> + +<!ENTITY bottomLinks.questions "質問がありますか？"> + +<!ENTITY bottomLinks.grow "Tor ネットワークを育てましょう！"> + +<!ENTITY bottomLinks.license "ライセンス情報"> +<!ENTITY tor.TrademarkStatement "'Tor' と 'Onion Logo' は Tor Project, Inc. の登録商標です。"> diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties index 591c9ca..ed1ecc6 100644 --- a/src/chrome/locale/ja/aboutTor.properties +++ b/src/chrome/locale/ja/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=検索 <a href="%1$S">安全に</a> 一緒に <a href="%2$S">スタートページ</a>. +aboutTor.searchSP.privacy=<a href="%2$S">Startpage</a>で<a href="%1$S">安全に</a>検索する # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=検索 <a href="%1$S">安全に</a> 一緒に <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>で<a href="%1$S">安全に</a>検索する # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=<a href="%2$S">Disconnect.me</a>で<a href="%1$S">安全に</a>検索する +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/ko/aboutDialog.dtd b/src/chrome/locale/ko/aboutDialog.dtd new file mode 100644 index 0000000..09c8d82 --- /dev/null +++ b/src/chrome/locale/ko/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName;의 개발자: "> + +<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> + +<!ENTITY help.start "Want to help? "> + +<!ENTITY help.donateLink "후원하기"> +<!ENTITY help.or " or "> + +<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Questions?"> + +<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> + +<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties index 02088f0..d607324 100644 --- a/src/chrome/locale/ko/aboutTor.properties +++ b/src/chrome/locale/ko/aboutTor.properties @@ -13,3 +13,9 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S 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.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 8496505..46aede2 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -16,9 +16,9 @@ <!ENTITY torbutton.about.code "코드 공헌자:"> <!ENTITY torbutton.about.maintainer "관리자 :"> <!ENTITY torbutton.about.security_review "보안 리뷰:"> -<!ENTITY torbutton.about.donate "Tor를 사용하는 것이 좋으시다면 모르겠소만,"> +<!ENTITY torbutton.about.donate "Tor를 사용하는 것이 좋으시다면 모"> <!ENTITY torbutton.about.make_donation "후원하기"> -<!ENTITY torbutton.pref_connection.notice "이렇게 설정을 바꿀 수 없습니다."> +<!ENTITY torbutton.pref_connection.notice "Torbutton이 다음의 설정들을 바꾸지 못하게 합니다."> <!ENTITY torbutton.pref_connection.more_info "추가 정보"> <!ENTITY torbutton.pref_connection_more_info.title "도움말"> <!ENTITY torbutton.pref_connection_more_info.text "Torbutton이 현재 활성화되었습니다. 만약 Tor 프록시가 아닌 일반 프록시 서버 설정을 하시려면, Torbutton을 비활성화하고 이 창으로 돌아오십시오. 혹시 Tor 프록시 설정을 바꾸고 싶으시다면, Torbutton 설정 화면을 사용해 주세요."> @@ -28,15 +28,15 @@ <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "Tor 작동 상태"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "개인정보 및 보안 관련 설정..."> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Torbutton에 대하여..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "토르 네트워크 설정..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> +<!ENTITY torbutton.context_menu.downloadUpdate "토르 브라우저 업데이트 체크하기..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "쿠키 보호...."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Tor URL 복사"> <!ENTITY torbutton.context_menu.copyTor.key "P"> @@ -162,25 +162,25 @@ <!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline (베이스라인) JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> <!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML가 비활성화 되었습니다."> <!ENTITY torbutton.prefs.sec_med_high "중간 높음"> <!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc "몇몇 종류의 이미지가 비활성화 되었습니다."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images가 비활성화 되었습니다."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "높음"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> +<!ENTITY torbutton.prefs.sec_all_js_desc "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "대다수 포맷의 음성, 영상 파일이 비활성화 되었습니다."> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "어떤 글씨체나 아이콘은 올바르지 않게 표시될 수 있습니다."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.prefs.sec_custom "맞춤 값"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> diff --git a/src/chrome/locale/nl/aboutDialog.dtd b/src/chrome/locale/nl/aboutDialog.dtd new file mode 100644 index 0000000..028e122 --- /dev/null +++ b/src/chrome/locale/nl/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; wordt ontwikkeld door"> + +<!ENTITY project.tpoLink "het &vendorShortName;"> +<!ENTITY project.end ", een non-profit die zich inzet om uw privacy en vrijheid online te verdedigen."> + +<!ENTITY help.start "Wilt u meehelpen?"> + +<!ENTITY help.donateLink "Doneer"> +<!ENTITY help.or "of"> + +<!ENTITY help.getInvolvedLink "doe mee"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Vragen?"> + +<!ENTITY bottomLinks.grow "Help het Tor-netwerk te groeien."> + +<!ENTITY bottomLinks.license "Licentie-informatie"> +<!ENTITY tor.TrademarkStatement "'Tor' en het 'Ui-logo' zijn geregistreerde handelsmerken van het Tor Project, Inc."> diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index e6d6650..63c49fa 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Zoeken <a href="%1$S">veilig</a> met <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=<a href="%1$S">Veilig</a> zoeken met <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/ned/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Zoeken <a href="%1$S">veilig</a> met <a href="%2$S">Startpage</a>. +aboutTor.searchDDG.privacy=<a href="%1$S">Veilig</a> zoeken met <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=<a href="%1$S">Veilig</a> zoeken met <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/pl/aboutDialog.dtd b/src/chrome/locale/pl/aboutDialog.dtd new file mode 100644 index 0000000..61a73bd --- /dev/null +++ b/src/chrome/locale/pl/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; jest tworzona przez"> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", organizację nonprofit która pracuje nad obroną Twojej prywatności i wolności online."> + +<!ENTITY help.start "Chcesz pomóc?"> + +<!ENTITY help.donateLink "Darowizna"> +<!ENTITY help.or "lub"> + +<!ENTITY help.getInvolvedLink "Przyłącz się"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Pytania?"> + +<!ENTITY bottomLinks.grow "Pomóż sieci Tor powiększyć się!"> + +<!ENTITY bottomLinks.license "Informacje o licencji"> +<!ENTITY tor.TrademarkStatement "'Tor' oraz logo 'Onion' są zarejestrowanymi markami Tor Project Inc."> diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 073f82b..ded026b 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "JEDNAK, ta przeglądarka jest nieaktualna."> <!ENTITY aboutTor.outOfDateTorOff.label "PONADTO, ta przeglądarka jest nieaktualna."> -<!ENTITY aboutTor.outOfDate2.label "Kliknij na cebulę a następnie wybierz Sprawdź czy są dostępne aktualizacje."> +<!ENTITY aboutTor.outOfDate2.label "Kliknij na ikonę cebuli, a następnie wybierz Sprawdź czy są dostępne aktualizacje."> <!ENTITY aboutTor.check.label "Przetestuj Ustawienia Sieci Tor"> diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties index 0bfea6f..9bf0dcd 100644 --- a/src/chrome/locale/pl/aboutTor.properties +++ b/src/chrome/locale/pl/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Szukaj <a href="%1$S">bezpiecznie</a> z <a href="%2$S">Strona startowa</a>. +aboutTor.searchSP.privacy=Szukaj <a href="%1$S">bezpiecznie</a> używając wyszukiwarki <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> z <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> używając wyszukiwarki <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Szukaj <a href="%1$S">bezpiecznie</a> używając wyszukiwarki <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/pt/aboutDialog.dtd b/src/chrome/locale/pt/aboutDialog.dtd new file mode 100644 index 0000000..9919695 --- /dev/null +++ b/src/chrome/locale/pt/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; é desenvolvido por "> + +<!ENTITY project.tpoLink "o &vendorShortName;"> +<!ENTITY project.end ", uma sem fins lucrativos, a trabalhar para defender a sua privacidade e liberdade on-line."> + +<!ENTITY help.start "Pretende ajudar?"> + +<!ENTITY help.donateLink "Doar"> +<!ENTITY help.or "ou"> + +<!ENTITY help.getInvolvedLink "contribua"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Questões?"> + +<!ENTITY bottomLinks.grow "Ajude a crescer a rede Tor!"> + +<!ENTITY bottomLinks.license "Informação de licenciamento"> +<!ENTITY tor.TrademarkStatement "'Tor' e o 'Logótipo Onion' são marcas registadas de Tor Project, Inc."> diff --git a/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties index 153401d..7bf9d5d 100644 --- a/src/chrome/locale/pt/aboutTor.properties +++ b/src/chrome/locale/pt/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Procurar <a href="%1$S">de forma segura</a> com <a href="%2$S">Página inicial</a>. +aboutTor.searchSP.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Procurar <a href="%1$S">de forma segura</a> com <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index e946ff2..0bf3ad6 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -1,6 +1,6 @@ <!ENTITY torbutton.prefs.title "Preferências Torbutton"> <!ENTITY torbutton.prefs.tor_settings "Configurações do Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Utilize as configurações recomendadas do proxy para a minha versão do Firefox"> +<!ENTITY torbutton.prefs.recommended_settings "Use as configurações recomendadas do proxy para a minha versão do Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy"> <!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo"> <!ENTITY torbutton.prefs.custom_settings "Utilize as configurações do proxy personalizadas"> @@ -13,7 +13,7 @@ <!ENTITY torbutton.about.title "Sobre o Torbutton"> <!ENTITY torbutton.about.version "Versão:"> <!ENTITY torbutton.about.summary "Protege a privacidade da sua navegação Tor."> -<!ENTITY torbutton.about.code "Contribuidores do Código:"> +<!ENTITY torbutton.about.code "Contribuidores do código:"> <!ENTITY torbutton.about.maintainer "Mantenedor:"> <!ENTITY torbutton.about.security_review "Revisão de Segurança:"> <!ENTITY torbutton.about.donate "Se gosta de utilizar o Tor, poderá considerar"> @@ -24,9 +24,9 @@ <!ENTITY torbutton.pref_connection_more_info.text "O Torbutton está ativado. Se desejar alterar as configurações do Proxy que não sejam do Tor, por favor, desative o Torbutton e volte aqui. Se desejar alterar as configurações do Tor, por favor, utilize a janela de preferências do Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Identidade Nova"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> +<!ENTITY torbutton.context_menu.new_circuit "Novo circuito Tor para este sítio"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.toggle "Alterar Estado do Tor"> +<!ENTITY torbutton.context_menu.toggle "Alterar estado do Tor"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Configurações de Segurança e Privacidade..."> <!ENTITY torbutton.context_menu.preferences.key "P"> @@ -34,15 +34,15 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Procurar por Atualizações do Tor..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Procurar atualizações do Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Proteções para os Cookies..."> +<!ENTITY torbutton.context_menu.cookieProtections "Proteções das Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Copiar URL do Tor"> <!ENTITY torbutton.context_menu.copyTor.key "P"> -<!ENTITY torbutton.context_menu.openTorTab "Abrir URL do Tor num novo Separador"> +<!ENTITY torbutton.context_menu.openTorTab "Abrir URL do Tor num separador novo "> <!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL do Tor numa nova Janela"> +<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL do Tor numa janela nova "> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton"> diff --git a/src/chrome/locale/ru/aboutDialog.dtd b/src/chrome/locale/ru/aboutDialog.dtd new file mode 100644 index 0000000..19b96a0 --- /dev/null +++ b/src/chrome/locale/ru/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; разработано"> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", проект, созданный, чтобы защитить вашу конфиденциальность и свободу в сети."> + +<!ENTITY help.start "Желаете помочь?"> + +<!ENTITY help.donateLink "Пожертвовать"> +<!ENTITY help.or "или"> + +<!ENTITY help.getInvolvedLink "присоединяйтесь"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Вопросы?"> + +<!ENTITY bottomLinks.grow "Помогите сети Tor стать больше!"> + +<!ENTITY bottomLinks.license "Информация о лицензии"> +<!ENTITY tor.TrademarkStatement "'Tor' и логотип 'Onion' являются зарегистрированными торговыми марками Tor Project, Inc."> diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 53e1de4..6795b7c 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Поиск <a href="%1$S">безопасно</a> with <a href="%2$S">Начальная страница</a>. +aboutTor.searchSP.privacy=Ищите <a href="%1$S">конфиденциально</a> со <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Поиск <a href="%1$S">безопасно</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Ищите <a href="%1$S">конфиденциально</a> с <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Ищите <a href="%1$S">конфиденциально</a> с <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/sv/aboutDialog.dtd b/src/chrome/locale/sv/aboutDialog.dtd new file mode 100644 index 0000000..808e769 --- /dev/null +++ b/src/chrome/locale/sv/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; utvecklas av"> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", en idéell verksamhet som arbetar för att försvara din frihet och integritet online."> + +<!ENTITY help.start "Vill du hjälpa till?"> + +<!ENTITY help.donateLink "Donera"> +<!ENTITY help.or "eller"> + +<!ENTITY help.getInvolvedLink "involvera dig"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Frågor?"> + +<!ENTITY bottomLinks.grow "Hjälp Tor-nätverket växa!!"> + +<!ENTITY bottomLinks.license "Licens information"> +<!ENTITY tor.TrademarkStatement "'Tor' och 'Onion Logotypen' är registerade varumärken av Tor Project, Inc."> diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties index 02088f0..fafe44a 100644 --- a/src/chrome/locale/sv/aboutTor.properties +++ b/src/chrome/locale/sv/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Sök <a href="%1$S">säkert</a> med <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Sök <a href="%1$S">säkert</a> med <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Sök <a href="%1$S">säkert</a> med <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 2e853b0..443bf1a 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Denna webbläsare torbutton.circuit_display.relay = relä torbutton.circuit_display.tor_bridge = Brygga torbutton.circuit_display.unknown_country = Okänt land -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor Browser lägger till denna marginal för att göra bredden och höjden på ditt fönster mindre tydlig. Därmed minskas möjligheten att spåra dig. torbutton.panel.tooltip.disabled = Klicka för att aktivera Tor torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor torbutton.panel.plugins.disabled = Klicka för att aktivera plugins diff --git a/src/chrome/locale/tr/aboutDialog.dtd b/src/chrome/locale/tr/aboutDialog.dtd new file mode 100644 index 0000000..794c6e7 --- /dev/null +++ b/src/chrome/locale/tr/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName;, "> + +<!ENTITY project.tpoLink "kar amacı gütmeyen, çevrimiçi gizlilik ve özgürlüğünüzü koruyan"> +<!ENTITY project.end "&vendorShortName; tarafından geliştirilmiştir."> + +<!ENTITY help.start "Yardım ister misiniz?"> + +<!ENTITY help.donateLink "Bağış Yapın"> +<!ENTITY help.or "ya da"> + +<!ENTITY help.getInvolvedLink "katılın"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Sorunuz var mı?"> + +<!ENTITY bottomLinks.grow "Tor Ağı'nın büyümesine yardım edin."> + +<!ENTITY bottomLinks.license "Lisans bilgisi"> +<!ENTITY tor.TrademarkStatement "'Tor' ve 'Soğan Logosu' Tor Projesi Inc.'in tescilli markalarıdır."> diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties index 02088f0..a9c53ab 100644 --- a/src/chrome/locale/tr/aboutTor.properties +++ b/src/chrome/locale/tr/aboutTor.properties @@ -4,7 +4,7 @@ aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +aboutTor.searchSP.privacy.link=https://startpage.com/tur/protect-privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ @@ -13,3 +13,9 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S 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.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/vi/aboutDialog.dtd b/src/chrome/locale/vi/aboutDialog.dtd new file mode 100644 index 0000000..844f4e0 --- /dev/null +++ b/src/chrome/locale/vi/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; is developed by "> + +<!ENTITY project.tpoLink "the &vendorShortName;"> +<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> + +<!ENTITY help.start "Want to help? "> + +<!ENTITY help.donateLink "Donate"> +<!ENTITY help.or " or "> + +<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "Questions?"> + +<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> + +<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties index 02088f0..d607324 100644 --- a/src/chrome/locale/vi/aboutTor.properties +++ b/src/chrome/locale/vi/aboutTor.properties @@ -13,3 +13,9 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S 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.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/zh-CN/aboutDialog.dtd b/src/chrome/locale/zh-CN/aboutDialog.dtd new file mode 100644 index 0000000..2b2bbf7 --- /dev/null +++ b/src/chrome/locale/zh-CN/aboutDialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; 的开发者为"> + +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end "，一个捍卫您的隐私和自由上网权的非营利组织。"> + +<!ENTITY help.start "想要提供帮助？"> + +<!ENTITY help.donateLink "捐款"> +<!ENTITY help.or "或者"> + +<!ENTITY help.getInvolvedLink "参与"> +<!ENTITY help.end "!"> + +<!ENTITY bottomLinks.questions "有疑问？"> + +<!ENTITY bottomLinks.grow "帮助 Tor 网络成长！"> + +<!ENTITY bottomLinks.license "许可信息"> +<!ENTITY tor.TrademarkStatement "“Tor”和“Onion Logo”是 Tor Project, Inc 的注册商标。"> diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties index dc346d6..e974862 100644 --- a/src/chrome/locale/zh-CN/aboutTor.properties +++ b/src/chrome/locale/zh-CN/aboutTor.properties @@ -2,14 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=搜索 <a href="%1$S">安全</a> 引擎 <a href="%2$S">Startpage</a>。 +aboutTor.searchSP.privacy=使用<a href="%2$S">开始页</a><a href="%1$S">安全地</a>进行搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=搜索 <a href="%1$S">安全</a> 引擎 <a href="%2$S">DuckDuckGo</a>。 +aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安全地</a>进行搜索。 # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=使用<a href="%2$S">Disconnect.me</a><a href="%1$S">安全地</a>进行搜索。 +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 385ce6c..e67ae7a 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = 本浏览器 torbutton.circuit_display.relay = 中继 torbutton.circuit_display.tor_bridge = 网桥 torbutton.circuit_display.unknown_country = 未知国家 -torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了这些边框，使浏览器窗口的宽高变得不再那么独特，从而让在线跟踪监视变得更难。 +torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了一些边框，以降低窗口大小的独特性，从而令在线跟踪监控变得更加困难。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor torbutton.panel.plugins.disabled = 点击启用插件

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #13313: Pref 'font.system.whitelist' restricts set of permitted fonts
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 2a36205b70076fc26145400addaa383142d71c81 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jul 23 09:44:20 2015 -0700 Bug #13313: Pref 'font.system.whitelist' restricts set of permitted fonts --- gfx/thebes/gfxDWriteFontList.cpp | 4 ++++ gfx/thebes/gfxFT2FontList.cpp | 28 +++++++++++++++------------- gfx/thebes/gfxFontUtils.cpp | 25 +++++++++++++++++++++++++ gfx/thebes/gfxFontUtils.h | 11 +++++++++++ gfx/thebes/gfxFontconfigUtils.cpp | 31 +++++++++++++++++++++++++++++++ gfx/thebes/gfxFontconfigUtils.h | 3 +++ gfx/thebes/gfxGDIFontList.cpp | 2 +- gfx/thebes/gfxMacPlatformFontList.mm | 7 +++++++ 8 files changed, 97 insertions(+), 14 deletions(-) diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp index 5eb2488..2e28fbf 100644 --- a/gfx/thebes/gfxDWriteFontList.cpp +++ b/gfx/thebes/gfxDWriteFontList.cpp @@ -1146,6 +1146,10 @@ gfxDWriteFontList::GetFontsFromCollection(IDWriteFontCollection* aCollection) nsDependentString familyName(enName.Elements()); + if (!gfxFontUtils::IsFontFamilyNameAllowed(familyName)) { + continue; + } + fam = new gfxDWriteFontFamily(familyName, family); if (!fam) { continue; diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp index 671813b..da72559 100644 --- a/gfx/thebes/gfxFT2FontList.cpp +++ b/gfx/thebes/gfxFT2FontList.cpp @@ -1044,7 +1044,7 @@ gfxFT2FontList::AddFaceToList(const nsCString& aEntryName, uint32_t aIndex, NS_ConvertUTF8toUTF16 name(aFace->family_name); BuildKeyNameFromFontName(name); gfxFontFamily *family = fontFamilies.GetWeak(name); - if (!family) { + if (!family && gfxFontUtils::IsFontFamilyNameAllowed(name)) { family = new FT2FontFamily(name); fontFamilies.Put(name, family); if (mSkipSpaceLookupCheckFamilies.Contains(name)) { @@ -1315,20 +1315,22 @@ gfxFT2FontList::AppendFaceFromFontListEntry(const FontListEntry& aFLE, aFLE.isHidden() ? mHiddenFontFamilies : mFontFamilies; fe->mStandardFace = (aStdFile == kStandard); nsAutoString name(aFLE.familyName()); - gfxFontFamily *family = fontFamilies.GetWeak(name); - if (!family) { - family = new FT2FontFamily(name); - fontFamilies.Put(name, family); - if (mSkipSpaceLookupCheckFamilies.Contains(name)) { - family->SetSkipSpaceFeatureCheck(true); - } - if (mBadUnderlineFamilyNames.Contains(name)) { - family->SetBadUnderlineFamily(); + if (gfxFontUtils::IsFontFamilyNameAllowed(name)) { + gfxFontFamily *family = fontFamilies.GetWeak(name); + if (!family) { + family = new FT2FontFamily(name); + fontFamilies.Put(name, family); + if (mSkipSpaceLookupCheckFamilies.Contains(name)) { + family->SetSkipSpaceFeatureCheck(true); + } + if (mBadUnderlineFamilyNames.Contains(name)) { + family->SetBadUnderlineFamily(); + } } - } - family->AddFontEntry(fe); + family->AddFontEntry(fe); - fe->CheckForBrokenFont(family); + fe->CheckForBrokenFont(family); + } } } diff --git a/gfx/thebes/gfxFontUtils.cpp b/gfx/thebes/gfxFontUtils.cpp index 094f74a..5432c7a 100644 --- a/gfx/thebes/gfxFontUtils.cpp +++ b/gfx/thebes/gfxFontUtils.cpp @@ -1771,3 +1771,28 @@ gfxFontUtils::IsCffFont(const uint8_t* aFontData) #endif +/* static */ +nsTHashtable<nsStringHashKey>* gfxFontUtils::sWhitelistFamilyNames = nullptr; + +/* static */ +bool +gfxFontUtils::IsFontFamilyNameAllowed(const nsAString& aFontFamilyName) +{ + if (!sWhitelistFamilyNames) { + sWhitelistFamilyNames = new nsTHashtable<nsStringHashKey>(); + nsAutoTArray<nsString, 10> list; + GetPrefsFontList("font.system.whitelist", list); + uint32_t numFonts = list.Length(); + for (uint32_t i = 0; i < numFonts; i++) { + nsAutoString key; + ToLowerCase(list[i], key); + sWhitelistFamilyNames->PutEntry(key); + } + } + nsAutoString fontFamilyNameLower; + ToLowerCase(aFontFamilyName, fontFamilyNameLower); + // If whitelist is empty, any family name is allowed. If whitelist + // has entries, then only allow family names in the whitelist. + return sWhitelistFamilyNames->Count() == 0 || + sWhitelistFamilyNames->Contains(fontFamilyNameLower); +} diff --git a/gfx/thebes/gfxFontUtils.h b/gfx/thebes/gfxFontUtils.h index 2da48af..18eaa2d 100644 --- a/gfx/thebes/gfxFontUtils.h +++ b/gfx/thebes/gfxFontUtils.h @@ -1,3 +1,4 @@ + /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -9,6 +10,8 @@ #include "gfxPlatform.h" #include "nsComponentManagerUtils.h" #include "nsTArray.h" +#include "nsTHashtable.h" +#include "nsHashKeys.h" #include "nsAutoPtr.h" #include "mozilla/Likely.h" #include "mozilla/Endian.h" @@ -971,6 +974,14 @@ public: nsTArray<uint16_t> &aGlyphs, nsTArray<mozilla::gfx::Color> &aColors); + // A list of white-listed system fonts. If the list is empty, we permit + // all fonts. + static nsTHashtable<nsStringHashKey>* sWhitelistFamilyNames; + + // Returns true only if the font family name is whitelisted or the + // whitelist is empty. + static bool IsFontFamilyNameAllowed(const nsAString& aFontFamilyName); + protected: friend struct MacCharsetMappingComparator; diff --git a/gfx/thebes/gfxFontconfigUtils.cpp b/gfx/thebes/gfxFontconfigUtils.cpp index f5d3e9c..829a52e 100644 --- a/gfx/thebes/gfxFontconfigUtils.cpp +++ b/gfx/thebes/gfxFontconfigUtils.cpp @@ -587,6 +587,9 @@ gfxFontconfigUtils::UpdateFontListInternal(bool aForce) ActivateBundledFonts(); #endif + ApplyWhitelist(); + currentConfig = FcConfigGetCurrent(); + // These FcFontSets are owned by fontconfig FcFontSet *fontSets[] = { FcConfigGetFonts(currentConfig, FcSetSystem) @@ -1087,4 +1090,32 @@ gfxFontconfigUtils::ActivateBundledFonts() } } +void +gfxFontconfigUtils::ApplyWhitelist() +{ + // Get the font family names in the font file loaded in the old configuration. + // If any of the font families are in our whitelist, then add that + // file to the new configuration. Otherwise, leave it out. + FcPattern *pattern = FcPatternCreate(); + FcObjectSet *objectSet = FcObjectSetBuild(FC_FILE, FC_FAMILY, nullptr); + FcFontSet *fontSet = FcFontList(nullptr, pattern, objectSet); + FcConfig *newConfig = FcConfigCreate(); + for (int i = 0; i < fontSet->nfont; ++i) { + FcPattern *font = fontSet->fonts[i]; + FcChar8 *file, *family; + FcPatternGetString(font, FC_FILE, 0, &file); + for (int j = 0; + FcPatternGetString(font, + FC_FAMILY, j, &family) == FcResultMatch; + ++j) { + nsAutoCString strFamily((char *) family); + if (gfxFontUtils::IsFontFamilyNameAllowed(NS_ConvertUTF8toUTF16(strFamily))) { + FcConfigAppFontAddFile(newConfig, file); + break; + } + } + } + FcConfigSetCurrent(newConfig); +} + #endif diff --git a/gfx/thebes/gfxFontconfigUtils.h b/gfx/thebes/gfxFontconfigUtils.h index de9f27f..7bd0cfc 100644 --- a/gfx/thebes/gfxFontconfigUtils.h +++ b/gfx/thebes/gfxFontconfigUtils.h @@ -310,6 +310,9 @@ protected: nsCString mBundledFontsPath; bool mBundledFontsInitialized; #endif + +private: + void ApplyWhitelist(); }; #endif /* GFX_FONTCONFIG_UTILS_H */ diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp index cce880b..7a0ba3f 100644 --- a/gfx/thebes/gfxGDIFontList.cpp +++ b/gfx/thebes/gfxGDIFontList.cpp @@ -697,7 +697,7 @@ gfxGDIFontList::EnumFontFamExProc(ENUMLOGFONTEXW *lpelfe, gfxGDIFontList *fontList = PlatformFontList(); - if (!fontList->mFontFamilies.GetWeak(name)) { + if (gfxFontUtils::IsFontFamilyNameAllowed(name) && !fontList->mFontFamilies.GetWeak(name)) { nsDependentString faceName(lf.lfFaceName); nsRefPtr<gfxFontFamily> family = new GDIFontFamily(faceName); fontList->mFontFamilies.Put(name, family); diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm index df859e5..02f5137 100644 --- a/gfx/thebes/gfxMacPlatformFontList.mm +++ b/gfx/thebes/gfxMacPlatformFontList.mm @@ -682,6 +682,10 @@ gfxMacPlatformFontList::InitFontList() buffer[len] = 0; nsAutoString familyName(reinterpret_cast<char16_t*>(buffer.Elements()), len); + if (!gfxFontUtils::IsFontFamilyNameAllowed(familyName)) { + continue; + } + // create a family entry gfxFontFamily *familyEntry = new gfxMacFontFamily(familyName); if (!familyEntry) break; @@ -726,6 +730,9 @@ gfxMacPlatformFontList::InitSingleFaceList() LOG_FONTLIST(("(fontlist-singleface) face name: %s\n", NS_ConvertUTF16toUTF8(singleFaceFonts[i]).get())); #endif + if (!gfxFontUtils::IsFontFamilyNameAllowed(singleFaceFonts[i])) { + continue; + } gfxFontEntry *fontEntry = LookupLocalFont(singleFaceFonts[i], 400, 0, NS_FONT_STYLE_NORMAL);

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 05e826cfabe18b243c833774a867a895e6dec5cb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jul 16 16:32:47 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 199 ++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8188855..95bc04b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -237,3 +237,202 @@ pref("security.cert_pinning.enforcement_level", 2); #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif + +// If we are bundling fonts, only allow bundled fonts to be used. +#ifdef MOZ_BUNDLED_FONTS +pref("font.default.lo", "Noto Sans Lao"); +pref("font.default.my", "Noto Sans Myanmar"); +pref("font.default.x-western", "sans-serif"); +pref("font.internaluseonly.changed", true); +pref("font.name-list.cursive.ar", "Noto Naskh Arabic"); +pref("font.name-list.cursive.el", "Noto Serif"); +pref("font.name-list.cursive.he", "Noto Sans Hebrew"); +pref("font.name-list.cursive.x-cyrillic", "Noto Serif"); +pref("font.name-list.cursive.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.cursive.x-western", "Noto Serif"); +pref("font.name-list.fantasy.ar", "Noto Kufi Arabic"); +pref("font.name-list.fantasy.el", "Noto Serif"); +pref("font.name-list.fantasy.he", "Noto Sans Hebrew"); +pref("font.name-list.fantasy.x-cyrillic", "Noto Serif"); +pref("font.name-list.fantasy.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.fantasy.x-western", "Noto Serif"); +pref("font.name-list.monospace.ar", "Noto Kufi Arabic"); +pref("font.name-list.monospace.el", "Cousine"); +pref("font.name-list.monospace.he", "Noto Sans Hebrew"); +pref("font.name-list.monospace.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.th", "Noto Sans Thai"); +pref("font.name-list.monospace.x-armn", "Noto Sans Armenian"); +pref("font.name-list.monospace.x-beng", "Noto Sans Bengali"); +pref("font.name-list.monospace.x-cyrillic", "Cousine"); +pref("font.name-list.monospace.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.monospace.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.monospace.x-geor", "Noto Sans Georgian"); +pref("font.name-list.monospace.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.monospace.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer"); +pref("font.name-list.monospace.x-knda", "Noto Sans Kannada"); +pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.monospace.x-orya", "Noto Sans Oriya"); +pref("font.name-list.monospace.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.monospace.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.monospace.x-telu", "Noto Sans Telugu"); +pref("font.name-list.monospace.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.monospace.x-unicode", "Cousine, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao"); +pref("font.name-list.monospace.x-western", "Cousine"); +pref("font.name-list.monospace.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.monospace.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic"); +pref("font.name-list.sans-serif.el", "Noto Sans"); +pref("font.name-list.sans-serif.he", "Noto Sans Hebrew"); +pref("font.name-list.sans-serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.th", "Noto Sans Thai"); +pref("font.name-list.sans-serif.x-armn", "Noto Sans Armenian"); +pref("font.name-list.sans-serif.x-beng", "Noto Sans Bengali"); +pref("font.name-list.sans-serif.x-cyrillic", "Noto Sans"); +pref("font.name-list.sans-serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.sans-serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.sans-serif.x-geor", "Noto Sans Georgian"); +pref("font.name-list.sans-serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.sans-serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.sans-serif.x-khmr", "Noto Sans Khmer"); +pref("font.name-list.sans-serif.x-knda", "Noto Sans Kannada"); +pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya"); +pref("font.name-list.sans-serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.sans-serif.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.sans-serif.x-telu", "Noto Sans Telugu"); +pref("font.name-list.sans-serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.sans-serif.x-unicode", "Noto Sans, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao"); +pref("font.name-list.sans-serif.x-western", "Noto Sans"); +pref("font.name-list.sans-serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.sans-serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.ar", "Noto Naskh Arabic"); +pref("font.name-list.serif.el", "Noto Serif"); +pref("font.name-list.serif.he", "Noto Sans Hebrew"); +pref("font.name-list.serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.th", "Noto Sans Thai"); +pref("font.name-list.serif.th", "Noto Serif Thai"); +pref("font.name-list.serif.x-armn", "Noto Serif Armenian"); +pref("font.name-list.serif.x-beng", "Noto Sans Bengali"); +pref("font.name-list.serif.x-cyrillic", "Noto Serif"); +pref("font.name-list.serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name-list.serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name-list.serif.x-geor", "Noto Sans Georgian"); +pref("font.name-list.serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name-list.serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name-list.serif.x-khmr", "Noto Serif Khmer"); +pref("font.name-list.serif.x-knda", "Noto Sans Kannada"); +pref("font.name-list.serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name-list.serif.x-orya", "Noto Sans Oriya"); +pref("font.name-list.serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name-list.serif.x-tamil", "Noto Sans Tamil"); +pref("font.name-list.serif.x-telu", "Noto Sans Telugu"); +pref("font.name-list.serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name-list.serif.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); +pref("font.name-list.serif.x-western", "Noto Serif"); +pref("font.name-list.serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name-list.serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.cursive.ar", "Noto Naskh Arabic"); +pref("font.name.cursive.el", "Noto Serif"); +pref("font.name.cursive.he", "Noto Sans Hebrew"); +pref("font.name.cursive.x-cyrillic", "Noto Serif"); +pref("font.name.cursive.x-unicode", "Noto Serif"); +pref("font.name.cursive.x-western", "Noto Serif"); +pref("font.name.fantasy.ar", "Noto Kufi Arabic"); +pref("font.name.fantasy.el", "Noto Serif"); +pref("font.name.fantasy.he", "Noto Sans Hebrew"); +pref("font.name.fantasy.x-cyrillic", "Noto Serif"); +pref("font.name.fantasy.x-unicode", "Noto Serif"); +pref("font.name.fantasy.x-western", "Noto Serif"); +pref("font.name.monospace.ar", "Noto Kufi Arabic"); +pref("font.name.monospace.el", "Cousine"); +pref("font.name.monospace.he", "Noto Sans Hebrew"); +pref("font.name.monospace.ja", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.ko", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.my", "Noto Sans Myanmar"); +pref("font.name.monospace.th", "Noto Sans Thai"); +pref("font.name.monospace.x-armn", "Noto Sans Armenian"); +pref("font.name.monospace.x-beng", "Noto Sans Bengali"); +pref("font.name.monospace.x-cyrillic", "Cousine"); +pref("font.name.monospace.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.monospace.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.monospace.x-geor", "Noto Sans Georgian"); +pref("font.name.monospace.x-gujr", "Noto Sans Gujarati"); +pref("font.name.monospace.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.monospace.x-khmr", "Noto Sans Khmer"); +pref("font.name.monospace.x-knda", "Noto Sans Kannada"); +pref("font.name.monospace.x-mlym", "Noto Sans Malayalam"); +pref("font.name.monospace.x-orya", "Noto Sans Oriya"); +pref("font.name.monospace.x-sinh", "Noto Sans Sinhala"); +pref("font.name.monospace.x-tamil", "Noto Sans Tamil"); +pref("font.name.monospace.x-telu", "Noto Sans Telugu"); +pref("font.name.monospace.x-tibt", "Noto Sans Tibetan"); +pref("font.name.monospace.x-unicode", "Cousine"); +pref("font.name.monospace.x-western", "Cousine"); +pref("font.name.monospace.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.monospace.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.ar", "Noto Naskh Arabic"); +pref("font.name.sans-serif.el", "Noto Sans"); +pref("font.name.sans-serif.he", "Noto Sans Hebrew"); +pref("font.name.sans-serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.th", "Noto Sans Thai"); +pref("font.name.sans-serif.x-armn", "Noto Sans Armenian"); +pref("font.name.sans-serif.x-beng", "Noto Sans Bengali"); +pref("font.name.sans-serif.x-cyrillic", "Noto Sans"); +pref("font.name.sans-serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.sans-serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.sans-serif.x-geor", "Noto Sans Georgian"); +pref("font.name.sans-serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name.sans-serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.sans-serif.x-khmr", "Noto Sans Khmer"); +pref("font.name.sans-serif.x-knda", "Noto Sans Kannada"); +pref("font.name.sans-serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name.sans-serif.x-orya", "Noto Sans Oriya"); +pref("font.name.sans-serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name.sans-serif.x-tamil", "Noto Sans Tamil"); +pref("font.name.sans-serif.x-telu", "Noto Sans Telugu"); +pref("font.name.sans-serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name.sans-serif.x-unicode", "Noto Sans"); +pref("font.name.sans-serif.x-western", "Noto Sans"); +pref("font.name.sans-serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.sans-serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name.sans.my", "Noto Sans Myanmar"); +pref("font.name.serif.ar", "Noto Naskh Arabic"); +pref("font.name.serif.el", "Noto Serif"); +pref("font.name.serif.he", "Noto Sans Hebrew"); +pref("font.name.serif.ja", "Noto Sans CJK SC Regular"); +pref("font.name.serif.ko", "Noto Sans CJK SC Regular"); +pref("font.name.serif.my", "Noto Sans Myanmar"); +pref("font.name.serif.th", "Noto Serif Thai"); +pref("font.name.serif.x-armn", "Noto Serif Armenian"); +pref("font.name.serif.x-beng", "Noto Sans Bengali"); +pref("font.name.serif.x-cyrillic", "Noto Serif"); +pref("font.name.serif.x-devanagari", "Noto Sans Devanagari"); +pref("font.name.serif.x-ethi", "Noto Sans Ethiopic"); +pref("font.name.serif.x-geor", "Noto Sans Georgian"); +pref("font.name.serif.x-gujr", "Noto Sans Gujarati"); +pref("font.name.serif.x-guru", "Noto Sans Gurmukhi"); +pref("font.name.serif.x-khmr", "Noto Serif Khmer"); +pref("font.name.serif.x-knda", "Noto Sans Kannada"); +pref("font.name.serif.x-mlym", "Noto Sans Malayalam"); +pref("font.name.serif.x-orya", "Noto Sans Oriya"); +pref("font.name.serif.x-sinh", "Noto Sans Sinhala"); +pref("font.name.serif.x-tamil", "Noto Sans Tamil"); +pref("font.name.serif.x-telu", "Noto Sans Telugu"); +pref("font.name.serif.x-tibt", "Noto Sans Tibetan"); +pref("font.name.serif.x-unicode", "Noto Serif"); +pref("font.name.serif.x-western", "Noto Serif"); +pref("font.name.serif.zh-CN", "Noto Sans CJK SC Regular"); +pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); +pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.system.whitelist", "Cousine, Noto Kufi Arabic, Noto Naskh Arabic, Noto Sans, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +#endif

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #13313 Part 2: Fix windows cross-compile for --enable-bundled-fonts
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit be6a317e6a7f028a882f6f641b7f90960e8fd239 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jul 20 08:52:24 2015 -0700 Bug #13313 Part 2: Fix windows cross-compile for --enable-bundled-fonts --- gfx/thebes/gfxDWriteFontList.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp index 8d0ae81..5eb2488 100644 --- a/gfx/thebes/gfxDWriteFontList.cpp +++ b/gfx/thebes/gfxDWriteFontList.cpp @@ -1803,6 +1803,7 @@ private: BundledFontFileEnumerator() = delete; BundledFontFileEnumerator(const BundledFontFileEnumerator&) = delete; BundledFontFileEnumerator& operator=(const BundledFontFileEnumerator&) = delete; + virtual ~BundledFontFileEnumerator() {} nsRefPtr<IDWriteFactory> mFactory; @@ -1870,6 +1871,7 @@ public: private: BundledFontLoader(const BundledFontLoader&) = delete; BundledFontLoader& operator=(const BundledFontLoader&) = delete; + virtual ~BundledFontLoader() { } }; IFACEMETHODIMP

1 0

[tor-browser-bundle/master] Download and verify Noto fonts and Noto CJK font
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit d72f6dc3bdfdcc719cb5e49d943756d289178f0a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jul 20 05:22:35 2015 +0000 Download and verify Noto fonts and Noto CJK font --- gitian/fetch-inputs.sh | 5 +++-- gitian/verify-tags.sh | 3 ++- gitian/versions | 5 +++++ gitian/versions.alpha | 5 +++++ gitian/versions.beta | 5 +++++ gitian/versions.nightly | 5 +++++ 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 2a5bd16..a97ff62 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -155,7 +155,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -258,6 +258,7 @@ siphash https://github.com/dchest/siphash.git $GOSIPHASH_TAG goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG goxnet https://go.googlesource.com/net $GO_X_NET_TAG obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG +noto-fonts https://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG EOF exit 0 diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 2c4e8c6..f801b32 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -118,6 +118,7 @@ ed25519 $GOED25519_TAG siphash $GOSIPHASH_TAG goxcrypto $GO_X_CRYPTO_TAG goxnet $GO_X_NET_TAG +noto-fonts $NOTO_FONTS_TAG EOF # Verify signatures on signed packages @@ -141,7 +142,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 02e6217..cea6029 100755 --- a/gitian/versions +++ b/gitian/versions @@ -32,6 +32,7 @@ GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 +NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8 @@ -53,6 +54,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 +NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -78,6 +80,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 @@ -99,6 +102,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -123,3 +127,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index cee61cd..6f8b4eb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -32,6 +32,7 @@ GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 +NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8 @@ -53,6 +54,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 +NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -78,6 +80,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 @@ -99,6 +102,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -123,3 +127,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 0341c4e..4436010 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -26,6 +26,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 MEEK_TAG=0.18 +NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-6 @@ -47,6 +48,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 +NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -72,6 +74,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -92,6 +95,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -116,3 +120,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1a0ce0a..db7eec7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -35,6 +35,7 @@ GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=master GO_X_NET_TAG=master OBFS4_TAG=master +NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-7 @@ -56,6 +57,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 +NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -81,6 +83,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 @@ -102,6 +105,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -126,3 +130,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} +NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a6d49abbfb5c83d0209584158/${NOTOCJKFONT_PACKAGE}

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'arthur/13313+4'
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 08b05d52c58c03e1a0c712dc64845185e53abe37 Merge: 83e881b bdc340e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 17:09:10 2015 +0000 Merge remote-tracking branch 'arthur/13313+4' Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt | 92 +++++++++++ Bundle-Data/Docs/Licenses/Noto-Fonts.txt | 201 +++++++++++++++++++++++++ gitian/descriptors/linux/gitian-bundle.yml | 15 ++ gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 15 ++ gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-bundle.yml | 15 ++ gitian/descriptors/windows/gitian-firefox.yml | 2 +- gitian/fetch-inputs.sh | 5 +- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/verify-tags.sh | 3 +- gitian/versions | 5 + gitian/versions.alpha | 5 + gitian/versions.beta | 5 + gitian/versions.nightly | 5 + 17 files changed, 369 insertions(+), 9 deletions(-)

1 0

[tor-browser-bundle/master] Install Noto fonts into bundles.
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit bdc340e960975098eb395fcf92c906748294c8fa Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 29 04:35:26 2014 +0000 Install Noto fonts into bundles. They are in the "fonts" directory next to the firefox executable, the directory that is activated by --enable-bundled-fonts in https://bugzilla.mozilla.org/show_bug.cgi?id=998844. The license for the Noto fonts is from https://github.com/googlei18n/noto-fonts/blob/720e34851382ee3c1ef024d8dffb6… The license for Noto CJK is from https://github.com/googlei18n/noto-cjk/blob/f36eda03dfa5582a6d49abbfb5c83d0… --- Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt | 92 ++++++++++++ Bundle-Data/Docs/Licenses/Noto-Fonts.txt | 201 ++++++++++++++++++++++++++ gitian/descriptors/linux/gitian-bundle.yml | 15 ++ gitian/descriptors/mac/gitian-bundle.yml | 15 ++ gitian/descriptors/windows/gitian-bundle.yml | 15 ++ gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 8 files changed, 341 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt b/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt new file mode 100644 index 0000000..d952d62 --- /dev/null +++ b/Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt @@ -0,0 +1,92 @@ +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Bundle-Data/Docs/Licenses/Noto-Fonts.txt b/Bundle-Data/Docs/Licenses/Noto-Fonts.txt new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/Bundle-Data/Docs/Licenses/Noto-Fonts.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 455fc89..819a1de 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -24,6 +24,8 @@ remotes: "dir": "https-everywhere" - "url": "https://git.torproject.org/pluggable-transports/meek.git" "dir": "meek" +- "url": "https://github.com/googlei18n/noto-fonts.git" + "dir": "noto-fonts" files: # TODO: Can we use an env for this file+version?? - "tor-browser-linux32-gbuilt.zip" @@ -51,6 +53,7 @@ files: - "mar-tools-linux32.zip" - "mar-tools-linux64.zip" - "tbb-docs.zip" +- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -118,6 +121,18 @@ script: | ~/build/dzip.sh ../../tor-browser/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions/meek-http-helper(a)bamsoftware.com.xpi . cd ~/build/ # + # Install fonts. + mkdir -p tor-browser/Browser/fonts + NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + for fontfile in $NOTO_FONTS_HINTED; do + cp "noto-fonts/hinted/$fontfile" tor-browser/Browser/fonts/ + done + NOTO_FONTS_UNHINTED="NotoSansCanadianAboriginal-Regular.ttf NotoSansBuginese-Regular.ttf NotoSansCherokee-Regular.ttf NotoSansMongolian-Regular.ttf NotoSansYi-Regular.ttf" + for fontfile in $NOTO_FONTS_UNHINTED; do + cp "noto-fonts/unhinted/$fontfile" tor-browser/Browser/fonts/ + done + cp NotoSansCJKsc-Regular.otf tor-browser/Browser/fonts/ + # unzip relativelink-src.zip cp RelativeLink/* tor-browser/Browser/ # diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 255d327..9b38d0f 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -30,6 +30,8 @@ remotes: "dir": "libdmg-hfsplus" - "url": "https://git.torproject.org/pluggable-transports/meek.git" "dir": "meek" +- "url": "https://github.com/googlei18n/noto-fonts.git" + "dir": "noto-fonts" files: # TODO: Can we use an env for this file+version?? - "tor-browser-mac64-gbuilt.zip" @@ -54,6 +56,7 @@ files: - "mar-tools-mac64.zip" - "tbb-docs.zip" - "mac-tor.sh" +- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -121,6 +124,18 @@ script: | ~/build/dzip.sh ../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.meek-http-helper/extensions/meek-http-helper(a)bamsoftware.com.xpi . cd ~/build/ # + # Install fonts. + mkdir -p $TORBROWSER_NAME.app/Contents/Resources/fonts + NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + for fontfile in $NOTO_FONTS_HINTED; do + cp "noto-fonts/hinted/$fontfile" $TORBROWSER_NAME.app/Contents/Resources/fonts/ + done + NOTO_FONTS_UNHINTED="NotoSansCanadianAboriginal-Regular.ttf NotoSansBuginese-Regular.ttf NotoSansCherokee-Regular.ttf NotoSansMongolian-Regular.ttf NotoSansYi-Regular.ttf" + for fontfile in $NOTO_FONTS_UNHINTED; do + cp "noto-fonts/unhinted/$fontfile" $TORBROWSER_NAME.app/Contents/Resources/fonts/ + done + cp NotoSansCJKsc-Regular.otf $TORBROWSER_NAME.app/Contents/Resources/fonts/ + # unzip tor-mac$GBUILD_BITS-gbuilt.zip if [ $BUILD_PT_BUNDLES ]; then unzip pluggable-transports-mac$GBUILD_BITS-gbuilt.zip diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 54ea258..02a3816 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -29,6 +29,8 @@ remotes: "dir": "https-everywhere" - "url": "https://git.torproject.org/pluggable-transports/meek.git" "dir": "meek" +- "url": "https://github.com/googlei18n/noto-fonts.git" + "dir": "noto-fonts" files: # TODO: Can we use an env for this file+version?? - "tor-browser-win32-gbuilt.zip" @@ -47,6 +49,7 @@ files: - "mar-tools-win32.zip" - "tbb-docs.zip" - "pe_checksum_fix.py" +- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -110,6 +113,18 @@ script: | mv ../meek-http-helper(a)bamsoftware.com.xpi ../../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions/meek-http-helper(a)bamsoftware.com.xpi cd ~/build/ # + # Install fonts. + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/fonts + NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + for fontfile in $NOTO_FONTS_HINTED; do + cp "noto-fonts/hinted/$fontfile" tbb-windows-installer/"Tor Browser"/Browser/fonts/ + done + NOTO_FONTS_UNHINTED="NotoSansCanadianAboriginal-Regular.ttf NotoSansBuginese-Regular.ttf NotoSansCherokee-Regular.ttf NotoSansMongolian-Regular.ttf NotoSansYi-Regular.ttf" + for fontfile in $NOTO_FONTS_UNHINTED; do + cp "noto-fonts/unhinted/$fontfile" tbb-windows-installer/"Tor Browser"/Browser/fonts/ + done + cp NotoSansCJKsc-Regular.otf tbb-windows-installer/"Tor Browser"/Browser/fonts/ + # cd tbb-windows-installer/"Tor Browser" unzip ~/build/tor-browser-win32-gbuilt.zip cd Browser/TorBrowser diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index cb80214..65af74e 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -247,7 +247,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,tor-launcher=$TORLAUNCHER_TAG,torbutton=$TORBUTTON_TAG,meek=$MEEK_TAG,noto-fonts=$NOTOFONTS_TAG $DESCRIPTOR_DIR/linux/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 363ebb1..cf54e19 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -217,7 +217,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,meek=$MEEK_TAG,noto-fonts=$NOTOFONTS_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 238ad51..24f8f4e 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -220,7 +220,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG,meek=$MEEK_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG,tbb-windows-installer=$NSIS_TAG,meek=$MEEK_TAG,noto-fonts=$NOTOFONTS_TAG $DESCRIPTOR_DIR/windows/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-win32.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Add --enable-bundled-fonts to firefox config.
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit b2f9648ada10c5f9eb0dd093928bfd4919d76f51 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 31 20:21:51 2014 +0000 Add --enable-bundled-fonts to firefox config. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 05b2beb..1efed90 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -110,7 +110,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close # to the end, see #12461 comment 8 and later. Additionally, we need to avoid diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e8f1046..8b85b5a 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -69,7 +69,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index c7efb62..7358922 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -86,7 +86,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/

1 0

[torbutton/master] Bug 16268: Taking lower-case into account
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 03cf87e2a76d15016703de631ca5140e42fdb1f4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 17:01:55 2015 +0000 Bug 16268: Taking lower-case into account Patch by Pearl Crescent --- trans_tools/import-translations.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 28816ff..ae686b4 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -66,18 +66,24 @@ fi echo "Locales: $BUNDLE_LOCALES" cd translation for KEYVAL in "${FILEMAP[@]}"; do - FILE="${KEYVAL%%:*}" + DEST_FILE="${KEYVAL%%:*}" BRANCH="${KEYVAL##*:}" - echo "Updating ${FILE}..." + echo "Updating ${DEST_FILE}..." git checkout -q "$BRANCH" git merge -q origin/"$BRANCH" for i in $BUNDLE_LOCALES; do UL="`echo $i|tr - _`" mkdir -p ../$LOCALE_DIR/$i/ +# Some file names are lowercase in Transifex. + if [ -f $UL/"$DEST_FILE" ]; then + SRCFILE="$DEST_FILE" + else + SRCFILE="`echo $DEST_FILE | tr '[:upper:]' '[:lower:]'`" + fi # Use sed to work around a Transifex "double entity" issue. sed -e 's/\&brandShortName;/\&brandShortName;/g' \ -e 's/\&vendorShortName;/\&vendorShortName;/g' \ - $UL/"$FILE" > ../$LOCALE_DIR/$i/"$FILE" + $UL/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" done done

1 0

[tor-browser-bundle/master] Adding new subkeys to gk's key
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 83e881b69a286c9d1e1c33f7522bb1ad9681b6f2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 15:59:40 2015 +0000 Adding new subkeys to gk's key --- gitian/gpg/gk.gpg | Bin 11926 -> 33866 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 9923c96..ad731ca 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser-bundle/master] Enable meek-http-helper prefs that make the ALPN extension match.
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 276e390fbd0aa2449675c55a477f337a0f2b78df Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 24 10:07:38 2015 +0000 Enable meek-http-helper prefs that make the ALPN extension match. https://trac.torproject.org/projects/tor/ticket/15512#comment:3 --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index 23565d9..de2355c 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -9,6 +9,14 @@ user_pref("browser.dom.window.dump.enabled", true); // https://trac.torproject.org/projects/tor/ticket/13442#comment:1 user_pref("security.ssl.disable_session_identifiers", false); +// Enable SPDY and HTTP/2 as they are in Firefox 38, for a matching ALPN +// extension. +// https://trac.torproject.org/projects/tor/ticket/15512 +user_pref("network.http.spdy.enabled", true); +user_pref("network.http.spdy.enabled.http2", true); +user_pref("network.http.spdy.enabled.http2draft", true); +user_pref("network.http.spdy.enabled.v3-1", true); + // Disable safe mode. In case of a crash, we don't want to prompt for a // safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562

1 0