- tbb-commits - lists.torproject.org

[torbutton/master] Update changelog and version for 1.7.0.1.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit 2e664c22b73b54f8238e7c8cb3400a002ade59b4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 15:06:50 2014 -0700 Update changelog and version for 1.7.0.1. --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 8b47e55..f889d61 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.7.0.1 + * Bug 13378: Prevent addon reordering in toolbars on first-run. + 1.7.0.0 9 Oct 2014 * Bug 10751: Adapt Torbutton to ESR31's Australis UI. diff --git a/src/install.rdf b/src/install.rdf index 06eb2d0..b4af033 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.7.0.0</em:version> + <em:version>1.7.0.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] Bug 13378: Prevent addon icon reordering in toolbar.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit ab075006b57a0867f09004615067a2355aaab208 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 10 15:06:01 2014 -0700 Bug 13378: Prevent addon icon reordering in toolbar. --- src/chrome/content/torbutton.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ffea83b..44020ec 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -543,8 +543,14 @@ function torbutton_init() { torbutton_log(3, 'Adding button'); try { if (CustomizableUI) { - // ESR31-style toolbar - CustomizableUI.addWidgetToArea("torbutton-button", CustomizableUI.AREA_NAVBAR, 0); + // ESR31-style toolbar is handled by the existing compiled-in pref. + // We also need to prevent first-run toolbar reorg (#13378), so we + // reset this toolbar state on first-run. + try { + m_tb_prefs.clearUserPref("browser.uiCustomization.state"); + } catch(e) {} + CustomizableUI.reset(); + CustomizableUI.undoReset(); } else { // ESR24-style toolbar // TODO: Remove this branch once TBB-ESR24 has been retired.

1 0

[tor-browser-bundle/master] update fteproxy to 0.2.19 and libfte to 0.1.0
by gk＠torproject.org 10 Oct '14

10 Oct '14

commit 524fd757efb83adf029f7cd2fb9554ae526fcbe6 Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Thu Oct 9 17:33:53 2014 -0700 update fteproxy to 0.2.19 and libfte to 0.1.0 --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions b/gitian/versions index 3e5cffa..838d77c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -20,8 +20,8 @@ MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 +LIBFTE_TAG=58734a5aec563600fa8d82fb48ea9d6b8e26556c # tag 0.1.0 +FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fe81f52..5d7b8a2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -20,8 +20,8 @@ MINGW_TAG=9418eaa1854320b57f40e29ec5bbc4f5717ecd58 # tag v3.1.0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 -FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 +LIBFTE_TAG=58734a5aec563600fa8d82fb48ea9d6b8e26556c # tag 0.1.0 +FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 diff --git a/gitian/versions.beta b/gitian/versions.beta index 72a1365..29ba9e9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -20,8 +20,8 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 -FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 +LIBFTE_TAG=58734a5aec563600fa8d82fb48ea9d6b8e26556c # tag 0.1.0 +FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit 5d524cb311ca7b7d107dd042c1025251314516df Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 9 10:44:53 2014 +0000 fixup! Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1 --- dom/workers/test/mochitest.ini | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dom/workers/test/mochitest.ini b/dom/workers/test/mochitest.ini index 0275195..1cfdca9 100644 --- a/dom/workers/test/mochitest.ini +++ b/dom/workers/test/mochitest.ini @@ -157,12 +157,5 @@ skip-if = buildapp == 'b2g' || e10s skip-if = (os == "win") || (os == "mac") || toolkit == 'android' || e10s #bug 798220 [test_url_exceptions.html] [test_urlSearchParams.html] -<<<<<<< HEAD -<<<<<<< HEAD -======= [test_bug1060621.html] [test_bug1062920.html] ->>>>>>> Bug 1062920 - WorkerNavigator strings should honor general.*.override prefs. r=khuey, a=sledru -======= -[test_bug1060621.html] ->>>>>>> Bug 1060621 - WorkerScope should CC mLocation and mNavigator. r=bz, a=sledru

1 0

[torbutton/master] Bump version and update changelog for 1.7.0.0.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit 523a6091faaee3a223f3f9ca0b8b8a6495a8a339 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 9 18:08:34 2014 -0700 Bump version and update changelog for 1.7.0.0. --- src/CHANGELOG | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 44b8999..8b47e55 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,5 +1,5 @@ 1.7.0.0 - ?? + 9 Oct 2014 * Bug 10751: Adapt Torbutton to ESR31's Australis UI. * Bug 13138: ESR31-about:tor shows "Tor is not working" * Bug 12947: Adapt session storage blocker to ESR 31. diff --git a/src/install.rdf b/src/install.rdf index 2411179..06eb2d0 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.7.0.0-pre</em:version> + <em:version>1.7.0.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Update translations from transifex.
by mikeperry＠torproject.org 10 Oct '14

