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

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 11 Oct '18

11 Oct '18

commit 8451d005857ccae5fdf6b14c3ab7f1e2a4cb9153 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 11 00:15:20 2018 +0000 Update translations for donatepages-messagespot --- locale/es_AR/LC_MESSAGES/messages.po | 29 ++++++++++++++++++++++++++--- locale/pt_BR/LC_MESSAGES/messages.po | 9 +++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 4c1467a27..b37bf9c03 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -1303,38 +1303,50 @@ msgid "" "required to process your credit card payment, including your billing " "address." msgstr "" +"Si donás por tarjeta de crédito, te va a ser solicitada alguna información " +"que es requerida para procesar tu pago, incluyendo tu domicilio de " +"facturación." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:329 msgid "" "This allows our payment processor to verify your identity, process your " "payment, and prevent fraudulent charges to your credit card." msgstr "" +"Esto le permite a nuestro procesador de pagos verificar tu identidad, y " +"prevenir cargos fraudulentos a tu tarjeta de crédito." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:331 msgid "" "We don't ask for information beyond what's required by the payment " "processor." msgstr "" +"No solicitamos información más allá de la requerida por el procesador de " +"pagos." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:337 msgid "Why is there a minimum donation?" -msgstr "" +msgstr "¿Por qué hay una donación mínima?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:341 msgid "" "People who have stolen credit card information often donate to nonprofits as" " a way of testing whether the card works." msgstr "" +"Individuos que han robado información sobre tarjetas de crédito, a menudo " +"donan a organizaciones sin fines de lucro a manera de prueba para ver si la " +"tarjeta funciona." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:343 msgid "" "These people typically use a very small amount for their testing, and we've " "found that setting a $1 minimum donation seems to deter them." msgstr "" +"Típicamente, usan un monto muy pequeño para sus pruebas, y hemos descubierto" +" que estableciendo un donación mínima de USD 1 parece detenerlos." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:349 msgid "Is there a maximum donation?" -msgstr "" +msgstr "¿Hay un monto de donación máximo?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:353 msgid "" @@ -1350,7 +1362,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:359 msgid "Can I donate via bitcoin?" -msgstr "" +msgstr "¿Puedo donar vía bitcoin?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:363 msgid "" @@ -1358,12 +1370,17 @@ msgid "" "href=\"https://www.torproject.org/donate/donate-options.html.en\">bitcoin " "via BitPay</a>." msgstr "" +"¡Sí! Aceptamos <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/donate/donate-options.html.en\">bitcoin " +"vía BitPay</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:369 msgid "" "If I want my donation to be anonymous, what is the best way for me to " "donate?" msgstr "" +"Si quiero que mi donación sea anónima, ¿cuál es la mejor manera de donar " +"para mí?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:373 msgid "" @@ -1371,16 +1388,22 @@ msgid "" "href=\"https://www.torproject.org/donate/donate-" "options.html.en#cash\">sending us a postal money order</a>." msgstr "" +"Podés donar <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/donate/donate-" +"options.html.en#cash\">enviándonos un giro postal</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:375 msgid "" "You can donate via bitcoin if you have bitcoin set up in a way that " "preserves your anonymity." msgstr "" +"Podés donar vía bitcoin si la tenés configurada de manera que preserve tu " +"anonimato." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:377 msgid "You can buy cash gift cards and mail them to us." msgstr "" +"Podés comprar tarjetas para regalos en efectivo y enviárnoslas por correo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:379 msgid "" diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 29d5180c0..eb9c14af0 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -628,11 +628,12 @@ msgid "" "browser for mobile devices and making it easier for third-party developers " "to integrate Tor into their applications." msgstr "" -"Obrigado por ajudar o Tor a Empoderar a Resistência Digital. Você deve " -"receber um recibo por email em breve. Com seu apoio, nós seremos capazes de " +"Obrigado por ajudar o Tor Empoderar a Resistência Digital. Você deve receber" +" um recibo por email em breve. Com o seu apoio, nós seremos capazes de " "encarar projetos ambiciosos, tais como desenvolver um navegador para " -"dispositivos móveis mais seguro e que amplie a privacidade, e tornar mais " -"fácil para outros desenvolvedores integrarem Tor em seus aplicativos. " +"dispositivos móveis mais seguros, ampliando a sua privacidade, e tornando " +"mais fácil para outros desenvolvedores a integrarem o Tor em seus " +"aplicativos. " #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:52 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 10 Oct '18

10 Oct '18

