- tbb-commits - lists.torproject.org

[torbutton/master] Bug 16735: about:tor should accommodate different fonts/font sizes.
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 08728b3bfac14fe5a325fe94cc9e7d6fe106b559 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Sep 14 11:37:14 2015 -0400 Bug 16735: about:tor should accommodate different fonts/font sizes. Avoid hard-coded heights and positions in about:tor. The "update needed" arrow is now constructed from 4 elements instead of 2 and the info. "bubbles" use table layout instead of hard-coded heights. Set the CSS z-index so that text will be in front of the status image (onion image) and the "update needed" arrow. Use "let" instead of "var" in the about:tor JS code. --- src/chrome/content/aboutTor/aboutTor.xhtml | 205 ++++++++++++-------- .../content/aboutTor/onionArrow-extension.png | Bin 1695 -> 1798 bytes .../content/aboutTor/onionArrow-leftBend.png | Bin 0 -> 2080 bytes src/chrome/content/aboutTor/onionArrow-right.png | Bin 2503 -> 0 bytes .../content/aboutTor/onionArrow-rightBend.png | Bin 0 -> 2077 bytes src/chrome/content/aboutTor/onionArrow.png | Bin 2381 -> 0 bytes src/chrome/skin/aboutTor.css | 68 +++---- 7 files changed, 157 insertions(+), 116 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 95807fd..0991ebe 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -38,86 +38,122 @@ function onLoad() function adjustToolbarIconArrow() { - var textElem = document.getElementById("updatePrompt"); - var arrowDiv = document.getElementById("toolbarIconArrow"); - var extDiv = document.getElementById("toolbarIconArrowExtension"); - if (textElem && arrowDiv && extDiv) + let textElem = document.getElementById("updatePrompt"); + let arrowHeadDiv = document.getElementById("toolbarIconArrowHead"); + let vertExtDiv = document.getElementById("toolbarIconArrowVertExtension"); + let bendDiv = document.getElementById("toolbarIconArrowBend"); + let horzExtDiv = document.getElementById("toolbarIconArrowHorzExtension"); + if (!textElem || !arrowHeadDiv || !vertExtDiv || !bendDiv || !horzExtDiv) + return; + + let arrowTailElems = [ vertExtDiv, bendDiv, horzExtDiv ]; + let tbXpos; + if (document.body.hasAttribute("torbutton-xpos")) + tbXpos = parseInt(document.body.getAttribute("torbutton-xpos"), 10); + + if (!tbXpos || isNaN(tbXpos) || (tbXpos < 0)) { - var tbXpos; - if (document.body.hasAttribute("torbutton-xpos")) - tbXpos = parseInt(document.body.getAttribute("torbutton-xpos"), 10); - - if (!tbXpos || isNaN(tbXpos) || (tbXpos < 0)) - { - arrowDiv.style.display = "none"; - extDiv.style.display = "none"; - return; - } + arrowHeadDiv.style.display = "none"; + for (let elem of arrowTailElems) + elem.style.display = "none"; + return; + } - // Account for content zoom and retina displays by converting to device - // independent units. - if ("devicePixelRatio" in window) // FF18+ - tbXpos /= window.devicePixelRatio; - - const kArrowMargin = 6; - arrowDiv.style.display = "block"; // Must be visible to get offsetWidth. - var arrowHalfWidth = arrowDiv.offsetWidth / 2.0; - var leftAnchor = textElem.offsetLeft - kArrowMargin - arrowHalfWidth; - var rightAnchor = textElem.offsetLeft + textElem.offsetWidth - + kArrowMargin + arrowHalfWidth; - - var arrowDisplay = "block"; - var extDisplay = "block"; - if (tbXpos < leftAnchor) - { - // Toolbar button to left of text. - arrowDiv.setAttribute("pos", "left"); - arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; - var extLeft = tbXpos + arrowHalfWidth; - extDiv.style.left = extLeft + "px"; - extDiv.style.width = (textElem.offsetLeft - extLeft - kArrowMargin) + "px"; - } - else if ((tbXpos > rightAnchor) && - (tbXpos < (window.innerWidth - arrowHalfWidth))) - { - // Toolbar button to right of text. - arrowDiv.setAttribute("pos", "right"); - arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; - var extLeft = rightAnchor - arrowHalfWidth; - extDiv.style.left = extLeft + "px"; - extDiv.style.width = (tbXpos - arrowHalfWidth - extLeft) + "px"; - } - else if ((tbXpos >= leftAnchor) && (tbXpos <= rightAnchor)) - { - // Toolbar button in middle about text; use arrow without a tail. - arrowDiv.setAttribute("pos", "middle"); - arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; - extDisplay = "none"; - } - else // Unable to display arrow (e.g., toolbar button is above sidebar). + // Account for content zoom and retina displays by converting to device + // independent units. + if ("devicePixelRatio" in window) // FF18+ + tbXpos /= window.devicePixelRatio; + + const kArrowMargin = 6; // Horizontal margin between line and text. + const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. + const kArrowLineThickness = 11; + const kBendWidth = 22; + const kBendHeight = 22; + + arrowHeadDiv.style.display = "block"; // Must be visible to get offsetWidth. + let arrowHalfWidth = Math.round(arrowHeadDiv.offsetWidth / 2); + let leftAnchor = textElem.offsetLeft - kArrowMargin + - kBendWidth + Math.round(kArrowLineThickness / 2); + let rightAnchor = textElem.offsetLeft + textElem.offsetWidth + + kArrowMargin + arrowHalfWidth; + + let isArrowOnLeft = (tbXpos < leftAnchor); + let isArrowOnRight = (tbXpos > rightAnchor) && + (tbXpos < (window.innerWidth - arrowHalfWidth)); + let isArrowInMiddle = (tbXpos >= leftAnchor) && (tbXpos <= rightAnchor); + + if (isArrowOnLeft || isArrowOnRight || isArrowInMiddle) + { + // Position the arrow head. + let arrowHeadLeft = tbXpos - arrowHalfWidth; + arrowHeadDiv.style.left = arrowHeadLeft + "px"; + if (isArrowOnLeft || isArrowOnRight) { - arrowDisplay = "none"; - extDisplay = "none"; + let horzExtBottom = textElem.offsetTop + + Math.round((textElem.offsetHeight + kArrowLineThickness) / 2); + + // Position the vertical (extended) line. + let arrowHeadBottom = arrowHeadDiv.offsetTop + arrowHeadDiv.offsetHeight; + vertExtDiv.style.top = arrowHeadBottom + "px"; + vertExtDiv.style.left = (arrowHeadLeft + kArrowHeadExtraWidth) + "px"; + let ht = horzExtBottom - kBendHeight - arrowHeadBottom; + vertExtDiv.style.height = ht + "px"; + + // Position the bend (elbow). + bendDiv.style.top = (horzExtBottom - kBendHeight) + "px"; + let bendDivLeft; + if (isArrowOnLeft) + { + bendDiv.setAttribute("pos", "left"); + bendDivLeft = arrowHeadLeft + kArrowHeadExtraWidth; + } + else if (isArrowOnRight) + { + bendDiv.setAttribute("pos", "right"); + bendDivLeft = arrowHeadLeft + kArrowHeadExtraWidth + + kArrowLineThickness - kBendWidth; + } + bendDiv.style.left = bendDivLeft + "px"; + + // Position the horizontal (extended) line. + horzExtDiv.style.top = (horzExtBottom - kArrowLineThickness) + "px"; + let horzExtLeft, w; + if (isArrowOnLeft) + { + horzExtLeft = bendDivLeft + kBendWidth; + w = (textElem.offsetLeft - horzExtLeft - kArrowMargin); + } + else + { + horzExtLeft = rightAnchor - arrowHalfWidth; + w = tbXpos - arrowHalfWidth - horzExtLeft; + } + horzExtDiv.style.left = horzExtLeft + "px"; + horzExtDiv.style.width = w + "px"; } - - arrowDiv.style.display = arrowDisplay; - extDiv.style.display = extDisplay; } + + let headDisplay = (isArrowOnLeft || isArrowInMiddle || isArrowOnRight) + ? "block" : "none"; + arrowHeadDiv.style.display = headDisplay; + let tailDisplay = (isArrowOnLeft || isArrowOnRight) ? "block" : "none"; + for (let elem of arrowTailElems) + elem.style.display = tailDisplay; } function insertPropertyStrings() { try { - var kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; + let kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; Components.utils.import("resource://gre/modules/Services.jsm"); - var gStringBundle = Services.strings.createBundle(kPropertiesURL); - var s1 = gStringBundle.GetStringFromName("aboutTor.searchDC.privacy.link"); - var s2 = gStringBundle.GetStringFromName("aboutTor.searchDC.search.link"); - var result = gStringBundle.formatStringFromName("aboutTor.searchDC.privacy", + let gStringBundle = Services.strings.createBundle(kPropertiesURL); + let s1 = gStringBundle.GetStringFromName("aboutTor.searchDC.privacy.link"); + let s2 = gStringBundle.GetStringFromName("aboutTor.searchDC.search.link"); + let result = gStringBundle.formatStringFromName("aboutTor.searchDC.privacy", [s1, s2], 2); if (result) { - var elem = document.getElementById("searchProviderInfo"); + let elem = document.getElementById("searchProviderInfo"); if (elem) elem.innerHTML = result; } @@ -159,8 +195,11 @@ window.addEventListener("pageshow", function() { <h1 class="hideIfTorOff">&aboutTor.outOfDateTorOn.label;</h1> <h1 class="hideIfTorOn">&aboutTor.outOfDateTorOff.label;</h1> <h3 id="updatePrompt">&aboutTor.outOfDate2.label;</h3> - <div id="toolbarIconArrow"/> - <div id="toolbarIconArrowExtension"/> + + <div id="toolbarIconArrowHead" class="arrow"/> + <div id="toolbarIconArrowVertExtension" class="arrow"/> + <div id="toolbarIconArrowBend" class="arrow"/> + <div id="toolbarIconArrowHorzExtension" class="arrow"/> </div> </div> @@ -180,20 +219,22 @@ window.addEventListener("pageshow", function() { <div class="hideIfTorOn" style="height:100px"/> <div id="middle" class="hideIfTorOff"> - <div class="container two"> - <h1>&aboutTor.whatnextQuestion.label;</h1> - <p>&aboutTor.whatnextAnswer.label;</p> - <a class="tips" href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a> - </div> + <div class="bubbleRow"> + <div class="bubble"> + <h1>&aboutTor.whatnextQuestion.label;</h1> + <p>&aboutTor.whatnextAnswer.label;</p> + <a class="tips" href="&aboutTor.whatnext.link;">&aboutTor.whatnext.label;</a> + </div> - <div class="container three"> - <h1>&aboutTor.helpInfo1.label;</h1> - <p>&aboutTor.helpInfo2.label;</p> - <ul> - <li><a href="&aboutTor.helpInfo3.link;">&aboutTor.helpInfo3.label;</a></li> - <li><a href="&aboutTor.helpInfo4.link;">&aboutTor.helpInfo4.label;</a></li> - <li><a href="&aboutTor.helpInfo5.link;">&aboutTor.helpInfo5.label;</a></li> - </ul> + <div class="bubble"> + <h1>&aboutTor.helpInfo1.label;</h1> + <p>&aboutTor.helpInfo2.label;</p> + <ul> + <li><a href="&aboutTor.helpInfo3.link;">&aboutTor.helpInfo3.label;</a></li> + <li><a href="&aboutTor.helpInfo4.link;">&aboutTor.helpInfo4.label;</a></li> + <li><a href="&aboutTor.helpInfo5.link;">&aboutTor.helpInfo5.label;</a></li> + </ul> + </div> </div> </div>  diff --git a/src/chrome/content/aboutTor/onionArrow-extension.png b/src/chrome/content/aboutTor/onionArrow-extension.png index 7552f2d..55ff208 100644 Binary files a/src/chrome/content/aboutTor/onionArrow-extension.png and b/src/chrome/content/aboutTor/onionArrow-extension.png differ diff --git a/src/chrome/content/aboutTor/onionArrow-leftBend.png b/src/chrome/content/aboutTor/onionArrow-leftBend.png new file mode 100644 index 0000000..9d1bb45 Binary files /dev/null and b/src/chrome/content/aboutTor/onionArrow-leftBend.png differ diff --git a/src/chrome/content/aboutTor/onionArrow-right.png b/src/chrome/content/aboutTor/onionArrow-right.png deleted file mode 100644 index b9f6d1e..0000000 Binary files a/src/chrome/content/aboutTor/onionArrow-right.png and /dev/null differ diff --git a/src/chrome/content/aboutTor/onionArrow-rightBend.png b/src/chrome/content/aboutTor/onionArrow-rightBend.png new file mode 100644 index 0000000..6b60342 Binary files /dev/null and b/src/chrome/content/aboutTor/onionArrow-rightBend.png differ diff --git a/src/chrome/content/aboutTor/onionArrow.png b/src/chrome/content/aboutTor/onionArrow.png deleted file mode 100644 index c778568..0000000 Binary files a/src/chrome/content/aboutTor/onionArrow.png and /dev/null differ diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 1342404..ab8dba8 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, The Tor Project, Inc. + * Copyright (c) 2015, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -56,31 +56,36 @@ body[toron] #torstatus-image { height: 128px; width: 128px; background-image: url('chrome://torbutton/content/aboutTor/tor-off.png'); + z-index: -1; } -#toolbarIconArrow, #toolbarIconArrowExtension { +.arrow { + display: none; position: absolute; - top: 4px; - height: 250px; + z-index: -1; } -#toolbarIconArrow { +#toolbarIconArrowHead { + top: 4px; width: 30px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow.png'); + height: 36px; + background-image: url('chrome://torbutton/content/aboutTor/onionArrow-short.png'); } -#toolbarIconArrow[pos="middle"] { - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-short.png'); - height: 36px; +#toolbarIconArrowVertExtension, #toolbarIconArrowHorzExtension { + width: 11px; + height: 11px; + background-image: url('chrome://torbutton/content/aboutTor/onionArrow-extension.png'); } -#toolbarIconArrow[pos="right"] { - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-right.png'); +#toolbarIconArrowBend { + width: 22px; + height: 22px; + background-image: url('chrome://torbutton/content/aboutTor/onionArrow-leftBend.png'); } -#toolbarIconArrowExtension { - width: 10px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-extension.png'); +#toolbarIconArrowBend[pos="right"] { + background-image: url('chrome://torbutton/content/aboutTor/onionArrow-rightBend.png'); } a { @@ -102,7 +107,7 @@ a:hover { #torstatus { position: relative; /* needed for torstatus-image positioning */ max-width: 620px; - height: 148px; + min-height: 148px; padding: 15px 128px 0px 128px; margin: 20px auto 0px auto; } @@ -168,20 +173,23 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { } #middle { - position: relative; - width: 920px; - height: 20em; + display: table; + width: 904px; /* 920px - (2 * 8px extra side margin) */ + margin: 40px auto 10px auto; + border-spacing: 100px 0px; + border-collapse: separate; text-align: center; } -#middle div.container { - position: absolute; - top: 3.1em; - width: 280px; - min-width: 280px; - min-height: 12.5em; +.bubbleRow { + display: table-row; +} + +.bubbleRow div.bubble { + display: table-cell; + width: 50%; + height: 100%; padding: 10px 10px; - margin: 8px 8px; color: #222222; background-color: #FFFFFF; border: 1px solid #008000; @@ -190,14 +198,6 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { vertical-align: top; } -#middle div.two { - left: 120px; -} - -#middle div.three { - left: 520px; -} - #middle h1 { font-family: "Liberation Sans", Arial, Helvetica, sans-serif; font-size: 1.9em; @@ -334,7 +334,7 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { /* #sx is the search input (text) field */ #sx { width: 350px; - height: 23px; + min-height: 23px; padding: 4px 6px 5px 6px; margin: 0; outline: none;

1 0

[tor-browser-bundle/master] Bug 16937: homepage pref has been translated in the Korean bundle
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 2029ea7002c4704c9965674c97ed9ea379c97765 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 15 13:43:20 2015 -0400 Bug 16937: homepage pref has been translated in the Korean bundle Remove the en-US spellchecking dictionary from non en-US packages. --- gitian/descriptors/linux/gitian-bundle.yml | 4 +++- gitian/descriptors/mac/gitian-bundle.yml | 5 +++-- gitian/descriptors/windows/gitian-bundle.yml | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index a8f8d51..81fcdf1 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -205,10 +205,12 @@ script: | rm -rf defaults popd - # Set the update.locale (it is used to replace %LOCALE% within app.update.url). + # Set the update.locale (it is used to replace %LOCALE% within + # app.update.url) and remove the en-US spellchecking dictionary. pushd tor-browser_$LANG/Browser/ echo "$LANG" > update.locale zip -Xm omni.ja update.locale + rm -rf dictionaries popd # Recreate precomplete file (needs to be accurate for full MAR updates). diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index bd54f0d..cfb7888 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -231,11 +231,12 @@ script: | popd # Set the update.locale (it is used to replace %LOCALE% within - # app.update.url) and recreate the precomplete file (needs to be accurate - # for full MAR updates). + # app.update.url), remove the en-US spellchecking dictionary, and recreate + # the precomplete file (needs to be accurate for full MAR updates). pushd ~/build/dmg/$DEST.app/Contents/Resources/ echo "$LANG" > update.locale zip -Xm omni.ja update.locale + rm -rf dictionaries rm -f precomplete python $MARTOOLS/createprecomplete.py popd diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index b821528..dc8ad05 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -192,10 +192,12 @@ script: | rm -rf defaults popd - # Set the update.locale (it is used to replace %LOCALE% within app.update.url). + # Set the update.locale (it is used to replace %LOCALE% within + # app.update.url) and remove the en-US spellchecking dictionary. pushd "Tor Browser"/Browser/ echo "$LANG" > update.locale zip -Xm omni.ja update.locale + rm -rf dictionaries popd # Recreate precomplete file (needs to be accurate for full MAR updates).

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'brade/bug16937-01'
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 1288790242194bbd7b98d16dbe815c25703eac3d Merge: 41adead 2029ea7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 15 20:54:16 2015 -0700 Merge remote-tracking branch 'brade/bug16937-01' gitian/descriptors/linux/gitian-bundle.yml | 4 +++- gitian/descriptors/mac/gitian-bundle.yml | 5 +++-- gitian/descriptors/windows/gitian-bundle.yml | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-)