10 Oct '14

commit 08105f44b697c60103602a36df50d99e4e64793e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 9 18:01:18 2014 -0700 Update translations from transifex. --- src/chrome/locale/eu/torbutton.properties | 20 ++++++++++---------- src/chrome/locale/ko/torbutton.properties | 6 +++--- src/chrome/locale/ru/torbutton.properties | 10 +++++----- src/chrome/locale/sv/brand.dtd | 2 +- src/chrome/locale/sv/brand.properties | 2 +- src/chrome/locale/tr/aboutTor.dtd | 4 ++-- src/chrome/locale/tr/brand.properties | 6 +++--- src/chrome/locale/tr/torbutton.dtd | 14 +++++++------- src/chrome/locale/vi/brand.dtd | 2 +- src/chrome/locale/vi/brand.properties | 6 +++--- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index fdff847..bd4f51e 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Tor proxy froga automatikoak huts egin du Tor torbutton.prefs.recommended = (gomendatua) torbutton.prefs.optional = (hautazkoa) torbutton.prefs.crucial = (erabakigarria) -torbutton.popup.external.title = Download an external file type? -torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n -torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n -torbutton.popup.launch = Download file +torbutton.popup.external.title = Kanpoko fitxategi mota bat desargatu? +torbutton.popup.external.app = Tor Nabigatzailea ezin du fitxategi hau bistaratu. Irekitzeko beste aplikazio bat behar izango duzu.\n\n +torbutton.popup.external.note = Fitxategi mota batzuk Tor erabili gabe aplikaziok Internetera konektatzea sor ditzake.\n\n +torbutton.popup.external.suggest = Arriskutik kanpo egoteko, zuk deskargatutako fitxategiak soilik lineaz kanpo ireki behar, edo Tor Live CD bat ilarak bezala erabiliz.\n +torbutton.popup.launch = Fitxategia deskargatu torbutton.popup.cancel = Utzi -torbutton.popup.dontask = Automatically download files from now on +torbutton.popup.dontask = Hemendik aurrera fitxategiak automatikoki deskargatu torbutton.popup.test.no_http_proxy = Tor proxy froga: Ezin da HTTP Proxy lokalera iritsi. Polipo zuzen exekutatzen ari da? torbutton.popup.captcha.title = Saihestu Googleren Captchak? torbutton.popup.captcha.ask = Torbuttonek Google Captcha dat detektatu du. Beste bilaketa motor batera birbideratua izan nahi al duzu eskakizun honetarako? @@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna eta torbutton.popup.never_ask_again = Ez nazazu galdetu berriz # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.siteprompt=Webgune hau (% S) HTML5 canvas irudi datuak ateratzen saiatu da, eta zure ordenagailua identifikatzeko erabil daitezke.\n\nTor Nabigatzailea baimendu nahi duzu webgune honetan HTML5 canvas irudiaren datuak ateratzeko? +canvas.notNow=Orain ez canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Etorkizunean baimendu canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Inoiz ez gune honetarako (gomendatuta) canvas.neverAccessKey=e diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index c8f16d1..03ce18a 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -49,9 +49,9 @@ torbutton.popup.never_ask_again = 다시는 물어보지 않기 # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.notNow=지금은 하지 않겠습니다 canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=다음에 허용함 canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=이 사이트에는 영원히 않음 (권장) canvas.neverAccessKey=e diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 5339ed1..ae55102 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Плагины вроде Flash могут н torbutton.popup.never_ask_again = Больше не спрашивать # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now -canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.siteprompt=Этот веб-сайт (%S) пытается извлечь данные изображения HTML5 canvas, что может быть использовано для получения информации о вашем компьютере.\n\nДолжен ли Tor Browser разрешить этому сайту извлечь данные изображения HTML5 canvas? +canvas.notNow=Не сейчас +canvas.notNowAccessKey=Н +canvas.allow=Разрешить в будущем canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Никогда для этого сайта (рекомендуется) canvas.neverAccessKey=e diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index 72b2120..454646f 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/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 brandShortName "Tor Browser"> +<!ENTITY brandShortName "Tor webbläsaren"> <!ENTITY brandFullName "Tor webbläsaren"> <!ENTITY vendorShortName "Tor projektet"> <!ENTITY trademarkInfo.part1 "Firefox och Firefox logotypen är varumärken tillhörande Mozilla Foundation."> diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties index 2b65162..5212773 100644 --- a/src/chrome/locale/sv/brand.properties +++ b/src/chrome/locale/sv/brand.properties @@ -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/. -brandShortName=Tor Browser +brandShortName=Tor webbläsaren brandFullName=Tor webbläsaren vendorShortName=Tor projektet diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 3c0402e..6e072c3 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -14,7 +14,7 @@ <!ENTITY aboutTor.success.label "Tebrikler!"> <!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için yapılandırılmıştır."> -<!ENTITY aboutTor.success3.label "Şimdi İnternet'i anonim olarak kullanmakta özgürsünüz!"> +<!ENTITY aboutTor.success3.label "Artık İnternet'i anonim olarak kullanmakta özgürsünüz!"> <!ENTITY aboutTor.failure.label "Üzgünüz, bir şeyler yanlış gitti!"> <!ENTITY aboutTor.failure2.label "Bu tarayıcıda Tor çalışmıyor."> <!ENTITY aboutTor.failure3prefix.label "Yardım için %S ile bağlantıya geçin."> @@ -40,7 +40,7 @@ <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Servislerinizi gönüllü yapın »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Yardımda bulunun »"> +<!ENTITY aboutTor.helpInfo5.label "Bağış yapın »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "Tor Projesi çevrimiçi gizlilik ve mahremiyet araştırma, geliştirme ve eğitime adanmış bir ABD 501(c)(3) kar amacı gütmeyen bir kuruluştur."> diff --git a/src/chrome/locale/tr/brand.properties b/src/chrome/locale/tr/brand.properties index 2ae02b1..5f032dd 100644 --- a/src/chrome/locale/tr/brand.properties +++ b/src/chrome/locale/tr/brand.properties @@ -7,9 +7,9 @@ brandFullName=Tor Tarayıcı vendorShortName=Tor Projesi homePageSingleStartMain=Firefox Başlangıç, dahili arama barındıran hızlı bir başlangıç sayfası -homePageImport=%S 'deb başlangıç sayfanızı kopyalayın. +homePageImport=%S konumundan başlangıç sayfanızı kopyalayın. -homePageMigrationPageTitle=Başlangıç sayfası seçimi +homePageMigrationPageTitle=Başlangıç Sayfası Seçimi homePageMigrationDescription=Lütfen kullanmak istediğiniz başlangıç sayfasını seçin: -syncBrandShortName=Eşleştirme +syncBrandShortName=Eşitleme diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 3b2975e..e469873 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -8,20 +8,20 @@ <!ENTITY torbutton.prefs.proxy.host.https "SSL Vekil Sunucusu:"> <!ENTITY torbutton.prefs.proxy.host.ftp "FTP Vekil Sunucusu:"> <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Vekil Sunucusu:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> +<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Sunucusu:"> +<!ENTITY torbutton.prefs.proxy.port "Bağl. Nok.:"> <!ENTITY torbutton.about.title "Torbutton Hakkında"> <!ENTITY torbutton.about.version "Versiyon:"> <!ENTITY torbutton.about.summary "Tor tarama gizliliğinizi korur."> <!ENTITY torbutton.about.code "Kodlarda yardımı bulunanlar:"> <!ENTITY torbutton.about.maintainer "Bakımcı:"> <!ENTITY torbutton.about.security_review "Güvenlik özeti:"> -<!ENTITY torbutton.about.donate "Tor kullanmayı seviyorsanız ayrıca şunu da düşünebilirsiniz"> +<!ENTITY torbutton.about.donate "Tor kullanmayı seviyorsanız ayrıca şunu da düşünebilirsiniz: "> <!ENTITY torbutton.about.make_donation "Bağış yapmak"> <!ENTITY torbutton.pref_connection.notice "Ayarları uygulumak için Torbutonu devredışı bırak."> <!ENTITY torbutton.pref_connection.more_info "Daha fazla bilgi"> <!ENTITY torbutton.pref_connection_more_info.title "Yardım"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbuton şu anda devredışı. Vekil sunucu ayarlarını değiştirmek istiyorsanız, Torbutonu tekrar devredışı bırakın. Genel ayarları değiştirecekseniz, ayarlar penceresini kullanın."> +<!ENTITY torbutton.pref_connection_more_info.text "Torbutton şu anda devre dışı. Vekil sunucu ayarlarını değiştirmek istiyorsanız, Torbutton'ı tekrar devre dışı bırakın. Genel ayarları değiştirecekseniz, ayarlar penceresini kullanın."> <!ENTITY torbutton.context_menu.new_identity "Yeni Bağlantı"> <!ENTITY torbutton.context_menu.new_identity_key "S"> <!ENTITY torbutton.context_menu.toggle "Durum"> @@ -113,7 +113,7 @@ <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> <!ENTITY torbutton.prefs.no_proxies_on "Şunun için vekil sunucu yok:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Uyarı: kaçının üzerinde herhangi bir sunucu isimleri kullanarak"> +<!ENTITY torbutton.prefs.no_proxy_warning "Uyarı: Yukarıdaki alan adlarını kullanmaktan kaçının"> <!ENTITY torbutton.prefs.spoofreresh "Aldatmaca Yenile"> <!ENTITY torbutton.prefs.refereroptions "Referans Aldatmacası Ayarları"> <!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> @@ -124,7 +124,7 @@ <!ENTITY torbutton.cookiedialog.lockCol "Korunmuş"> <!ENTITY torbutton.cookiedialog.domainCol "Sunucu"> <!ENTITY torbutton.cookiedialog.nameCol "İsim"> -<!ENTITY torbutton.cookiedialog.pathCol "yol"> +<!ENTITY torbutton.cookiedialog.pathCol "Yol"> <!ENTITY torbutton.cookiedialog.protectCookie "Çerezi sakla"> <!ENTITY torbutton.cookiedialog.removeCookie "Çerezi sil"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Çerezi korumayı sonlandır"> @@ -144,7 +144,7 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Kaldır platform ve Google Arama Kutusu gelen dil sorgular"> <!ENTITY torbutton.prefs.transparentTor "Şeffaf Torifikasyon (özel transproxy veya Tor yönlendiricisi gerekir)"> -<!ENTITY torbutton.prefs.block_disk "Tarama geçmişini ve web sitesi bilgilerini kaydetme (Özel Tarama Modu'nu aktifleştirir)"> +<!ENTITY torbutton.prefs.block_disk "Tarama geçmişini ve web sitesi bilgilerini kaydetme (Özel Tarama Kipi'ni etkinleştirir)"> <!ENTITY torbutton.prefs.restrict_thirdparty "3. parti çerezleri ve diğer iz sürücü bilgileri engelle."> <!ENTITY torbutton.prefs.block_plugins "Flash gibi tarayıcı eklentilerini engelle."> <!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor kullanıcılardan sizi ayıran detayları değiştirin."> diff --git a/src/chrome/locale/vi/brand.dtd b/src/chrome/locale/vi/brand.dtd index 59f665e..49ca087 100644 --- a/src/chrome/locale/vi/brand.dtd +++ b/src/chrome/locale/vi/brand.dtd @@ -4,5 +4,5 @@ <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> +<!ENTITY vendorShortName "Dự án Tor"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/vi/brand.properties b/src/chrome/locale/vi/brand.properties index e2b5250..51608eb 100644 --- a/src/chrome/locale/vi/brand.properties +++ b/src/chrome/locale/vi/brand.properties @@ -4,12 +4,12 @@ brandShortName=Tor Browser brandFullName=Tor Browser -vendorShortName=Tor Project +vendorShortName=Dự án Tor homePageSingleStartMain=Firefox Start, a fast home page with built-in search homePageImport=Import your home page from %S -homePageMigrationPageTitle=Home Page Selection +homePageMigrationPageTitle=Lựa chọn trang chủ homePageMigrationDescription=Vui lòng chọn trang chủ mà bạn muốn dùng: -syncBrandShortName=Sync +syncBrandShortName=Đồng bộ hóa