commit fcb8fdc4f96b5b04e319f0d79ca3f0f6a3970440 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 10 23:45:19 2018 +0000 Update translations for donatepages-messagespot --- locale/es_AR/LC_MESSAGES/messages.po | 23 ++++++++++++++++++++--- locale/pt_BR/LC_MESSAGES/messages.po | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index a06395b89..4c1467a27 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -1213,58 +1213,75 @@ msgid "" "used, we're required by the IRS to track and report separately on that " "money." msgstr "" +"Si aceptamos una donación de alguien que ha especificado cómo la quiere " +"utilizada, nos es requerido por el IRS rastrear y reportar acerca de ese " +"dinero separadamente." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:283 msgid "" "That would be a big administrative burden for a small organization, and we " "don't think it's a good idea for us." msgstr "" +"Eso sería una gran carga administrativa para una pequeña organización, y no " +"pensamos que sea una buena idea para nosotros." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:285 msgid "" "However, we would be very happy to hear your ideas and feedback about our " "work." msgstr "" +"Sin embargo, estaríamos muy felices al escuchar tus ideas y aportes acerca " +"de nuestro trabajo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:287 msgid "" "If you're donating using a mechanism that allows for comments, feel free to " "send your thoughts that way." msgstr "" +"Si donás utilizando un mecanismo que permita comentarios, sentite libre de " +"enviarnos tus pensamientos de esa manera." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:293 msgid "Can I donate while using Tor Browser?" -msgstr "" +msgstr "¿Puedo donar mientras esté usando el Navegador Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:297 msgid "Yes! In our testing, donation works via Tor Browser." msgstr "" +"¡Sí! En nuestras pruebas, las donaciones funcionan vía el Navegador Tor." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:299 msgid "" "If you run into problems, please contact <span " "class=\"email\">giving(at)torproject.org</span>." msgstr "" +"Si te encontrás con problemas, por favor contactá giving(at)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:303 msgid "" "For users logging in to Paypal: some people had no problem donating via " "PayPal while using Tor Browser." msgstr "" +"Para usuarios iniciando sesión con PayPal: algunas personas no han tenido " +"problemas donando vía PayPal mientras usaban el Navegador Tor." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:305 msgid "" "In past years, some people couldn't complete the donation process, and one " "person had their PayPal account temporarily frozen." msgstr "" +"Años atrás, algunas personas no pudieron completar el proceso de donación, y" +" a una persona le fue bloqueada temporalmente su cuenta de PayPal." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:307 msgid "If you run into any problems donating via PayPal, please let us know." msgstr "" +"Si te encontrás con cualquier problema donando vía PayPal, por favor " +"hacénoslo saber." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:313 msgid "How can I donate via debit or credit card?" -msgstr "" +msgstr "¿Cómo puedo donar vía tarjeta de débito o crédito?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:317 msgid "" @@ -1278,7 +1295,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:323 msgid "Why do you ask for my address and similar information?" -msgstr "" +msgstr "¿Por qué preguntan por mi domicilio e información similar?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:327 msgid "" diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 714893ecc..29d5180c0 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -609,7 +609,7 @@ msgid "" "Your support today will help ensure Tor remains independent, robust, and " "secure." msgstr "" -"Sua ajuda hoje vai ajudar a garantir que o Tor se mantenha independente, " +"A sua ajuda hoje vai ajudar a garantir que o Tor se mantenha independente, " "robusto e seguro. " #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:34

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 10 Oct '18

10 Oct '18