1 0

[torbutton/master] Bug 16937: homepage pref has been translated in the Korean bundle
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit fc91b515a6e0d9e5455d39e52abf2c1352e20f3c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Sep 14 15:28:31 2015 -0400 Bug 16937: homepage pref has been translated in the Korean bundle To keep the browser.startup.homepage pref value out of translators hands, all of the localized browser.properties files have been removed and the pref value (about:tor) has been moved to a new non-localized.properties file. We no longer provide a value for spellchecker.dictionary, which means non en-US users will probably need to set their spellchecking language from the browser context menu or via about:config after they install a dictionary for their language. The browser will also consult the LANG environment variable and use a "default default" of en-US if an en-US dictionary is installed. --- src/chrome/content/locale/non-localized.properties | 6 ++++++ src/chrome/locale/af/browser.properties | 13 ------------- src/chrome/locale/ak/browser.properties | 13 ------------- src/chrome/locale/am/browser.properties | 13 ------------- src/chrome/locale/ar/browser.properties | 5 ----- src/chrome/locale/arn/browser.properties | 13 ------------- src/chrome/locale/ast/browser.properties | 13 ------------- src/chrome/locale/az/browser.properties | 13 ------------- src/chrome/locale/be/browser.properties | 13 ------------- src/chrome/locale/bg/browser.properties | 13 ------------- src/chrome/locale/bn-IN/browser.properties | 13 ------------- src/chrome/locale/bn/browser.properties | 13 ------------- src/chrome/locale/bo/browser.properties | 13 ------------- src/chrome/locale/br/browser.properties | 13 ------------- src/chrome/locale/bs/browser.properties | 13 ------------- src/chrome/locale/ca/browser.properties | 13 ------------- src/chrome/locale/cs/browser.properties | 13 ------------- src/chrome/locale/csb/browser.properties | 13 ------------- src/chrome/locale/cy/browser.properties | 13 ------------- src/chrome/locale/da/browser.properties | 13 ------------- src/chrome/locale/de/browser.properties | 5 ----- src/chrome/locale/dz/browser.properties | 13 ------------- src/chrome/locale/el/browser.properties | 13 ------------- src/chrome/locale/en/browser.properties | 5 ----- src/chrome/locale/eo/browser.properties | 13 ------------- src/chrome/locale/es/browser.properties | 5 ----- src/chrome/locale/et/browser.properties | 13 ------------- src/chrome/locale/eu/browser.properties | 5 ----- src/chrome/locale/fa/browser.properties | 5 ----- src/chrome/locale/fi/browser.properties | 13 ------------- src/chrome/locale/fil/browser.properties | 13 ------------- src/chrome/locale/fo/browser.properties | 13 ------------- src/chrome/locale/fr/browser.properties | 5 ----- src/chrome/locale/fur/browser.properties | 13 ------------- src/chrome/locale/fy/browser.properties | 13 ------------- src/chrome/locale/ga/browser.properties | 13 ------------- src/chrome/locale/gl/browser.properties | 13 ------------- src/chrome/locale/gu/browser.properties | 13 ------------- src/chrome/locale/gun/browser.properties | 13 ------------- src/chrome/locale/ha/browser.properties | 13 ------------- src/chrome/locale/he/browser.properties | 13 ------------- src/chrome/locale/hi/browser.properties | 13 ------------- src/chrome/locale/hr/browser.properties | 13 ------------- src/chrome/locale/ht/browser.properties | 13 ------------- src/chrome/locale/hu/browser.properties | 13 ------------- src/chrome/locale/hy/browser.properties | 13 ------------- src/chrome/locale/id/browser.properties | 13 ------------- src/chrome/locale/is/browser.properties | 13 ------------- src/chrome/locale/it/browser.properties | 5 ----- src/chrome/locale/ja/browser.properties | 5 ----- src/chrome/locale/jv/browser.properties | 13 ------------- src/chrome/locale/ka/browser.properties | 13 ------------- src/chrome/locale/km/browser.properties | 13 ------------- src/chrome/locale/kn/browser.properties | 13 ------------- src/chrome/locale/ko/browser.properties | 5 ----- src/chrome/locale/ku/browser.properties | 13 ------------- src/chrome/locale/kw/browser.properties | 13 ------------- src/chrome/locale/ky/browser.properties | 13 ------------- src/chrome/locale/lb/browser.properties | 13 ------------- src/chrome/locale/ln/browser.properties | 13 ------------- src/chrome/locale/lo/browser.properties | 13 ------------- src/chrome/locale/lt/browser.properties | 13 ------------- src/chrome/locale/lv/browser.properties | 13 ------------- src/chrome/locale/mg/browser.properties | 13 ------------- src/chrome/locale/mi/browser.properties | 13 ------------- src/chrome/locale/mk/browser.properties | 13 ------------- src/chrome/locale/ml/browser.properties | 13 ------------- src/chrome/locale/mn/browser.properties | 13 ------------- src/chrome/locale/mr/browser.properties | 13 ------------- src/chrome/locale/ms/browser.properties | 13 ------------- src/chrome/locale/mt/browser.properties | 13 ------------- src/chrome/locale/my/browser.properties | 13 ------------- src/chrome/locale/nah/browser.properties | 13 ------------- src/chrome/locale/nap/browser.properties | 13 ------------- src/chrome/locale/nb/browser.properties | 13 ------------- src/chrome/locale/ne/browser.properties | 13 ------------- src/chrome/locale/nl/browser.properties | 5 ----- src/chrome/locale/nn/browser.properties | 13 ------------- src/chrome/locale/nso/browser.properties | 13 ------------- src/chrome/locale/oc/browser.properties | 13 ------------- src/chrome/locale/or/browser.properties | 13 ------------- src/chrome/locale/pa/browser.properties | 13 ------------- src/chrome/locale/pap/browser.properties | 13 ------------- src/chrome/locale/pl/browser.properties | 5 ----- src/chrome/locale/pms/browser.properties | 13 ------------- src/chrome/locale/ps/browser.properties | 13 ------------- src/chrome/locale/pt-BR/browser.properties | 13 ------------- src/chrome/locale/pt/browser.properties | 5 ----- src/chrome/locale/ro/browser.properties | 13 ------------- src/chrome/locale/ru/browser.properties | 5 ----- src/chrome/locale/sco/browser.properties | 13 ------------- src/chrome/locale/sk/browser.properties | 13 ------------- src/chrome/locale/sl/browser.properties | 13 ------------- src/chrome/locale/so/browser.properties | 13 ------------- src/chrome/locale/son/browser.properties | 13 ------------- src/chrome/locale/sq/browser.properties | 13 ------------- src/chrome/locale/sr/browser.properties | 13 ------------- src/chrome/locale/st/browser.properties | 13 ------------- src/chrome/locale/su/browser.properties | 13 ------------- src/chrome/locale/sv/browser.properties | 5 ----- src/chrome/locale/sw/browser.properties | 13 ------------- src/chrome/locale/ta/browser.properties | 13 ------------- src/chrome/locale/te/browser.properties | 13 ------------- src/chrome/locale/tg/browser.properties | 13 ------------- src/chrome/locale/th/browser.properties | 13 ------------- src/chrome/locale/ti/browser.properties | 13 ------------- src/chrome/locale/tk/browser.properties | 13 ------------- src/chrome/locale/tr/browser.properties | 5 ----- src/chrome/locale/uk/browser.properties | 13 ------------- src/chrome/locale/ur/browser.properties | 13 ------------- src/chrome/locale/ve/browser.properties | 13 ------------- src/chrome/locale/vi/browser.properties | 5 ----- src/chrome/locale/wa/browser.properties | 13 ------------- src/chrome/locale/wo/browser.properties | 13 ------------- src/chrome/locale/zh-CN/browser.properties | 5 ----- src/chrome/locale/zh-HK/browser.properties | 13 ------------- src/chrome/locale/zh-TW/browser.properties | 13 ------------- src/chrome/locale/zu/browser.properties | 13 ------------- src/defaults/preferences/preferences.js | 6 +++--- trans_tools/import-translations.sh | 1 - 120 files changed, 9 insertions(+), 1381 deletions(-) diff --git a/src/chrome/content/locale/non-localized.properties b/src/chrome/content/locale/non-localized.properties new file mode 100644 index 0000000..dca7863 --- /dev/null +++ b/src/chrome/content/locale/non-localized.properties @@ -0,0 +1,6 @@ +# This file must be located in a subdirectory named "locale" so that +# about:config will display the correct value for browser.startup.homepage. +# See fetchPref() inside toolkit/components/viewconfig/content/config.js + +# Default home page +browser.startup.homepage=about:tor diff --git a/src/chrome/locale/af/browser.properties b/src/chrome/locale/af/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/af/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ak/browser.properties b/src/chrome/locale/ak/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ak/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/am/browser.properties b/src/chrome/locale/am/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/am/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ar/browser.properties b/src/chrome/locale/ar/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/ar/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/arn/browser.properties b/src/chrome/locale/arn/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/arn/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ast/browser.properties b/src/chrome/locale/ast/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ast/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/az/browser.properties b/src/chrome/locale/az/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/az/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/be/browser.properties b/src/chrome/locale/be/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/be/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/bg/browser.properties b/src/chrome/locale/bg/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/bg/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/bn-IN/browser.properties b/src/chrome/locale/bn-IN/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/bn-IN/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/bn/browser.properties b/src/chrome/locale/bn/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/bn/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/bo/browser.properties b/src/chrome/locale/bo/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/bo/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/br/browser.properties b/src/chrome/locale/br/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/br/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/bs/browser.properties b/src/chrome/locale/bs/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/bs/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ca/browser.properties b/src/chrome/locale/ca/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ca/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/cs/browser.properties b/src/chrome/locale/cs/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/cs/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/csb/browser.properties b/src/chrome/locale/csb/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/csb/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/cy/browser.properties b/src/chrome/locale/cy/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/cy/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/da/browser.properties b/src/chrome/locale/da/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/da/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/de/browser.properties b/src/chrome/locale/de/browser.properties deleted file mode 100644 index c8a19c5..0000000 --- a/src/chrome/locale/de/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=de_DE diff --git a/src/chrome/locale/dz/browser.properties b/src/chrome/locale/dz/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/dz/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/el/browser.properties b/src/chrome/locale/el/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/el/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/en/browser.properties b/src/chrome/locale/en/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/en/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/eo/browser.properties b/src/chrome/locale/eo/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/eo/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/es/browser.properties b/src/chrome/locale/es/browser.properties deleted file mode 100644 index 173fa7b..0000000 --- a/src/chrome/locale/es/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=es-ES diff --git a/src/chrome/locale/et/browser.properties b/src/chrome/locale/et/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/et/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/eu/browser.properties b/src/chrome/locale/eu/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/eu/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/fa/browser.properties b/src/chrome/locale/fa/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/fa/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/fi/browser.properties b/src/chrome/locale/fi/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/fi/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/fil/browser.properties b/src/chrome/locale/fil/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/fil/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/fo/browser.properties b/src/chrome/locale/fo/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/fo/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/fr/browser.properties b/src/chrome/locale/fr/browser.properties deleted file mode 100644 index 3b96d52..0000000 --- a/src/chrome/locale/fr/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=fr_FR diff --git a/src/chrome/locale/fur/browser.properties b/src/chrome/locale/fur/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/fur/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/fy/browser.properties b/src/chrome/locale/fy/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/fy/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ga/browser.properties b/src/chrome/locale/ga/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ga/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/gl/browser.properties b/src/chrome/locale/gl/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/gl/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/gu/browser.properties b/src/chrome/locale/gu/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/gu/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/gun/browser.properties b/src/chrome/locale/gun/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/gun/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ha/browser.properties b/src/chrome/locale/ha/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ha/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/he/browser.properties b/src/chrome/locale/he/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/he/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/hi/browser.properties b/src/chrome/locale/hi/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/hi/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/hr/browser.properties b/src/chrome/locale/hr/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/hr/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ht/browser.properties b/src/chrome/locale/ht/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ht/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/hu/browser.properties b/src/chrome/locale/hu/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/hu/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/hy/browser.properties b/src/chrome/locale/hy/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/hy/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/id/browser.properties b/src/chrome/locale/id/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/id/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/is/browser.properties b/src/chrome/locale/is/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/is/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/it/browser.properties b/src/chrome/locale/it/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/it/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/ja/browser.properties b/src/chrome/locale/ja/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/ja/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/jv/browser.properties b/src/chrome/locale/jv/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/jv/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ka/browser.properties b/src/chrome/locale/ka/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ka/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/km/browser.properties b/src/chrome/locale/km/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/km/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/kn/browser.properties b/src/chrome/locale/kn/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/kn/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ko/browser.properties b/src/chrome/locale/ko/browser.properties deleted file mode 100644 index 99872f4..0000000 --- a/src/chrome/locale/ko/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=Tor에 관하여 - -# Spell checker dictionary -spellchecker.dictionary=영어-미국 diff --git a/src/chrome/locale/ku/browser.properties b/src/chrome/locale/ku/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ku/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/kw/browser.properties b/src/chrome/locale/kw/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/kw/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ky/browser.properties b/src/chrome/locale/ky/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ky/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/lb/browser.properties b/src/chrome/locale/lb/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/lb/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ln/browser.properties b/src/chrome/locale/ln/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ln/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/lo/browser.properties b/src/chrome/locale/lo/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/lo/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/lt/browser.properties b/src/chrome/locale/lt/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/lt/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/lv/browser.properties b/src/chrome/locale/lv/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/lv/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/mg/browser.properties b/src/chrome/locale/mg/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/mg/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/mi/browser.properties b/src/chrome/locale/mi/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/mi/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/mk/browser.properties b/src/chrome/locale/mk/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/mk/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ml/browser.properties b/src/chrome/locale/ml/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ml/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/mn/browser.properties b/src/chrome/locale/mn/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/mn/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/mr/browser.properties b/src/chrome/locale/mr/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/mr/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ms/browser.properties b/src/chrome/locale/ms/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ms/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/mt/browser.properties b/src/chrome/locale/mt/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/mt/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/my/browser.properties b/src/chrome/locale/my/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/my/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/nah/browser.properties b/src/chrome/locale/nah/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/nah/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/nap/browser.properties b/src/chrome/locale/nap/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/nap/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/nb/browser.properties b/src/chrome/locale/nb/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/nb/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ne/browser.properties b/src/chrome/locale/ne/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ne/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/nl/browser.properties b/src/chrome/locale/nl/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/nl/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/nn/browser.properties b/src/chrome/locale/nn/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/nn/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/nso/browser.properties b/src/chrome/locale/nso/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/nso/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/oc/browser.properties b/src/chrome/locale/oc/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/oc/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/or/browser.properties b/src/chrome/locale/or/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/or/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/pa/browser.properties b/src/chrome/locale/pa/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/pa/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/pap/browser.properties b/src/chrome/locale/pap/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/pap/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/pl/browser.properties b/src/chrome/locale/pl/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/pl/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/pms/browser.properties b/src/chrome/locale/pms/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/pms/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ps/browser.properties b/src/chrome/locale/ps/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ps/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/pt-BR/browser.properties b/src/chrome/locale/pt-BR/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/pt-BR/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/pt/browser.properties b/src/chrome/locale/pt/browser.properties deleted file mode 100644 index 52ef750..0000000 --- a/src/chrome/locale/pt/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=pt_PT diff --git a/src/chrome/locale/ro/browser.properties b/src/chrome/locale/ro/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ro/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ru/browser.properties b/src/chrome/locale/ru/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/ru/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/sco/browser.properties b/src/chrome/locale/sco/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/sco/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/sk/browser.properties b/src/chrome/locale/sk/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/sk/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/sl/browser.properties b/src/chrome/locale/sl/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/sl/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/so/browser.properties b/src/chrome/locale/so/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/so/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/son/browser.properties b/src/chrome/locale/son/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/son/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/sq/browser.properties b/src/chrome/locale/sq/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/sq/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/sr/browser.properties b/src/chrome/locale/sr/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/sr/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/st/browser.properties b/src/chrome/locale/st/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/st/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/su/browser.properties b/src/chrome/locale/su/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/su/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/sv/browser.properties b/src/chrome/locale/sv/browser.properties deleted file mode 100644 index 6542522..0000000 --- a/src/chrome/locale/sv/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=sv_SE diff --git a/src/chrome/locale/sw/browser.properties b/src/chrome/locale/sw/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/sw/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ta/browser.properties b/src/chrome/locale/ta/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ta/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/te/browser.properties b/src/chrome/locale/te/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/te/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/tg/browser.properties b/src/chrome/locale/tg/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/tg/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/th/browser.properties b/src/chrome/locale/th/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/th/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ti/browser.properties b/src/chrome/locale/ti/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ti/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/tk/browser.properties b/src/chrome/locale/tk/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/tk/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/tr/browser.properties b/src/chrome/locale/tr/browser.properties deleted file mode 100644 index 7b312a5..0000000 --- a/src/chrome/locale/tr/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=tr_TR diff --git a/src/chrome/locale/uk/browser.properties b/src/chrome/locale/uk/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/uk/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ur/browser.properties b/src/chrome/locale/ur/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ur/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/ve/browser.properties b/src/chrome/locale/ve/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/ve/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/vi/browser.properties b/src/chrome/locale/vi/browser.properties deleted file mode 100644 index 8849b67..0000000 --- a/src/chrome/locale/vi/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US diff --git a/src/chrome/locale/wa/browser.properties b/src/chrome/locale/wa/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/wa/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/wo/browser.properties b/src/chrome/locale/wo/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/wo/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/zh-CN/browser.properties b/src/chrome/locale/zh-CN/browser.properties deleted file mode 100644 index 452496c..0000000 --- a/src/chrome/locale/zh-CN/browser.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=zh_CN diff --git a/src/chrome/locale/zh-HK/browser.properties b/src/chrome/locale/zh-HK/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/zh-HK/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/zh-TW/browser.properties b/src/chrome/locale/zh-TW/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/zh-TW/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/chrome/locale/zu/browser.properties b/src/chrome/locale/zu/browser.properties deleted file mode 100644 index 295a03a..0000000 --- a/src/chrome/locale/zu/browser.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Default home page -browser.startup.homepage=about:tor - -# Spell checker dictionary -spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index ce66d0e..164abbf 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -219,10 +219,10 @@ pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); -// Browser home page, and spell checker dictionary: -pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties"); -pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); +// 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); diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index ae686b4..494e64f 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -19,7 +19,6 @@ FILEMAP=( "aboutDialog.dtd:torbutton-aboutdialogdtd" "aboutTor.properties:torbutton-abouttorproperties" "brand.dtd:torbutton-branddtd" "brand.properties:torbutton-brandproperties" - "browser.properties:torbutton-browserproperties" "torbutton.dtd:torbutton-torbuttondtd" "torbutton.properties:torbutton-torbuttonproperties" )

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] Merge remote-tracking branch 'arthur/16855' into tor-browser-38.2.1esr-5.5-2
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 5d79d403e0963d72af518a04711f828170649134 Merge: 15243aa 3fad667 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 15 16:57:49 2015 -0700 Merge remote-tracking branch 'arthur/16855' into tor-browser-38.2.1esr-5.5-2 docshell/base/nsDocShell.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] Bug #16855: Allow blobs to be downloaded on first-party pages
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 3fad66704cdf3a731b776aef0972ba46eb4c31b3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Sep 15 12:40:18 2015 -0700 Bug #16855: Allow blobs to be downloaded on first-party pages This patch may be made obsolete by Tanvi's work: https://bugzilla.mozilla.org/show_bug.cgi?id=1198559#c15 --- docshell/base/nsDocShell.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 317f072..03885534 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -10538,9 +10538,14 @@ nsDocShell::DoURILoad(nsIURI* aURI, nsCOMPtr<nsINode> requestingNode; if (mScriptGlobal) { - requestingNode = mScriptGlobal->GetFrameElementInternal(); - if (!requestingNode) { + if (!aFileName.IsVoid()) { + // File is being downloaded. Assign current document to requesting node. requestingNode = mScriptGlobal->GetExtantDoc(); + } else { + requestingNode = mScriptGlobal->GetFrameElementInternal(); + if (!requestingNode) { + requestingNode = mScriptGlobal->GetExtantDoc(); + } } }

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 565b5d0020d66fc8da2874015572fe907e6fd19c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 15 16:41:46 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. This sets prefs for: Bug #7446 - TorButton should not fixup .onion domains Bug #16837 - Disable Firefox Hotfix updates Bug #17046 - Event.timeStamp reveals startup time --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c80c119..b94b6d1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -14,6 +14,7 @@ pref("startup.homepage_override_url", ""); // Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); +pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues // Disable "Slow startup" warnings and associated disk history // (bug #13346) @@ -73,6 +74,7 @@ pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confus pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) pref("browser.search.region", "US"); pref("browser.search.geoip.url", ""); +pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups // Fingerprinting pref("webgl.min_capability_mode", true); @@ -109,6 +111,7 @@ pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API pref("privacy.resistFingerprinting", true); +pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 15243aa153711dd09bf6e1cdcecfdd7d31d1e957 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 15 16:41:46 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. This sets prefs for: Bug #7446 - TorButton should not fixup .onion domains Bug #16837 - Disable Firefox Hotfix updates Bug #17046 - Event.timeStamp reveals startup time --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3e77a82..0610297 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -19,6 +19,7 @@ pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags // Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); +pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues // Disable "Slow startup" warnings and associated disk history // (bug #13346) @@ -78,6 +79,7 @@ pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confus pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) pref("browser.search.region", "US"); pref("browser.search.geoip.url", ""); +pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups // Fingerprinting pref("webgl.min_capability_mode", true); @@ -114,6 +116,7 @@ pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API pref("privacy.resistFingerprinting", true); +pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser-bundle/maint-5.0] Bug 16783: Normalize NoScript default whitelist
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 079f1dcba2ac77c33bb232bc12f9f88ebb1c1774 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 15 16:12:28 2015 -0700 Bug 16783: Normalize NoScript default whitelist This ensures that if/when the NoScript whitelist is reset, the right list is there. The most important change here is noscript.mandatory, as NoScript ensures that those elements are in the whitelist every restart (and on New Identity). --- .../Browser/profile.default/preferences/extension-overrides.js | 5 +++-- .../Browser/profile.default/preferences/extension-overrides.js | 5 +++-- .../Browser/profile.default/preferences/extension-overrides.js | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 26b019c..83d4bbf 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource:"); +pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); pref("noscript.confirmUnblock", false); pref("noscript.contentBlocker", true); -pref("noscript.default", "about: chrome: resources:"); pref("noscript.firstRunRedirection", false); pref("noscript.global", true); pref("noscript.gtemp", ""); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 26b019c..83d4bbf 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource:"); +pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); pref("noscript.confirmUnblock", false); pref("noscript.contentBlocker", true); -pref("noscript.default", "about: chrome: resources:"); pref("noscript.firstRunRedirection", false); pref("noscript.global", true); pref("noscript.gtemp", ""); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index d92bd3b..83d4bbf 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource:"); +pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); pref("noscript.confirmUnblock", false); pref("noscript.contentBlocker", true); -pref("noscript.default", "about: chrome: resource:"); pref("noscript.firstRunRedirection", false); pref("noscript.global", true); pref("noscript.gtemp", "");

