October 2015 - tor-commits - lists.torproject.org

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 28 Oct '15

28 Oct '15

commit 6ae447e3e1fb67b60255132ae84426225cffb5f9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 15:15:27 2015 +0000 Update translations for tails-greeter --- fr_CA/fr_CA.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 7a872f5..1580d0c 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -5,14 +5,15 @@ # Translators: # matsa <matsa(a)riseup.net>, 2013 # Onizuka, 2013 +# Trans-fr, 2015 # Trans-fr, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-26 17:51+0100\n" -"PO-Revision-Date: 2015-10-27 10:10+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-10-28 14:45+0000\n" +"Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -162,7 +163,7 @@ msgstr "La connexion réseau de cet ordinateur est censurée, filtrée ou relay #: ../glade/optionswindow.glade.h:23 msgid "Disable all networking" -msgstr "" +msgstr "Désactiver tous les réseaux" #: ../glade/langpanel.glade.h:1 msgid " "

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 28 Oct '15

28 Oct '15

commit 67c5d8645cd1ee6cf770a6143ee2fc3222fb76a3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 15:15:24 2015 +0000 Update translations for tails-persistence-setup_completed --- fr_CA/fr_CA.po | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 902db93..c9762bc 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -14,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-05-02 21:08+0200\n" -"PO-Revision-Date: 2015-06-23 13:36+0000\n" +"POT-Creation-Date: 2015-10-26 14:15+0100\n" +"PO-Revision-Date: 2015-10-28 14:47+0000\n" "Last-Translator: Trans-fr\n" -"Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" +"Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -121,10 +121,18 @@ msgid "Lists downloaded by APT" msgstr "Listes téléchargées par APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 +msgid "Icedove" +msgstr "Icedove" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 +msgid "Icedove profiles and locally stored email" +msgstr "Profils Icedove et courriel stocké localement" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Dotfiles" msgstr "Dotfiles" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:180 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Créer un lien symbolique, dans $HOME, pour chaque fichier ou dossier se trouvant dans le dossier « dotfiles »"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 28 Oct '15

28 Oct '15

commit 2758496ca8f6b6968482583d757a6b4699bfd87e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 15:15:21 2015 +0000 Update translations for tails-persistence-setup --- fr_CA/fr_CA.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index fb49946..c9762bc 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-10-26 14:15+0100\n" -"PO-Revision-Date: 2015-10-27 08:44+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-10-28 14:47+0000\n" +"Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -122,11 +122,11 @@ msgstr "Listes téléchargées par APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Icedove" -msgstr "" +msgstr "Icedove" #: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "Icedove profiles and locally stored email" -msgstr "" +msgstr "Profils Icedove et courriel stocké localement" #: ../lib/Tails/Persistence/Configuration/Presets.pm:178 msgid "Dotfiles"

1 0

[translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties
by translation＠torproject.org 28 Oct '15

28 Oct '15

commit 8a07279c08d53dd9070719be140b96da069e669b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 14:46:10 2015 +0000 Update translations for tor-messenger-authproperties --- lt/auth.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lt/auth.properties b/lt/auth.properties index d795ef4..75c853a 100644 --- a/lt/auth.properties +++ b/lt/auth.properties @@ -1,12 +1,12 @@ auth.title=Verify %S's identity auth.yourFingerprint=Fingerprint for you, %S:\n%S auth.theirFingerprint=Purported fingerprint for %S:\n%S -auth.help=Verifying a contact's identity helps ensure that the person you are talking to is who they claim to be. +auth.help=Tikrinima kontakto tapatybė padės jums istikinti kad tas zmogus su kuriuo kalbate yra kas sakosi esąs. auth.helpTitle=Patikrinimo Pagalba auth.question=Čia yra klausimas kuris buvo paklaustas tavo kontakto\n\n%S\n\nParasykite slapta atsakyma čia (didžiosiomis ir mažosiomis raidėmis) -auth.secret=įvesti paslaptis čia +auth.secret=įvesti paslaptis čia: auth.error=An error occurred while verifying your contact's identity. auth.success=Verifying your contact's identity completed successfully. auth.successThem=Your contact has successfully verified your identity. You may want to verify their identity as well by asking your own question. -auth.fail=Buvo klaida patikrinti tavo kontakto tapatybė +auth.fail=Buvo klaida patikrinti tavo kontakto tapatybę. auth.done=Atlikta

1 0

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 28 Oct '15

28 Oct '15

commit 11a117a468a77bcc2bcc398e121a31c8d10ed519 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 14:16:42 2015 +0000 Update translations for tor-messenger-privdtd --- lt/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lt/priv.dtd b/lt/priv.dtd new file mode 100644 index 0000000..14b54f7 --- /dev/null +++ b/lt/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.done "Atlikta"> \ No newline at end of file

1 0

[translation/tor-messenger-authproperties] Update translations for tor-messenger-authproperties
by translation＠torproject.org 28 Oct '15

28 Oct '15

commit 6f499dcdb24291c2c1397f320d963fc126ff0ed3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 14:16:16 2015 +0000 Update translations for tor-messenger-authproperties --- lt/auth.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/auth.properties b/lt/auth.properties index f76c719..d795ef4 100644 --- a/lt/auth.properties +++ b/lt/auth.properties @@ -2,11 +2,11 @@ auth.title=Verify %S's identity auth.yourFingerprint=Fingerprint for you, %S:\n%S auth.theirFingerprint=Purported fingerprint for %S:\n%S auth.help=Verifying a contact's identity helps ensure that the person you are talking to is who they claim to be. -auth.helpTitle=Verification help -auth.question=This is the question asked by your contact:\n\n%S\n\nEnter secret answer here (case sensitive): -auth.secret=Enter secret here: +auth.helpTitle=Patikrinimo Pagalba +auth.question=Čia yra klausimas kuris buvo paklaustas tavo kontakto\n\n%S\n\nParasykite slapta atsakyma čia (didžiosiomis ir mažosiomis raidėmis) +auth.secret=įvesti paslaptis čia auth.error=An error occurred while verifying your contact's identity. auth.success=Verifying your contact's identity completed successfully. auth.successThem=Your contact has successfully verified your identity. You may want to verify their identity as well by asking your own question. -auth.fail=Failed to verify your contact's identity. -auth.done=Done +auth.fail=Buvo klaida patikrinti tavo kontakto tapatybė +auth.done=Atlikta

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 28 Oct '15

28 Oct '15

commit 640b16d7f4c77e7f883d028893d92851a133763b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 28 14:16:11 2015 +0000 Update translations for tor-messenger-authdtd --- lt/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/auth.dtd b/lt/auth.dtd index f14ff9f..1617be3 100644 --- a/lt/auth.dtd +++ b/lt/auth.dtd @@ -17,5 +17,5 @@ <!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> <!ENTITY authDialog.question "Enter question here:"> <!ENTITY authDialog.answer "Enter secret answer here (case sensitive):"> -<!ENTITY authDialog.secret "Enter secret here:"> +<!ENTITY authDialog.secret "įvesti paslaptis čia"> <!ENTITY authDialog.waiting "Waiting for contact ..."> \ No newline at end of file

1 0

[torbutton/maint-1.9.3] Bug 16735: about:tor should accommodate different fonts/font sizes.
by gk＠torproject.org 28 Oct '15

28 Oct '15

commit c6d94fb1c74b579ea442395ad15cf37bf815e2df 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/tor-browser-38.3.0esr-5.5-2] fixup! Bug #5926: Allow JS locale to be set to English/C.
by gk＠torproject.org 28 Oct '15

