[tbb-commits] [torbutton/master] Merge remote-tracking branch 'brade/bug10398'

commit a9a3b8f1cc3aeddbc0abc621ade08680ef09e146 Merge: 838c372 54c8721 Author: Mike Perry mikeperry-git@torproject.org Date: Sat Mar 29 21:18:10 2014 -0700

Merge remote-tracking branch 'brade/bug10398'

Conflicts: src/chrome/content/aboutTor/aboutTor.xhtml src/chrome/locale/eu/aboutTor.dtd src/chrome/locale/fa/aboutTor.dtd src/chrome/locale/ja/aboutTor.dtd

src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++++++++++- src/chrome/locale/af/aboutTor.dtd | 19 +------------------ src/chrome/locale/af/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ak/aboutTor.dtd | 19 +------------------ src/chrome/locale/ak/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/am/aboutTor.dtd | 19 +------------------ src/chrome/locale/am/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ar/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ar/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/arn/aboutTor.dtd | 19 +------------------ src/chrome/locale/arn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ast/aboutTor.dtd | 19 +------------------ src/chrome/locale/ast/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/az/aboutTor.dtd | 19 +------------------ src/chrome/locale/az/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/be/aboutTor.dtd | 19 +------------------ src/chrome/locale/be/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bg/aboutTor.dtd | 19 +------------------ src/chrome/locale/bg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bms/aboutTor.dtd | 19 +------------------ src/chrome/locale/bms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bn-IN/aboutTor.dtd | 19 +------------------ src/chrome/locale/bn-IN/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bn/aboutTor.dtd | 19 +------------------ src/chrome/locale/bn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bo/aboutTor.dtd | 19 +------------------ src/chrome/locale/bo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/br/aboutTor.dtd | 19 +------------------ src/chrome/locale/br/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bs/aboutTor.dtd | 19 +------------------ src/chrome/locale/bs/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ca/aboutTor.dtd | 19 +------------------ src/chrome/locale/ca/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/cs/aboutTor.dtd | 19 +------------------ src/chrome/locale/cs/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/csb/aboutTor.dtd | 19 +------------------ src/chrome/locale/csb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/cy/aboutTor.dtd | 19 +------------------ src/chrome/locale/cy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/da/aboutTor.dtd | 19 +------------------ src/chrome/locale/da/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/de/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/de/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/dz/aboutTor.dtd | 19 +------------------ src/chrome/locale/dz/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/el/aboutTor.dtd | 19 +------------------ src/chrome/locale/el/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/en/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/en/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/eo/aboutTor.dtd | 19 +------------------ src/chrome/locale/eo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/es/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/es/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/et/aboutTor.dtd | 19 +------------------ src/chrome/locale/et/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/eu/aboutTor.dtd | 18 +----------------- src/chrome/locale/eu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fa/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/fa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fi/aboutTor.dtd | 19 +------------------ src/chrome/locale/fi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fil/aboutTor.dtd | 19 +------------------ src/chrome/locale/fil/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fo/aboutTor.dtd | 19 +------------------ src/chrome/locale/fo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fr/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/fr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fur/aboutTor.dtd | 19 +------------------ src/chrome/locale/fur/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fy/aboutTor.dtd | 19 +------------------ src/chrome/locale/fy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ga/aboutTor.dtd | 19 +------------------ src/chrome/locale/ga/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gl/aboutTor.dtd | 19 +------------------ src/chrome/locale/gl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gu/aboutTor.dtd | 19 +------------------ src/chrome/locale/gu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gun/aboutTor.dtd | 19 +------------------ src/chrome/locale/gun/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ha/aboutTor.dtd | 19 +------------------ src/chrome/locale/ha/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/he/aboutTor.dtd | 19 +------------------ src/chrome/locale/he/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hi/aboutTor.dtd | 19 +------------------ src/chrome/locale/hi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hr/aboutTor.dtd | 19 +------------------ src/chrome/locale/hr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ht/aboutTor.dtd | 19 +------------------ src/chrome/locale/ht/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hu/aboutTor.dtd | 19 +------------------ src/chrome/locale/hu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hy/aboutTor.dtd | 19 +------------------ src/chrome/locale/hy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/id/aboutTor.dtd | 19 +------------------ src/chrome/locale/id/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/is/aboutTor.dtd | 19 +------------------ src/chrome/locale/is/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/it/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/it/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ja/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ja/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/jv/aboutTor.dtd | 19 +------------------ src/chrome/locale/jv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ka/aboutTor.dtd | 19 +------------------ src/chrome/locale/ka/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/km/aboutTor.dtd | 19 +------------------ src/chrome/locale/km/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/kn/aboutTor.dtd | 19 +------------------ src/chrome/locale/kn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ko/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ko/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ku/aboutTor.dtd | 19 +------------------ src/chrome/locale/ku/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/kw/aboutTor.dtd | 19 +------------------ src/chrome/locale/kw/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ky/aboutTor.dtd | 19 +------------------ src/chrome/locale/ky/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lb/aboutTor.dtd | 19 +------------------ src/chrome/locale/lb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lg/aboutTor.dtd | 19 +------------------ src/chrome/locale/lg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ln/aboutTor.dtd | 19 +------------------ src/chrome/locale/ln/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lo/aboutTor.dtd | 19 +------------------ src/chrome/locale/lo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lt/aboutTor.dtd | 19 +------------------ src/chrome/locale/lt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lv/aboutTor.dtd | 19 +------------------ src/chrome/locale/lv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mg/aboutTor.dtd | 19 +------------------ src/chrome/locale/mg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mi/aboutTor.dtd | 19 +------------------ src/chrome/locale/mi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mk/aboutTor.dtd | 19 +------------------ src/chrome/locale/mk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ml/aboutTor.dtd | 19 +------------------ src/chrome/locale/ml/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mn/aboutTor.dtd | 19 +------------------ src/chrome/locale/mn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mr/aboutTor.dtd | 19 +------------------ src/chrome/locale/mr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ms/aboutTor.dtd | 19 +------------------ src/chrome/locale/ms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mt/aboutTor.dtd | 19 +------------------ src/chrome/locale/mt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/my/aboutTor.dtd | 19 +------------------ src/chrome/locale/my/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nah/aboutTor.dtd | 19 +------------------ src/chrome/locale/nah/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nap/aboutTor.dtd | 19 +------------------ src/chrome/locale/nap/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nb/aboutTor.dtd | 19 +------------------ src/chrome/locale/nb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ne/aboutTor.dtd | 19 +------------------ src/chrome/locale/ne/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nl/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/nl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nn/aboutTor.dtd | 19 +------------------ src/chrome/locale/nn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nso/aboutTor.dtd | 19 +------------------ src/chrome/locale/nso/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/oc/aboutTor.dtd | 19 +------------------ src/chrome/locale/oc/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/or/aboutTor.dtd | 19 +------------------ src/chrome/locale/or/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pa/aboutTor.dtd | 19 +------------------ src/chrome/locale/pa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pap/aboutTor.dtd | 19 +------------------ src/chrome/locale/pap/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pl/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/pl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pms/aboutTor.dtd | 19 +------------------ src/chrome/locale/pms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ps/aboutTor.dtd | 19 +------------------ src/chrome/locale/ps/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pt-BR/aboutTor.dtd | 19 +------------------ src/chrome/locale/pt-BR/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pt/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/pt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ro/aboutTor.dtd | 19 +------------------ src/chrome/locale/ro/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ru/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ru/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sco/aboutTor.dtd | 19 +------------------ src/chrome/locale/sco/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sk/aboutTor.dtd | 19 +------------------ src/chrome/locale/sk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sl/aboutTor.dtd | 19 +------------------ src/chrome/locale/sl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/so/aboutTor.dtd | 19 +------------------ src/chrome/locale/so/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/son/aboutTor.dtd | 19 +------------------ src/chrome/locale/son/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sq/aboutTor.dtd | 19 +------------------ src/chrome/locale/sq/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sr/aboutTor.dtd | 19 +------------------ src/chrome/locale/sr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/st/aboutTor.dtd | 19 +------------------ src/chrome/locale/st/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/su/aboutTor.dtd | 19 +------------------ src/chrome/locale/su/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sv/aboutTor.dtd | 19 +------------------ src/chrome/locale/sv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sw/aboutTor.dtd | 19 +------------------ src/chrome/locale/sw/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ta/aboutTor.dtd | 19 +------------------ src/chrome/locale/ta/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/te/aboutTor.dtd | 19 +------------------ src/chrome/locale/te/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tg/aboutTor.dtd | 19 +------------------ src/chrome/locale/tg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/th/aboutTor.dtd | 19 +------------------ src/chrome/locale/th/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ti/aboutTor.dtd | 19 +------------------ src/chrome/locale/ti/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tk/aboutTor.dtd | 19 +------------------ src/chrome/locale/tk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tr/aboutTor.dtd | 19 +------------------ src/chrome/locale/tr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/uk/aboutTor.dtd | 19 +------------------ src/chrome/locale/uk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ur/aboutTor.dtd | 19 +------------------ src/chrome/locale/ur/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ve/aboutTor.dtd | 19 +------------------ src/chrome/locale/ve/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/vi/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/vi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/wa/aboutTor.dtd | 19 +------------------ src/chrome/locale/wa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/wo/aboutTor.dtd | 19 +------------------ src/chrome/locale/wo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-CN/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/zh-CN/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-HK/aboutTor.dtd | 19 +------------------ src/chrome/locale/zh-HK/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-TW/aboutTor.dtd | 19 +------------------ src/chrome/locale/zh-TW/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zu/aboutTor.dtd | 19 +------------------ src/chrome/locale/zu/aboutTor.properties | 15 +++++++++++++++ 239 files changed, 1927 insertions(+), 2262 deletions(-)