1 0

[tor-browser-bundle/master] Bug 16783: Normalize NoScript default whitelist
by mikeperry＠torproject.org 16 Sep '15

16 Sep '15

commit 41adead1637a07ec370fbab90e95324d62c2d1a6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 15 16:12:28 2015 -0700 Bug 16783: Normalize NoScript default whitelist This ensures that if/when the NoScript whitelist is reset, the right list is there. The most important change here is noscript.mandatory, as NoScript ensures that those elements are in the whitelist every restart (and on New Identity). --- .../Browser/profile.default/preferences/extension-overrides.js | 5 +++-- .../Browser/profile.default/preferences/extension-overrides.js | 5 +++-- .../Browser/profile.default/preferences/extension-overrides.js | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 26b019c..83d4bbf 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource:"); +pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); pref("noscript.confirmUnblock", false); pref("noscript.contentBlocker", true); -pref("noscript.default", "about: chrome: resources:"); pref("noscript.firstRunRedirection", false); pref("noscript.global", true); pref("noscript.gtemp", ""); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 26b019c..83d4bbf 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource:"); +pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); pref("noscript.confirmUnblock", false); pref("noscript.contentBlocker", true); -pref("noscript.default", "about: chrome: resources:"); pref("noscript.firstRunRedirection", false); pref("noscript.global", true); pref("noscript.gtemp", ""); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index d92bd3b..83d4bbf 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource:"); +pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:"); +pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); pref("noscript.confirmUnblock", false); pref("noscript.contentBlocker", true); -pref("noscript.default", "about: chrome: resource:"); pref("noscript.firstRunRedirection", false); pref("noscript.global", true); pref("noscript.gtemp", "");

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 11 Sep '15

