November 2016 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Pick up latest donation banner changes
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit 6e8555daebfc4a1ad664ff03c7273b95bfe02a44 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 10:42:51 2016 +0000 Pick up latest donation banner changes --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6d5d66b..6efa439 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.5a4 -- November 16 2016 * Update Firefox to 45.5.0esr * Update Tor to 0.2.9.5-alpha * Update OpenSSL to 1.0.2j - * Update Torbutton to 1.9.6.5 + * Update Torbutton to 1.9.6.6 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Bug 20111: use Unix domain sockets for SOCKS port by default * Bug 19459: Move resizing code to tor-browser.git diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 55ebb2e..a8fff36 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 TOR_TAG=tor-0.2.9.5-alpha TORLAUNCHER_TAG=0.2.10.2 -TORBUTTON_TAG=1.9.6.5 +TORBUTTON_TAG=1.9.6.6 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/maint-6.0] Pick up latest donation banner changes
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit a28df60e59e8ef3e328a95f04e8f8adb5750f0e5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 10:30:29 2016 +0000 Pick up latest donation banner changes --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e6f9b74..75a6fc3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.0.6 -- November 15 * Update Firefox to 45.5.0esr * Update Tor to 0.2.8.9 * Update OpenSSL to 1.0.1u - * Update Torbutton to 1.9.5.9 + * Update Torbutton to 1.9.5.10 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates * Update Tor Launcher to 0.2.9.4 diff --git a/gitian/versions b/gitian/versions index bb83b2d..226c472 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.8.9 TORLAUNCHER_TAG=0.2.9.4 -TORBUTTON_TAG=1.9.5.9 +TORBUTTON_TAG=1.9.5.10 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/maint-1.9.5] Update pt translation, CHANGELOG and Torbutton version
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit e6ce4a86360b4b17f690dcd229bb8b478fa19679 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 10:25:37 2016 +0000 Update pt translation, CHANGELOG and Torbutton version --- src/CHANGELOG | 2 +- src/chrome/locale/pt/aboutTor.properties | 12 ++++++------ src/install.rdf | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index db42f82..8f19f42 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,4 @@ -1.9.5.9 +1.9.5.10 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates diff --git a/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties index f9b6dbf..f8f6235 100644 --- a/src/chrome/locale/pt/aboutTor.properties +++ b/src/chrome/locale/pt/aboutTor.properties @@ -20,9 +20,9 @@ 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/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=Doe Agora! +aboutTor.donationBanner.heart=O Tor é o coração da liberdade na Internet +aboutTor.donationBanner.tagline1=Milhares de pessoas dependem do Tor para Segurança & Privacidade Online +aboutTor.donationBanner.tagline2=Uma Rede de Pessoas Protegendo Pessoas +aboutTor.donationBanner.tagline3=Vigilância = Opressão +aboutTor.donationBanner.tagline4=Protegendo Jornalistas, Ativistas & Denunciantes Desde 2006 diff --git a/src/install.rdf b/src/install.rdf index 16adb7e..d518982 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.5.9</em:version> + <em:version>1.9.5.10</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/maint-1.9.5] Bug 20414.3: Delay banner 1 week & add pt locale
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit ba95ab383ce6ecdcdba9cc905095b0a85ad1b08e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 10 23:26:47 2016 -0800 Bug 20414.3: Delay banner 1 week & add pt locale Also, improve donate button appearance by moving arrow below text and choosing a narrow arrow. --- src/chrome/content/aboutTor/aboutTor.xhtml | 4 +++- src/chrome/content/aboutTor/donation_banner.js | 11 ++++++----- src/chrome/skin/donation_banner.css | 19 ++++++++++++++----- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 1ecae65..b6860d8 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -180,7 +180,9 @@ window.addEventListener("pageshow", function() { href="https://www.torproject.org/donate/donate-tbb"> <div id="banner-donate-button-container"> <div id="banner-donate-button"> - <div id="banner-donate-button-text"></div> + <div id="banner-donate-button-text"> + <span></span> + </div> <div id="banner-donate-button-arrow"></div> </div> </div> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 04f8db9..727d984 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -9,6 +9,7 @@ let kBannerLocales = [ "fr", "it", "nl", + "pt", "ru", "tr", "vi", @@ -58,9 +59,9 @@ let shouldShowBanner = function () { kDonationPageLocales.indexOf(kBrowserLocaleShort) === -1) { return false; } - // Only show banner between 2016 Nov 15 and 2017 Jan 25. + // Only show banner between 2016 Nov 22 and 2017 Jan 25. let now = new Date(); - let start = new Date(2016, 10, 15); + let start = new Date(2016, 10, 22); let end = new Date(2017, 0, 26); let shownCountPref = "extensions.torbutton.donation_banner2016.shown_count"; if (now < start || now > end) { @@ -122,7 +123,7 @@ let avoidWidows = function (element) { let updateTextSizes = function () { fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-heart")); - fitTextInElement(sel("#banner-donate-button")); + fitTextInElement(sel("#banner-donate-button-text")); avoidWidows(sel("#banner-tagline span")); }; @@ -143,9 +144,9 @@ let runDonationBanner = function () { sel("#banner-tagline span").innerText = getTagline(randomInteger(4)); sel("#banner-heart span").innerText = gStringBundle.GetStringFromName("aboutTor.donationBanner.heart"); - sel("#banner-donate-button-text").innerHTML = + sel("#banner-donate-button-text span").innerHTML = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - sel("#banner-donate-button-arrow").innerHTML = "▶"; + sel("#banner-donate-button-arrow").innerHTML = "⟶"; sel("#banner").style.display = "flex"; sel("#banner-spacer").style.display = "block"; addEventListener("resize", updateTextSizes); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 8ad3f88..06d6194 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -96,10 +96,10 @@ letter-spacing: -0.00em; opacity: 100%; padding-bottom: 5px; - padding-left: 15px; - padding-right: 15px; + padding-left: 5px; + padding-right: 5px; padding-top: 5px; - width: 80px; + width: 100px; } #banner-donate-button-container:hover { border-color: #610; @@ -110,16 +110,25 @@ #banner-donate-button { align-items: center; display: flex; + flex-direction: column; font-family: sans-serif; font-size: 12px; font-weight: bold; height: 100%; - text-align: start; + text-align: center; width: 100%; } +#banner-donate-button-text { + align-self: stretch; + align-items: center; + display: flex; + justify-content: center; + flex: 2 2 67%; +} #banner-donate-button-arrow { + flex: 1 1 33%; font-size: 14px; - margin-inline-start: 5px; + line-height: 14px; } #banner-donate-button-arrow:-moz-dir(rtl) { transform: scaleX(-1);

1 0

[torbutton/master] CHANGELOG update and version bump
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit f6ad4d7aa78b7fe0a8c84c01f8eef0d8ad8c31cc Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 10:21:32 2016 +0000 CHANGELOG update and version bump --- src/CHANGELOG | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0f0b103..a89302f 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,4 @@ -1.9.6.5 +1.9.6.6 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Bug 20111: use Unix domain sockets for SOCKS port by default * Bug 19459: Move resizing code to tor-browser.git diff --git a/src/install.rdf b/src/install.rdf index 2d3bde6..994aa5c 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.6.5</em:version> + <em:version>1.9.6.6</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] Translation updates
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit 0f3c9aedcbcc765950be119f4cc3926f3d9d1782 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 10:20:20 2016 +0000 Translation updates --- src/chrome/locale/de/torbutton.dtd | 2 +- src/chrome/locale/pt/aboutTor.properties | 12 ++++++------ src/chrome/locale/tr/torbutton.dtd | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index ee52349..1e3a967 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts können auf manchen Seiten langsamer laufen."> <!ENTITY torbutton.prefs.sec_mathml_desc "Manche Vorgänge zur Anzeige von mathematischen Gleichungen sind deaktiviert."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ist deaktiviert."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> +<!ENTITY torbutton.prefs.sec_medium "Mittel"> <!ENTITY torbutton.prefs.sec_all_jit_desc "Auf Seiten wo JavaScript aktiviert ist, sind Leistungsoptimierungen deaktiviert."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Einige Schriftabbildungseigenschaften sind deaktiviert."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Der Graphite-Schriftdarstellungsvorgang ist deaktiviert."> diff --git a/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties index f9b6dbf..f8f6235 100644 --- a/src/chrome/locale/pt/aboutTor.properties +++ b/src/chrome/locale/pt/aboutTor.properties @@ -20,9 +20,9 @@ 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/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=Doe Agora! +aboutTor.donationBanner.heart=O Tor é o coração da liberdade na Internet +aboutTor.donationBanner.tagline1=Milhares de pessoas dependem do Tor para Segurança & Privacidade Online +aboutTor.donationBanner.tagline2=Uma Rede de Pessoas Protegendo Pessoas +aboutTor.donationBanner.tagline3=Vigilância = Opressão +aboutTor.donationBanner.tagline4=Protegendo Jornalistas, Ativistas & Denunciantes Desde 2006 diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index cca8d92..116e0fc 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> <!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_medium "Orta"> +<!ENTITY torbutton.prefs.sec_medium "Ortam"> <!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScript kullanılan web sitelerinde başarım iyileştirmeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi görüntüleme düzeneği devre dışı bırakılır.">

1 0

[torbutton/master] Bug 20414.3: Delay banner 1 week & add pt locale
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit 64f16026a2e9899c136e925f4487721d2746c56e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 10 23:26:47 2016 -0800 Bug 20414.3: Delay banner 1 week & add pt locale Also, improve donate button appearance by moving arrow below text and choosing a narrow arrow. --- src/chrome/content/aboutTor/aboutTor.xhtml | 4 +++- src/chrome/content/aboutTor/donation_banner.js | 11 ++++++----- src/chrome/skin/donation_banner.css | 19 ++++++++++++++----- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 1ecae65..b6860d8 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -180,7 +180,9 @@ window.addEventListener("pageshow", function() { href="https://www.torproject.org/donate/donate-tbb"> <div id="banner-donate-button-container"> <div id="banner-donate-button"> - <div id="banner-donate-button-text"></div> + <div id="banner-donate-button-text"> + <span></span> + </div> <div id="banner-donate-button-arrow"></div> </div> </div> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 04f8db9..727d984 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -9,6 +9,7 @@ let kBannerLocales = [ "fr", "it", "nl", + "pt", "ru", "tr", "vi", @@ -58,9 +59,9 @@ let shouldShowBanner = function () { kDonationPageLocales.indexOf(kBrowserLocaleShort) === -1) { return false; } - // Only show banner between 2016 Nov 15 and 2017 Jan 25. + // Only show banner between 2016 Nov 22 and 2017 Jan 25. let now = new Date(); - let start = new Date(2016, 10, 15); + let start = new Date(2016, 10, 22); let end = new Date(2017, 0, 26); let shownCountPref = "extensions.torbutton.donation_banner2016.shown_count"; if (now < start || now > end) { @@ -122,7 +123,7 @@ let avoidWidows = function (element) { let updateTextSizes = function () { fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-heart")); - fitTextInElement(sel("#banner-donate-button")); + fitTextInElement(sel("#banner-donate-button-text")); avoidWidows(sel("#banner-tagline span")); }; @@ -143,9 +144,9 @@ let runDonationBanner = function () { sel("#banner-tagline span").innerText = getTagline(randomInteger(4)); sel("#banner-heart span").innerText = gStringBundle.GetStringFromName("aboutTor.donationBanner.heart"); - sel("#banner-donate-button-text").innerHTML = + sel("#banner-donate-button-text span").innerHTML = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - sel("#banner-donate-button-arrow").innerHTML = "▶"; + sel("#banner-donate-button-arrow").innerHTML = "⟶"; sel("#banner").style.display = "flex"; sel("#banner-spacer").style.display = "block"; addEventListener("resize", updateTextSizes); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 8ad3f88..06d6194 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -96,10 +96,10 @@ letter-spacing: -0.00em; opacity: 100%; padding-bottom: 5px; - padding-left: 15px; - padding-right: 15px; + padding-left: 5px; + padding-right: 5px; padding-top: 5px; - width: 80px; + width: 100px; } #banner-donate-button-container:hover { border-color: #610; @@ -110,16 +110,25 @@ #banner-donate-button { align-items: center; display: flex; + flex-direction: column; font-family: sans-serif; font-size: 12px; font-weight: bold; height: 100%; - text-align: start; + text-align: center; width: 100%; } +#banner-donate-button-text { + align-self: stretch; + align-items: center; + display: flex; + justify-content: center; + flex: 2 2 67%; +} #banner-donate-button-arrow { + flex: 1 1 33%; font-size: 14px; - margin-inline-start: 5px; + line-height: 14px; } #banner-donate-button-arrow:-moz-dir(rtl) { transform: scaleX(-1);

1 0

[torbutton/master] Bug 19459.3: Remove extensions.torbutton.window.max(Width, Height)
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit 516ada586ebbceb736e9d40ff28425aeb0b226ae Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 10 22:21:49 2016 -0800 Bug 19459.3: Remove extensions.torbutton.window.max(Width,Height) --- src/defaults/preferences/preferences.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index ec2cdbc..b7fa11b 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -55,9 +55,5 @@ pref("extensions.torbutton.confirm_newnym", true); // Browser home page: pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); -// Browser window maximum size (used when setting the size during startup): -pref("extensions.torbutton.window.maxHeight", 1000); -pref("extensions.torbutton.window.maxWidth", 1000); - // This pref specifies an ad-hoc "version" for various pref update hacks we need to do pref("extensions.torbutton.pref_fixup_version", 0);

1 0

[torbutton/master] Bug 19459.2: Don't let Cu.import pollute namespaces
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit e33d7c3ae6752ca7b4d5a266a3424f59f483b26f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 10 16:48:31 2016 -0800 Bug 19459.2: Don't let Cu.import pollute namespaces --- src/chrome/content/content-sizer.js | 3 ++- src/chrome/content/preferences.js | 2 +- src/chrome/content/tor-circuit-display.js | 4 ++-- src/chrome/content/torbutton.js | 10 +++++----- src/modules/security-prefs.js | 6 +++--- src/modules/tor-control-port.js | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/content-sizer.js b/src/chrome/content/content-sizer.js index ded06d7..bd657b8 100644 --- a/src/chrome/content/content-sizer.js +++ b/src/chrome/content/content-sizer.js @@ -41,7 +41,8 @@ let torbuttonBundle = Services.strings.createBundle( "chrome://torbutton/locale/torbutton.properties"); // Import utility functions -let { bindPrefAndInit, getEnv } = Cu.import("resource://torbutton/modules/utils.js"); +let { bindPrefAndInit, getEnv, observe } = + Cu.import("resource://torbutton/modules/utils.js", {}); // __windowUtils(window)__. // See nsIDOMWindowUtils on MDN. diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 3bb6c0c..1f94dbb 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -3,7 +3,7 @@ // Utilities let { utils: Cu } = Components; let { getBoolPref, getIntPref, setBoolPref, setIntPref } = - Cu.import("resource://gre/modules/Services.jsm").Services.prefs; + Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; // Description elements have the follow names. const descNames = diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index c58c6d7..14e5e8e 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -31,10 +31,10 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); // Import the controller code. -let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js"); +let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); // Utility functions -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js"); +let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 53e5479..7de599d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -7,11 +7,11 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); -let { Services } = Cu.import("resource://gre/modules/Services.jsm"); -let { showDialog } = Cu.import("resource://torbutton/modules/utils.js"); -let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js"); -let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js"); +let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm', {}); +let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); +let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); +let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index e6a888c..4a39ca8 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -4,9 +4,9 @@ let {classes: Cc, utils: Cu } = Components; let { getBoolPref, setBoolPref, getIntPref, setIntPref } = - Cu.import("resource://gre/modules/Services.jsm").Services.prefs; -let { bindPref } = - Cu.import("resource://torbutton/modules/utils.js"); + Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; +let { bindPref, bindPrefAndInit } = + Cu.import("resource://torbutton/modules/utils.js", {}); let logger = Components.classes["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; let log = (level, msg) => logger.log(level, msg); diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index a7f0434..b3d431a 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -7,7 +7,7 @@ // // To import the module, use // -// let { controller } = Components.utils.import("path/to/tor-control-port.js"); +// let { controller } = Components.utils.import("path/to/tor-control-port.js", {}); // // See the last function defined in this file: // controller(ipcFile, host, port, password, onError)

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 11 Nov '16

11 Nov '16

commit ece67a808cf4630d63565aee85e00b48cbf093f7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 11 04:16:35 2016 +0000 Update translations for torbutton-torbuttondtd --- tr/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd index cca8d92..116e0fc 100644 --- a/tr/torbutton.dtd +++ b/tr/torbutton.dtd @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> <!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_medium "Orta"> +<!ENTITY torbutton.prefs.sec_medium "Ortam"> <!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScript kullanılan web sitelerinde başarım iyileştirmeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi görüntüleme düzeneği devre dışı bırakılır.">

1 0