28 Oct '15

commit 6e22e68547b2bac647c5a9c4e2c43eda2dc1c63b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 15 22:10:48 2015 +0000 fixup! Bug #5926: Allow JS locale to be set to English/C. Fixes #17329: Use the UTF-8 version of the "C" locale to ensure that non-ASCII characters can be typed. --- xpcom/build/XPCOMInit.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index 292652d..ec1f6c9 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -520,7 +520,15 @@ void UseUSEnglishLocalePrefChangedCallback(const char* /* pref */, void* /* clos // Read the pref to see if we will use US English locale. bool useUSEnglishLocale = mozilla::Preferences::GetBool(USE_US_ENGLISH_LOCALE_PREF, false); // Set the application-wide C-locale. Needed for Date.toLocaleFormat(). - setlocale(LC_ALL, useUSEnglishLocale ? "C" : sSystemLocale); + if (useUSEnglishLocale) { + // Set the locale to "C.UTF-8" if possible, to avoid interfering with non-ASCII + // keyboard input on some Linux desktops. + // Otherwise fall back to the "C" locale, which is available on all platforms. + // See https://bugs.torproject.org/17329 + setlocale(LC_ALL, "C.UTF-8") || setlocale(LC_ALL, "C"); + } else { + setlocale(LC_ALL, sSystemLocale); + } // Now override the JavaScript Runtime Locale that is used by the Intl API // as well as Date.toLocaleString, Number.toLocaleString, and String.localeCompare. JS_SetDefaultLocale(rt, useUSEnglishLocale ? "en-US" : sJSLocale);

1 0

[tor-browser/tor-browser-38.3.0esr-5.0-2] fixup! Bug #5926: Allow JS locale to be set to English/C.
by gk＠torproject.org 28 Oct '15

28 Oct '15

commit 6d36430a07b75db21fb4007f28cceb98adc23f35 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Oct 15 22:10:48 2015 +0000 fixup! Bug #5926: Allow JS locale to be set to English/C. Fixes #17329: Use the UTF-8 version of the "C" locale to ensure that non-ASCII characters can be typed. --- xpcom/build/XPCOMInit.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index 292652d..ec1f6c9 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -520,7 +520,15 @@ void UseUSEnglishLocalePrefChangedCallback(const char* /* pref */, void* /* clos // Read the pref to see if we will use US English locale. bool useUSEnglishLocale = mozilla::Preferences::GetBool(USE_US_ENGLISH_LOCALE_PREF, false); // Set the application-wide C-locale. Needed for Date.toLocaleFormat(). - setlocale(LC_ALL, useUSEnglishLocale ? "C" : sSystemLocale); + if (useUSEnglishLocale) { + // Set the locale to "C.UTF-8" if possible, to avoid interfering with non-ASCII + // keyboard input on some Linux desktops. + // Otherwise fall back to the "C" locale, which is available on all platforms. + // See https://bugs.torproject.org/17329 + setlocale(LC_ALL, "C.UTF-8") || setlocale(LC_ALL, "C"); + } else { + setlocale(LC_ALL, sSystemLocale); + } // Now override the JavaScript Runtime Locale that is used by the Intl API // as well as Date.toLocaleString, Number.toLocaleString, and String.localeCompare. JS_SetDefaultLocale(rt, useUSEnglishLocale ? "en-US" : sJSLocale);

1 0