11 Sep '15

commit 769e682313bdd3ea26bdbc492c3158e1b0698c28 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 14:04:54 2015 +0000 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. This is part of the fix for bug 16909. We need to adapt our update packaging tools to cope with the HTTPS Everywhere extension ID change introduced by version 5.1.0. --- tools/update-packaging/make_full_update.sh | 5 ++++- tools/update-packaging/make_incremental_update.sh | 13 ++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 62baf4c..3578ae4 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -11,7 +11,10 @@ . $(dirname "$0")/common.sh # TODO: it would be better to pass this as a command line option. -directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org' +# Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it +# exists. The extension ID got changed with the version bump to 5.1.0. +ext_path='TorBrowser/Data/Browser/profile.default/extensions' +directories_to_remove="$ext_path/https-everywhere(a)eff.org $ext_path/https-everywhere-eff(a)eff.org" # ----------------------------------------------------------------------------- diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 0e1e3f6..c803809 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -64,7 +64,8 @@ check_for_forced_update() { fi # If the file in the skip list ends with /*, do a prefix match. - # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org/* to be used to force all HTTPS Everywhere files to be updated. + # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org/* + # to be used to force all HTTPS Everywhere files to be updated. f_suffix=${f##*/} if [[ $f_suffix = "*" ]]; then f_prefix="${f%\/\*}"; @@ -122,7 +123,7 @@ archivefiles="updatev2.manifest updatev3.manifest" # If the NoScript or HTTPS Everywhere extensions have changed between # releases, add them to the "force updates" list. ext_path='TorBrowser/Data/Browser/profile.default/extensions' -https_everywhere='https-everywhere(a)eff.org' +https_everywhere='https-everywhere-eff(a)eff.org' noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' # NoScript is a packed extension, so we simply compare the old and the new @@ -144,12 +145,14 @@ https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" diff "$olddir/$https_everywhere_install_rdf" \ "$newdir/$https_everywhere_install_rdf" > /dev/null rc=$? -if [ $rc -gt 1 ]; then +if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" exit 2 -elif [ $rc -eq 1 ]; then +elif [ $rc -ge 1 ]; then requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" - directories_to_remove="$directories_to_remove $ext_path/$https_everywhere" + # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it + # exists. The extension ID got changed with the version bump to 5.1.0. + directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere" fi mkdir -p "$workdir"