1 0

[tor-browser-bundle/master] Actually, we want to hash all *.zip files as well.
by gk＠torproject.org 09 Oct '14

09 Oct '14

commit 6f53d746c45e1b60b8a4027666af16345e6eaf29 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 9 19:40:05 2014 +0000 Actually, we want to hash all *.zip files as well. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 5153c9b..010b41d 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -44,7 +44,7 @@ if [ $status = done ]; then echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 - sha256sum *.tar.xz *.dmg *.exe > sha256sums.txt + sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums.txt gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR)

1 0

[tor-browser-bundle/master] Put the *.dmg files in the sha256sums.txt, too.
by gk＠torproject.org 09 Oct '14

09 Oct '14

commit 482b8d3f2e84e74ef29c24ab8f66739d1cd3cb0b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 9 16:15:58 2014 +0000 Put the *.dmg files in the sha256sums.txt, too. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index d46fd30..5153c9b 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -44,7 +44,7 @@ if [ $status = done ]; then echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 - sha256sum *.tar.xz *.zip *.exe > sha256sums.txt + sha256sum *.tar.xz *.dmg *.exe > sha256sums.txt gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR)

1 0

[tor-browser-bundle/master] Bug 13359: Revert LD_LIBRARY_PATH + move libstdc++.
by gk＠torproject.org 09 Oct '14