diff --cc src/chrome/content/aboutTor/aboutTor.xhtml index 6efe617,02e0c7c..b99bc7e --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@@ -25,8 -25,10 +25,10 @@@ <![CDATA[ function onLoad() { + insertPropertyStrings(); + - window.addEventListener("resize", function() { - resizeToolbarIconArrow(); + document.addEventListener("AboutTorAdjustArrow", function() { + adjustToolbarIconArrow(); }, false);

window.setTimeout( function() { @@@ -35,74 -37,36 +37,94 @@@ }, 0); }

-function resizeToolbarIconArrow() +function adjustToolbarIconArrow() { var textElem = document.getElementById("updatePrompt"); - var rightDiv = document.getElementById("toolbarIconArrowRight"); - if (textElem && rightDiv) + var arrowDiv = document.getElementById("toolbarIconArrow"); + var extDiv = document.getElementById("toolbarIconArrowExtension"); + if (textElem && arrowDiv && extDiv) { - var width = textElem.offsetLeft - rightDiv.offsetLeft - 6; - rightDiv.style.width = width + "px"; + 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; + } + + // 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). + { + arrowDisplay = "none"; + extDisplay = "none"; + } + + arrowDiv.style.display = arrowDisplay; + extDiv.style.display = extDisplay; } } + + function insertPropertyStrings() + { + try { + var 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.searchSP.privacy.link"); + var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link"); + var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy", + [s1, s2], 2); + if (result) { + var elem = document.getElementById("searchProviderInfo"); + if (elem) + elem.innerHTML = result; + } + } catch(e) {}; + } + ]]> </script> </head> diff --cc src/chrome/locale/eu/aboutTor.dtd index 7b07102,9f14022..157346e --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@@ -21,53 -21,27 +21,37 @@@ <!ENTITY aboutTor.failure3Link "help@rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label ".">

-<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> +<!ENTITY aboutTor.search.label "Bilatu"> + +<!-- Note to translators: the following 18 entities are used to construct a + - sentence (either the SP or DDG entities are used, but not both at the + - same time). In English, the sentence reads: + - Search securely with Startpage. + - or: + - Search securely with DuckDuckGo. + - The sentence contains two embedded links for "securely" and + - the search engine ("Startpage" or "DuckDuckGo"). + --> +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Bilatu"> - <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Bilatu"> - <!ENTITY aboutTor.searchSP.privacy.label "segurtasunez"> - <!ENTITY aboutTor.searchDDG.privacy.label "segurtasunez"> - <!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> - <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> - <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&amp;nbsp;"> - <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&amp;nbsp;"> - <!ENTITY aboutTor.searchSP.search.beforeLink.label "rekin"> - <!ENTITY aboutTor.searchDDG.search.beforeLink.label "rekin"> - <!ENTITY aboutTor.searchSP.search.label "Startpage"> - <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> - <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> - <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> - <!ENTITY aboutTor.searchSP.search.afterLink.label "."> - <!ENTITY aboutTor.searchDDG.search.afterLink.label ".">

-<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.torInfo1.label "Informazio gehiago:"> +<!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:"> +<!ENTITY aboutTor.torInfo3.label "Irteera nodoa:"> +<!ENTITY aboutTor.torInfo4.label "Ostalari honek ez du bisitarien inguruko inolako informaziorik biltzen."> +<!ENTITY aboutTor.whatnextQuestion.label "Eta orain zer?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor EZ da anonimoki nabigatzeko behar duzun guztia! Baliteke zure nabigatze ohitura batzuk aldatu behar izatea zure nortasuna seguru mantentzen dela ziurtatzeko."> +<!ENTITY aboutTor.whatnext.label "Anonimo mantentzeko aholkuak »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo1.label "Lagundu dezakezu!"> +<!ENTITY aboutTor.helpInfo2.label "Tor sarea bizkorragoa eta indartsuagoa egiteko hainbat modutan lagundu dezakezu:"> +<!ENTITY aboutTor.helpInfo3.label "Tor errele nodo bat exekutatu »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.label "Zure zerbitzuak bolondrestu »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.label "Dohaintza egin »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en">

-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.footer.label "The Tor Project irabazi asmorik gabeko US 501(c)(3) bat da, ikerketara, garapenera, eta onlineko anonimotasuna eta pribatutasunaren hezkuntzara zuzendutakoa."> +<!ENTITY aboutTor.learnMore.label "The Tor Projecti buruz gehiago ikasi »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">