1 0

[tor-browser-bundle/master] Bug 16909: Adapt to HTTPS-Everyhwere build changes
by gk＠torproject.org 11 Sep '15

11 Sep '15

commit f8a4557bb2a46f06e664e47a57a7065322dbbd35 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 8 15:18:17 2015 +0000 Bug 16909: Adapt to HTTPS-Everyhwere build changes There are two changes that got made recently: 1) The extension ID got renamed due to conflicts on the AMO dashboard with the version hosted by Mozilla. 2) Translations moved to an own git submodule. The first change is unproblematic. For the second one, however, we need to bump the mininmum Ubuntu version for the host operating system to 14.04. We want to initialize and update the submodules right while we are fetching the inputs and not during build time to be not dependent on network access during the bundling step. This fails on Ubuntu 12.04 due to an old git version (1.7.9.5) that uses abolute paths to locate submodules. As this path is not available on the build VM the build breaks. This does not affect Debian Wheezy (which ships with git 1.7.10.4) nor any later Debian version. In order to make this change obvious for 12.04 users we include an Ubuntu version check in check-prerequisites.sh. Additionally, we cleaned the bundling descriptors up to implement a proper solution for #10066 instead of working around that bug. --- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 25 ++++++++++++++++--------- gitian/descriptors/linux/gitian-bundle.yml | 18 ++++++++++++------ gitian/descriptors/mac/gitian-bundle.yml | 18 ++++++++++++------ gitian/descriptors/windows/gitian-bundle.yml | 18 ++++++++++++------ gitian/fetch-inputs.sh | 9 ++++++++- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 9 files changed, 64 insertions(+), 32 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 656dddd..f289791 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,6 +1,6 @@ QuickStart: - On an Ubuntu 12.04+/Debian Wheezy+ machine or VM, run: + On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run: $ make diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 32c9b7b..cc16d0e 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -6,7 +6,7 @@ if [ ! -f /etc/debian_version ]; then echo "Gitian is dependent upon the Ubuntu Virtualization Tools." echo - echo "You need to run Ubuntu 12.04 LTS/Debian Wheezy or newer." + echo "You need to run Ubuntu 14.04 LTS/Debian Wheezy or newer." exit 1 fi @@ -14,15 +14,22 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then - dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null - - if [ $? -ne 0 ]; + VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` + if [ "$VERSION" -ge "14" ]; then - echo "You are missing one or more Gitian build tool dependencies." - echo - echo "Please run:" - echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + + if [ $? -ne 0 ]; + then + echo "You are missing one or more Gitian build tool dependencies." + echo + echo "Please run:" + echo " sudo apt-get install torsocks tor" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + exit 1 + fi + else + echo "Your Ubuntu is too old. You need Ubuntu 14.04 LTS or newer to build Tor Browser with Gitian." exit 1 fi elif [ $DISTRO = "Debian" ]; diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index afb632e..a8f8d51 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -66,7 +66,7 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/Caches mkdir -p tor-browser/Browser/TorBrowser/Docs/sources/ @@ -100,10 +100,16 @@ script: | cd ../../../ # cd https-everywhere - # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in - # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh + # We are invoking the build script with a particular tag to avoid #10066. This + # does not work for nightlies as there is no "master" tag in that sense. But + # we don't need to care about that as we don't need reproducibility for + # nightly builds. + if [ $HTTPSE_TAG != "master" ]; + then + ./makexpi.sh $HTTPSE_TAG + else + ./makexpi.sh + fi # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -112,7 +118,7 @@ script: | cp *.xpi tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/ cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere(a)eff.org/ + cd https-everywhere-eff(a)eff.org/ unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index da441a2..bd54f0d 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -74,7 +74,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches mkdir -p $TORBROWSER_NAME.app/TorBrowser/Docs/sources @@ -102,10 +102,16 @@ script: | cd ../../../ # cd https-everywhere - # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in - # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh + # We are invoking the build script with a particular tag to avoid #10066. This + # does not work for nightlies as there is no "master" tag in that sense. But + # we don't need to care about that as we don't need reproducibility for + # nightly builds. + if [ $HTTPSE_TAG != "master" ]; + then + ./makexpi.sh $HTTPSE_TAG + else + ./makexpi.sh + fi # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -114,7 +120,7 @@ script: | cp *.xpi ./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ cd $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere(a)eff.org + cd https-everywhere-eff(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index d4ae0fa..b821528 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -65,7 +65,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources @@ -90,10 +90,16 @@ script: | cd ../../../ # cd https-everywhere - # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in - # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh + # We are invoking the build script with a particular tag to avoid #10066. This + # does not work for nightlies as there is no "master" tag in that sense. But + # we don't need to care about that as we don't need reproducibility for + # nightly builds. + if [ $HTTPSE_TAG != "master" ]; + then + ./makexpi.sh $HTTPSE_TAG + else + ./makexpi.sh + fi # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi @@ -102,7 +108,7 @@ script: | cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere(a)eff.org + cd https-everywhere-eff(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 42efa33..22162b0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${!URL}" done -# NoScript and HTTPS-Everywhere are magikal and special: +# NoScript is magikal and special: wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check @@ -281,5 +281,12 @@ obfs4 https://git.torproject.org/pluggable-transports/obfs4.git noto-fonts https://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG EOF +# HTTPS-Everywhere is special, too. We need to initialize the git submodules and +# update them here. Otherwise it would happen during the build. +cd https-everywhere +git submodule init +git submodule update +cd .. + exit 0 diff --git a/gitian/versions b/gitian/versions index b833342..70801b2 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.2 -HTTPSE_TAG=5.0.7 +HTTPSE_TAG=5.1.0 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f37b98a..679da18 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.3 -HTTPSE_TAG=5.0.7 +HTTPSE_TAG=5.1.0 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index c2143a0..8c4cfa9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=5.0.2 +HTTPSE_TAG=5.1.0 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit dd27a46185405a87cf5a8a56e4d293bddedde52a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 13:02:51 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 13579. Thanks to anonym for proposing this patch. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 20e2f3a..c80c119 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -238,6 +238,11 @@ pref("security.tls.version.max", 3); // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); +// Workaround for https://bugs.torproject.org/13579. Progress on +// `about:downloads` is only shown if the following preference is set to `true` +// in case the download panel got removed from the toolbar. +pref("browser.download.panel.shown", true); + #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit 2e79f3111bc999b6f30f3ec43d47913a3f0e5002 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 13:02:51 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 13579. Thanks to anonym for proposing this patch. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 34b8e6e..3e77a82 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -243,6 +243,11 @@ pref("security.tls.version.max", 3); // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); +// Workaround for https://bugs.torproject.org/13579. Progress on +// `about:downloads` is only shown if the following preference is set to `true` +// in case the download panel got removed from the toolbar. +pref("browser.download.panel.shown", true); + #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif

1 0

[tor-browser-bundle/maint-5.0] Bug 16910: Mac OS app bundle has wrong copyright year.
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit 7d0d8bb670f93be292997d6483825f661a29583f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 8 10:29:10 2015 -0400 Bug 16910: Mac OS app bundle has wrong copyright year. Insert the year associated with the last tor-browser commit when generating the Info.plist file for Mac OS. --- gitian/build-helpers/fix-info-plist.py | 6 +++--- gitian/descriptors/mac/gitian-firefox.yml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gitian/build-helpers/fix-info-plist.py b/gitian/build-helpers/fix-info-plist.py index ac531ec..fae29ed 100755 --- a/gitian/build-helpers/fix-info-plist.py +++ b/gitian/build-helpers/fix-info-plist.py @@ -10,17 +10,17 @@ import plistlib import sys def usage(): - print >> sys.stderr, "usage: %s TORBROWSER_VERSION < Info.plist > FixedInfo.plist" % sys.argv[0] + print >> sys.stderr, "usage: %s TORBROWSER_VERSION YEAR < Info.plist > FixedInfo.plist" % sys.argv[0] sys.exit(2) _, args = getopt.gnu_getopt(sys.argv[1:], "") -if len(args) != 1: +if len(args) != 2: usage() TORBROWSER_VERSION = args[0] +YEAR = args[1] -YEAR = "2014" COPYRIGHT = "Tor Browser %s Copyright %s The Tor Project" % (TORBROWSER_VERSION, YEAR) plist = plistlib.readPlist(sys.stdin) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e8f1046..1c34544 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -58,6 +58,8 @@ script: | tar xaf MacOSX10.7.sdk.tar.gz # cd tor-browser + TB_COMMIT_DATE=$(git show -s --format='%ci') + COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src @@ -101,7 +103,7 @@ script: | # Adjust the Info.plist file INFO_PLIST=TorBrowser.app/Contents/Info.plist mv $INFO_PLIST tmp.plist - ~/build/fix-info-plist.py $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST + ~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST rm -f tmp.plist ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja

1 0

[tor-browser-bundle/master] Bug 16910: Mac OS app bundle has wrong copyright year.
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit 5019358bcac86508260703ae9cd99a4dfd2983e1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 8 10:29:10 2015 -0400 Bug 16910: Mac OS app bundle has wrong copyright year. Insert the year associated with the last tor-browser commit when generating the Info.plist file for Mac OS. --- gitian/build-helpers/fix-info-plist.py | 6 +++--- gitian/descriptors/mac/gitian-firefox.yml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gitian/build-helpers/fix-info-plist.py b/gitian/build-helpers/fix-info-plist.py index ac531ec..fae29ed 100755 --- a/gitian/build-helpers/fix-info-plist.py +++ b/gitian/build-helpers/fix-info-plist.py @@ -10,17 +10,17 @@ import plistlib import sys def usage(): - print >> sys.stderr, "usage: %s TORBROWSER_VERSION < Info.plist > FixedInfo.plist" % sys.argv[0] + print >> sys.stderr, "usage: %s TORBROWSER_VERSION YEAR < Info.plist > FixedInfo.plist" % sys.argv[0] sys.exit(2) _, args = getopt.gnu_getopt(sys.argv[1:], "") -if len(args) != 1: +if len(args) != 2: usage() TORBROWSER_VERSION = args[0] +YEAR = args[1] -YEAR = "2014" COPYRIGHT = "Tor Browser %s Copyright %s The Tor Project" % (TORBROWSER_VERSION, YEAR) plist = plistlib.readPlist(sys.stdin) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 8b85b5a..1a35eab 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -58,6 +58,8 @@ script: | tar xaf MacOSX10.7.sdk.tar.gz # cd tor-browser + TB_COMMIT_DATE=$(git show -s --format='%ci') + COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src @@ -101,7 +103,7 @@ script: | # Adjust the Info.plist file INFO_PLIST=TorBrowser.app/Contents/Info.plist mv $INFO_PLIST tmp.plist - ~/build/fix-info-plist.py $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST + ~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST rm -f tmp.plist ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit 45666d66cbd1e51e0926e3ad14831af47aa8a44d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 4 21:57:43 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16707 - Use more system fonts for OS X and Windows --- browser/app/profile/000-tor-browser.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b32728b..34b8e6e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -247,21 +247,29 @@ pref("security.cert_pinning.enforcement_level", 2); #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif -// If we are bundling fonts, only allow bundled fonts to be used. +// If we are bundling fonts, whitelist those bundled fonts, and restrict system fonts to a selection. #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "Courier, Georgia, Verdana, Noto Naskh Arabic, 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 Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, 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 Tibetan, Noto Sans Yi, STHeiti, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, 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 Tibetan, Noto Sans Yi"); +pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, 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 Tibetan, Noto Sans Yi"); +pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, 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 Tibetan, Noto Sans Yi"); +pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, 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 Tibetan, Noto Sans Yi"); +pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, 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 Tibetan, Noto Sans Yi"); +pref("font.name.cursive.ar", "Arial"); +pref("font.name.fantasy.ar", "Arial"); +pref("font.name.monospace.ar", "Arial"); +pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Courier New, Georgia, Arial, Noto Naskh Arabic, 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 Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.system.whitelist", "Arial, Batang, Courier New, Euphemia, Gautami, Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); #endif #ifdef XP_LINUX pref("font.system.whitelist", "Arimo, Arimo Bold, Arimo Italic, Arimo Bold Italic, Cousine, Tinos, Tinos Bold, Tinos Italic, Tinos Bold Italic, Noto Naskh Arabic, 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 Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); -#endif pref("font.default.lo", "Noto Sans Lao"); pref("font.default.my", "Noto Sans Myanmar"); @@ -456,3 +464,5 @@ pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); #endif + +#endif

1 0

[tor-browser-bundle/master] Bug #16707: Bundle fewer Noto fonts
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit eeb219db7b3a1539a4e79e9665f98ee2d32b62bf Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Sep 5 05:30:27 2015 +0000 Bug #16707: Bundle fewer Noto fonts --- gitian/descriptors/mac/gitian-bundle.yml | 4 +--- gitian/descriptors/windows/gitian-bundle.yml | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index dabe619..da441a2 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -56,7 +56,6 @@ files: - "mar-tools-mac64.zip" - "tbb-docs.zip" - "mac-tor.sh" -- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -126,7 +125,7 @@ script: | # # Install fonts. mkdir -p $TORBROWSER_NAME.app/Contents/Resources/fonts - NOTO_FONTS_HINTED="NotoNaskhArabic-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 NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + NOTO_FONTS_HINTED="NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-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 NotoSansTibetan-Regular.ttf" for fontfile in $NOTO_FONTS_HINTED; do cp "noto-fonts/hinted/$fontfile" $TORBROWSER_NAME.app/Contents/Resources/fonts/ done @@ -134,7 +133,6 @@ script: | 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 diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 649ff53..d4ae0fa 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -49,7 +49,6 @@ files: - "mar-tools-win32.zip" - "tbb-docs.zip" - "pe_checksum_fix.py" -- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -115,15 +114,14 @@ script: | # # Install fonts. mkdir -p tbb-windows-installer/"Tor Browser"/Browser/fonts - NOTO_FONTS_HINTED="NotoNaskhArabic-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 NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + NOTO_FONTS_HINTED="NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMyanmar-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" + NOTO_FONTS_UNHINTED="NotoSansBuginese-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

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'arthur/16707'
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit 10a4658832496eba75ae0b30ee3dbb25823dd23b Merge: 3dd1fc4 eeb219d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 07:42:44 2015 +0000 Merge remote-tracking branch 'arthur/16707' gitian/descriptors/mac/gitian-bundle.yml | 4 +--- gitian/descriptors/windows/gitian-bundle.yml | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0

[tor-browser-bundle/master] Bug 16551: generate a downloads.json file
by gk＠torproject.org 08 Sep '15

08 Sep '15