commit a5a508312ed3ddc87837f80312924537ad2450b7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 10 23:15:19 2018 +0000 Update translations for donatepages-messagespot --- locale/es_AR/LC_MESSAGES/messages.po | 56 +++++++++++++++++++++++++++++++----- locale/pt_BR/LC_MESSAGES/messages.po | 37 +++++++++++++++++++----- 2 files changed, 79 insertions(+), 14 deletions(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 2abc78c0b..a06395b89 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -1015,12 +1015,16 @@ msgid "" "using Tor in the past, or that they misunderstand what Tor is and how it " "works (we’re working to change this)." msgstr "" +"Usualmente significa que ese sitio ha tenido en el pasado dificultades con " +"visitantes que han estado usando Tor, o que han malentendido qué es Tor y " +"cómo funciona (estamos trabajando para cambiar ésto)." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:187 msgid "" "But it is not illegal to use Tor, and you shouldn't get in trouble for doing" " it." msgstr "" +"Pero no es ilegal usar Tor, y no deberías meterte en problemas por hacerlo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:189 msgid "" @@ -1028,12 +1032,17 @@ msgid "" "class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.eff.org/torchallenge/faq.html\">EFF site</a>." msgstr "" +"Podés encontrar más información acerca del estado legal de Tor en el <a " +"class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.eff.org/torchallenge/faq.html\">sitio de la FFE</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:195 msgid "" "Where can I find out more about the Tor Project, especially financial " "information?" msgstr "" +"¿Dónde puedo averiguar más acerca del Proyecto Tor, especialmente " +"información financiera?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:199 msgid "" @@ -1041,10 +1050,13 @@ msgid "" "href=\"https://www.torproject.org/about/financials.html.en\">financial " "statements, and its Form 990</a>." msgstr "" +"Acá están las <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/financials.html.en\">declaraciones " +"financieras, y el Formulario 990</a> del Proyecto Tor." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:205 msgid "Where does the Tor Project's money come from?" -msgstr "" +msgstr "¿De dónde viene el dinero para el Proyecto Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:209 msgid "" @@ -1052,6 +1064,9 @@ msgid "" " foundations, research institutions, private companies, and nearly 8,000 " "personal donations from people like you." msgstr "" +"Tor está soportado por agencias financieras del gobierno de Estados Unidos, " +"ONGs, fundaciones privadas, instituciones de investigación, compañías " +"privadas, y cerca de 8.000 donaciones personales de gente como vos." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:211 msgid "" @@ -1059,12 +1074,17 @@ msgid "" "href=\"https://www.torproject.org/about/sponsors.html.en\">https://www.torproject.org/about/sponsors</a>" " for more.)" msgstr "" +"(Mirá <a class=\"hyperlinks links single-link\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/sponsors.html.en\">https://www.torproject.org/about/sponsors</a>" +" por más.)" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:213 msgid "" "While we are grateful for this funding, we don't want the Tor Project to " "become too dependent on any single source." msgstr "" +"Mientras que estamos agradecidos por este financiamiento, no queremos que el" +" Proyecto Tor se vuelva demasiado dependiente de cualquier fuente única." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:215 msgid "" @@ -1072,6 +1092,10 @@ msgid "" " allows us to spend the money on the projects we think are most important " "and respond quickly to changing events." msgstr "" +"La financiación colectiva nos permite diversificar nuestra base de donantes " +"y es irrestricta -- nos permite invertir el dinero en los proyectos que " +"pensamos son los más importantes y responden rápidamente a eventos " +"cambiantes." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:217 msgid "" @@ -1079,15 +1103,18 @@ msgid "" "Tor Project's independence and ensure the sustainability of the products and" " services we provide." msgstr "" +"Y por lo tanto, te pedimos que nos apoyes financieramente, para incrementar " +"la independencia del Proyecto Tor y asegurar la sustentabilidad de los " +"productos y servicios que proveemos." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:223 msgid "" "How much money does the Tor Project spend annually, and what is it used for?" -msgstr "" +msgstr "¿Cuánto dinero gasta el Proyecto Tor anualmente, y para qué se usa?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:227 msgid "The Tor Project spends about $2.5 million annually." -msgstr "" +msgstr "El Proyecto Tor gasta anualmente cerca de USD 2,5 millones." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:229 #, php-format @@ -1095,32 +1122,42 @@ msgid "" "About 80% of the Tor Project's spending goes to staffing, mostly software " "engineers." msgstr "" +"Cerca del 80% de los gastos del Proyecto Tor van a la planta rentada, " +"mayormente ingenieros en sistemas." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:231 msgid "" "About 10% goes towards administrative costs such as accounting and legal " "costs and bank fees." msgstr "" +"Cerca del 10% se destina a costos administrativos, tales como honorarios " +"contables y legales, y aranceles bancarios." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:233 msgid "" "The remaining 10% is spent on travel, meetings and conferences, which are " "important for Tor because the Tor community is global." msgstr "" +"El 10% restante se gasta en viajes, encuentros y conferencias, los cuales " +"son importantes para Tor porque su comnidad es global." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:239 msgid "Is my donation tax-deductible?" -msgstr "" +msgstr "¿Mi donación es deducible de impuestos?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:243 msgid "" "If you pay taxes in the United States, your donation to Tor is tax " "deductible to the full extent required by law." msgstr "" +"Si pagás impuestos en los Estados Unidos, tu donación a Tor es deducible de " +"impuestos en la completa extensión requerida por ley." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:245 msgid "Following is information you may need for reporting purposes:" msgstr "" +"A continuación te damos la información que podés necesitar para propósitos " +"de reporte fiscal:" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:250 msgid "" @@ -1142,28 +1179,33 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:263 msgid "If I am not in the United States, can I still donate?" -msgstr "" +msgstr "Si no estoy en los Estados Unidos, ¿aún puedo donar?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:267 msgid "Yes, definitely." -msgstr "" +msgstr "Sí, definitivamente." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:269 msgid "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." msgstr "" +"Tu donación probablemente no sea deducible de impuestos (a menos que " +"tributes en ganancias percibidas en EE.UU.), pero apreciaríamos muchísimo tu" +" soporte." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:275 msgid "" "Can I donate to a specific project, or restrict my donation to a particular " "purpose?" msgstr "" +"¿Puedo donar a un proyecto específico, o restringir mi donación a un " +"propósito particular?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:279 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:559 msgid "No, sorry." -msgstr "" +msgstr "No, lo sentimos." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:281 msgid "" diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 7227630ee..714893ecc 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -1113,15 +1113,18 @@ msgid "" "Tor Project's independence and ensure the sustainability of the products and" " services we provide." msgstr "" +"E por isso, estamos pedindo para que você nos ajude a nos manter " +"financeiramente, para ampliar a independência do Projeto Tor e garantir a " +"sustentabilidade dos produtos e serviços que nós fornecemos. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:223 msgid "" "How much money does the Tor Project spend annually, and what is it used for?" -msgstr "" +msgstr "Quanto dinheiro o Projeto Tor gasta anualmente e para que é usado?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:227 msgid "The Tor Project spends about $2.5 million annually." -msgstr "" +msgstr "O Projeto Tor gasta cerca de $2,5 milhões de dólares anualmente. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:229 #, php-format @@ -1129,32 +1132,40 @@ msgid "" "About 80% of the Tor Project's spending goes to staffing, mostly software " "engineers." msgstr "" +"Cerca de 80% das despesas do Projeto Tor são gastos com equipe, " +"principalmente engenheiros de software. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:231 msgid "" "About 10% goes towards administrative costs such as accounting and legal " "costs and bank fees." msgstr "" +"Cerca de 10% vão para custos administrativos tais como custos legais e com " +"contabilidade e taxas bancárias. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:233 msgid "" "The remaining 10% is spent on travel, meetings and conferences, which are " "important for Tor because the Tor community is global." msgstr "" +"Os restantes 10% são gastos com viagens, encontros e conferências, que são " +"importantes para o Tor já que a comunidade Tor é global. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:239 msgid "Is my donation tax-deductible?" -msgstr "" +msgstr "A minha doação é dedutível de impostos?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:243 msgid "" "If you pay taxes in the United States, your donation to Tor is tax " "deductible to the full extent required by law." msgstr "" +"Se você paga impostos nos Estados Unidos, sua doação para o Tor é dedutível " +"em toda a extensão requerida pela lei. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:245 msgid "Following is information you may need for reporting purposes:" -msgstr "" +msgstr "A seguir estão informações que você pode precisar para declarar:" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:250 msgid "" @@ -1176,28 +1187,33 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:263 msgid "If I am not in the United States, can I still donate?" -msgstr "" +msgstr "Se eu não estou nos Estados Unidos, ainda assim posso doar?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:267 msgid "Yes, definitely." -msgstr "" +msgstr "Sim, definitivamente. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:269 msgid "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." msgstr "" +"A sua doação provavelmente não será dedutível de impostos (a menos que você " +"pague impostos sobre renda nos EUA), mas mesmo assim, gostaríamos muito do " +"seu apoio." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:275 msgid "" "Can I donate to a specific project, or restrict my donation to a particular " "purpose?" msgstr "" +"Posso doar para um projeto específico, ou restringir minha doação para uma " +"finalidade particular?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:279 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:559 msgid "No, sorry." -msgstr "" +msgstr "Não, desculpe." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:281 msgid "" @@ -1205,18 +1221,25 @@ msgid "" "used, we're required by the IRS to track and report separately on that " "money." msgstr "" +"Se aceitarmos uma doação de alguém que especificou como quer que a doação " +"seja usada, nos é exigido pela IRS rastrear e declarar separadamente esse " +"dinheiro. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:283 msgid "" "That would be a big administrative burden for a small organization, and we " "don't think it's a good idea for us." msgstr "" +"Esse seria um grande fardo para uma organização pequena, e nós não " +"acreditamos que seja uma boa ideia para nós. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:285 msgid "" "However, we would be very happy to hear your ideas and feedback about our " "work." msgstr "" +"Entretanto, nós ficaríamos muito felizes em ouvir suas ideias e avaliações " +"sobre nosso trabalho. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:287 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 10 Oct '18

10 Oct '18

commit c82ab1004f89eaace20d69b655d84788d138f47a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 10 22:45:20 2018 +0000 Update translations for donatepages-messagespot --- locale/es_AR/LC_MESSAGES/messages.po | 41 ++++++++++++++++++++++++++++++++++-- locale/pt_BR/LC_MESSAGES/messages.po | 33 +++++++++++++++++++++++++---- 2 files changed, 68 insertions(+), 6 deletions(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 764c69fc6..2abc78c0b 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -879,6 +879,8 @@ msgid "" "People also support Tor in non-financial ways, for example by running Tor " "relays to help carry traffic for other users." msgstr "" +"Otras personas también soportan Tor por medios no financieros, por ejemplo " +"corriendo relevos Tor para ayudar a transportar tráfico para otros usuarios." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:130 msgid "" @@ -886,10 +888,15 @@ msgid "" "anonymous, because the more people using Tor, the harder it is to identify " "any single individual." msgstr "" +"Además, todo aquel que use Tor está ayudando a mantener a otros usuarios " +"seguros y anónimos, porque a mayor cantidad de personas usando Tor, más " +"difícil es identificar a cualquier individuo en particular." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:136 msgid "How does the Tor software work to protect people's anonymity?" msgstr "" +"¿Cómo trabaja el conjunto de programas Tor para proteger el anonimato de las" +" personas?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:140 msgid "" @@ -897,17 +904,22 @@ msgid "" "which is a distributed network of relays run by volunteers all around the " "world." msgstr "" +"Tor te protege al pivotar tus comunicaciones por la red de Tor, la cual " +"consta de relevos corridos por voluntarios distribuidos alrededor del mundo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:142 msgid "" "If someone is watching your internet connection, Tor prevents them from " "finding out what sites you are visiting." msgstr "" +"Si alguien está vigilando tu conexión a Internet, Tor evita que averigüe qué" +" sitios estás visitando." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:144 msgid "" "It also prevents sites you visit from finding out where you're located." msgstr "" +"También evita que los sitios que visitás averigüen dónde estás ubicado." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:146 msgid "" @@ -915,12 +927,18 @@ msgid "" "target=\"_blank\" " "href=\"https://www.torproject.org/about/overview.html.en\">overview page." msgstr "" +"Podés leer más acerca de cómo funciona Tor en nuestra <a class=\"hyperlinks " +"links\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/overview.html.en\">página " +"introductoria." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:153 msgid "" "I would like to know more about how Tor works, what hidden services are, or " "how to run a relay." msgstr "" +"Me gustaría saber más acerca de cómo funciona Tor, qué son servicios onion, " +"o cómo correr un relevo." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:157 msgid "" @@ -928,10 +946,13 @@ msgid "" "href=\"https://www.torproject.org/docs/faq.html.en\">This Tor Project " "FAQ</a> has answers to all those questions, and more." msgstr "" +"<a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/docs/faq.html.en\">Estas PMF del Proyecto " +"Tor</a> tienen respuestas a todas esas preguntas, y más." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:163 msgid "Does the Tor software work?" -msgstr "" +msgstr "¿El conjunto de programas de Tor funciona?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:167 msgid "" @@ -939,12 +960,18 @@ msgid "" "does a better job of keeping you safely anonymous than other options such as" " VPNs, proxychains, or browser \"private browsing\" modes." msgstr "" +"Creemos que Tor es la mejor solución disponible al día de hoy, y sabemos que" +" hace un mejor papel al mantenerte anónimo con seguridad que otras opciones " +"tales como RPVs, cadenas de proxies, o modos de \"navegación privada\" de " +"los navegadores." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:169 msgid "" "We know that both the Russian government and the NSA have tried in the past " "to crack Tor, and failed." msgstr "" +"Sabemos que tanto el gobierno Ruso como la NSA de EE.UU. han tratado de " +"vulnerar Tor en el pasado, y fallaron." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:171 msgid "" @@ -955,22 +982,32 @@ msgid "" "book Data and Goliath, security expert Bruce Schneier wrote \"The current " "best tool to protect your anonymity when browsing the web is Tor.\"" msgstr "" +"La Fundación Frontera Electrónica dice que Tor ofrece <a class=\"hyperlinks " +"links\" target=\"_blank\" href=\"https://www.eff.org/deeplinks/2014/07/7" +"-things-you-should-know-about-tor\">uno de los conjuntos de programas de " +"anonimato más fuerte que existe</a>, y en su libro \"Data and Goliath\", el " +"experto en seguridad Bruce Schneier escribió: \"Al momento, la mejor " +"herramienta para proteger tu anonimato cuando navegués la web, es Tor\"." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:177 msgid "Is what Tor does legal? Can I get in trouble for using it?" -msgstr "" +msgstr "¿Lo que hace Tor es legal? ¿Puedo meterme en problemas por usarlo?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:181 msgid "" "Downloading Tor Browser or using the Tor network is legal in nearly every " "country." msgstr "" +"Descargar el navegador Tor o usar la red de Tor es legal en prácticamente " +"todos los países." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:183 msgid "" "A few web sites occasionally block Tor, but that doesn't mean you're doing " "anything wrong." msgstr "" +"Unos pocos sitios web ocasionalmente bloquean Tor, pero eso no significa que" +" estés haciendo algo equivocado." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:185 msgid "" diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index af8fe75de..7227630ee 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -547,8 +547,8 @@ msgid "" "A required field is missing from the form. Please reload the page and try " "again." msgstr "" -"Um campo requerido do formulário não está preenchido. Por favor recarregue a" -" página e tente novamente. " +"Um campo requerido do formulário não está preenchido. Por favor, recarregue " +"a página e tente novamente. " #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:473 msgid "There was a problem submitting your request to the server:<br>" @@ -562,7 +562,7 @@ msgstr "A validação falhou" #. javascript. #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:483 msgid "__field_name__ must be filled out." -msgstr "__field_name__ deve ser preenchido. " +msgstr "__campo_nome__ deve ser preenchido. " #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:488 msgid "This field is required" @@ -1017,6 +1017,8 @@ msgid "" "A few web sites occasionally block Tor, but that doesn't mean you're doing " "anything wrong." msgstr "" +"Alguns web sites ocasionalmente bloqueiam Tor, mas isso não significa que " +"você está fazendo algo de errado. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:185 msgid "" @@ -1024,12 +1026,16 @@ msgid "" "using Tor in the past, or that they misunderstand what Tor is and how it " "works (we’re working to change this)." msgstr "" +"Geralmente significa que o site teve dificuldades no passado com visitantes " +"que estivam usando Tor, ou que não compreenderam o que o Tor é e como " +"funciona (nós estamos trabalhando para mudar isso)." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:187 msgid "" "But it is not illegal to use Tor, and you shouldn't get in trouble for doing" " it." msgstr "" +"Mas não é ilegal usar Tor e você não deveria ter problemas por usá-lo. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:189 msgid "" @@ -1037,12 +1043,17 @@ msgid "" "class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.eff.org/torchallenge/faq.html\">EFF site</a>." msgstr "" +"Você pode achar mais informação sobre o status legal do Tor no <a " +"class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.eff.org/torchallenge/faq.html\">site da EFF</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:195 msgid "" "Where can I find out more about the Tor Project, especially financial " "information?" msgstr "" +"Onde eu posso saber mais sobre o Projeto Tor, especialmente informações " +"financeiras?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:199 msgid "" @@ -1050,10 +1061,13 @@ msgid "" "href=\"https://www.torproject.org/about/financials.html.en\">financial " "statements, and its Form 990</a>." msgstr "" +"Aqui estão as <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/financials.html.en\">declarações " +"financeiras e o Formulário 990</a>do Projeto Tor. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:205 msgid "Where does the Tor Project's money come from?" -msgstr "" +msgstr "De onde vem o dinheiro do Projeto Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:209 msgid "" @@ -1061,6 +1075,9 @@ msgid "" " foundations, research institutions, private companies, and nearly 8,000 " "personal donations from people like you." msgstr "" +"O Tor é apoiado por agências de financiamento do governo dos Estados Unidos," +" ONGs, fundações privadas, instituições de pesquisa, empresas privadas, e " +"quase 8.000 doações pessoais de pessoas como você. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:211 msgid "" @@ -1068,12 +1085,17 @@ msgid "" "href=\"https://www.torproject.org/about/sponsors.html.en\">https://www.torproject.org/about/sponsors</a>" " for more.)" msgstr "" +"(Veja <a class=\"hyperlinks links single-link\" target=\"_blank\" " +"href=\"https://www.torproject.org/about/sponsors.html.en\">https://www.torproject.org/about/sponsors</a>" +" para mais informações.)" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:213 msgid "" "While we are grateful for this funding, we don't want the Tor Project to " "become too dependent on any single source." msgstr "" +"Ainda que sejamos gratos por esses financiamentos, não queremos que o " +"Projeto Tor se torne dependente demais de nenhuma fonte específica. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:215 msgid "" @@ -1081,6 +1103,9 @@ msgid "" " allows us to spend the money on the projects we think are most important " "and respond quickly to changing events." msgstr "" +"Financiamentos coletivos nos permitem diversificar nossa base de doadores e " +"são irrestritos - nos permitem gastar o dinheiro nos projetos que pensamos " +"ser mais importantes e ter uma resposta rápida à mudanças de contexto. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:217 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 10 Oct '18

10 Oct '18

commit 15b1d86485a5b0b1740cd95c800fe6b1d60df412 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 10 22:15:20 2018 +0000 Update translations for donatepages-messagespot --- locale/es_AR/LC_MESSAGES/messages.po | 11 +++++++++-- locale/pt_BR/LC_MESSAGES/messages.po | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 817b1f94e..764c69fc6 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -850,11 +850,11 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:120 msgid "What kinds of people support Tor?" -msgstr "" +msgstr "¿Qué clases de personas soportan Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:124 msgid "All kinds of people." -msgstr "" +msgstr "Toda clase de personas." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:126 msgid "" @@ -866,6 +866,13 @@ msgid "" "Federal Foreign Office of Germany, the U.S. Naval Research Laboratory, " "Omidyar Network, SRI International, and Radio Free Asia." msgstr "" +"Miles de individuos han donado para soportar el Proyecto Tor, y también " +"hemos recibido financiamiento por parte de un amplio rango de " +"organizaciones, incluyendo Google, la Fundación Ford, la Fundación Knight, " +"la Fundación Frontera Electrónica, Guardianes de los Derechos Humanos, la " +"Agencia Sueca de Cooperación para el Desarrollo Internacional, la Oficina " +"Federal de Asuntos Extranjeros de Alemania, el Laboratorio de Investigación " +"Naval de EE.UU., la Red Omidyar, SRI Internacional, y Radio Asia Libre." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:128 msgid "" diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 8723b06fb..af8fe75de 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -1002,12 +1002,15 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:177 msgid "Is what Tor does legal? Can I get in trouble for using it?" msgstr "" +"O que o Tor faz está dentro da lei? Eu posso ter problemas por estar usando?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:181 msgid "" "Downloading Tor Browser or using the Tor network is legal in nearly every " "country." msgstr "" +"Fazer o download do Navegador Tor ou usar a rede Tor é legal em quase todos " +"os países. " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:183 msgid ""

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit 717507e3bb38d11814f4128ed7ccde676ab2aa89 Merge: 119df9c1c e8c7d7d3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 10 17:12:11 2018 -0400 Merge remote-tracking branch 'tor-github/pr/392' into maint-0.2.9 .travis.yml | 49 ++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 21 deletions(-)

1 0

[tor/maint-0.3.3] Travis: use the Homebrew addon for xz and zstd
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit 49ffc035729f02fa6e6dc49bc24807d8e8503f2b Author: teor <teor(a)torproject.org> Date: Tue Sep 18 19:36:28 2018 +1000 Travis: use the Homebrew addon for xz and zstd xz and zstd were added as optional dependencies in 0.3.1.1-alpha. Implements ticket 27738. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 878175f66..68842419a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,6 +140,8 @@ addons: #- zlib ## Optional dependencies - libscrypt + - xz + - zstd ## Required build dependencies ## Tor needs pkg-config to find some dependencies at build time - pkg-config @@ -162,8 +164,6 @@ before_install: install: ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zstd; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features

1 0

[tor/maint-0.3.3] Travis: use the Homebrew addon
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit e8c7d7d3be2a281954294fe5738dfd2aa72357e7 Author: teor <teor(a)torproject.org> Date: Tue Sep 18 19:26:54 2018 +1000 Travis: use the Homebrew addon Use the Travis Homebrew addon to install packages on macOS. The package list is the same, but the Homebrew addon does not do a `brew update` by default. This makes builds faster, at the cost of using slightly older packages. Implements ticket 27738. --- .travis.yml | 49 ++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06db583e1..939f4f4e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,55 +85,62 @@ sudo: ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty -## (Linux only) Download our dependencies +## Download our dependencies addons: + ## (Linux only) apt: packages: ## Required dependencies - libevent-dev + ## Ubuntu comes with OpenSSL by default + #- libssl-dev - zlib1g-dev ## Optional dependencies - libcap-dev - libscrypt-dev - libseccomp-dev - ## Conditional dependencies + ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc - docbook-xsl - docbook-xml - xmlto + ## (OSX only) + homebrew: + packages: + ## Required dependencies + - libevent + ## The OSX version of OpenSSL is way too old + - openssl + ## OSX comes with zlib by default + ## to use a newer zlib, pass the keg path to configure (like OpenSSL) + #- zlib + ## Optional dependencies + - libscrypt + ## Required build dependencies + ## Tor needs pkg-config to find some dependencies at build time + - pkg-config + ## Optional build dependencies + - ccache + ## Conditional build dependencies + ## Always installed, because manual brew installs are hard to get right + - asciidoc + - xmlto ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version ## Default is Xcode 9.4 on macOS 10.13 as of August 2018 #osx_image: xcode9.4 -before_install: - ## If we're on OSX, homebrew usually needs to be updated first - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - ## We might be upgrading some useless packages, but that's better than missing an upgrade - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi - install: - ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi - ## macOS comes with zlib by default, so the homebrew install is keg-only - # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi - ## If we're on OSX also install the optional dependencies - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi - ## If we're on OSX, and using asciidoc, install asciidoc - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi ## ## Finally, list installed package versions diff --git a/changes/ticket27738 b/changes/ticket27738 new file mode 100644 index 000000000..f23bfb019 --- /dev/null +++ b/changes/ticket27738 @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - Use the Travis Homebrew addon to install packages on macOS. The package + list is the same, but the Homebrew addon does not do a `brew update` by + default. Implements ticket 27738.

1 0

[tor/maint-0.3.3] Merge branch 'bug27738-029' into bug27738-032
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit e81001a0884b389a3218247f68b19facdf474f2c Merge: 0971b3ce4 e8c7d7d3b Author: teor <teor(a)torproject.org> Date: Tue Sep 18 19:34:53 2018 +1000 Merge branch 'bug27738-029' into bug27738-032 Resolve conflicts due to modified comments, and deleted lines. .travis.yml | 47 ++++++++++++++++++++++++++++------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 19 deletions(-) diff --cc .travis.yml index 82eeecb58,939f4f4e9..878175f66 --- a/.travis.yml +++ b/.travis.yml @@@ -114,12 -97,9 +117,12 @@@ addons - zlib1g-dev ## Optional dependencies - libcap-dev + - liblzma-dev - libscrypt-dev - libseccomp-dev + ## zstd doesn't exist in Ubuntu Trusty + #- libzstd - ## Conditional dependencies + ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc - docbook-xsl @@@ -131,44 -132,16 +155,29 @@@ ## Default is Xcode 9.4 on macOS 10.13 as of August 2018 #osx_image: xcode9.4 +before_install: - ## If we're on OSX, homebrew usually needs to be updated first - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - ## We might be upgrading some useless packages, but that's better than missing an upgrade - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi + ## Create empty rust directories for non-Rust builds, so caching succeeds + - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi + install: - ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi - ## macOS comes with zlib by default, so the homebrew install is keg-only - # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi - ## If we're on OSX also install the optional dependencies - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zstd; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi - ## If we're on OSX, and using asciidoc, install asciidoc - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi + ## If we're using Rust, download rustup + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi + ## If we're testing rust builds in offline-mode, then set up our vendored dependencies + - if [[ "$RUST_DEPENDENCIES" == "true" ]]; then export RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi

1 0

[tor/maint-0.2.9] Travis: use the Homebrew addon
by nickm＠torproject.org 10 Oct '18

10 Oct '18

commit e8c7d7d3be2a281954294fe5738dfd2aa72357e7 Author: teor <teor(a)torproject.org> Date: Tue Sep 18 19:26:54 2018 +1000 Travis: use the Homebrew addon Use the Travis Homebrew addon to install packages on macOS. The package list is the same, but the Homebrew addon does not do a `brew update` by default. This makes builds faster, at the cost of using slightly older packages. Implements ticket 27738. --- .travis.yml | 49 ++++++++++++++++++++++++++++--------------------- changes/ticket27738 | 4 ++++ 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06db583e1..939f4f4e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,55 +85,62 @@ sudo: ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty -## (Linux only) Download our dependencies +## Download our dependencies addons: + ## (Linux only) apt: packages: ## Required dependencies - libevent-dev + ## Ubuntu comes with OpenSSL by default + #- libssl-dev - zlib1g-dev ## Optional dependencies - libcap-dev - libscrypt-dev - libseccomp-dev - ## Conditional dependencies + ## Conditional build dependencies ## Always installed, so we don't need sudo - asciidoc - docbook-xsl - docbook-xml - xmlto + ## (OSX only) + homebrew: + packages: + ## Required dependencies + - libevent + ## The OSX version of OpenSSL is way too old + - openssl + ## OSX comes with zlib by default + ## to use a newer zlib, pass the keg path to configure (like OpenSSL) + #- zlib + ## Optional dependencies + - libscrypt + ## Required build dependencies + ## Tor needs pkg-config to find some dependencies at build time + - pkg-config + ## Optional build dependencies + - ccache + ## Conditional build dependencies + ## Always installed, because manual brew installs are hard to get right + - asciidoc + - xmlto ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version ## Default is Xcode 9.4 on macOS 10.13 as of August 2018 #osx_image: xcode9.4 -before_install: - ## If we're on OSX, homebrew usually needs to be updated first - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - ## We might be upgrading some useless packages, but that's better than missing an upgrade - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi - install: - ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi - ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi - ## macOS comes with zlib by default, so the homebrew install is keg-only - # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi - ## If we're on OSX also install the optional dependencies - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi - ## If we're on OSX, and using asciidoc, install asciidoc - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi ## ## Finally, list installed package versions diff --git a/changes/ticket27738 b/changes/ticket27738 new file mode 100644 index 000000000..f23bfb019 --- /dev/null +++ b/changes/ticket27738 @@ -0,0 +1,4 @@ + o Minor features (continuous integration): + - Use the Travis Homebrew addon to install packages on macOS. The package + list is the same, but the Homebrew addon does not do a `brew update` by + default. Implements ticket 27738.

1 0