09 Oct '14

commit fb0ffbecae5c102230ee6b789dcc02c11b862689 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 8 21:35:50 2014 +0000 Bug 13359: Revert LD_LIBRARY_PATH + move libstdc++. Amending the LD_LIBRARY_PATH in our start script breaks the update from a Tor Browser with the older value to a Tor Browser requiring the new one. We therefore move the libstdc++ to the directory with the libraries tor depends upon and LD_LIBRARY_PATH used to point to and change the LD_LIBRARY_PATH value back to the old one. --- RelativeLink/RelativeLink.sh | 2 +- gitian/descriptors/linux/gitian-firefox.yml | 2 -- gitian/descriptors/linux/gitian-tor.yml | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 88f9f8e..e75482a 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -215,7 +215,7 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then exit 1 fi -LD_LIBRARY_PATH="${HOME}:${HOME}/TorBrowser/Tor/" +LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH function setControlPortPasswd() { diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 27ba077..5f96b6e 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -155,8 +155,6 @@ script: | strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB done - # We need to copy the libstdc++.so.6 for older Linux distros. - cp $INSTDIR/gcc/lib$ARCH/libstdc++.so.6 Browser # ~/build/re-dzip.sh Browser/omni.ja ~/build/re-dzip.sh Browser/webapprt/omni.ja diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index aad9368..e678203 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -32,6 +32,8 @@ files: - "openssl-linux64-utils.zip" - "libevent-linux32-utils.zip" - "libevent-linux64-utils.zip" +- "gcc-linux32-utils.zip" +- "gcc-linux64-utils.zip" script: | INSTDIR="$HOME/install" source versions @@ -53,9 +55,23 @@ script: | mkdir -p $INSTDIR/Debug/Tor/ unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR libevent-linux$GBUILD_BITS-utils.zip + unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ + # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. + # Copying it into /Browser, which feels more natural, and amending + # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old + # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy + # the libstdc++ into the directory with the libs tor depends on, too. See bug + # 13359 for further details. + ARCH="" + if [ $GBUILD_BITS == "64" ]; + then + ARCH="64" + fi + cp $INSTDIR/gcc/lib$ARCH/libstdc++.so.6 $INSTDIR/Tor/ + chmod 700 $INSTDIR/Tor/*so* # This is needed to make RPATH unavailable. See bug 9150. export LD_LIBRARY_PATH="$INSTDIR/Tor/"

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit aed7442860ce3919eaec9f9d99da89195903b5d9 Merge: 8daaea3 30f92a2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 23:55:46 2014 -0700 Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1 dom/base/Navigator.cpp | 61 ++++++++++--------- dom/base/Navigator.h | 13 +++-- dom/workers/Navigator.cpp | 47 ++++++++++++++- dom/workers/Navigator.h | 37 ++++-------- dom/workers/RuntimeService.cpp | 104 ++++++++++++++++++++++++++++++++- dom/workers/RuntimeService.h | 12 ++++ dom/workers/WorkerScope.cpp | 4 ++ dom/workers/test/bug1060621_worker.js | 2 + dom/workers/test/bug1062920_worker.js | 6 ++ dom/workers/test/chrome.ini | 2 + dom/workers/test/mochitest.ini | 11 ++++ dom/workers/test/test_bug1060621.html | 30 ++++++++++ dom/workers/test/test_bug1062920.html | 61 +++++++++++++++++++ dom/workers/test/test_bug1062920.xul | 68 +++++++++++++++++++++ 14 files changed, 394 insertions(+), 64 deletions(-)

1 0