commit 3dd1fc4afa36266027a2785a443757b2c6c3d93d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 21 16:40:03 2015 +0200 Bug 16551: generate a downloads.json file --- gitian/check-prerequisites.sh | 2 +- tools/update-responses/README.md | 6 ++--- tools/update-responses/update_responses | 41 +++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 8518ffe..32c9b7b 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -60,7 +60,7 @@ else exit 1 fi -update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl" +update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg do diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 5fe69a2..5440b0d 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -14,7 +14,7 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML - LWP + LWP JSON On Debian / Ubuntu you can install them with: @@ -23,7 +23,7 @@ On Debian / Ubuntu you can install them with: libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ libparallel-forkmanager-perl libxml-libxml-perl \ - libwww-perl + libwww-perl libjson-perl ``` On Red Hat / Fedora you can install them with: @@ -31,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager XML::LibXML LWP + Parallel::ForkManager XML::LibXML LWP JSON do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b1b3331..72a19d7 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -19,6 +19,7 @@ use Parallel::ForkManager; use File::Basename; use XML::LibXML '1.70'; use LWP::Simple; +use JSON; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -109,6 +110,32 @@ sub get_version_files { $config->{versions}{$version}{files} = $files; } +sub get_version_downloads { + my ($config, $version) = @_; + my $downloads = {}; + my $vdir = "$releases_dir/$version"; + opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; + foreach my $file (readdir $d) { + next unless -f "$vdir/$file"; + my ($os, $lang); + if ($file =~ m/^TorBrowser-$version-osx64_(.+).dmg$/) { + ($os, $lang) = ('osx64', $1); + } elsif ($file =~ m/^tor-browser-(linux32|linux64)-${version}_(.+).tar.xz$/) { + ($os, $lang) = ($1, $2); + } elsif ($file =~ m/^torbrowser-install-${version}_(.+).exe$/) { + ($os, $lang) = ('win32', $1); + } else { + next; + } + $downloads->{$os}{$lang} = { + binary => "$config->{versions}{$version}{download_url}/$file", + sig => "$config->{versions}{$version}{download_url}/$file.asc", + }; + } + closedir $d; + $config->{versions}{$version}{downloads} = $downloads; +} + sub extract_mar { my ($mar_file, $dest_dir) = @_; my $old_cwd = getcwd; @@ -301,6 +328,19 @@ sub write_htaccess { } } +sub write_downloads_json { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; + my $data = { + version => $version, + downloads => get_version_downloads($config, $version), + }; + write_htdocs($channel, 'downloads.json', encode_json($data)); + } +} + sub check_deps { foreach my $bin (qw(bunzip2 mar mbsdiff make_incremental_update.sh)) { exit_error "Cannot find $bin in PATH" unless which($bin); @@ -501,6 +541,7 @@ my %actions = ( } write_responses($config, @channels); write_htaccess($config, @channels); + write_downloads_json($config, @channels); clean_htdocs(@channels); }, gen_incrementals => sub {

1 0

[torbutton/master] Bug 16887: Update intl.accept_languages value
by gk＠torproject.org 08 Sep '15

08 Sep '15

commit c39a9540dc693d8f5b14636c643530f29e1c0ead Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 7 14:01:53 2015 +0000 Bug 16887: Update intl.accept_languages value We previously spoofed the `intl.accept_languages` value to "en-us, en" but with the update to ESR 38 Firefox does not like the lower case country code anymore. See: https://html5.org/r/8458 and https://bugzilla.mozilla.org/show_bug.cgi?id=889335 for the reasons behind that. We adapt our code accordingly and set the default value to "en-US, en" now. This fixes #13277 as well. Thanks for this patch, cypherpunk. --- src/chrome/content/torbutton.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 28da420..11591dc 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2207,10 +2207,10 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.clearUserPref("browser.display.max_font_attempts"); if(m_tb_prefs.prefHasUserValue("browser.display.max_font_count")) m_tb_prefs.clearUserPref("browser.display.max_font_count"); - - // Governed also by the spoof_english dialog.. + + // Governed also by the spoof_english dialog.. if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) { - m_tb_prefs.setCharPref("intl.accept_languages", "en-us, en"); + m_tb_prefs.setCharPref("intl.accept_languages", "en-US, en"); m_tb_prefs.setCharPref("intl.accept_charsets", "iso-8859-1,*,utf-8"); m_tb_prefs.setCharPref("intl.charsetmenu.browser.cache", "UTF-8"); m_tb_prefs.setBoolPref("javascript.use_us_english_locale", true);

1 0

[tor-browser-bundle/master] Bug 16960: OS X nightly tor target is broken
by gk＠torproject.org 04 Sep '15

04 Sep '15

commit 96b9929f24d0461ec05b010c6a8d74506c8e2657 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 19:01:57 2015 +0000 Bug 16960: OS X nightly tor target is broken Commit b79e90f6ba9426158cf305655590f70d3ae89875 (which fixed bug 16901) makes it necessary to update our CFLAGS for cross-compiling tor for OS X. --- gitian/descriptors/mac/gitian-tor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 8e64922..848fbe9 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -50,7 +50,7 @@ script: | # Building tor # XXX Clean up these flags? - export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CFLAGS="-m64 -I${INSTDIR}/openssl/include -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" export LDFLAGS="-m64 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" cd tor git update-index --refresh -q

1 0

[tor-browser-bundle/master] Bug 10140: Support platform specific langpacks
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 5b34c06405a5524a5bc2b8ba42fd0587086dd52c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Sep 1 10:54:30 2015 +0000 Bug 10140: Support platform specific langpacks This patch allows to fetch Linux/Windows/OSX-specific language packs. Furthermore, it enables Japanese. --- gitian/descriptors/linux/gitian-bundle.yml | 3 ++- gitian/descriptors/mac/gitian-bundle.yml | 3 ++- gitian/descriptors/windows/gitian-bundle.yml | 3 ++- gitian/fetch-inputs.sh | 20 ++++++++++++++++++++ gitian/versions | 4 ++++ gitian/versions.alpha | 3 +++ gitian/versions.beta | 3 +++ gitian/versions.nightly | 3 +++ 8 files changed, 39 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f1d0554..afb632e 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -182,7 +182,8 @@ script: | # unzip linux-langpacks.zip cd linux-langpacks - for LANG in $BUNDLE_LOCALES + LINUX_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_LINUX" + for LANG in $LINUX_LOCALES do xpi=$LANG.xpi cp -a ../tor-browser ../tor-browser_$LANG diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a956fa7..dabe619 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -208,7 +208,8 @@ script: | # unzip mac-langpacks.zip cd mac-langpacks - for LANG in $BUNDLE_LOCALES + MAC_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_MAC" + for LANG in $MAC_LOCALES do xpi=$LANG.xpi DEST=$TORBROWSER_APP diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index c674e1b..649ff53 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -173,7 +173,8 @@ script: | # unzip ../win32-langpacks.zip cd win32-langpacks - for LANG in $BUNDLE_LOCALES + WIN32_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_WIN32" + for LANG in $WIN32_LOCALES do xpi=$LANG.xpi cp $xpi ../"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index a97ff62..42efa33 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -177,6 +177,7 @@ do fi done +# Fetch the common langpacks first, then the platform specific ones if any. mkdir -p langpacks-$FIREFOX_LANG_VER/linux-langpacks mkdir -p langpacks-$FIREFOX_LANG_VER/win32-langpacks mkdir -p langpacks-$FIREFOX_LANG_VER/mac-langpacks @@ -196,6 +197,25 @@ do cd .. done +for i in $BUNDLE_LOCALES_LINUX +do + cd linux-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done +for i in $BUNDLE_LOCALES_WIN32 +do + cd win32-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done +for i in $BUNDLE_LOCALES_MAC +do + cd mac-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done + "$WRAPPER_DIR/build-helpers/dzip.sh" ../win32-langpacks.zip win32-langpacks "$WRAPPER_DIR/build-helpers/dzip.sh" ../linux-langpacks.zip linux-langpacks "$WRAPPER_DIR/build-helpers/dzip.sh" ../mac-langpacks.zip mac-langpacks diff --git a/gitian/versions b/gitian/versions index 3df967e..b833342 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,5 +1,9 @@ TORBROWSER_VERSION_TYPE=release BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" + BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5005445..f37b98a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,8 @@ TORBROWSER_VERSION_TYPE=alpha BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.beta b/gitian/versions.beta index 343d4b5..c2143a0 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,5 +1,8 @@ TORBROWSER_VERSION_TYPE=beta BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index afb82c5..f0551f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -3,6 +3,9 @@ TORBROWSER_VERSION=tbb-nightly TORBROWSER_BUILDDIR=tbb-nightly TORBROWSER_SYMLINK_VERSION=0 BUNDLE_LOCALES="ar ru zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=0

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit badf55cb0fdda5c3c893f01f996a29a4e105d3d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index d238d3a..a371403 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -421,7 +421,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit f3a1676797a35a63ff2e40f89e6aab169b8661b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a371403..a875774 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -329,6 +329,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0