date:20190118

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-01-18 Thread translation

commit 05074b796b1ede03754dfd6df4221778c7781f3a
Author: Translation commit bot 
Date:   Sat Jan 19 07:19:22 2019 +

Update translations for tpo-web
---
 contents+es.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 06e5d36c8..684d9fb9f 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -112,11 +112,11 @@ msgstr "Prensa"
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Blog"
-msgstr ""
+msgstr "Blog"
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Newsletter"
-msgstr ""
+msgstr "Gacetilla"
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Contact"
@@ -1862,7 +1862,7 @@ msgstr ""
 #: https//torproject.org/about/sponsors/torfox/
 #: (content/about/sponsors/torfox/contents+en.lrsponsor.name)
 msgid "Torfox"
-msgstr ""
+msgstr "Torfox"
 
 #: https//torproject.org/about/sponsors/USSD-DHRL/
 #: (content/about/sponsors/USSD-DHRL/contents+en.lrsponsor.name)
@@ -1890,7 +1890,7 @@ msgstr ""
 
 #: templates/about.html:7 templates/homepage.html:8 templates/layout.html:7
 msgid "Tor Project"
-msgstr "Proyecto Tor"
+msgstr "Tor Project"
 
 #: templates/download.html:7
 msgid "Get connected"
@@ -1936,7 +1936,7 @@ msgstr ""
 
 #: templates/footer.html:19
 msgid "Our mission:"
-msgstr "Nuestra misiÃ³n:"
+msgstr "Nuestra misiÃ³n"
 
 #: templates/footer.html:19
 msgid ""
@@ -1964,7 +1964,7 @@ msgid ""
 "found in our "
 msgstr ""
 "Se pueden encontrar, la marca registrada, las notas de derechos de autor, y "
-"las reglas de uso por terceras partes, en nuestra "
+"las reglas de uso por terceras partes, en nuestra"
 
 #: templates/hero-home.html:2
 msgid "Browse Privately."
@@ -2024,7 +2024,7 @@ msgstr ""
 
 #: templates/home.html:63
 msgid "Learn more"
-msgstr ""
+msgstr "Leer mÃ¡s"
 
 #: templates/home.html:81
 msgid "BROWSE FREELY"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] typo

2019-01-18 Thread emmapeel

commit b318b4f6d013f3add8848aa10519ae6b55513c58
Author: emma peel 
Date:   Sat Jan 19 07:46:03 2019 +0100

typo
---
 content/about/sponsors/mdf/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/sponsors/mdf/contents.lr 
b/content/about/sponsors/mdf/contents.lr
index 4eced17..b661c2f 100644
--- a/content/about/sponsors/mdf/contents.lr
+++ b/content/about/sponsors/mdf/contents.lr
@@ -4,7 +4,7 @@ active: True
 ---
 time: 2016 - 2018
 ---
-name: Media Democracy Found
+name: Media Democracy Fund
 ---
 logo: /static/images/sponsors/mdf.png
 ---

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-01-18 Thread translation

commit d252c693acb91791db8a827c86f38806d3884589
Author: Translation commit bot 
Date:   Sat Jan 19 06:49:31 2019 +

Update translations for tpo-web
---
 contents+de.po| 12 ++-
 contents+es.po| 63 +++
 contents+fa.po| 12 ++-
 contents+fr.po| 12 ++-
 contents+pt-BR.po | 12 ++-
 contents+ru.po| 12 ++-
 contents+tr.po| 12 ++-
 contents+zh-CN.po | 12 ++-
 contents.pot  | 14 -
 9 files changed, 126 insertions(+), 35 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index 37a25c8c5..9aa1a9b9d 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 16:50+CET\n"
+"POT-Creation-Date: 2019-01-19 07:40+CET\n"
 "PO-Revision-Date: 2019-01-10 12:38+\n"
 "Last-Translator: Oliver Parczyk, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/94225/de/)\n"
@@ -2004,6 +2004,16 @@ msgid ""
 "that youâre using Tor."
 msgstr ""
 
+#: templates/home.html:45
+msgid "RESIST FINGERPRINTING"
+msgstr ""
+
+#: templates/home.html:46
+msgid ""
+"Tor aims to make all users look the same making it difficult for you to be "
+"fingerprinted based on your browser and device information."
+msgstr ""
+
 #: templates/home.html:62
 msgid "MULTI-LAYERED ENCRYPTION"
 msgstr ""
diff --git a/contents+es.po b/contents+es.po
index a7385424d..06e5d36c8 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1,7 +1,6 @@
 # Translators:
 # strel, 2019
 # Edward Navarro, 2019
-# Antonio de la Piedra , 2019
 # erinm, 2019
 # Emma Peel, 2019
 # 
@@ -9,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 16:50+CET\n"
+"POT-Creation-Date: 2019-01-19 07:40+CET\n"
 "PO-Revision-Date: 2019-01-10 12:38+\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/94225/es/)\n"
@@ -21,7 +20,7 @@ msgstr ""
 
 #: https//torproject.org/ (content/contents+en.lrpage.title)
 msgid "Anonymity Online"
-msgstr "Anonimato en lÃnea"
+msgstr "Anonimato online"
 
 #: https//torproject.org/ (content/contents+en.lrpage.section)
 msgid "home"
@@ -29,7 +28,7 @@ msgstr "pÃ¡gina principal"
 
 #: https//torproject.org/ (content/contents+en.lrpage.body)
 msgid "##ABOUT US##"
-msgstr ""
+msgstr "##ACERCA DE NOSOTROS##"
 
 #: https//torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
@@ -53,7 +52,7 @@ msgstr "contacta"
 #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.section)
 #: https//torproject.org/press/ (content/press/contents+en.lrpage.section)
 msgid "the tor project"
-msgstr ""
+msgstr "el tor project"
 
 #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.body)
 msgid ""
@@ -71,7 +70,7 @@ msgstr ""
 #: https//torproject.org/download/ (content/download/contents+en.lrpage.title)
 #: (content/download/contents+en.lrpage.section)
 msgid "download"
-msgstr "descargar"
+msgstr "Descargar"
 
 #: https//torproject.org/download/ (content/download/contents+en.lrpage.body)
 msgid "Download Tor Browser"
@@ -97,19 +96,19 @@ msgstr "historia"
 #: https//torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrpage.section)
 msgid "about"
-msgstr "acerca-de"
+msgstr "acerca de"
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "About"
-msgstr ""
+msgstr "Acerca de"
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Documentation"
-msgstr ""
+msgstr "DocumentaciÃ³n"
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Press"
-msgstr ""
+msgstr "Prensa"
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Blog"
@@ -121,7 +120,7 @@ msgstr ""
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.body)
 msgid "Contact"
-msgstr ""
+msgstr "Contacta"
 
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.body)
 msgid ""
@@ -1616,7 +1615,7 @@ msgstr ""
 #: https//torproject.org/about/sponsors/internews-eu/
 #: (content/about/sponsors/internews-eu/contents+en.lrsponsor.name)
 msgid "Internews Europe"
-msgstr ""
+msgstr "Internews Europe"
 
 #: https//torproject.org/about/sponsors/mdf/
 #: (content/about/sponsors/mdf/contents+en.lrsponsor.name)
@@ -1635,7 +1634,7 @@ msgstr ""
 #: https//torproject.org/about/sponsors/mozilla/
 #: (content/about/sponsors/mozilla/contents+en.lrsponsor.name)
 msgid "Mozilla"
-msgstr ""
+msgstr "Mozilla"
 
 #: https//torproject.org/about/sponsors/mozilla/
 #: (content/about/sponsors/mozilla/contents+en.lrsponsor.description)
@@ -1655,7 +1654,7 @@ msgstr ""
 #: https//torproject.org/about/sponsors/ncf/
 #: (content/about/sponsors/ncf/contents+en.lrsponsor.name)
 msgid "National Christian Foundation"
-msgstr ""
+msgstr

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-01-18 Thread translation

commit ca51235f87233c62dae9c48796352b26f687426b
Author: Translation commit bot 
Date:   Sat Jan 19 06:49:36 2019 +

Update translations for tpo-web_completed
---
 contents.pot | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/contents.pot b/contents.pot
index cbf5b4c7c..0701a392b 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 16:50+CET\n"
+"POT-Creation-Date: 2019-01-19 07:40+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -2356,6 +2356,18 @@ msgstr ""
 "websites you visit. All anyone monitoring your browsing habits can see is "
 "that youâre using Tor."
 
+#: templates/home.html:45
+msgid "RESIST FINGERPRINTING"
+msgstr "RESIST FINGERPRINTING"
+
+#: templates/home.html:46
+msgid ""
+"Tor aims to make all users look the same making it difficult for you to be "
+"fingerprinted based on your browser and device information."
+msgstr ""
+"Tor aims to make all users look the same making it difficult for you to be "
+"fingerprinted based on your browser and device information."
+
 #: templates/home.html:62
 msgid "MULTI-LAYERED ENCRYPTION"
 msgstr "MULTI-LAYERED ENCRYPTION"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] better strings to translate, template i18n

2019-01-18 Thread emmapeel

commit ba0008a57c45c8cdf39ec703eec7385097664f84
Author: emma peel 
Date:   Sat Jan 19 07:40:08 2019 +0100

better strings to translate, template i18n
---
 content/about/sponsors/DARPA-nrl/contents.lr | 10 ++
 content/about/sponsors/USSD-DHRL-harvard/contents.lr |  5 +
 content/about/sponsors/USSD-DHRL/contents.lr |  5 +
 models/people.ini|  1 -
 models/sponsor.ini   |  2 ++
 templates/home.html  |  4 ++--
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/content/about/sponsors/DARPA-nrl/contents.lr 
b/content/about/sponsors/DARPA-nrl/contents.lr
index f3b0acc..fa799aa 100644
--- a/content/about/sponsors/DARPA-nrl/contents.lr
+++ b/content/about/sponsors/DARPA-nrl/contents.lr
@@ -4,7 +4,7 @@ active: False
 ---
 time: 2001 - 2006
 ---
-name: DARPA and ONR via Naval Research Laboratory 
+name: DARPA and ONR via Naval Research Laboratory
 ---
 logo: /static/images/sponsors/darpa.png
 ---
@@ -12,10 +12,4 @@ link: https://www.darpa.mil/program/extreme-ddos-defense
 ---
 description:
 
-DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of 
opportunity
-to improve resilience against DDoS attacks and aims to thwart DDoS attacks by:
-(1) dispersing cyber assets (physically and/or logically) to complicate 
adversarial
-targeting; (2) disguising the characteristics and behaviors of those assets 
through
-networked maneuver to confuse or deceive the adversary; and (3) using adaptive
-mitigation techniques on endpoints (e.g., mission-critical servers) to blunt 
the
-effects of attacks that succeed in penetrating other defensive measures.
+DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of 
opportunity to improve resilience against DDoS attacks and aims to thwart DDoS 
attacks by: (1) dispersing cyber assets (physically and/or logically) to 
complicate adversarial targeting; (2) disguising the characteristics and 
behaviors of those assets through networked maneuver to confuse or deceive the 
adversary; and (3) using adaptive mitigation techniques on endpoints (e.g., 
mission-critical servers) to blunt the effects of attacks that succeed in 
penetrating other defensive measures.
diff --git a/content/about/sponsors/USSD-DHRL-harvard/contents.lr 
b/content/about/sponsors/USSD-DHRL-harvard/contents.lr
index 10b40d5..4d43285 100644
--- a/content/about/sponsors/USSD-DHRL-harvard/contents.lr
+++ b/content/about/sponsors/USSD-DHRL-harvard/contents.lr
@@ -12,7 +12,4 @@ link: https://www.state.gov/j/drl/
 ---
 description:
 
-The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to 
promote
-[democracy](http://www.state.gov/j/drl/democ/), protect [human 
rights](http://www.state.gov/j/drl/hr/)
-and [international religious freedom](http://www.state.gov/j/drl/irf/), and
-advance [labor rights](http://www.state.gov/j/drl/ila/index.htm) globally.
+The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to 
promote [democracy](http://www.state.gov/j/drl/democ/), protect [human 
rights](http://www.state.gov/j/drl/hr/) and [international religious 
freedom](http://www.state.gov/j/drl/irf/), and advance [labor 
rights](http://www.state.gov/j/drl/ila/index.htm) globally.
diff --git a/content/about/sponsors/USSD-DHRL/contents.lr 
b/content/about/sponsors/USSD-DHRL/contents.lr
index 014919e..0d19722 100644
--- a/content/about/sponsors/USSD-DHRL/contents.lr
+++ b/content/about/sponsors/USSD-DHRL/contents.lr
@@ -12,7 +12,4 @@ link: https://www.state.gov/j/drl/
 ---
 description:
 
-The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to 
promote
-[democracy](http://www.state.gov/j/drl/democ/), protect [human 
rights](http://www.state.gov/j/drl/hr/)
-and [international religious freedom](http://www.state.gov/j/drl/irf/), and
-advance [labor rights](http://www.state.gov/j/drl/ila/index.htm) globally.
+The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to 
promote [democracy](http://www.state.gov/j/drl/democ/), protect [human 
rights](http://www.state.gov/j/drl/hr/) and [international religious 
freedom](http://www.state.gov/j/drl/irf/), and advance [labor 
rights](http://www.state.gov/j/drl/ila/index.htm) globally.
diff --git a/models/people.ini b/models/people.ini
index 2f860be..7928c32 100644
--- a/models/people.ini
+++ b/models/people.ini
@@ -11,7 +11,6 @@ translate = True
 [fields.section]
 label = Section
 type = string
-translate = True
 
 [fields.body]
 label = Body
diff --git a/models/sponsor.ini b/models/sponsor.ini
index 312475d..2ec323c 100644
--- a/models/sponsor.ini
+++ b/models/sponsor.ini
@@ -6,6 +6,7 @@ hidden = yes
 [fields.name]
 label = Name
 type = string
+translate = True
 
 [fields.link]
 label = Link
@@ -18,6 +19,7 @@ type = boolean
 [fields.description]
 label = Description
 type = markdown
+translate = True
 
 [fields.logo]
 label = Logo
diff --git

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-18 Thread translation

commit 61dce40a6d3f509a6a6efee135dde8b7690ffc32
Author: Translation commit bot 
Date:   Sat Jan 19 06:16:10 2019 +

Update translations for tails-misc
---
 uk.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uk.po b/uk.po
index 06b0ce940..94b224d1c 100644
--- a/uk.po
+++ b/uk.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-19 06:12+\n"
+"Last-Translator: ÐÐ½Ð´ÑÑÐ¹ ÐÐ°Ð½Ð´ÑÑÐ° \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed

2019-01-18 Thread translation

commit 99f15c63537e740d69e987b1dfa79d7c78ddb974
Author: Translation commit bot 
Date:   Fri Jan 18 22:45:31 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/pt_PT/LC_MESSAGES/messages.po | 2036 ++
 1 file changed, 2036 insertions(+)

diff --git a/locale/pt_PT/LC_MESSAGES/messages.po 
b/locale/pt_PT/LC_MESSAGES/messages.po
new file mode 100644
index 0..9f177f0d6
--- /dev/null
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -0,0 +1,2036 @@
+# Translators:
+# erinm, 2018
+# Manuela Silva , 2018
+# MS , 2018
+# alfalb_mansil, 2019
+# Rui , 2019
+# 
+msgid ""
+msgstr ""
+"Last-Translator: Rui , 2019\n"
+"Language-Team: Portuguese (Portugal) 
(https://www.transifex.com/otf/teams/1519/pt_PT/)\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34
+msgid "Processing Donation - Tor"
+msgstr "Processamento do Donativo - Tor"
+
+#: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:44
+msgid "Processing Donation. Please Wait..."
+msgstr "A processar o seu donativo - Por favor aguarde..."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34
+msgid "Tor Privacy Policy"
+msgstr "Tor - PolÃtica de Privacidade"
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:44
+msgid "Donor privacy policy"
+msgstr "politica de privacidade do doador"
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:58
+msgid ""
+"The Tor Project respects donor privacy and welcomes anonymous donations."
+msgstr ""
+"O Projeto Tor respeita a privacidade do seus doadores e aceita donativos "
+"anÃ³nimos."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:60
+msgid ""
+"If being anonymous is important to you, the best way to preserve your "
+"anonymity is by donating using a method that doesn't disclose your personal "
+"information."
+msgstr ""
+"Se o anonimato Ã© importante para si, a melhor maneira de preservar o seu "
+"anonimato Ã© fazer um donativo utilizando um mÃ©todo que nÃ£o divulgue as 
suas "
+"informaÃ§Ãµes pessoais."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:65
+msgid ""
+"If you provide personal information as part of the donation process, it may "
+"be collected and retained by third-party service providers and/or the Tor "
+"Project, as described below."
+msgstr ""
+"Se fornecer informaÃ§Ãµes pessoais, como parte do processo de doaÃ§Ã£o, estas 
"
+"poderÃ£o ser recolhidas e retidas por fornecedores de serviÃ§os terceiros 
e/ou"
+" pelo Projeto Tor, conforme descrito abaixo."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:67
+msgid ""
+"The Tor Project has very little influence over how third-party service "
+"providers, such as PayPal, may collect and use your information."
+msgstr ""
+"O Projeto Tor tem pouca influÃªncia sobre como os fornecedores de serviÃ§os 
de"
+" pagamentos terceiros, como o PayPal, que podem recolher e usar as suas "
+"informaÃ§Ãµes."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:69
+msgid ""
+"We recommend you familiarize yourself with their https://www.paypal.com/webapps/mpp/ua;
+"/privacy-full\">policies, especially if you have privacy concerns."
+msgstr ""
+"Recomendamos que se familiarize com as https://www.paypal.com/webapps/mpp/ua/privacy-;
+"full\">termos de privacidade da PayPal, especialmente se tiver "
+"preocupaÃ§Ãµes com a sua privacidade."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:74
+msgid ""
+"When you donate to the Tor Project, depending what mechanism you use, we may"
+" learn your name, the amount you donated, your email address, phone number "
+"and/or mailing address, as well as any other information you provide."
+msgstr ""
+"Quando faz um donativo para o Projeto Tor, dependendo do mecanismo que "
+"utiliza, poderemos recolher o seu nome, o valor do donativo, o seu endereÃ§o "
+"de e-mail, o nÃºmero de telefone e/ou o seu endereÃ§o de correspondÃªncia, 
bem "
+"como qualquer outra informaÃ§Ã£o que forneÃ§a."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:76
+msgid ""
+"We may also learn incidental data such as the date and time of your "
+"donation."
+msgstr ""
+"NÃ³s tambÃ©m podemos recolher alguns dados incidentais, como a data e a hora "
+"em que fez o donativo."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:78
+msgid ""
+"The Tor Project will never have access to your financial data, such as your "
+"credit card information.We aim to be careful with your information."
+msgstr ""
+"O

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-18 Thread translation

commit 1bfe1f603b05c708926f188e15408d735cea44a6
Author: Translation commit bot 
Date:   Fri Jan 18 22:45:25 2019 +

Update translations for donatepages-messagespot
---
 locale/pt_PT/LC_MESSAGES/messages.po | 103 +--
 1 file changed, 85 insertions(+), 18 deletions(-)

diff --git a/locale/pt_PT/LC_MESSAGES/messages.po 
b/locale/pt_PT/LC_MESSAGES/messages.po
index 18658285d..9f177f0d6 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -115,6 +115,8 @@ msgstr ""
 msgid ""
 "If you opt in during the donation process, we may email you again in future."
 msgstr ""
+"Se aceitar receber e-mails durante o processo de fazer um donativo, "
+"poderemos enviar-lhe e-mails futuramente."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:87
 msgid ""
@@ -336,7 +338,7 @@ msgstr "$15"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:261
 msgid "OFF"
-msgstr ""
+msgstr "MENOS"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:267
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:261
@@ -422,7 +424,7 @@ msgstr "Morada"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:375
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:369
 msgid "Apt."
-msgstr ""
+msgstr "Apt."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:385
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:379
@@ -1660,10 +1662,13 @@ msgid ""
 "amount you donated, your full name, the payment method you used and your "
 "country of origin."
 msgstr ""
+"Para processar o seu reembolso, precisamos de saber a data em que fez o "
+"donativo, o valor deste, o seu nome completo, o mÃ©todo de pagamento que "
+"utilizou e o seu paÃs de origem."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:466
 msgid "Please also tell us why you're asking for a refund."
-msgstr ""
+msgstr "Por favor, diga-nos tambÃ©m porque estÃ¡ a pedir um reembolso."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:468
 msgid ""
@@ -1671,6 +1676,9 @@ msgid ""
 " to be made in a specific way, so we may need additional information from "
 "you in order to process yours."
 msgstr ""
+"Lembre-se que alguns mÃ©todos de pagamento nÃ£o suportam reembolsos ou exigem 
"
+"que sejam feitos de uma forma especÃfica, pelo que poderemos necessitar de "
+"mais informaÃ§Ãµes para processar o seu."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:474
 msgid "Can I donate by mail?"
@@ -1686,6 +1694,8 @@ msgid ""
 "Our mailing address is The Tor Project, 217 First Avenue South #4903, "
 "Seattle WA 98194, USA"
 msgstr ""
+"O nosso endereÃ§o para correspondÃªncia Ã©: The Tor Project, 217 First Avenue 
"
+"South #4903, Seattle WA 98194, USA"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486
 msgid "Do you accept cash donations?"
@@ -1697,7 +1707,7 @@ msgstr "Sim"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:496
 msgid "Does Tor Project accept matching donations?"
-msgstr ""
+msgstr "O Projeto Tor aceita que se igualem donativos?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:500
 msgid ""
@@ -1705,6 +1715,9 @@ msgid ""
 "Verizon, Red Hat, many universities, and others-- will match donations made "
 "by their employees."
 msgstr ""
+"Sim! Muitas empresas - como a Google, Microsoft, eBay, PayPal, Apple, "
+"Verizon, Red Hat, universidades e outros - igualarÃ£o os donativos feitos "
+"pelos seus funcionÃ¡rios."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:502
 msgid ""
@@ -1713,18 +1726,26 @@ msgid ""
 " https://www.matchinggifts.com/rit/\;>https://www.matchinggifts.com/rit/."
 msgstr ""
+"A maneira mais rÃ¡pida de descobrir se a sua empresa iguala os donativos Ã© "
+"perguntar ao departamento de recursos humanos ou pesquisando o nome da sua "
+"empresa em https://www.matchinggifts.com/rit/\;>https://www.matchinggifts.com/rit/."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:504
 msgid ""
 "If your company isn't currently set up to match donations to the Tor "
 "Project, we would be happy to help with the paperwork."
 msgstr ""
+"Se a sua empresa nÃ£o estÃ¡ atualmente configurada para igualar os donativos "
+"ao Projeto Tor, ficaremos felizes em ajudar com a papelada."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:506
 msgid ""
 "If you want help

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-18 Thread translation

commit 6157713be283c9dc41ee79d4340bf2d31f41cb46
Author: Translation commit bot 
Date:   Fri Jan 18 22:15:25 2019 +

Update translations for donatepages-messagespot
---
 locale/pt_PT/LC_MESSAGES/messages.po | 29 +
 1 file changed, 29 insertions(+)

diff --git a/locale/pt_PT/LC_MESSAGES/messages.po 
b/locale/pt_PT/LC_MESSAGES/messages.po
index 165e9b0e5..18658285d 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -1541,12 +1541,16 @@ msgid ""
 "If you donate to the Tor Project, there will be some people at the Tor "
 "Project who know about your donation."
 msgstr ""
+"Se fizer um donativo para o Projeto Tor, algumas pessoas do Projeto Tor "
+"saberÃ£o que fe um donativo."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:413
 msgid ""
 "However, we will never publicly identify you as a donor, unless you have "
 "given us permission to do so."
 msgstr ""
+"No entanto, nunca iremos identificÃ¡-lo publicamente como um doador, a nÃ£o "
+"ser que nos tenha dado permissÃ£o para fazÃª-lo."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:415
 msgid ""
@@ -1554,24 +1558,34 @@ msgid ""
 "do anything else that would publicly identify you as someone who has "
 "donated."
 msgstr ""
+"Isso significa que nÃ£o publicaremos o seu nome no nosso site, nÃ£o iremos "
+"agradecer-lhe no Twitter ou fazer qualquer outra coisa que o identifique "
+"publicamente como alguÃ©m que fez um donativo."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:417
 msgid ""
 "If we decide we would like to publicly name you as a donor, we will ask you "
 "first, and will not do it until and unless you say it's okay."
 msgstr ""
+"Se decidirmos que gostarÃamos de nomeÃ¡-lo publicamente como um doador, "
+"iremos perguntar-lhe primeiro, e nÃ£o iremos fazÃª-lo a nÃ£o ser que diga que 
"
+"concorda."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:423
 msgid ""
 "It's important to me that my donation be tax-deductible, but I don't pay "
 "taxes in the United States."
 msgstr ""
+"Ã importante que o meu donativo seja dedutÃvel nos impostos, mas nÃ£o pago "
+"impostos nos Estados Unidos."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:427
 msgid ""
 "Right now, we can only offer tax-deductibility to donors who pay taxes in "
 "the United States."
 msgstr ""
+"Neste momento, apenas podemos fornecer deduÃ§Ãµes nos impostos a doadores que 
"
+"pagam impostos nos Estados Unidos."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:429
 msgid ""
@@ -1579,6 +1593,9 @@ msgid ""
 "different country, let us know and we will try to offer tax-deductibility in"
 " your country in future."
 msgstr ""
+"Se for importante para si que os seus donativos sejam dedutÃveis nos "
+"impostos noutro paÃs, avise-nos e iremos tentar fornecer essa opÃ§Ã£o no seu 
"
+"paÃs no futuro."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:431
 msgid ""
@@ -1588,12 +1605,19 @@ msgid ""
 "organizations support the Tor network and may be able to offer you tax-"
 "deductibility for your donation."
 msgstr ""
+"Se estiver na Alemanha, FranÃ§a ou SuÃ©cia, https://www.torproject.org/docs/faq.html.en#RelayDonations\;>estas "
+"organizaÃ§Ãµes suportam a rede Tor e podem oferecer deduÃ§Ã£o fiscal para 
o "
+"seu donativo."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:437
 msgid ""
 "What if I don't want to use credit card or PayPal? Is there another way I "
 "can donate?"
 msgstr ""
+"E se eu nÃ£o quiser usar o cartÃ£o de crÃ©dito ou o PayPal? Existe outra 
forma "
+"de fazer um donativo?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:441
 msgid ""
@@ -1601,6 +1625,9 @@ msgid ""
 "options.html.en\" class=\"hyperlinks links\" target=\"_blank\">other ways "
 "you can donate."
 msgstr ""
+"Sim! Aqui estÃ¡ uma lista de https://www.torproject.org/donate;
+"/donate-options.html.en\" class=\"hyperlinks links\" "
+"target=\"_blank\">outras forma de fazer um donativo"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:448
 msgid "What is your donor privacy policy?"
@@ -1624,6 +1651,8 @@ msgid ""
 "If you want your donation refunded, please tell us by emailing giving(at)torproject.org."
 msgstr ""
+"Se quiser que o seu donativo seja reembolsÃ¡vel, por favor indique-nos por "
+"e-mail para giving(at)torproject.org."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:464
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-18 Thread translation

commit c603f502e09bff1b6e7d19574579da043252bc35
Author: Translation commit bot 
Date:   Fri Jan 18 21:15:27 2019 +

Update translations for donatepages-messagespot
---
 locale/pt_PT/LC_MESSAGES/messages.po | 51 
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/locale/pt_PT/LC_MESSAGES/messages.po 
b/locale/pt_PT/LC_MESSAGES/messages.po
index 6b3937ee4..165e9b0e5 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -126,8 +126,8 @@ msgstr ""
 "Se fizer um donativo superior a US $5.000 e se soubermos o seu nome e "
 "endereÃ§o, seremos por lei obrigados a transmiti-los ao Internal Revenue "
 "Service (IRS) no https://www.irs.gov/pub/irs-pdf/f990ezb.pdf\;>Schedule B do "
-"FormulÃ¡rio 990."
+"href=\"https://www.irs.gov/pub/irs-pdf/f990ezb.pdf\;>Anexo B do FormulÃ¡rio "
+"990."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:89
 msgid ""
@@ -1383,22 +1383,30 @@ msgid ""
 "We don't ask for information beyond what's required by the payment "
 "processor."
 msgstr ""
+"NÃ£o pedimos informaÃ§Ãµes para alÃ©m do que Ã© exigido pela empresa que faz 
o "
+"processador do pagamento."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:338
 msgid "Why is there a minimum donation?"
-msgstr ""
+msgstr "Porque Ã© que existe um donativo mÃnimo?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:342
 msgid ""
 "People who have stolen credit card information often donate to nonprofits as"
 " a way of testing whether the card works."
 msgstr ""
+"As pessoas que roubam informaÃ§Ãµes de cartÃµes de crÃ©dito costumam doar um "
+"valor irrisÃ³rio para organizaÃ§Ãµes sem fins lucrativos como forma de testar 
"
+"se o cartÃ£o funciona."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:344
 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 ""
+"Estas pessoas normalmente usam uma quantidade muito pequena para o teste, e "
+"assim, descobrimos que definir um donativo mÃnimo de US $1 parece dissuadi-"
+"las."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:350
 msgid "Is there a maximum donation?"
@@ -1411,6 +1419,10 @@ msgid ""
 "research, test, and implement ideas we have for making the Tor network even "
 "stronger."
 msgstr ""
+"NÃ£o! Mais fundos de si significa que podemos fazer mais coisas que estejamos"
+" empolgados para fazer, assim como, contratar uma pessoa a tempo integral "
+"para monitorizar a rede Tor ou pesquisar, testar e implementar as ideias que"
+" temos, para tornar a rede Tor ainda mais forte."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:360
 msgid "Can I donate via bitcoin?"
@@ -1422,12 +1434,17 @@ msgid ""
 "href=\"https://www.torproject.org/donate/donate-options.html.en\;>bitcoin "
 "via BitPay."
 msgstr ""
+"Sim! NÃ³s aceitamos https://www.torproject.org/donate/donate-options.html.en\;>bitcoins "
+"pelo BitPay."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:370
 msgid ""
 "If I want my donation to be anonymous, what is the best way for me to "
 "donate?"
 msgstr ""
+"Se eu quiser que o meu donativo seja anÃ³nimo, qual Ã© a melhor forma de o "
+"fazer?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:374
 msgid ""
@@ -1435,28 +1452,37 @@ msgid ""
 "href=\"https://www.torproject.org/donate/donate-;
 "options.html.en#cash\">sending us a postal money order."
 msgstr ""
+"Pode fazer o donativo https://www.torproject.org/donate/donate-options.html.en#cash;
+"\">enviando-nos um vale postal."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:376
 msgid ""
 "You can donate via bitcoin if you have bitcoin set up in a way that "
 "preserves your anonymity."
 msgstr ""
+"Pode fazer um donativo em bitcoins se tiver o bitcoin configurado de uma "
+"forma que preserve o seu anonimato."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:378
 msgid "You can buy cash gift cards and mail them to us."
-msgstr ""
+msgstr "Pode comprar vales-presente em dinheiro e enviar-nos."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:380
 msgid ""
 "There are probably other ways to donate anonymously that we haven't thought "
 "of-- maybe you will :)"
 msgstr ""
+"Provavelmente existem outras formas fazer um donativo de forma anÃ³nima de "
+"que nÃ£o nos lembramos - talvez vocÃª saiba como :)"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:387
 msgid ""
 "Is the Tor

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-18 Thread translation

commit 8aece7fa8f950e2e079875ef9914885b07841cd2
Author: Translation commit bot 
Date:   Fri Jan 18 20:45:21 2019 +

Update translations for donatepages-messagespot
---
 locale/pt_PT/LC_MESSAGES/messages.po | 146 +--
 1 file changed, 138 insertions(+), 8 deletions(-)

diff --git a/locale/pt_PT/LC_MESSAGES/messages.po 
b/locale/pt_PT/LC_MESSAGES/messages.po
index 5057cb501..6b3937ee4 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -869,6 +869,9 @@ msgid ""
 "Other Tor users are journalists, human rights defenders, domestic violence "
 "survivors, policymakers, diplomats, and academic and research institutions."
 msgstr ""
+"Outros utilizadores do Tor sÃ£o jornalistas, defensores de direitos humanos, "
+"sobreviventes de violÃªncia domÃ©stica, legisladores, diplomatas, 
instituiÃ§Ãµes"
+" acadÃ©micas e de pesquisa."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:107
 msgid "Can anyone use Tor?"
@@ -884,6 +887,9 @@ msgid ""
 "href=\"https://www.torproject.org/projects/torbrowser.html.en\;>download Tor Browser."
 msgstr ""
+"Para comeÃ§ar irÃ¡ precisar de https://www.torproject.org/projects/torbrowser.html.en\;>descarregar o Tor Browser."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:115
 msgid ""
@@ -895,6 +901,13 @@ msgid ""
 "OS X and https://www.torproject.org/projects/torbrowser.html.en#linux\;>Linux."
 msgstr ""
+"Temos instruÃ§Ãµes sobre como descarregar para o sistema https://www.torproject.org/projects/torbrowser.html.en#windows\;>Windows,"
+" https://www.torproject.org/projects/torbrowser.html.en#macosx\;>Mac "
+"OS X e https://www.torproject.org/projects/torbrowser.html.en#linux\;>Linux."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:121
 msgid "What kinds of people support Tor?"
@@ -914,12 +927,22 @@ msgid ""
 "Federal Foreign Office of Germany, the U.S. Naval Research Laboratory, "
 "Omidyar Network, SRI International, and Radio Free Asia."
 msgstr ""
+"Milhares de indivÃduos jÃ¡ fizeram donativos para apoiar o Projeto Tor, e "
+"tambÃ©m jÃ¡ recebemos financiamento de uma variada gama de organizaÃ§Ãµes 
como: "
+"a Google, a Ford Foundation, a Knight Foundation, Reddit, a U.S. National "
+"Science Foundation, a Electronic Frontier Foundation, a Human Rights Watch, "
+"a Swedish International Development Cooperation Agency, o Federal Foreign "
+"Office da Alemanha, o U.S. Naval Research Laboratory, o Omidyar Network, SRI"
+" International, a Radio Free Asia."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:129
 msgid ""
 "People also support Tor in non-financial ways, for example by running Tor "
 "relays to help carry traffic for other users."
 msgstr ""
+"As pessoas tambÃ©m apoiam o Tor de outras formas nÃ£o financeiras, por "
+"exemplo, executando retransmissores do Tor para ajudar a transportar o "
+"trÃ¡fego de outros utilizadores."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:131
 msgid ""
@@ -927,10 +950,14 @@ msgid ""
 "anonymous, because the more people using Tor, the harder it is to identify "
 "any single individual."
 msgstr ""
+"AlÃ©m disso, todas as pessoas que usam o Tor estÃ£o a ajudar a manter outros "
+"utilizadores seguros e anÃ³nimos, porque quanto mais pessoas utilizam o Tor, "
+"mais difÃcil Ã© identificar qualquer utilizador individual. "
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:137
 msgid "How does the Tor software work to protect people's anonymity?"
 msgstr ""
+"Como Ã© que o programa Tor funciona para proteger o anonimato das pessoas?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:141
 msgid ""
@@ -938,17 +965,22 @@ msgid ""
 "which is a distributed network of relays run by volunteers all around the "
 "world."
 msgstr ""
+"O Tor protege, enviando as comunicaÃ§Ãµes pela rede Tor, que Ã© uma rede "
+"distribuÃda de retransmissÃµes executada por voluntÃ¡rios em todo o mundo."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:143
 msgid ""
 "If someone is watching your internet connection, Tor prevents them from "
 "finding out what sites you are visiting."
 msgstr ""
+"Se alguÃ©m estiver a observar a sua ligaÃ§Ã£o Ã  Internet, o Tor irÃ¡ impedir 
que"
+" eles descubram que sites estÃ¡ a aceder."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:145
 msgid ""
 "It also prevents sites you visit from finding out where you're located."
 msgstr ""
+"TambÃ©m impede que os sites que visita descubram onde o utilizador estÃ¡."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:147
 msgid ""
@@ -956,12 +988,18 @@

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-18 Thread translation

commit b399a84f85295e289260fa1c27f114fd8e6912a1
Author: Translation commit bot 
Date:   Fri Jan 18 20:15:24 2019 +

Update translations for donatepages-messagespot
---
 locale/pt_PT/LC_MESSAGES/messages.po | 107 +--
 1 file changed, 78 insertions(+), 29 deletions(-)

diff --git a/locale/pt_PT/LC_MESSAGES/messages.po 
b/locale/pt_PT/LC_MESSAGES/messages.po
index c889aae26..5057cb501 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -341,9 +341,7 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:267
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:261
 msgid "Get our limited edition Tor: Strength in Numbers shirt."
-msgstr ""
-"Receba a nossa ediÃ§Ã£o limitada Tor: a t-shirt Strength in Numbers (ForÃ§a 
nos"
-" NÃºmeros)."
+msgstr "Receba a ediÃ§Ã£o limitada da nossa t-shirt \"Tor: Strength in 
Numbers\"."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:278
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:272
@@ -357,21 +355,24 @@ msgid ""
 "the Digital Resistance, Open Observatory of Network Interference (OONI), or "
 "Tor at the Heart of Internet Freedom t-shirts."
 msgstr ""
+"As nossas t-shirts \"Tor: Strength in Numbers\", \"Tor: Powering the Digital"
+" Resistance\", \"Open Observatory of Network Interference (OONI)\" ou \"Tor "
+"at the Heart of Internet Freedom\"."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:294
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:288
 msgid "Tor at the Heart of Internet Freedom"
-msgstr ""
+msgstr "Tor at the Heart of Internet Freedom"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:298
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:292
 msgid "Powering the Digital Resistance"
-msgstr ""
+msgstr "Powering the Digital Resistance"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:302
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:296
 msgid "Open Observatory of Network Interference"
-msgstr ""
+msgstr "Open Observatory of Network Interference"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:313
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:307
@@ -381,7 +382,7 @@ msgstr "polo"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:320
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:314
 msgid "Your generous support of Tor gets you this high-quality zip hoodie."
-msgstr ""
+msgstr "O seu apoio generoso ao Tor tem direito a esta camisola com capuz."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:330
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:324
@@ -446,12 +447,12 @@ msgstr "Inserir e-mail"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:404
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:398
 msgid "Well email you your receipt"
-msgstr ""
+msgstr "Enviaremos-lhe o recibo por e-mail."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:411
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:405
 msgid "Start sending me email updates about the Tor Project!"
-msgstr ""
+msgstr "ComeÃ§ar a enviar-me atualizaÃ§Ãµes por e-mail sobre o Projeto Tor!"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:418
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:412
@@ -478,7 +479,7 @@ msgstr "CVC"
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:435
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:487
 msgid "Choose your size and fit."
-msgstr ""
+msgstr "Escolha a medida e tamanho."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:446
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:454
@@ -499,7 +500,7 @@ msgstr "ComentÃ¡rios"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:476
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:470
 msgid "Donating:"
-msgstr ""
+msgstr "A doar:"
 
 #:

[tor-commits] [stem/master] Missing changelog entry

2019-01-18 Thread atagar

commit 46a12277acd4ac2ec0b9507b7502fd4c219e8b53
Author: Damian Johnson 
Date:   Mon Jan 14 10:40:36 2019 -0800

Missing changelog entry
---
 docs/change_log.rst | 4 
 1 file changed, 4 insertions(+)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index f6590601..bd954e42 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -66,6 +66,10 @@ The following are only available within Stem's `git 
repository
   * DescriptorDownloader crashed if **use_mirrors** is set (:trac:`28393`)
   * Don't download from Serge, a bridge authority that frequently timeout
 
+ * **Client**
+
+  * Sockets with ORPorts errored if responses exceeded a hardcoded buffer size 
(:trac:`28961`)
+
  * **Website**
 
   * Added NetBSD to our `download page `_



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Revert "Include the originating stacktrace in stem.descriptor.remote exceptions"

2019-01-18 Thread atagar

commit 8c61fc85a51f9acb65e9fed15bb079a8fad47636
Author: Damian Johnson 
Date:   Fri Jan 18 10:52:13 2019 -0800

Revert "Include the originating stacktrace in stem.descriptor.remote 
exceptions"

Unfortunately in this case the cure is worse than the disease. When 
dannenberg
went down this caused stacktraces in DocTor's emails which gives the 
impression
the service is having problems...

  ERROR: Unable to retrieve the consensus from dannenberg 
(http://193.23.244.244:80/tor/status-vote/current/consensus): 

  Original traceback:
File "/srv/doctor.torproject.org/doctor/stem/descriptor/remote.py", 
line 594, in _download_descriptors
  self.content, self.reply_headers = 
_download_from_dirport(self.download_url, self.compression, timeout)
File "/srv/doctor.torproject.org/doctor/stem/descriptor/remote.py", 
line 1043, in _download_from_dirport
  timeout = timeout,
File "/usr/lib/python2.7/urllib2.py", line 154, in urlopen
  return opener.open(url, data, timeout)
File "/usr/lib/python2.7/urllib2.py", line 429, in open
  response = self._open(req, data)
File "/usr/lib/python2.7/urllib2.py", line 447, in _open
  '_open', req)
File "/usr/lib/python2.7/urllib2.py", line 407, in _call_chain
  result = func(*args)
File "/usr/lib/python2.7/urllib2.py", line 1228, in http_open
  return self.do_open(httplib.HTTPConnection, req)
File "/usr/lib/python2.7/urllib2.py", line 1198, in do_open
  raise URLError(err)
  URLError: 

I'm kinda torn on this change. On one hand it's usful information for 
unusual
errors, but on the other it's troubling looking bloat for mundane things 
like
this.

Encoding a stacktrace within an encepiton message was definitely an icky 
hack
so simply reverting this for now. Most likely we'll simply need to live 
without
underlying stacktraces until we drop python 2.x support.

This reverts commit cc43a6ca90e3943a542258b2b4d8466ae9a4ac36.
---
 stem/descriptor/remote.py | 33 +
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index 9ccfaced..9eb639ad 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -97,7 +97,6 @@ import random
 import sys
 import threading
 import time
-import traceback
 import zlib
 
 import stem
@@ -467,13 +466,6 @@ class Query(object):
 Blocks until our request is complete then provides the descriptors. If we
 haven't yet started our request then this does so.
 
-.. versionchanged:: 1.8.0
-   Overwriting exceptions to include the originating traceback.
-
-   In Stem 2.x (when we no longer need Python 2.x compatibility) this will
-   revert back to re-raising the originating exception, but with its
-   stacktrace preserved.
-
 :param bool suppress: avoids raising exceptions if **True**
 
 :returns: list for the requested 
:class:`~stem.descriptor.__init__.Descriptor` instances
@@ -483,7 +475,6 @@ class Query(object):
   **False**...
 
 * **ValueError** if the descriptor contents is malformed
-* **stem.ProtocolError** if unable to parse an ORPort response
 * **socket.timeout** if our request timed out
 * **urllib2.URLError** for most request failures
 
@@ -502,27 +493,7 @@ class Query(object):
 if suppress:
   return
 
-# TODO: Unfortunately the proper way to retain a stacktrace differs
-# between python 2.x and 3.x in a syntactic way...
-#
-#   Python 2.x
-#
-# raise exc_type, exc_value, exc_traceback
-#
-#   Python 3.x
-#
-# raise WrapperException('foo') from exc_value
-#
-# Because this is syntactic we cannot do an 'if python2, else python3'
-# for this. As such re-encoding the stacktrace as part of the message.
-#
-# When we drop python 2.x support we should replace this with the
-# 'raise from' option above.
-
-exc_type, exc_value, exc_traceback = self._error_attr
-stacktrace = 'Original traceback:\n' + 
''.join(traceback.format_exception(exc_type, exc_value, exc_traceback)[1:])
-
-raise exc_type(str(exc_value) + '\n\n' + stacktrace)
+raise self.error
   else:
 if self.content is None:
   if suppress:
@@ -554,7 +525,6 @@ class Query(object):
 yield desc
 except ValueError as exc:
   self.error = exc  # encountered a parsing error
-  self._error_attr = sys.exc_info()
 
   if suppress:
 return
@@ -609,7 +579,6 @@ class Query(object):
   else:
 log.debug("Unable to download descriptors from '%s': %s" % 
(self.download_url, exc))
 self.error = exc
-self._error_attr = sys.exc_info()
 finally:

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-18 Thread translation

commit cd37daa5a74230707f8fae1de2bea93029fbdd1e
Author: Translation commit bot 
Date:   Fri Jan 18 18:45:21 2019 +

Update translations for donatepages-messagespot
---
 locale/pt_PT/LC_MESSAGES/messages.po | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/locale/pt_PT/LC_MESSAGES/messages.po 
b/locale/pt_PT/LC_MESSAGES/messages.po
index c8f07b539..c889aae26 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -252,7 +252,7 @@ msgstr "Total de Donativos"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:159
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:159
 msgid "Total Raised with Mozilla's Match"
-msgstr ""
+msgstr "Total arrecadado com Mozilla Match"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:170
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:176
@@ -264,7 +264,7 @@ msgstr "doar"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:172
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:172
 msgid "once"
-msgstr ""
+msgstr "uma vez"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:178
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:178
@@ -276,7 +276,7 @@ msgstr "mensalmente"
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:185
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:339
 msgid "Want to donate Bitcoin, Stock, or via snail mail?"
-msgstr ""
+msgstr "Quer doar Bitcoins, aÃ§Ãµes ou atravÃ©s do correio tradicional?"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:201
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:201
@@ -296,23 +296,25 @@ msgstr "$ outro"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:216
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:216
 msgid "Choose your gift as a token of our thanks."
-msgstr ""
+msgstr "Escolha um presente como um sÃmbolo da nossa gratidÃ£o."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:223
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:223
 msgid "No thanks, I don't want a gift."
-msgstr ""
+msgstr "NÃ£o, obrigado, nÃ£o quero um presente."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:225
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:225
 #, php-format
 msgid "I would prefer 100% of my donation to go to the Tor Project's work."
 msgstr ""
+"Eu prefiro que 100% do meu donativo seja aplicado no trabalho do Projeto "
+"Tor."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:236
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:236
 msgid "sticker Pack"
-msgstr ""
+msgstr "Pacote de autocolantes"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:243
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:243
@@ -320,6 +322,8 @@ msgid ""
 "A collection of our favorite logo stickers for decorating your stuff and "
 "covering your cams."
 msgstr ""
+"Temos uma coleÃ§Ã£o de autocolantes para decorar as suas coisas e tapar as "
+"suas cÃ¢maras."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:253
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:253
@@ -338,11 +342,13 @@ msgstr ""
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:261
 msgid "Get our limited edition Tor: Strength in Numbers shirt."
 msgstr ""
+"Receba a nossa ediÃ§Ã£o limitada Tor: a t-shirt Strength in Numbers (ForÃ§a 
nos"
+" NÃºmeros)."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:278
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:272
 msgid "t-shirt pack"
-msgstr ""
+msgstr "pacote de t-shirts"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:288
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:282

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-18 Thread translation

commit 74f16ebb1f8bf96e668e477f858edd56f8c63541
Author: Translation commit bot 
Date:   Fri Jan 18 18:17:33 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 39 ---
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index 1ef360d36..b5d2f675f 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -2211,7 +2211,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid "Enter your information into the fields and click the 'Sign Up' button:"
-msgstr ""
+msgstr "Preencha os campos e clique no botÃ£o 'Criar conta':"
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2224,6 +2224,8 @@ msgid ""
 "* Fill out the next page with your name and select \"Localization\" and "
 "\"Translator\" from the drop-down menus:"
 msgstr ""
+"* Preencha a pÃ¡gina seguinte com o seu nome e selecione \"LocalizaÃ§Ã£o\" e "
+"\"Tradutor\" nos campos de menus:"
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2234,6 +2236,8 @@ msgstr ""
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid "* On the next page, select 'Join an existing project' and continue."
 msgstr ""
+"* Na pÃ¡gina seguinte, selecione 'Junte-se a um projeto existente' e "
+"continue."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2241,6 +2245,8 @@ msgid ""
 "* On the next page, select the languages you speak from the drop-down menu "
 "and continue."
 msgstr ""
+"* Na pÃ¡gina seguinte, selecione os idiomas que entende no campo de menu e "
+"continue."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2248,11 +2254,14 @@ msgid ""
 "* You are now signed up! Go to the https://www.transifex.com/otf/torproject/\;>Tor Transifex page."
 msgstr ""
+"* JÃ¡ terminou o seu registo! Aceda Ã  https://www.transifex.com/otf/torproject/\;>pÃ¡gina do Tor no "
+"Transifex ."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr ""
+msgstr "* Clique no botÃ£o 'Aderir Ã  equipa' no canto direito:"
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2263,7 +2272,7 @@ msgstr ""
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid ""
 "* Select the language you would like to translate from the dropdown menu:"
-msgstr ""
+msgstr "* Selecione o idioma que gostaria de traduzir no campo:"
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2274,6 +2283,8 @@ msgstr ""
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid "* A notification will now show up on the top of the page like so:"
 msgstr ""
+"* AparecerÃ¡ uma notificaÃ§Ã£o na parte superior da pÃ¡gina como o exemplo "
+"seguinte:"
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2287,6 +2298,9 @@ msgid ""
 " back to the https://www.transifex.com/otf/torproject/\;>Tor "
 "Transifex page when you are ready to begin."
 msgstr ""
+"Quando for aprovado, poderÃ¡ comeÃ§ar a traduzir.Basta aceder Ã  https://www.transifex.com/otf/torproject/\;>pÃ¡gina do Tor no "
+"Transifex quando estiver pronto para comeÃ§ar."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2296,20 +2310,23 @@ msgid ""
 "There you will find translation guidelines and resources that will help you "
 "contribute to Tor translations."
 msgstr ""
+"Antes de traduzir, leia a pÃ¡gina do Projeto Tor no [Localization Lab "
+"Wiki](https://wiki.localizationlab.org/index.php/Tor). Encontram-se aÃ "
+"diretrizes de traduÃ§Ã£o e recursos que o ajudarÃ£o nas traduÃ§Ãµes do Tor."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid "Thanks for your interest in helping the project!"
-msgstr ""
+msgstr "Obrigado pelo seu interesse em ajudar o projeto!"
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.seo_slug)
 msgid "becoming-tor-translator"
-msgstr ""
+msgstr "tornar-me-tradutor-do-tor"
 
 #: templates/footer.html:5
 msgid "Our mission:"
-msgstr ""
+msgstr "A nossa missÃ£o:"
 
 #:

[tor-commits] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2019-01-18 Thread translation

commit 133eaa0803c0fc6e03ec9c50ea18bcfa03529272
Author: Translation commit bot 
Date:   Fri Jan 18 18:17:39 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+pt_PT.po | 2385 +
 1 file changed, 2385 insertions(+)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
new file mode 100644
index 0..b5d2f675f
--- /dev/null
+++ b/contents+pt_PT.po
@@ -0,0 +1,2385 @@
+# Translators:
+# Hugo9191 , 2018
+# MS , 2018
+# erinm, 2019
+# Rui , 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-13 17:25+CET\n"
+"PO-Revision-Date: 2018-11-14 12:31+\n"
+"Last-Translator: Rui , 2019\n"
+"Language-Team: Portuguese (Portugal) 
(https://www.transifex.com/otf/teams/1519/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.title)
+msgid "Managing identities"
+msgstr "Gerir identidades"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.description)
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+"Saiba como lidar com informaÃ§Ãµes de identificaÃ§Ã£o pessoal no Tor Browser"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"When you connect to a website, it is not only the operators of that website "
+"who can record information about your visit. Most websites now use numerous "
+"third-party services, including social networking âLikeâ buttons, 
analytics "
+"trackers, and advertising beacons, all of which can link your activity "
+"across different sites."
+msgstr ""
+"Quando acede a um site, nÃ£o Ã© apenas os operadores daquele site que podem "
+"registar as informaÃ§Ãµes sobre a sua visita. A maior parte dos sites atuais "
+"usam inÃºmeros serviÃ§os de terceiros, inclusive os de botÃµes 'Curtir' das "
+"redes sociais, rastreadores de dados e janelas de publicidade, capazes de "
+"associar a sua atividade entre os vÃ¡rios sites que visita."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"Using the Tor network stops observers from being able to discover your exact"
+" location and IP address, but even without this information they might be "
+"able to link different areas of your activity together. For this reason, Tor"
+" Browser includes some additional features that help you control what "
+"information can be tied to your identity."
+msgstr ""
+"O uso da rede Tor impede que observadores possam descobrir a sua 
localizaÃ§Ã£o"
+" exata e o seu endereÃ§o IP. No entanto, mesmo sem essas informaÃ§Ãµes, Ã© "
+"possÃvel associar informaÃ§Ãµes de origens diversas. Por isso, o Tor Browser 
"
+"inclui algumas funcionalidades adicionais para o ajudar a controlar as "
+"informaÃ§Ãµes que podem ser associadas Ã  sua identidade."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid "# The URL bar"
+msgstr "# A barra de endereÃ§os"
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"Tor Browser centers your web experience around your relationship with the "
+"website in the URL bar. Even if you connect to two different sites that use "
+"the same third-party tracking service, Tor Browser will force the content to"
+" be served over two different Tor circuits, so the tracker will not know "
+"that both connections originate from your browser."
+msgstr ""
+"O Tor Browser centra a sua experiÃªncia de navegaÃ§Ã£o em torno da sua "
+"interaÃ§Ã£o com sites na barra de endereÃ§os. Mesmo que aceda a dois sites "
+"diferentes que usem o mesmo serviÃ§o de rastreamento oferecido por terceiros,"
+" o Tor Browser irÃ¡ forÃ§ar o trÃ¡fego do conteÃºdo por dois circuitos "
+"diferentes do Tor. Assim, o rastreador nÃ£o saberÃ¡ que ambas as conexÃµes 
sÃ£o "
+"originÃ¡rias do seu navegador."
+
+#: https//tb-manual.torproject.org/en-US/managing-identities/
+#: (content/managing-identities/contents+en-US.lrtopic.body)
+msgid ""
+"On the other hand, all connections to a single website address will be made "
+"over the same Tor circuit, meaning you can browse different pages of a "
+"single website in separate tabs or windows, without any loss of "
+"functionality."
+msgstr ""
+"Por outro lado, todas as conexÃµes a um Ãºnico endereÃ§o de um site serÃ£o "
+"feitas atravÃ©s do mesmo circuito do Tor, o que significa que vocÃª pode "
+"navegar por diferentes pÃ¡ginas de um

[tor-commits] [translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed

2019-01-18 Thread translation

commit 51e45dcd1c1333ec704a2e2174bcd7a0bad9cbf1
Author: Translation commit bot 
Date:   Fri Jan 18 18:17:08 2019 +

Update translations for tails-onioncircuits_completed
---
 pl/onioncircuits.pot | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pl/onioncircuits.pot b/pl/onioncircuits.pot
index a6cf7e15d..9e5bf7dba 100644
--- a/pl/onioncircuits.pot
+++ b/pl/onioncircuits.pot
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cafero lafen , 2019
 # sebx, 2016
 # Gandalf, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2018-02-20 19:11+\n"
-"Last-Translator: Marcin Januchta \n"
+"PO-Revision-Date: 2019-01-18 17:59+\n"
+"Last-Translator: cafero lafen \n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,7 +73,7 @@ msgstr "Nieznany"
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"
-msgstr "Fingerprint:"
+msgstr "odcisk palca"
 
 #: ../onioncircuits:608
 msgid "Published:"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2019-01-18 Thread translation

commit 5ce6f57b3e00919ff02d24c65bd726ccfb2e
Author: Translation commit bot 
Date:   Fri Jan 18 18:16:57 2019 +

Update translations for tails-openpgp-applet_completed
---
 pl/openpgp-applet.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/openpgp-applet.pot b/pl/openpgp-applet.pot
index f7f0fa9dd..b2a9b0f76 100644
--- a/pl/openpgp-applet.pot
+++ b/pl/openpgp-applet.pot
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2019-01-15 12:27+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-01-18 17:59+\n"
+"Last-Translator: cafero lafen \n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-onioncircuits] Update translations for tails-onioncircuits

2019-01-18 Thread translation

commit 1b2e74e3b9f91df1b3f0e7384bb01153852b93c3
Author: Translation commit bot 
Date:   Fri Jan 18 18:17:02 2019 +

Update translations for tails-onioncircuits
---
 pl/onioncircuits.pot | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pl/onioncircuits.pot b/pl/onioncircuits.pot
index a6cf7e15d..9e5bf7dba 100644
--- a/pl/onioncircuits.pot
+++ b/pl/onioncircuits.pot
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cafero lafen , 2019
 # sebx, 2016
 # Gandalf, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2018-02-20 19:11+\n"
-"Last-Translator: Marcin Januchta \n"
+"PO-Revision-Date: 2019-01-18 17:59+\n"
+"Last-Translator: cafero lafen \n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,7 +73,7 @@ msgstr "Nieznany"
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"
-msgstr "Fingerprint:"
+msgstr "odcisk palca"
 
 #: ../onioncircuits:608
 msgid "Published:"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2019-01-18 Thread translation

commit 4667e11a569bcb50b41ff87e0d4e5c7ccca166cd
Author: Translation commit bot 
Date:   Fri Jan 18 18:16:51 2019 +

Update translations for tails-openpgp-applet
---
 pl/openpgp-applet.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/openpgp-applet.pot b/pl/openpgp-applet.pot
index f7f0fa9dd..b2a9b0f76 100644
--- a/pl/openpgp-applet.pot
+++ b/pl/openpgp-applet.pot
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2019-01-15 12:27+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-01-18 17:59+\n"
+"Last-Translator: cafero lafen \n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-01-18 Thread translation

commit 95ec5737ed268f9862910bd9a8514d59af211881
Author: Translation commit bot 
Date:   Fri Jan 18 18:15:22 2019 +

Update translations for donatepages-messagespot
---
 locale/pt_PT/LC_MESSAGES/messages.po | 53 ++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/locale/pt_PT/LC_MESSAGES/messages.po 
b/locale/pt_PT/LC_MESSAGES/messages.po
index d5138415e..c8f07b539 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -18,7 +18,7 @@ msgstr "Processamento do Donativo - Tor"
 
 #: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:44
 msgid "Processing Donation. Please Wait..."
-msgstr ""
+msgstr "A processar o seu donativo - Por favor aguarde..."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34
 msgid "Tor Privacy Policy"
@@ -32,6 +32,8 @@ msgstr "politica de privacidade do doador"
 msgid ""
 "The Tor Project respects donor privacy and welcomes anonymous donations."
 msgstr ""
+"O Projeto Tor respeita a privacidade do seus doadores e aceita donativos "
+"anÃ³nimos."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:60
 msgid ""
@@ -39,6 +41,9 @@ msgid ""
 "anonymity is by donating using a method that doesn't disclose your personal "
 "information."
 msgstr ""
+"Se o anonimato Ã© importante para si, a melhor maneira de preservar o seu "
+"anonimato Ã© fazer um donativo utilizando um mÃ©todo que nÃ£o divulgue as 
suas "
+"informaÃ§Ãµes pessoais."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:65
 msgid ""
@@ -46,12 +51,18 @@ msgid ""
 "be collected and retained by third-party service providers and/or the Tor "
 "Project, as described below."
 msgstr ""
+"Se fornecer informaÃ§Ãµes pessoais, como parte do processo de doaÃ§Ã£o, estas 
"
+"poderÃ£o ser recolhidas e retidas por fornecedores de serviÃ§os terceiros 
e/ou"
+" pelo Projeto Tor, conforme descrito abaixo."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:67
 msgid ""
 "The Tor Project has very little influence over how third-party service "
 "providers, such as PayPal, may collect and use your information."
 msgstr ""
+"O Projeto Tor tem pouca influÃªncia sobre como os fornecedores de serviÃ§os 
de"
+" pagamentos terceiros, como o PayPal, que podem recolher e usar as suas "
+"informaÃ§Ãµes."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:69
 msgid ""
@@ -59,6 +70,10 @@ msgid ""
 "links\" target=\"_blank\" href=\"https://www.paypal.com/webapps/mpp/ua;
 "/privacy-full\">policies, especially if you have privacy concerns."
 msgstr ""
+"Recomendamos que se familiarize com as https://www.paypal.com/webapps/mpp/ua/privacy-;
+"full\">termos de privacidade da PayPal, especialmente se tiver "
+"preocupaÃ§Ãµes com a sua privacidade."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:74
 msgid ""
@@ -66,24 +81,35 @@ msgid ""
 " learn your name, the amount you donated, your email address, phone number "
 "and/or mailing address, as well as any other information you provide."
 msgstr ""
+"Quando faz um donativo para o Projeto Tor, dependendo do mecanismo que "
+"utiliza, poderemos recolher o seu nome, o valor do donativo, o seu endereÃ§o "
+"de e-mail, o nÃºmero de telefone e/ou o seu endereÃ§o de correspondÃªncia, 
bem "
+"como qualquer outra informaÃ§Ã£o que forneÃ§a."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:76
 msgid ""
 "We may also learn incidental data such as the date and time of your "
 "donation."
 msgstr ""
+"NÃ³s tambÃ©m podemos recolher alguns dados incidentais, como a data e a hora "
+"em que fez o donativo."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:78
 msgid ""
 "The Tor Project will never have access to your financial data, such as your "
 "credit card information.We aim to be careful with your information."
 msgstr ""
+"O Projeto Tor nunca terÃ¡ acesso aos seus dados financeiros, como 
informaÃ§Ãµes"
+" do seu cartÃ£o de crÃ©dito. O nosso objetivo Ã© ter cuidado com as suas "
+"informaÃ§Ãµes."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:83
 msgid ""
 "If you have provided your email address, we will email you once to thank you"
 " and give you a receipt."
 msgstr ""
+"Se forneceu o seu endereÃ§o de e-mail, enviaremos-lhe um e-mail de resposta "
+"com os nossos agradecimentos e o recibo da transaÃ§Ã£o."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:85
 msgid ""
@@ -97,27 +123,39 @@ msgid ""
 "target=\"_blank\" href=\"https://www.irs.gov/pub/irs-;
 "pdf/f990ezb.pdf\">Schedule B of the Form 990."
 msgstr ""
+"Se fizer um

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2019-01-18 Thread translation

commit 54adcae1eec49bc4d1af5398c5dcde1ed6e2a1d5
Author: Translation commit bot 
Date:   Fri Jan 18 18:15:50 2019 +

Update translations for https_everywhere_completed
---
 mk/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/https-everywhere.dtd b/mk/https-everywhere.dtd
index b0eb31b00..44071c5b6 100644
--- a/mk/https-everywhere.dtd
+++ b/mk/https-everywhere.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2019-01-18 Thread translation

commit 9dac098c9f4fa990bf1880d4f98edb284c620946
Author: Translation commit bot 
Date:   Fri Jan 18 18:15:43 2019 +

Update translations for https_everywhere
---
 mk/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/https-everywhere.dtd b/mk/https-everywhere.dtd
index e71b976c8..44071c5b6 100644
--- a/mk/https-everywhere.dtd
+++ b/mk/https-everywhere.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-18 Thread translation

commit 4fd6a327ac46edd0bf73245b05d27edbf63c7abc
Author: Translation commit bot 
Date:   Fri Jan 18 17:47:27 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 86 ---
 1 file changed, 70 insertions(+), 16 deletions(-)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index 7699f2e10..1ef360d36 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -1919,6 +1919,8 @@ msgid ""
 "* Your computerâs system clock must be set correctly, or Tor will not be "
 "able to connect."
 msgstr ""
+"* O relÃ³gio do sistema operativo do seu computador tem de ser configurado "
+"corretamente. Caso contrÃ¡rio, o Tor nÃ£o conseguirÃ¡ ligar Ã  rede."
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
@@ -1926,6 +1928,8 @@ msgid ""
 "* Make sure another Tor Browser is not already running. If youâre not sure "
 "if Tor Browser is running, restart your computer."
 msgstr ""
+"* Certifique-se que nÃ£o tem nenhum outro Tor Browser a ser executado. Se 
nÃ£o"
+" tiver certeza, reinicie o computador."
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
@@ -1934,11 +1938,14 @@ msgid ""
 "Tor from running. You may need to consult the documentation for your "
 "antivirus software if you do not know how to do this."
 msgstr ""
+"* Certifique-se de que nenhum programa antivÃrus instalado esteja a impedir "
+"o funcionamento do Tor. Pode ter de consultar a documentaÃ§Ã£o do programa "
+"antivÃrus."
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
 msgid "* Temporarily disable your firewall."
-msgstr ""
+msgstr "* Desative temporariamente a sua firewall."
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
@@ -1947,11 +1954,14 @@ msgid ""
 "overwrite your previous Tor Browser files; ensure they are fully deleted "
 "beforehand."
 msgstr ""
+"* Desinstale o Tor Browser e instale-o novamente. Se fizer uma atualizaÃ§Ã£o, 
"
+"nÃ£o grave simplesmente pro cima dos ficheiros existentes do Tor Browser; "
+"certifique-se primeiro que os ficheiros existentes sÃ£o eliminados."
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
 msgid "# Is your connection censored?"
-msgstr ""
+msgstr "# A sua ligaÃ§Ã£o Ã  Internet Ã© censurada?"
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
@@ -1960,11 +1970,14 @@ msgid ""
 "censoring connections to the Tor network. Read the Circumvention section for possible solutions."
 msgstr ""
+"Se ainda assim nÃ£o conseguir ligar-se Ã  rede, talvez o seu fornecedor de "
+"acesso Ã  Internet esteja a bloquear ligaÃ§Ãµes Ã  rede Tor. Leia a secÃ§Ã£o 
Contornar para encontrar soluÃ§Ãµes. "
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
 msgid "# Known issues"
-msgstr ""
+msgstr "# Problemas conhecidos"
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.body)
@@ -1974,6 +1987,10 @@ msgid ""
 "Issues page to see if the problem you are experiencing is already listed"
 " there."
 msgstr ""
+"O Tor Browser estÃ¡ em constante desenvolvimento. Alguns problemas sÃ£o "
+"conhecidos, mas ainda nÃ£o foram solucionados. Por favor, consulte a pÃ¡gina "
+"Problemas conhecidos para ver se o problema "
+"que estÃ¡ a ter jÃ¡ foi reportado e Ã© conhecido pelos programadores."
 
 #: https//tb-manual.torproject.org/en-US/troubleshooting/
 #: (content/troubleshooting/contents+en-US.lrtopic.seo_slug)
@@ -1991,6 +2008,8 @@ msgstr "Problemas conhecidos"
 msgid ""
 "* Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
+"* O Tor necessita que o seu relÃ³gio do sistema (e o fuso horÃ¡rio) estejam "
+"configurados corretamente."
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
@@ -1998,26 +2017,28 @@ msgid ""
 "* The following firewall software have been known to interfere with Tor and "
 "may need to be temporarily disabled:"
 msgstr ""
+"* Os seguintes programas de firewall sÃ£o conhecidos por interferirem com o "
+"Tor e tÃªm de ser desativados temporariamente:"
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
 msgid "* Webroot SecureAnywhere"
-msgstr ""
+msgstr "* Webroot SecureAnywhere"
 
 #: https//tb-manual.torproject.org/en-US/known-issues/
 #: (content/known-issues/contents+en-US.lrtopic.body)
 msgid "* Kaspersky Internet Security 2012"
-msgstr ""
+msgstr "* Kaspersky Internet Security 2012"
 
 #:

[tor-commits] [tor/release-0.2.9] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2019-01-18 Thread nickm

commit 06338dc605231d7c83b10a864d765a0fe5af79ec
Merge: ad70dd403 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-18 Thread nickm

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
Merge: b5fdb91ad 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-18 Thread nickm

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
Merge: b5fdb91ad 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2019-01-18 Thread nickm

commit b655e77ec5d8d793e4313e7dd24da1d5c8e9e898
Merge: 9609d1325 4cca7fb99
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2019-01-18 Thread nickm

commit 448448120fbdc66dc03a354fae311a46e8266a2f
Merge: 0ce74ec7e a8580a683
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug29029   | 5 +
 src/feature/rend/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-18 Thread nickm

commit a8580a683696eb76f5f24fe36e7ea61f9c49db0a
Merge: f0408b844 761f1bf71
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/bug29029   | 5 +
 src/feature/rend/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --cc src/feature/rend/rendmid.c
index 151604ada,0..fcfa5052c
mode 100644,00..100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@@ -1,370 -1,0 +1,370 @@@
 +/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file rendmid.c
 + * \brief Implement introductions points and rendezvous points.
 + **/
 +
 +#include "core/or/or.h"
 +#include "core/or/channel.h"
 +#include "core/or/circuitlist.h"
 +#include "core/or/circuituse.h"
 +#include "app/config/config.h"
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "core/or/dos.h"
 +#include "core/or/relay.h"
 +#include "feature/rend/rendmid.h"
 +#include "feature/stats/rephist.h"
 +#include "feature/hs/hs_circuitmap.h"
 +#include "feature/hs/hs_intropoint.h"
 +
 +#include "core/or/or_circuit_st.h"
 +
 +/** Respond to an ESTABLISH_INTRO cell by checking the signed data and
 + * setting the circuit's purpose and service pk digest.
 + */
 +int
 +rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request,
 +size_t request_len)
 +{
 +  crypto_pk_t *pk = NULL;
 +  char buf[DIGEST_LEN+9];
 +  char expected_digest[DIGEST_LEN];
 +  char pk_digest[DIGEST_LEN];
 +  size_t asn1len;
 +  or_circuit_t *c;
 +  char serviceid[REND_SERVICE_ID_LEN_BASE32+1];
 +  int reason = END_CIRC_REASON_INTERNAL;
 +
 +  log_info(LD_REND,
 +   "Received a legacy ESTABLISH_INTRO request on circuit %u",
 +   (unsigned) circ->p_circ_id);
 +
 +  if (!hs_intro_circuit_is_suitable_for_establish_intro(circ)) {
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +
 +  if (request_len < 2+DIGEST_LEN)
 +goto truncated;
 +  /* First 2 bytes: length of asn1-encoded key. */
 +  asn1len = ntohs(get_uint16(request));
 +
 +  /* Next asn1len bytes: asn1-encoded key. */
 +  if (request_len < 2+DIGEST_LEN+asn1len)
 +goto truncated;
 +  pk = crypto_pk_asn1_decode((char*)(request+2), asn1len);
 +  if (!pk) {
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +log_warn(LD_PROTOCOL, "Couldn't decode public key.");
 +goto err;
 +  }
 +
 +  /* Next 20 bytes: Hash of rend_circ_nonce | "INTRODUCE" */
 +  memcpy(buf, circ->rend_circ_nonce, DIGEST_LEN);
 +  memcpy(buf+DIGEST_LEN, "INTRODUCE", 9);
 +  if (crypto_digest(expected_digest, buf, DIGEST_LEN+9) < 0) {
 +log_warn(LD_BUG, "Internal error computing digest.");
 +goto err;
 +  }
 +  if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) {
 +log_warn(LD_PROTOCOL, "Hash of session info was not as expected.");
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +  /* Rest of body: signature of previous data */
 +  if (crypto_pk_public_checksig_digest(pk,
 +   (char*)request, 2+asn1len+DIGEST_LEN,
 +   (char*)(request+2+DIGEST_LEN+asn1len),
 +   request_len-(2+DIGEST_LEN+asn1len))<0) 
{
 +log_warn(LD_PROTOCOL,
 + "Incorrect signature on ESTABLISH_INTRO cell; rejecting.");
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +
 +  /* The request is valid.  First, compute the hash of the service's PK.*/
 +  if (crypto_pk_get_digest(pk, pk_digest)<0) {
 +log_warn(LD_BUG, "Internal error: couldn't hash public key.");
 +goto err;
 +  }
 +
 +  crypto_pk_free(pk); /* don't need it anymore */
 +  pk = NULL; /* so we don't free it again if err */
 +
 +  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1,
 +pk_digest, REND_SERVICE_ID_LEN);
 +
 +  /* Close any other intro circuits with the same pk. */
 +  c = NULL;
 +  while ((c = hs_circuitmap_get_intro_circ_v2_relay_side(
 +(const uint8_t *)pk_digest))) 
{
 +log_info(LD_REND, "Replacing old circuit for service %s",
 + safe_str(serviceid));
 +circuit_mark_for_close(TO_CIRCUIT(c), END_CIRC_REASON_FINISHED);
 +/* Now it's marked, and it won't be returned next time. */
 +  }
 +
 +  /* Acknowledge the request. */
 +  if (hs_intro_send_intro_established_cell(circ) < 0) {
 +log_info(LD_GENERAL, "Couldn't send INTRO_ESTABLISHED cell.");
 +goto err_no_close;
 +  }
 +
 +  /* Now, set up this circuit. */
 +  circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_INTRO_POINT);
 +  hs_circuitmap_register_intro_circ_v2_relay_side(circ, (uint8_t *)pk_digest);
 +
 +  log_info(LD_REND,
 +   "Established introduction point on circuit %u for service %s",
 +   (unsigned) circ->p_circ_id,

[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

2019-01-18 Thread nickm

commit d1af4d65df8b5ef8049707029335049db147829f
Merge: 9d7b4f1ca a8580a683
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.5'

 changes/bug29029   | 5 +
 src/feature/rend/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-18 Thread nickm

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
Merge: b5fdb91ad 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-01-18 Thread nickm

commit 761f1bf71e301f0b68718854379dd42e06fcd202
Merge: 41bb77822 4cca7fb99
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2019-01-18 Thread nickm

commit 001367eb13579332739694f82905c71f2e91a351
Merge: 33c8150dd 761f1bf71
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-01-18 Thread nickm

commit 761f1bf71e301f0b68718854379dd42e06fcd202
Merge: 41bb77822 4cca7fb99
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-18 Thread nickm

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
Merge: b5fdb91ad 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.4] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-18 Thread nickm

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
Merge: b5fdb91ad 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-18 Thread nickm

commit a8580a683696eb76f5f24fe36e7ea61f9c49db0a
Merge: f0408b844 761f1bf71
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/bug29029   | 5 +
 src/feature/rend/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --cc src/feature/rend/rendmid.c
index 151604ada,0..fcfa5052c
mode 100644,00..100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@@ -1,370 -1,0 +1,370 @@@
 +/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file rendmid.c
 + * \brief Implement introductions points and rendezvous points.
 + **/
 +
 +#include "core/or/or.h"
 +#include "core/or/channel.h"
 +#include "core/or/circuitlist.h"
 +#include "core/or/circuituse.h"
 +#include "app/config/config.h"
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "core/or/dos.h"
 +#include "core/or/relay.h"
 +#include "feature/rend/rendmid.h"
 +#include "feature/stats/rephist.h"
 +#include "feature/hs/hs_circuitmap.h"
 +#include "feature/hs/hs_intropoint.h"
 +
 +#include "core/or/or_circuit_st.h"
 +
 +/** Respond to an ESTABLISH_INTRO cell by checking the signed data and
 + * setting the circuit's purpose and service pk digest.
 + */
 +int
 +rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request,
 +size_t request_len)
 +{
 +  crypto_pk_t *pk = NULL;
 +  char buf[DIGEST_LEN+9];
 +  char expected_digest[DIGEST_LEN];
 +  char pk_digest[DIGEST_LEN];
 +  size_t asn1len;
 +  or_circuit_t *c;
 +  char serviceid[REND_SERVICE_ID_LEN_BASE32+1];
 +  int reason = END_CIRC_REASON_INTERNAL;
 +
 +  log_info(LD_REND,
 +   "Received a legacy ESTABLISH_INTRO request on circuit %u",
 +   (unsigned) circ->p_circ_id);
 +
 +  if (!hs_intro_circuit_is_suitable_for_establish_intro(circ)) {
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +
 +  if (request_len < 2+DIGEST_LEN)
 +goto truncated;
 +  /* First 2 bytes: length of asn1-encoded key. */
 +  asn1len = ntohs(get_uint16(request));
 +
 +  /* Next asn1len bytes: asn1-encoded key. */
 +  if (request_len < 2+DIGEST_LEN+asn1len)
 +goto truncated;
 +  pk = crypto_pk_asn1_decode((char*)(request+2), asn1len);
 +  if (!pk) {
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +log_warn(LD_PROTOCOL, "Couldn't decode public key.");
 +goto err;
 +  }
 +
 +  /* Next 20 bytes: Hash of rend_circ_nonce | "INTRODUCE" */
 +  memcpy(buf, circ->rend_circ_nonce, DIGEST_LEN);
 +  memcpy(buf+DIGEST_LEN, "INTRODUCE", 9);
 +  if (crypto_digest(expected_digest, buf, DIGEST_LEN+9) < 0) {
 +log_warn(LD_BUG, "Internal error computing digest.");
 +goto err;
 +  }
 +  if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) {
 +log_warn(LD_PROTOCOL, "Hash of session info was not as expected.");
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +  /* Rest of body: signature of previous data */
 +  if (crypto_pk_public_checksig_digest(pk,
 +   (char*)request, 2+asn1len+DIGEST_LEN,
 +   (char*)(request+2+DIGEST_LEN+asn1len),
 +   request_len-(2+DIGEST_LEN+asn1len))<0) 
{
 +log_warn(LD_PROTOCOL,
 + "Incorrect signature on ESTABLISH_INTRO cell; rejecting.");
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +
 +  /* The request is valid.  First, compute the hash of the service's PK.*/
 +  if (crypto_pk_get_digest(pk, pk_digest)<0) {
 +log_warn(LD_BUG, "Internal error: couldn't hash public key.");
 +goto err;
 +  }
 +
 +  crypto_pk_free(pk); /* don't need it anymore */
 +  pk = NULL; /* so we don't free it again if err */
 +
 +  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1,
 +pk_digest, REND_SERVICE_ID_LEN);
 +
 +  /* Close any other intro circuits with the same pk. */
 +  c = NULL;
 +  while ((c = hs_circuitmap_get_intro_circ_v2_relay_side(
 +(const uint8_t *)pk_digest))) 
{
 +log_info(LD_REND, "Replacing old circuit for service %s",
 + safe_str(serviceid));
 +circuit_mark_for_close(TO_CIRCUIT(c), END_CIRC_REASON_FINISHED);
 +/* Now it's marked, and it won't be returned next time. */
 +  }
 +
 +  /* Acknowledge the request. */
 +  if (hs_intro_send_intro_established_cell(circ) < 0) {
 +log_info(LD_GENERAL, "Couldn't send INTRO_ESTABLISHED cell.");
 +goto err_no_close;
 +  }
 +
 +  /* Now, set up this circuit. */
 +  circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_INTRO_POINT);
 +  hs_circuitmap_register_intro_circ_v2_relay_side(circ, (uint8_t *)pk_digest);
 +
 +  log_info(LD_REND,
 +   "Established introduction point on circuit %u for service %s",
 +   (unsigned) circ->p_circ_id,

[tor-commits] [tor/maint-0.2.9] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-01-18 Thread nickm

commit a8580a683696eb76f5f24fe36e7ea61f9c49db0a
Merge: f0408b844 761f1bf71
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/bug29029   | 5 +
 src/feature/rend/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --cc src/feature/rend/rendmid.c
index 151604ada,0..fcfa5052c
mode 100644,00..100644
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@@ -1,370 -1,0 +1,370 @@@
 +/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2019, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file rendmid.c
 + * \brief Implement introductions points and rendezvous points.
 + **/
 +
 +#include "core/or/or.h"
 +#include "core/or/channel.h"
 +#include "core/or/circuitlist.h"
 +#include "core/or/circuituse.h"
 +#include "app/config/config.h"
 +#include "lib/crypt_ops/crypto_cipher.h"
 +#include "core/or/dos.h"
 +#include "core/or/relay.h"
 +#include "feature/rend/rendmid.h"
 +#include "feature/stats/rephist.h"
 +#include "feature/hs/hs_circuitmap.h"
 +#include "feature/hs/hs_intropoint.h"
 +
 +#include "core/or/or_circuit_st.h"
 +
 +/** Respond to an ESTABLISH_INTRO cell by checking the signed data and
 + * setting the circuit's purpose and service pk digest.
 + */
 +int
 +rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request,
 +size_t request_len)
 +{
 +  crypto_pk_t *pk = NULL;
 +  char buf[DIGEST_LEN+9];
 +  char expected_digest[DIGEST_LEN];
 +  char pk_digest[DIGEST_LEN];
 +  size_t asn1len;
 +  or_circuit_t *c;
 +  char serviceid[REND_SERVICE_ID_LEN_BASE32+1];
 +  int reason = END_CIRC_REASON_INTERNAL;
 +
 +  log_info(LD_REND,
 +   "Received a legacy ESTABLISH_INTRO request on circuit %u",
 +   (unsigned) circ->p_circ_id);
 +
 +  if (!hs_intro_circuit_is_suitable_for_establish_intro(circ)) {
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +
 +  if (request_len < 2+DIGEST_LEN)
 +goto truncated;
 +  /* First 2 bytes: length of asn1-encoded key. */
 +  asn1len = ntohs(get_uint16(request));
 +
 +  /* Next asn1len bytes: asn1-encoded key. */
 +  if (request_len < 2+DIGEST_LEN+asn1len)
 +goto truncated;
 +  pk = crypto_pk_asn1_decode((char*)(request+2), asn1len);
 +  if (!pk) {
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +log_warn(LD_PROTOCOL, "Couldn't decode public key.");
 +goto err;
 +  }
 +
 +  /* Next 20 bytes: Hash of rend_circ_nonce | "INTRODUCE" */
 +  memcpy(buf, circ->rend_circ_nonce, DIGEST_LEN);
 +  memcpy(buf+DIGEST_LEN, "INTRODUCE", 9);
 +  if (crypto_digest(expected_digest, buf, DIGEST_LEN+9) < 0) {
 +log_warn(LD_BUG, "Internal error computing digest.");
 +goto err;
 +  }
 +  if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) {
 +log_warn(LD_PROTOCOL, "Hash of session info was not as expected.");
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +  /* Rest of body: signature of previous data */
 +  if (crypto_pk_public_checksig_digest(pk,
 +   (char*)request, 2+asn1len+DIGEST_LEN,
 +   (char*)(request+2+DIGEST_LEN+asn1len),
 +   request_len-(2+DIGEST_LEN+asn1len))<0) 
{
 +log_warn(LD_PROTOCOL,
 + "Incorrect signature on ESTABLISH_INTRO cell; rejecting.");
 +reason = END_CIRC_REASON_TORPROTOCOL;
 +goto err;
 +  }
 +
 +  /* The request is valid.  First, compute the hash of the service's PK.*/
 +  if (crypto_pk_get_digest(pk, pk_digest)<0) {
 +log_warn(LD_BUG, "Internal error: couldn't hash public key.");
 +goto err;
 +  }
 +
 +  crypto_pk_free(pk); /* don't need it anymore */
 +  pk = NULL; /* so we don't free it again if err */
 +
 +  base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1,
 +pk_digest, REND_SERVICE_ID_LEN);
 +
 +  /* Close any other intro circuits with the same pk. */
 +  c = NULL;
 +  while ((c = hs_circuitmap_get_intro_circ_v2_relay_side(
 +(const uint8_t *)pk_digest))) 
{
 +log_info(LD_REND, "Replacing old circuit for service %s",
 + safe_str(serviceid));
 +circuit_mark_for_close(TO_CIRCUIT(c), END_CIRC_REASON_FINISHED);
 +/* Now it's marked, and it won't be returned next time. */
 +  }
 +
 +  /* Acknowledge the request. */
 +  if (hs_intro_send_intro_established_cell(circ) < 0) {
 +log_info(LD_GENERAL, "Couldn't send INTRO_ESTABLISHED cell.");
 +goto err_no_close;
 +  }
 +
 +  /* Now, set up this circuit. */
 +  circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_INTRO_POINT);
 +  hs_circuitmap_register_intro_circ_v2_relay_side(circ, (uint8_t *)pk_digest);
 +
 +  log_info(LD_REND,
 +   "Established introduction point on circuit %u for service %s",
 +   (unsigned) circ->p_circ_id,

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-18 Thread nickm

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
Merge: b5fdb91ad 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-01-18 Thread nickm

commit 761f1bf71e301f0b68718854379dd42e06fcd202
Merge: 41bb77822 4cca7fb99
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-01-18 Thread nickm

commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45
Merge: b5fdb91ad 89a0b7774
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] rend: stop warning when clients send multiple rend establish cells

2019-01-18 Thread nickm

commit 89a0b77740f2a1179badcaa71d1e104cedb6ddde
Author: teor 
Date:   Wed Jan 9 18:00:34 2019 +1000

rend: stop warning when clients send multiple rend establish cells

Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.

Fixes bug 29029; bugfix on 0.2.5.7-rc.
---
 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changes/bug29029 b/changes/bug29029
new file mode 100644
index 0..e100a8c2e
--- /dev/null
+++ b/changes/bug29029
@@ -0,0 +1,5 @@
+  o Minor bugfixes (logging, onion services):
+- Stop logging "Tried to establish rendezvous on non-OR circuit..." as
+  a warning. Instead, log it as a protocol warning, because there is
+  nothing that relay operators can do to fix it. Fixes bug 29029;
+  bugfix on 0.2.5.7-rc.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 441d5043c..08b2e8923 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -242,9 +242,9 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const 
uint8_t *request,
(unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-log_warn(LD_PROTOCOL,
- "Tried to establish rendezvous on non-OR circuit with purpose %s",
- circuit_purpose_to_string(circ->base_.purpose));
+log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+   "Tried to establish rendezvous on non-OR circuit with purpose %s",
+   circuit_purpose_to_string(circ->base_.purpose));
 goto err;
   }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-01-18 Thread nickm

commit 761f1bf71e301f0b68718854379dd42e06fcd202
Merge: 41bb77822 4cca7fb99
Author: Nick Mathewson 
Date:   Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug29029 | 5 +
 src/or/rendmid.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

2019-01-18 Thread translation

commit 6a95ae74f9bcf2bb1f468c1495090f1dd50f0417
Author: Translation commit bot 
Date:   Fri Jan 18 17:20:00 2019 +

Update translations for support-portal_completed
---
 contents+pt-PT.po | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index fd0a961c8..51653162b 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -274,8 +274,8 @@ msgid ""
 "It's strongly discouraged to install new add-ons in Tor Browser, because "
 "they can compromise your privacy and security."
 msgstr ""
-"NÃ³s desencorajamos fortemente a instalaÃ§Ã£o de novos extras no Tor Browser, 
"
-"pois estes podem comprometer a sua privacidade e a sua seguranÃ§a."
+"NÃ³s desencorajamos fortemente a instalaÃ§Ã£o de novas extensÃµes  no Tor "
+"Browser, pois estas podem comprometer a sua privacidade e a sua seguranÃ§a."
 
 #: http//localhost/faq/install-add-on-extension-tor-browser/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -677,7 +677,7 @@ msgstr "tor-browser-protege-outras-aplicacoes"
 #: http//localhost/tbb/installing-add-on-extensions-tor-browser/
 #: (content/tbb/tbb-14/contents+en.lrquestion.seo_slug)
 msgid "installing-add-on-extensions-tor-browser"
-msgstr "instalar-add-on-extensÃµes-tor-browser"
+msgstr "instalar-extensÃµes-no-tor-browser"
 
 #: http//localhost/tbb/download-tor-browser-chromeos/
 #: (content/tbb/tbb-15/contents+en.lrquestion.title)
@@ -994,9 +994,9 @@ msgid ""
 "Click the button labelled \"Copy Tor Log To Clipboard\" that appears in the "
 "dialog window when Tor Browser is first connecting to the network."
 msgstr ""
-"Clique no botÃ£o rotulado \"Copiar o registro do Tor para a Ãrea de "
-"TransferÃªncia\", que serÃ¡ exibido numa caixa de diÃ¡logo quando o Tor 
Browser"
-" estiver se conectando Ã¡ rede pela primeira vez."
+"Clique no botÃ£o rotulado \"Copiar o Registo do Tor para a Ãrea de "
+"TransferÃªncia\", que serÃ¡ mostrado numa caixa de diÃ¡logo quando o Tor "
+"Browser estiver a ligar Ã  rede pela primeira vez."
 
 #: http//localhost/tbb/view-tor-browser-message-log/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
@@ -1007,8 +1007,8 @@ msgid ""
 msgstr ""
 "Caso o Tor Browser jÃ¡ esteja aberto, clique no Ãcone do Torbutton (a 
pequena"
 " cebola verde no canto superior esquerdo da tela) e, em seguida, em \"Abrir "
-"configuraÃ§Ãµes de rede\" e, em seguida, em \"Copiar os registros do Tor para 
"
-"a Ãrea de TransferÃªncia\"."
+"configuraÃ§Ãµes de rede\" e depois em \"Copiar o Registo do Tor para a Ãrea 
de"
+" TransferÃªncia\"."
 
 #: http//localhost/tbb/view-tor-browser-message-log/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] Update translations for support-portal

2019-01-18 Thread translation

commit d6242ae90c90e1bda0329176230b034ca0b00405
Author: Translation commit bot 
Date:   Fri Jan 18 17:19:51 2019 +

Update translations for support-portal
---
 contents+pt-PT.po | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index fd0a961c8..51653162b 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -274,8 +274,8 @@ msgid ""
 "It's strongly discouraged to install new add-ons in Tor Browser, because "
 "they can compromise your privacy and security."
 msgstr ""
-"NÃ³s desencorajamos fortemente a instalaÃ§Ã£o de novos extras no Tor Browser, 
"
-"pois estes podem comprometer a sua privacidade e a sua seguranÃ§a."
+"NÃ³s desencorajamos fortemente a instalaÃ§Ã£o de novas extensÃµes  no Tor "
+"Browser, pois estas podem comprometer a sua privacidade e a sua seguranÃ§a."
 
 #: http//localhost/faq/install-add-on-extension-tor-browser/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -677,7 +677,7 @@ msgstr "tor-browser-protege-outras-aplicacoes"
 #: http//localhost/tbb/installing-add-on-extensions-tor-browser/
 #: (content/tbb/tbb-14/contents+en.lrquestion.seo_slug)
 msgid "installing-add-on-extensions-tor-browser"
-msgstr "instalar-add-on-extensÃµes-tor-browser"
+msgstr "instalar-extensÃµes-no-tor-browser"
 
 #: http//localhost/tbb/download-tor-browser-chromeos/
 #: (content/tbb/tbb-15/contents+en.lrquestion.title)
@@ -994,9 +994,9 @@ msgid ""
 "Click the button labelled \"Copy Tor Log To Clipboard\" that appears in the "
 "dialog window when Tor Browser is first connecting to the network."
 msgstr ""
-"Clique no botÃ£o rotulado \"Copiar o registro do Tor para a Ãrea de "
-"TransferÃªncia\", que serÃ¡ exibido numa caixa de diÃ¡logo quando o Tor 
Browser"
-" estiver se conectando Ã¡ rede pela primeira vez."
+"Clique no botÃ£o rotulado \"Copiar o Registo do Tor para a Ãrea de "
+"TransferÃªncia\", que serÃ¡ mostrado numa caixa de diÃ¡logo quando o Tor "
+"Browser estiver a ligar Ã  rede pela primeira vez."
 
 #: http//localhost/tbb/view-tor-browser-message-log/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
@@ -1007,8 +1007,8 @@ msgid ""
 msgstr ""
 "Caso o Tor Browser jÃ¡ esteja aberto, clique no Ãcone do Torbutton (a 
pequena"
 " cebola verde no canto superior esquerdo da tela) e, em seguida, em \"Abrir "
-"configuraÃ§Ãµes de rede\" e, em seguida, em \"Copiar os registros do Tor para 
"
-"a Ãrea de TransferÃªncia\"."
+"configuraÃ§Ãµes de rede\" e depois em \"Copiar o Registo do Tor para a Ãrea 
de"
+" TransferÃªncia\"."
 
 #: http//localhost/tbb/view-tor-browser-message-log/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed

2019-01-18 Thread translation

commit 8f4851dbbff240e52cbb97bd1c192b6ba5b43ae9
Author: Translation commit bot 
Date:   Fri Jan 18 17:18:13 2019 +

Update translations for torbutton-branddtd_completed
---
 pt_PT/brand.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_PT/brand.dtd b/pt_PT/brand.dtd
index 0acc133a9..912e89881 100644
--- a/pt_PT/brand.dtd
+++ b/pt_PT/brand.dtd
@@ -12,4 +12,4 @@
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-branddtd] Update translations for torbutton-branddtd

2019-01-18 Thread translation

commit 8190d0ea22cecd876e254ba8b1c3b90aef0dbbf6
Author: Translation commit bot 
Date:   Fri Jan 18 17:18:07 2019 +

Update translations for torbutton-branddtd
---
 pt_PT/brand.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_PT/brand.dtd b/pt_PT/brand.dtd
index 0acc133a9..912e89881 100644
--- a/pt_PT/brand.dtd
+++ b/pt_PT/brand.dtd
@@ -12,4 +12,4 @@
 
 
 
-
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-18 Thread translation

commit 5365d7cbd18511983221413dfbd8815805708c8e
Author: Translation commit bot 
Date:   Fri Jan 18 17:17:23 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 91 +--
 1 file changed, 75 insertions(+), 16 deletions(-)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index 4a1df0dcb..7699f2e10 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -1639,6 +1639,9 @@ msgid ""
 "outdated version of the software, you may be vulnerable to serious security "
 "flaws that compromise your privacy and anonymity."
 msgstr ""
+"O Tor Browser deve ser sempre atualizado. Se continuar a utilizar uma versÃ£o"
+" antiga do programa, expÃµe-se a sÃ©rios problemas de seguranÃ§a, que "
+"comprometem a sua privacidade e anonimato."
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
@@ -1648,16 +1651,20 @@ msgid ""
 "may see a written update indicator when Tor Browser opens. You can update "
 "either automatically or manually."
 msgstr ""
+"O Tor Browser irÃ¡ perguntar-lhe se quer atualizar apÃ³s ser lanÃ§ada uma 
nova "
+"versÃ£o: o Ãcone do Torbutton mostra um triÃ¢ngulo amarelo, e verÃ¡ um "
+"indicaÃ§Ã£o com texto sobre a atualizaÃ§Ã£o quando o Tor Browser Ã© iniciado. 
"
+"PoderÃ¡ atualizar o Tor de forma automÃ¡tica ou manual. "
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
 msgid "# Updating Tor Browser automatically"
-msgstr ""
+msgstr "# Como atualizar o Tor Browser automaticamente"
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
@@ -1665,11 +1672,13 @@ msgid ""
 "When you are prompted to update Tor Browser, click on the Torbutton icon, "
 "then select âCheck for Tor Browser Updateâ."
 msgstr ""
+"Ao ver o alerta para atualizar o Tor Browser, clique no Ãcone do Torbutton. "
+"Em seguida, selecione âProcurar por atualizaÃ§Ãµes do Tor Browser...â. "
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
@@ -1677,11 +1686,13 @@ msgid ""
 "When Tor Browser has finished checking for updates, click on the âUpdateâ 
"
 "button."
 msgstr ""
+"Quando o Tor Browser tiver acabado de procurar atualizaÃ§Ãµes, clique no 
botÃ£o"
+" \"Atualizar\"."
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
@@ -1689,11 +1700,13 @@ msgid ""
 "Wait for the update to download and install, then restart Tor Browser. You "
 "will now be running the latest version."
 msgstr ""
+"Aguarde atÃ© que a atualizaÃ§Ã£o seja descarregada e instalada. ApÃ³s isso "
+"reinicie o Tor Browser. Agora estarÃ¡ a utilizar a Ãºltima versÃ£o do Tor."
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
 msgid "# Updating Tor Browser manually"
-msgstr ""
+msgstr "# Como atualizar o Tor Browser manualmente"
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
@@ -1701,6 +1714,8 @@ msgid ""
 "When you are prompted to update Tor Browser, finish the browsing session and"
 " close the program."
 msgstr ""
+"Quando lhe for perguntado se quer atualizar o Tor Browser, termine a sessÃ£o "
+"de navegaÃ§Ã£o e feche o programa."
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
@@ -1709,6 +1724,8 @@ msgid ""
 "(see the Uninstalling section for more "
 "information)."
 msgstr ""
+"Remova o Tor Browser do seu sistema eliminando a pasta do Tor (consulte a "
+"secÃ§Ã£o Desinstalar para mais informaÃ§Ãµes)."
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)
@@ -1718,26 +1735,30 @@ msgid ""
 " and download a copy of the latest Tor Browser release, then install it as "
 "before."
 msgstr ""
+"Veja a pÃ¡gina  https://www.torproject.org/projects/torbrowser.html.en\;> "
+"https://www.torproject.org/projects/torbrowser.html.en e descarregue uma"
+" cÃ³pia  da Ãºltima versÃ£o do Tor Browser e instale-a."
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.seo_slug)
 msgid "updating"
-msgstr ""
+msgstr "atualizar"
 
 #: https//tb-manual.torproject.org/en-US/plugins/
 #: (content/plugins/contents+en-US.lrtopic.title)
 msgid "Plugins, add-ons and JavaScript"
-msgstr ""
+msgstr "Plugins, extensÃµes e JavaScript"
 
 #:

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-01-18 Thread translation

commit d193284403a0714bd865215f97867588e0be6ea8
Author: Translation commit bot 
Date:   Fri Jan 18 16:47:15 2019 +

Update translations for tbmanual-contentspot
---
 contents+pt_PT.po | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/contents+pt_PT.po b/contents+pt_PT.po
index 8b1693300..4a1df0dcb 100644
--- a/contents+pt_PT.po
+++ b/contents+pt_PT.po
@@ -1562,6 +1562,14 @@ msgid ""
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
+"Neste nÃvel, os vÃdeos e Ã¡udios HTML5 necessitam de clique-para-reproduzir 
"
+"atravÃ©s do NoScript; toda otimizaÃ§Ã£o de performance em JavaScript Ã© "
+"desativada; algumas equaÃ§Ãµes matemÃ¡ticas podem nÃ£o ser mostradas "
+"corretamente; alguns componentes de processamento de fontes tipogrÃ¡ficas 
sÃ£o"
+" desativados; alguns tipos de imagens sÃ£o desativados; o Javascript Ã© "
+"desativado como padrÃ£o em todos os sites; a maioria dos formatos de vÃdeo e 
"
+"Ã¡udio sÃ£o desativados; algumas fontes e Ãcones podem nÃ£o ser mostrados "
+"corretamente."
 
 #: https//tb-manual.torproject.org/en-US/security-slider/
 #: (content/security-slider/contents+en-US.lrtopic.body)
@@ -1582,6 +1590,12 @@ msgid ""
 "disabled by default on all non-HTTPS "
 "sites."
 msgstr ""
+"Neste nÃvel, os vÃdeos e Ã¡udios HTML5 necessitam de \n"
+"clique-para-reproduzir atravÃ©s do NoScript; toda otimizaÃ§Ã£o de \n"
+"performance em JavaScript Ã© desativada; algumas equaÃ§Ãµes matemÃ¡ticas \n"
+"podem nÃ£o ser mostradas corretamente; alguns componentes de \n"
+"processamento de fontes tipogrÃ¡ficas sÃ£o desativados; alguns tipos de \n"
+"imagens sÃ£o desativados; o Javascript Ã© desativado como padrÃ£o em todos os 
sites nÃ£o-HTTPS."
 
 #: https//tb-manual.torproject.org/en-US/security-slider/
 #: (content/security-slider/contents+en-US.lrtopic.body)
@@ -1598,23 +1612,25 @@ msgid ""
 "At this level, all browser features are enabled. This is the most usable "
 "option."
 msgstr ""
+"Neste nÃvel, todas as funcionalidades do navegador sÃ£o ativadas. Esta Ã© a "
+"opÃ§Ã£o que garante mais usabilidade."
 
 #: https//tb-manual.torproject.org/en-US/security-slider/
 #: (content/security-slider/contents+en-US.lrtopic.seo_slug)
 #: https//tb-manual.torproject.org/en-US/security-slider.html
 #: (content/security-slider.html/contents+en-US.lrtopic.seo_slug)
 msgid "security-slider"
-msgstr ""
+msgstr "deslizador-de.-seguranca "
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.title)
 msgid "Updating"
-msgstr ""
+msgstr "Atualizar"
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.description)
 msgid "How to update Tor Browser"
-msgstr ""
+msgstr "Como atualizar o Tor Browser"
 
 #: https//tb-manual.torproject.org/en-US/updating/
 #: (content/updating/contents+en-US.lrtopic.body)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-01-18 Thread translation

commit 13ea2715eda932aea412d2525c064558cc22ae1a
Author: Translation commit bot 
Date:   Fri Jan 18 16:19:36 2019 +

Update translations for tpo-web
---
 contents+de.po|  96 +-
 contents+es.po|  96 +-
 contents+fa.po|  96 +-
 contents+fr.po|  96 +-
 contents+pt-BR.po |  96 +-
 contents+ru.po|  96 +-
 contents+tr.po|  96 +-
 contents+zh-CN.po |  96 +-
 contents.pot  | 122 +++---
 9 files changed, 104 insertions(+), 786 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index 4359c3262..37a25c8c5 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 16:43+CET\n"
+"POT-Creation-Date: 2019-01-18 16:50+CET\n"
 "PO-Revision-Date: 2019-01-10 12:38+\n"
 "Last-Translator: Oliver Parczyk, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/94225/de/)\n"
@@ -44,7 +44,7 @@ msgstr ""
 #: https//torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
 "We advance human rights and defend your privacy online through free software"
-" and open networks. Meet our team."
+" and open networks. [Meet our team](about/people)."
 msgstr ""
 
 #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title)
@@ -1538,57 +1538,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of "
-"opportunity"
-msgstr ""
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"to improve resilience against DDoS attacks and aims to thwart DDoS attacks "
-"by:"
-msgstr ""
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"(1) dispersing cyber assets (physically and/or logically) to complicate "
-"adversarial"
-msgstr ""
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"targeting; (2) disguising the characteristics and behaviors of those assets "
-"through"
-msgstr ""
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"networked maneuver to confuse or deceive the adversary; and (3) using "
-"adaptive"
-msgstr ""
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"mitigation techniques on endpoints (e.g., mission-critical servers) to blunt"
-" the"
-msgstr ""
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"effects of attacks that succeed in penetrating other defensive measures."
-msgstr ""
-
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.name)
-msgid "DARPA via University of Pennsylvania"
-msgstr ""
-
 #: https//torproject.org/about/sponsors/DARPA-penn/
 #: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
@@ -1602,6 +1551,11 @@ msgid ""
 "succeed in penetrating other defensive measures."
 msgstr ""
 
+#: https//torproject.org/about/sponsors/DARPA-penn/
+#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.name)
+msgid "DARPA via University of Pennsylvania"
+msgstr ""
+
 #: https//torproject.org/about/sponsors/disconnect/
 #: (content/about/sponsors/disconnect/contents+en.lrsponsor.name)
 msgid "Disconnect"
@@ -1923,32 +1877,10 @@ msgstr ""
 #: (content/about/sponsors/USSD-DHRL-harvard/contents+en.lrsponsor.description)
 msgid ""
 "The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to "
-"promote"
-msgstr ""
-
-#: https//torproject.org/about/sponsors/USSD-DHRL/
-#: (content/about/sponsors/USSD-DHRL/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/USSD-DHRL-harvard/
-#: (content/about/sponsors/USSD-DHRL-harvard/contents+en.lrsponsor.description)
-msgid ""
-"[democracy](http://www.state.gov/j/drl/democ/), protect [human "
-"rights](http://www.state.gov/j/drl/hr/)"
-msgstr ""
-
-#: https//torproject.org/about/sponsors/USSD-DHRL/
-#: (content/about/sponsors/USSD-DHRL/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/USSD-DHRL-harvard/
-#: (content/about/sponsors/USSD-DHRL-harvard/contents+en.lrsponsor.description)
-msgid

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-01-18 Thread translation

commit 18a7bbe4a84b9cdefff0a83d981a291049586a3a
Author: Translation commit bot 
Date:   Fri Jan 18 16:19:41 2019 +

Update translations for tpo-web_completed
---
 contents.pot | 122 ---
 1 file changed, 16 insertions(+), 106 deletions(-)

diff --git a/contents.pot b/contents.pot
index 6931e225d..cbf5b4c7c 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 16:43+CET\n"
+"POT-Creation-Date: 2019-01-18 16:50+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -37,10 +37,10 @@ msgstr "We are the Tor Project, a 501(c)3 US nonprofit."
 #: https//torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
 "We advance human rights and defend your privacy online through free software"
-" and open networks. Meet our team."
+" and open networks. [Meet our team](about/people)."
 msgstr ""
 "We advance human rights and defend your privacy online through free software"
-" and open networks. Meet our team."
+" and open networks. [Meet our team](about/people)."
 
 #: https//torproject.org/contact/ (content/contact/contents+en.lrpage.title)
 msgid "contact"
@@ -1802,70 +1802,6 @@ msgstr "DARPA and ONR via Naval Research Laboratory"
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of "
-"opportunity"
-msgstr ""
-"DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of "
-"opportunity"
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"to improve resilience against DDoS attacks and aims to thwart DDoS attacks "
-"by:"
-msgstr ""
-"to improve resilience against DDoS attacks and aims to thwart DDoS attacks "
-"by:"
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"(1) dispersing cyber assets (physically and/or logically) to complicate "
-"adversarial"
-msgstr ""
-"(1) dispersing cyber assets (physically and/or logically) to complicate "
-"adversarial"
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"targeting; (2) disguising the characteristics and behaviors of those assets "
-"through"
-msgstr ""
-"targeting; (2) disguising the characteristics and behaviors of those assets "
-"through"
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"networked maneuver to confuse or deceive the adversary; and (3) using "
-"adaptive"
-msgstr ""
-"networked maneuver to confuse or deceive the adversary; and (3) using "
-"adaptive"
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"mitigation techniques on endpoints (e.g., mission-critical servers) to blunt"
-" the"
-msgstr ""
-"mitigation techniques on endpoints (e.g., mission-critical servers) to blunt"
-" the"
-
-#: https//torproject.org/about/sponsors/DARPA-nrl/
-#: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-msgid ""
-"effects of attacks that succeed in penetrating other defensive measures."
-msgstr ""
-"effects of attacks that succeed in penetrating other defensive measures."
-
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.name)
-msgid "DARPA via University of Pennsylvania"
-msgstr "DARPA via University of Pennsylvania"
-
 #: https//torproject.org/about/sponsors/DARPA-penn/
 #: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
@@ -1887,6 +1823,11 @@ msgstr ""
 "(e.g., mission-critical servers) to blunt the effects of attacks that "
 "succeed in penetrating other defensive measures."
 
+#: https//torproject.org/about/sponsors/DARPA-penn/
+#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.name)
+msgid "DARPA via University of Pennsylvania"
+msgstr "DARPA via University of Pennsylvania"
+
 #: https//torproject.org/about/sponsors/disconnect/
 #: (content/about/sponsors/disconnect/contents+en.lrsponsor.name)
 msgid "Disconnect"
@@ -2261,39 +2202,16 @@ msgstr "U.S. Department of State Bureau of Democracy, 
Human Rights, and Labor"
 #: (content/about/sponsors/USSD-DHRL-harvard/contents+en.lrsponsor.description)
 msgid ""
 "The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to "
-"promote"
+"promote [democracy](http://www.state.gov/j/drl/democ/), protect [human "
+"rights](http://www.state.gov/j/drl/hr/) and [international religious "

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-01-18 Thread translation

commit 6757c654d06dd5dd21d7d68a32a0b381ec7adcaa
Author: Translation commit bot 
Date:   Fri Jan 18 15:49:48 2019 +

Update translations for tpo-web
---
 contents+de.po| 122 --
 contents+es.po| 121 --
 contents+fa.po| 121 --
 contents+fr.po| 121 --
 contents+pt-BR.po | 121 --
 contents+ru.po| 121 --
 contents+tr.po| 121 --
 contents+zh-CN.po | 121 --
 contents.pot  | 154 ++
 9 files changed, 874 insertions(+), 249 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index f2117f852..4359c3262 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -2,7 +2,6 @@
 # ducki2p , 2019
 # Ettore Atalan , 2019
 # erinm, 2019
-# Lars Schimmer , 2019
 # Emma Peel, 2019
 # Ikono Gangansi , 2019
 # Oliver Parczyk, 2019
@@ -11,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 10:56+CET\n"
+"POT-Creation-Date: 2019-01-18 16:43+CET\n"
 "PO-Revision-Date: 2019-01-10 12:38+\n"
 "Last-Translator: Oliver Parczyk, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/94225/de/)\n"
@@ -96,12 +95,8 @@ msgstr ""
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
-#: https//torproject.org/about/people/
-#: (content/about/people/contents+en.lrpeople.section)
 #: https//torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrpage.section)
-#: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrjobs.section)
 msgid "about"
 msgstr "Ã¼ber"
 
@@ -309,20 +304,6 @@ msgid ""
 "transparency in its work and reporting."
 msgstr ""
 
-#: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrjobs.title)
-msgid "Jobs"
-msgstr "Arbeiten"
-
-#: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrjobs.body)
-msgid ""
-"Weâre always looking for more great people to join our team. Join us in our 
"
-"Seattle office or work remotely from wherever you are in the world. Youâll "
-"work with a diverse group of bright and passionate folks committed to "
-"fostering internet freedom worldwide."
-msgstr ""
-
 #: https//torproject.org/about/people/hc/
 #: (content/about/people/hc/contents+en.lrperson.role)
 #: https//torproject.org/about/people/agrabeli/
@@ -1977,20 +1958,58 @@ msgid ""
 "Harvard"
 msgstr ""
 
-#: https//torproject.org/about/jobs/developer-data-architect/
-#: (content/about/jobs/developer-data-architect/contents+en.lrjob.title)
-msgid "Developer Data Architect"
-msgstr ""
-
-#: https//torproject.org/about/jobs/senior-system-administrator/
-#: (content/about/jobs/senior-system-administrator/contents+en.lrjob.title)
-msgid "Senior System Administrator"
+#: https//torproject.org/ (content/contents+en.lrpage.body)
+msgid ""
+"We advance human rights and defend your privacy online through free software"
+" and open networks. [Meet our team](about/people)."
 msgstr ""
 
 #: templates/about.html:7 templates/homepage.html:8 templates/layout.html:7
 msgid "Tor Project"
 msgstr "Tor-Projekt"
 
+#: templates/download.html:7
+msgid "Get connected"
+msgstr ""
+
+#: templates/download.html:9
+msgid ""
+"If you are in a country where Tor is blocked, you can configure Tor to connect to a bridge during the "
+"setup process. Select \"Tor is censored in my "
+"country.\""
+msgstr ""
+
+#: templates/download.html:12
+msgid ""
+"If Tor is not censored, one of the most common reasons Tor wonât connect is 
"
+"an incorrect system clock. Please make sure itâs set correctly. Read other "
+"FAQâs at our https://support.torproject.org\;>Support "
+"Portal."
+msgstr ""
+
+#: templates/download.html:19
+msgid "Stay safe"
+msgstr ""
+
+#: templates/download.html:21
+msgid "Please do not torrent over Tor."
+msgstr ""
+
+#: templates/download.html:22
+msgid ""
+"Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime,"
+" and others: they can be manipulated into revealing your IP address."
+msgstr ""
+
+#: templates/download.html:25
+msgid ""
+"We do not recommend installing additional add-ons or plugins into Tor"
+" Browser, as these may bypass Tor or compromise your privacy. Tor Browser "
+"already comes with HTTPS Everywhere, NoScript, and other patches to protect "
+"your privacy and security."
+msgstr ""
+
 #: templates/footer.html:19
 msgid "Our mission:"
 msgstr "Unsere Mission:"
@@ -2037,6 +2056,53 @@ msgid ""
 "Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
 
+#: templates/home.html:11
+msgid "BLOCK

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-01-18 Thread translation

commit 8c290dce7bd5a6881df39121a398cc4616d6aede
Author: Translation commit bot 
Date:   Fri Jan 18 15:49:54 2019 +

Update translations for tpo-web_completed
---
 contents.pot | 154 ++-
 1 file changed, 122 insertions(+), 32 deletions(-)

diff --git a/contents.pot b/contents.pot
index 40017e31d..6931e225d 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 10:56+CET\n"
+"POT-Creation-Date: 2019-01-18 16:43+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -95,12 +95,8 @@ msgstr "history"
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.section)
 #: https//torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.section)
-#: https//torproject.org/about/people/
-#: (content/about/people/contents+en.lrpeople.section)
 #: https//torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrpage.section)
-#: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrjobs.section)
 msgid "about"
 msgstr "about"
 
@@ -361,24 +357,6 @@ msgstr ""
 "The Tor Project, Inc. is a US 501(c)(3) nonprofit organization committed to "
 "transparency in its work and reporting."
 
-#: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrjobs.title)
-msgid "Jobs"
-msgstr "Jobs"
-
-#: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrjobs.body)
-msgid ""
-"Weâre always looking for more great people to join our team. Join us in our 
"
-"Seattle office or work remotely from wherever you are in the world. Youâll "
-"work with a diverse group of bright and passionate folks committed to "
-"fostering internet freedom worldwide."
-msgstr ""
-"Weâre always looking for more great people to join our team. Join us in our 
"
-"Seattle office or work remotely from wherever you are in the world. Youâll "
-"work with a diverse group of bright and passionate folks committed to "
-"fostering internet freedom worldwide."
-
 #: https//torproject.org/about/people/hc/
 #: (content/about/people/hc/contents+en.lrperson.role)
 #: https//torproject.org/about/people/agrabeli/
@@ -2326,20 +2304,74 @@ msgstr ""
 "U.S. Department of State Bureau of Democracy, Human Rights, and Labor via "
 "Harvard"
 
-#: https//torproject.org/about/jobs/developer-data-architect/
-#: (content/about/jobs/developer-data-architect/contents+en.lrjob.title)
-msgid "Developer Data Architect"
-msgstr "Developer Data Architect"
-
-#: https//torproject.org/about/jobs/senior-system-administrator/
-#: (content/about/jobs/senior-system-administrator/contents+en.lrjob.title)
-msgid "Senior System Administrator"
-msgstr "Senior System Administrator"
+#: https//torproject.org/ (content/contents+en.lrpage.body)
+msgid ""
+"We advance human rights and defend your privacy online through free software"
+" and open networks. [Meet our team](about/people)."
+msgstr ""
+"We advance human rights and defend your privacy online through free software"
+" and open networks. [Meet our team](about/people)."
 
 #: templates/about.html:7 templates/homepage.html:8 templates/layout.html:7
 msgid "Tor Project"
 msgstr "Tor Project"
 
+#: templates/download.html:7
+msgid "Get connected"
+msgstr "Get connected"
+
+#: templates/download.html:9
+msgid ""
+"If you are in a country where Tor is blocked, you can configure Tor to connect to a bridge during the "
+"setup process. Select \"Tor is censored in my "
+"country.\""
+msgstr ""
+"If you are in a country where Tor is blocked, you can configure Tor to connect to a bridge during the "
+"setup process. Select \"Tor is censored in my "
+"country.\""
+
+#: templates/download.html:12
+msgid ""
+"If Tor is not censored, one of the most common reasons Tor wonât connect is 
"
+"an incorrect system clock. Please make sure itâs set correctly. Read other "
+"FAQâs at our https://support.torproject.org\;>Support "
+"Portal."
+msgstr ""
+"If Tor is not censored, one of the most common reasons Tor wonât connect is 
"
+"an incorrect system clock. Please make sure itâs set correctly. Read other "
+"FAQâs at our https://support.torproject.org\;>Support "
+"Portal."
+
+#: templates/download.html:19
+msgid "Stay safe"
+msgstr "Stay safe"
+
+#: templates/download.html:21
+msgid "Please do not torrent over Tor."
+msgstr "Please do not torrent over Tor."
+
+#: templates/download.html:22
+msgid ""
+"Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime,"
+" and others: they can be manipulated into revealing your IP address."
+msgstr ""
+"Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime,"
+" and others: they can be manipulated into revealing your IP address."
+
+#: templates/download.html:25
+msgid ""
+"We do not recommend installing additional add-ons or plugins

[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd

2019-01-18 Thread translation

commit b282a4981021ec3f3f4d7d663805a73289276274
Author: Translation commit bot 
Date:   Fri Jan 18 15:47:14 2019 +

Update translations for tba-torbrowserstringsdtd
---
 nl/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/android_strings.dtd b/nl/android_strings.dtd
index 4f051a6a9..9e95287c8 100644
--- a/nl/android_strings.dtd
+++ b/nl/android_strings.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-18 Thread translation

commit 00e2c181e9685129d5e57a665da7cbfad219234f
Author: Translation commit bot 
Date:   Fri Jan 18 15:46:13 2019 +

Update translations for tails-misc
---
 nl.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nl.po b/nl.po
index ab74410ac..e498f13a9 100644
--- a/nl.po
+++ b/nl.po
@@ -17,6 +17,7 @@
 # LittleNacho , 2013
 # 53a60eabbf5124a226a7678001f9a57b, 2015
 # Nathan Follens, 2015
+# Meteor0id, 2019
 # Midgard, 2014
 # T. Des Maison , 2014
 # Thinkwell, 2018
@@ -30,8 +31,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-18 15:41+\n"
+"Last-Translator: Meteor0id\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -131,7 +132,7 @@ msgstr "Hernoemen"
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:26
 msgid "Keep current name"
-msgstr ""
+msgstr "Behoud huidige naam"
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed

2019-01-18 Thread translation

commit 24ee835c9d4c50be7b995c88968d880bcdd7e863
Author: Translation commit bot 
Date:   Fri Jan 18 15:45:32 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/es_AR/LC_MESSAGES/messages.po | 927 ---
 1 file changed, 521 insertions(+), 406 deletions(-)

diff --git a/locale/es_AR/LC_MESSAGES/messages.po 
b/locale/es_AR/LC_MESSAGES/messages.po
index d4d4ba2ef..ff0ce13b1 100644
--- a/locale/es_AR/LC_MESSAGES/messages.po
+++ b/locale/es_AR/LC_MESSAGES/messages.po
@@ -1,33 +1,41 @@
 # Translators:
 # Emma Peel, 2018
 # erinm, 2018
-# JoaquÃn Serna, 2018
 # Mariano Calvento , 2018
-# Zuhualime Akoochimoya, 2018
+# JoaquÃn Serna, 2019
+# Zuhualime Akoochimoya, 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Zuhualime Akoochimoya, 2018\n"
+"Last-Translator: Zuhualime Akoochimoya, 2019\n"
 "Language-Team: Spanish (Argentina) 
(https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:34
+#: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34
+msgid "Processing Donation - Tor"
+msgstr "Procesando DonaciÃ³n - Tor"
+
+#: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:44
+msgid "Processing Donation. Please Wait..."
+msgstr "Procesando DonaciÃ³n. Por favor espere..."
+
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34
 msgid "Tor Privacy Policy"
 msgstr "PolÃtica de Privacidad de Tor"
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:44
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:44
 msgid "Donor privacy policy"
 msgstr "PolÃtica de Privacidad de Donantes"
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:58
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:58
 msgid ""
 "The Tor Project respects donor privacy and welcomes anonymous donations."
 msgstr ""
 "El Proyecto Tor respeta la privacidad de los donantes y le dÃ¡ la bienvenida "
 "a donaciones anÃ³nimas."
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:60
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:60
 msgid ""
 "If being anonymous is important to you, the best way to preserve your "
 "anonymity is by donating using a method that doesn't disclose your personal "
@@ -36,7 +44,7 @@ msgstr ""
 "Si permanecer anÃ³nimo es importante para vos, la mejor manera de hacerlo es "
 "donar usando un mÃ©todo que no revele tu informaciÃ³n personal."
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:65
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:65
 msgid ""
 "If you provide personal information as part of the donation process, it may "
 "be collected and retained by third-party service providers and/or the Tor "
@@ -46,7 +54,7 @@ msgstr ""
 "ser recopilada y retenida por proveedores de servicios tercerizados y/o el "
 "Proyecto Tor, como se describe abajo."
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:67
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:67
 msgid ""
 "The Tor Project has very little influence over how third-party service "
 "providers, such as PayPal, may collect and use your information."
@@ -55,7 +63,7 @@ msgstr ""
 "servicios tercerizados, tales como PayPal, pueden recopilar y usar tu "
 "informaciÃ³n."
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:69
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:69
 msgid ""
 "We recommend you familiarize yourself with their https://www.paypal.com/webapps/mpp/ua;
@@ -66,7 +74,7 @@ msgstr ""
 "full\">polÃticas, especialmente si tenÃ©s preocupaciones acerca de tu "
 "privacidad."
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:74
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:74
 msgid ""
 "When you donate to the Tor Project, depending what mechanism you use, we may"
 " learn your name, the amount you donated, your email address, phone number "
@@ -77,7 +85,7 @@ msgstr ""
 "nÃºmero de telÃ©fono y/o domicilio postal, como asÃ tambiÃ©n cualquier otra "
 "informaciÃ³n que proveas."
 
-#: 
tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:76
+#: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:76
 msgid ""
 "We may also learn incidental

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2019-01-18 Thread translation

commit 21946005ee85a69107ad90deba17d63bac830ba0
Author: Translation commit bot 
Date:   Fri Jan 18 15:45:04 2019 +

Update translations for abouttor-homepage
---
 nl/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd
index 8929fc65f..e39fbdda5 100644
--- a/nl/aboutTor.dtd
+++ b/nl/aboutTor.dtd
@@ -18,7 +18,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tpo/staging] better strings to translate, template i18n

2019-01-18 Thread emmapeel

commit 019a6b73ce00f4e147dffdb3a6d41d2ddeeda517
Author: emma peel 
Date:   Fri Jan 18 16:42:41 2019 +0100

better strings to translate, template i18n
---
 .../jobs/developer-data-architect/contents.lr  | 57 
 .../jobs/senior-system-administrator/contents.lr   | 77 +-
 content/about/people/arma/contents.lr  |  3 +-
 content/about/people/cindy-core/contents.lr|  3 +-
 content/about/people/dawuud/contents.lr|  4 +-
 content/about/people/hc/contents.lr|  3 +-
 content/about/people/hellais/contents.lr   |  4 +-
 content/about/people/iangoldberg/contents.lr   |  3 +-
 content/about/people/inf0/contents.lr  |  3 +-
 content/about/people/irl/contents.lr   |  3 +-
 content/about/people/karsten/contents.lr   |  3 +-
 content/about/people/kushal/contents.lr|  5 +-
 content/about/people/mrphs/contents.lr |  3 +-
 content/about/people/robgjansen/contents.lr|  4 +-
 content/about/people/saint/contents.lr |  4 +-
 content/about/people/sebastian/contents.lr |  5 +-
 content/about/people/sukhe/contents.lr |  6 +-
 content/about/sponsors/DARPA-penn/contents.lr  |  8 +--
 content/about/sponsors/individuals/contents.lr |  3 +-
 content/about/sponsors/mozilla/contents.lr |  3 +-
 content/about/sponsors/otf/contents.lr |  3 +-
 content/about/sponsors/sida/contents.lr|  3 +-
 content/contents.lr|  5 +-
 templates/download.html| 14 ++--
 templates/home.html| 20 +++---
 25 files changed, 126 insertions(+), 123 deletions(-)

diff --git a/content/about/jobs/developer-data-architect/contents.lr 
b/content/about/jobs/developer-data-architect/contents.lr
index 8e728f6..611de70 100644
--- a/content/about/jobs/developer-data-architect/contents.lr
+++ b/content/about/jobs/developer-data-architect/contents.lr
@@ -14,18 +14,21 @@ Internet Freedom Nonprofit Seeks Metrics Data Architect
 
 The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human 
rights and freedoms by creating and deploying free and open source anonymity 
and privacy technologies, is seeking an experienced Data Architect to take our 
metrics work to the next level.
 
-Tor is for everyone, and we are actively working to build a team that 
represents people from all over the world â people from diverse ethnic, 
national, and cultural backgrounds; people from all walks of life. Racial 
minorities, non-gender-binary people, women, and people from any group that is 
generally underrepresented in tech are encouraged to apply.
+Tor is for everyone, and we are actively working to build a team that 
represents people from all over the world â people from diverse ethnic, 
national, and cultural backgrounds; people from all walks of life.
+Racial minorities, non-gender-binary people, women, and people from any group 
that is generally underrepresented in tech are encouraged to apply.
 
 The team:
 
-Our Metrics Team has been collecting data since 2004 to help improve the tools 
we build and learn more about the Tor network. For example, we monitor the 
number of relays and clients in the network, their respective capabilities, the 
number of clients connecting via bridges, fluctuations in network speed, etc. 
Gathering this data results in huge data archives, so we are also working to 
develop tools to process this data and make it available to everyone.
+Our Metrics Team has been collecting data since 2004 to help improve the tools 
we build and learn more about the Tor network.
+For example, we monitor the number of relays and clients in the network, their 
respective capabilities, the number of clients connecting via bridges, 
fluctuations in network speed, etc.
+Gathering this data results in huge data archives, so we are also working to 
develop tools to process this data and make it available to everyone.
 
 How we achieve our goals:
 
-Robustness (We want to avoid bugs and/or bad design decision that cause us 
to miss data)
-Timeliness (users need up-to-date network status information)
-Scalability (as the network grows, so does our data)
-Transparency (our community rightly wants to know what data we're 
collecting)
+* Robustness (We want to avoid bugs and/or bad design decision that cause us 
to miss data)
+* Timeliness (users need up-to-date network status information)
+* Scalability (as the network grows, so does our data)
+* Transparency (our community rightly wants to know what data we're collecting)
 
 The Tor Metrics team presently consists of two full-time developers; this 
position will be the third. Our team works asynchronously on each personâs 
own schedule, but we sync regularly via Git, Trac, IRC, e-mail, and an 
occasional video chat.
 
@@ -37,38 +40,38 @@ The person in this position will work

[tor-commits] [tor/release-0.3.4] Fix the year for 0.3.4.10

2019-01-18 Thread nickm

commit 33c8150dd735adb15700d585520c7678fce95518
Author: Nick Mathewson 
Date:   Fri Jan 18 10:22:21 2019 -0500

Fix the year for 0.3.4.10
---
 ChangeLog| 2 +-
 ReleaseNotes | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a53b0b636..df947bd4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.3.4.10 - 2018-01-07
+Changes in version 0.3.4.10 - 2019-01-07
   Tor 0.3.4.9 is the second stable release in its series; it backports
   numerous fixes, including an important fix for relays, and for anyone
   using OpenSSL 1.1.1. Anyone running an  earlier version of Tor 0.3.4
diff --git a/ReleaseNotes b/ReleaseNotes
index d6c6863b7..37e4eab75 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,7 +2,7 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
-Changes in version 0.3.4.10 - 2018-01-07
+Changes in version 0.3.4.10 - 2019-01-07
   Tor 0.3.4.9 is the second stable release in its series; it backports
   numerous fixes, including an important fix for relays, and for anyone
   using OpenSSL 1.1.1. Anyone running an  earlier version of Tor 0.3.4

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fix the year for 0.3.4.10 and 0.3.3.11

2019-01-18 Thread nickm

commit 9d7b4f1ca8c8e096c56e963fa34eec480f22fa03
Author: Nick Mathewson 
Date:   Fri Jan 18 10:22:06 2019 -0500

Fix the year for 0.3.4.10 and 0.3.3.11
---
 ChangeLog| 4 ++--
 ReleaseNotes | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0be9ac570..e6bcc806e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -314,7 +314,7 @@ Changes in version 0.4.0.1-alpha - 2019-01-18
   issue 28008.
 
 
-Changes in version 0.3.3.11 - 2018-01-07
+Changes in version 0.3.3.11 - 2019-01-07
   Tor 0.3.3.11 backports numerous fixes from later versions of Tor.
   numerous fixes, including an important fix for anyone using OpenSSL
   1.1.1. Anyone running an earlier version of Tor 0.3.3 should upgrade
@@ -487,7 +487,7 @@ Changes in version 0.3.3.11 - 2018-01-07
   bugfix on 0.3.0.1-alpha.
 
 
-Changes in version 0.3.4.10 - 2018-01-07
+Changes in version 0.3.4.10 - 2019-01-07
   Tor 0.3.4.9 is the second stable release in its series; it backports
   numerous fixes, including an important fix for relays, and for anyone
   using OpenSSL 1.1.1. Anyone running an  earlier version of Tor 0.3.4
diff --git a/ReleaseNotes b/ReleaseNotes
index 7c8ab0166..6c9aa3c29 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,7 +2,7 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
-Changes in version 0.3.3.11 - 2018-01-07
+Changes in version 0.3.3.11 - 2019-01-07
   Tor 0.3.3.11 backports numerous fixes from later versions of Tor.
   numerous fixes, including an important fix for anyone using OpenSSL
   1.1.1. Anyone running an earlier version of Tor 0.3.3 should upgrade
@@ -175,7 +175,7 @@ Changes in version 0.3.3.11 - 2018-01-07
   bugfix on 0.3.0.1-alpha.
 
 
-Changes in version 0.3.4.10 - 2018-01-07
+Changes in version 0.3.4.10 - 2019-01-07
   Tor 0.3.4.9 is the second stable release in its series; it backports
   numerous fixes, including an important fix for relays, and for anyone
   using OpenSSL 1.1.1. Anyone running an  earlier version of Tor 0.3.4

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Fix the year for 0.3.3.11

2019-01-18 Thread nickm

commit 9609d132599f8770f2037bbaac8ade6245b24ab4
Author: Nick Mathewson 
Date:   Fri Jan 18 10:22:28 2019 -0500

Fix the year for 0.3.3.11
---
 ChangeLog| 2 +-
 ReleaseNotes | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d3f0cb6e..a14ea6afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.3.3.11 - 2018-01-07
+Changes in version 0.3.3.11 - 2019-01-07
   Tor 0.3.3.11 backports numerous fixes from later versions of Tor.
   numerous fixes, including an important fix for anyone using OpenSSL
   1.1.1. Anyone running an earlier version of Tor 0.3.3 should upgrade
diff --git a/ReleaseNotes b/ReleaseNotes
index 8ca83a965..7f217cb56 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,7 +2,7 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
-Changes in version 0.3.3.11 - 2018-01-07
+Changes in version 0.3.3.11 - 2019-01-07
   Tor 0.3.3.11 backports numerous fixes from later versions of Tor,
   including an important fix for anyone using OpenSSL 1.1.1. Anyone
   running an earlier version of Tor 0.3.3 should upgrade to this version,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2019-01-18 Thread translation

commit 1e05b8b971be4ca9786ca9f918e003a36c5db4a4
Author: Translation commit bot 
Date:   Fri Jan 18 15:16:20 2019 +

Update translations for tails-misc_completed
---
 he.po | 44 ++--
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/he.po b/he.po
index c4fb408d1..832683a8d 100644
--- a/he.po
+++ b/he.po
@@ -6,7 +6,7 @@
 # Dvir Rosen , 2014
 # Emma Peel, 2018
 # GenghisKhan , 2013
-# ION, 2017-2018
+# ION, 2017-2019
 # Johnny Diralenzo, 2015
 # Kunda, 2014
 # Ruben , 2014
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-07 10:24+0100\n"
-"PO-Revision-Date: 2019-01-11 14:12+\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2019-01-14 21:20+0100\n"
+"PO-Revision-Date: 2019-01-18 14:56+\n"
+"Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,6 +98,30 @@ msgstr "_××¤×¢×"
 msgid "_Exit"
 msgstr "_××¦×××"
 
+#: config/chroot_local-includes/usr/local/bin/keepassx:17
+#, sh-format
+msgid ""
+"Do you want to rename your KeePassX database?\n"
+"\n"
+"You have a KeePassX database in your Persistent folder:\n"
+"\n"
+"${filename}\n"
+"\n"
+"Renaming it to keepassx.kdbx would allow KeePassX to open it 
automatically in the future."
+msgstr "××× ××ª× ×¨××¦× ××©× ××ª ××ª ×©× ××¡× ×× ×ª×× 
×× KeePassX ×©××?\n\n××© ×× ××¡× × ×ª×× ×× 
KeePassX ××ª××§××× ×××ª×××× 
×©××:\n\n${filename}\n\n×©×× ×× ×©×× ×× keepassx.kdbx 
××ª××¨ ×× KeePassX ××¤×ª×× ×××ª× ××××¤× ××××××× 
××¢×ª××."
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:25
+msgid "Rename"
+msgstr "×©×× ×× ×©×"
+
+#: config/chroot_local-includes/usr/local/bin/keepassx:26
+msgid "Keep current name"
+msgstr "×©×××¨ ×©× × ××××"
+
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr "su ×××©××ª. ×× × ××©×ª××© ×Ö¾sudo ×××§××."
+
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "××¤×¢×× ××××©"
@@ -244,7 +268,7 @@ msgid "Remove"
 msgstr "××¡×¨"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "×××××"
@@ -388,23 +412,23 @@ msgid ""
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "××××£ MAC × ××©× ×¢×××¨ ××¨×××¡ ××¨×©×ª ${nic_name} 
(${nic}). ××©××ª ××©×××× × ××©×× ××£ ××× ×× ×©×× ××¨××©××ª 
×××©××ª.\n×××× ×ª×¢×××£ ×××¤×¢×× ××××© ××ª Tails 
××××©×××ª ××××£ MAC."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
 msgid "Lock Screen"
 msgstr "× ×¢× ××¡×"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
 msgid "Screen Locker"
 msgstr "× ××¢× ×××¡×"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
 msgid "Set up a password to unlock the screen."
 msgstr "×§××¢ ×¡××¡×× ×××××× × ×¢×××ª ×××¡×."
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136
 msgid "Password"
 msgstr "×¡××¡××"
 
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142
 msgid "Confirm"
 msgstr "××©×¨"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2019-01-18 Thread translation

commit 43260e0938f091b41ba3412874bdfa823c3358a7
Author: Translation commit bot 
Date:   Fri Jan 18 15:16:14 2019 +

Update translations for tails-misc
---
 he.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/he.po b/he.po
index 8d4216199..832683a8d 100644
--- a/he.po
+++ b/he.po
@@ -6,7 +6,7 @@
 # Dvir Rosen , 2014
 # Emma Peel, 2018
 # GenghisKhan , 2013
-# ION, 2017-2018
+# ION, 2017-2019
 # Johnny Diralenzo, 2015
 # Kunda, 2014
 # Ruben , 2014
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-14 21:20+0100\n"
-"PO-Revision-Date: 2019-01-17 01:47+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-01-18 14:56+\n"
+"Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -108,7 +108,7 @@ msgid ""
 "${filename}\n"
 "\n"
 "Renaming it to keepassx.kdbx would allow KeePassX to open it 
automatically in the future."
-msgstr ""
+msgstr "××× ××ª× ×¨××¦× ××©× ××ª ××ª ×©× ××¡× ×× ×ª×× 
×× KeePassX ×©××?\n\n××© ×× ××¡× × ×ª×× ×× 
KeePassX ××ª××§××× ×××ª×××× 
×©××:\n\n${filename}\n\n×©×× ×× ×©×× ×× keepassx.kdbx 
××ª××¨ ×× KeePassX ××¤×ª×× ×××ª× ××××¤× ××××××× 
××¢×ª××."
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:25
 msgid "Rename"
@@ -116,11 +116,11 @@ msgstr "×©×× ×× ×©×"
 
 #: config/chroot_local-includes/usr/local/bin/keepassx:26
 msgid "Keep current name"
-msgstr ""
+msgstr "×©×××¨ ×©× × ××××"
 
 #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
 msgid "su is disabled. Please use sudo instead."
-msgstr ""
+msgstr "su ×××©××ª. ×× × ××©×ª××© ×Ö¾sudo ×××§××."
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] format_changelog: treat "issue NNNN" as a track ticket

2019-01-18 Thread nickm

commit aaef95ada5d304117d5697a042d0f43b87329ecc
Author: Nick Mathewson 
Date:   Fri Jan 18 10:15:02 2019 -0500

format_changelog: treat "issue " as a track ticket
---
 scripts/maint/format_changelog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/maint/format_changelog.py 
b/scripts/maint/format_changelog.py
index 8dce4b6e5..08b2155fa 100755
--- a/scripts/maint/format_changelog.py
+++ b/scripts/maint/format_changelog.py
@@ -401,7 +401,7 @@ class ChangeLog(object):
 self.dumpEndOfChangelog()
 
 # Let's turn bugs to html.
-BUG_PAT = re.compile('(bug|ticket|feature)\s+(\d{4,5})', re.I)
+BUG_PAT = re.compile('(bug|ticket|issue|feature)\s+(\d{4,5})', re.I)
 def bug_html(m):
 return "%s %s" % (m.group(1), 
m.group(2), m.group(2))
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Bump to 0.4.0.1-alpha-dev

2019-01-18 Thread nickm

commit 67f275f8dacc53f10b34b431028cebe346d0369c
Author: Nick Mathewson 
Date:   Fri Jan 18 10:08:57 2019 -0500

Bump to 0.4.0.1-alpha-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6d1b58923..75bb0c7bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.1-alpha])
+AC_INIT([tor],[0.4.0.1-alpha-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index bc8ab7de9..4f2f82d00 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.1-alpha"
+!define VERSION "0.4.0.1-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 51b78b0b3..c618c5b49 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.1-alpha"
+#define VERSION "0.4.0.1-alpha-dev"
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Tor 0.4.0.1-alpha released

2019-01-18 Thread nickm

commit 7615de22b04d53f9f9cc659d0c0408cd5d0f924c
Author: Nick Mathewson 
Date:   Fri Jan 18 09:55:06 2019 -0500

Tor 0.4.0.1-alpha released
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0c050ad4..ba3058ac 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.3.5.7
-export DEVTAG=tor-0.3.5.7
+export DEVTAG=tor-0.4.0.1-alpha
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index 6e850301..929f734f 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.3.5.7
-0.3.5.7
+0.4.0.1-alpha
 
 maint-7.5
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-01-18 Thread translation

commit 66186dcba5cc4c249c0020bd120c4daa45c4df9d
Author: Translation commit bot 
Date:   Fri Jan 18 10:19:49 2019 +

Update translations for tpo-web_completed
---
 contents.pot | 207 ++-
 1 file changed, 64 insertions(+), 143 deletions(-)

diff --git a/contents.pot b/contents.pot
index 073e4f7f8..40017e31d 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 10:14+CET\n"
+"POT-Creation-Date: 2019-01-18 10:56+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -1824,8 +1824,6 @@ msgstr "DARPA and ONR via Naval Research Laboratory"
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of "
 "opportunity"
@@ -1835,8 +1833,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "to improve resilience against DDoS attacks and aims to thwart DDoS attacks "
 "by:"
@@ -1846,8 +1842,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "(1) dispersing cyber assets (physically and/or logically) to complicate "
 "adversarial"
@@ -1857,8 +1851,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "targeting; (2) disguising the characteristics and behaviors of those assets "
 "through"
@@ -1868,8 +1860,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "networked maneuver to confuse or deceive the adversary; and (3) using "
 "adaptive"
@@ -1879,8 +1869,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "mitigation techniques on endpoints (e.g., mission-critical servers) to blunt"
 " the"
@@ -1890,8 +1878,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "effects of attacks that succeed in penetrating other defensive measures."
 msgstr ""
@@ -1902,6 +1888,27 @@ msgstr ""
 msgid "DARPA via University of Pennsylvania"
 msgstr "DARPA via University of Pennsylvania"
 
+#: https//torproject.org/about/sponsors/DARPA-penn/
+#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
+msgid ""
+"DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of "
+"opportunity to improve resilience against DDoS attacks and aims to thwart "
+"DDoS attacks by: (1) dispersing cyber assets (physically and/or logically) "
+"to complicate adversarial targeting; (2) disguising the characteristics and "
+"behaviors of those assets through networked maneuver to confuse or deceive "
+"the adversary; and (3) using adaptive mitigation techniques on endpoints "
+"(e.g., mission-critical servers) to blunt the effects of attacks that "
+"succeed in penetrating other defensive measures."
+msgstr ""
+"DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of "
+"opportunity to improve resilience against DDoS attacks and aims to thwart "
+"DDoS attacks by: (1) dispersing cyber assets (physically and/or logically) "
+"to complicate adversarial targeting; (2) disguising the characteristics and "
+"behaviors of those assets through networked maneuver to confuse or deceive "
+"the adversary; and (3) using adaptive mitigation techniques on endpoints "
+"(e.g., mission-critical servers) to blunt the effects of attacks that "
+"succeed in penetrating other defensive measures."
+
 #: https//torproject.org/about/sponsors/disconnect/
 #:

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-01-18 Thread translation

commit e2f545b9100fb5c7e6dad47da6d11d406cf3c709
Author: Translation commit bot 
Date:   Fri Jan 18 10:19:43 2019 +

Update translations for tpo-web
---
 contents+de.po| 153 
 contents+es.po| 153 
 contents+fa.po| 153 
 contents+fr.po| 153 
 contents+pt-BR.po | 153 
 contents+ru.po| 153 
 contents+tr.po| 153 
 contents+zh-CN.po | 153 
 contents.pot  | 207 +-
 9 files changed, 424 insertions(+), 1007 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index bc9ca85ff..f2117f852 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-18 10:14+CET\n"
+"POT-Creation-Date: 2019-01-18 10:56+CET\n"
 "PO-Revision-Date: 2019-01-10 12:38+\n"
 "Last-Translator: Oliver Parczyk, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/94225/de/)\n"
@@ -1557,8 +1557,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of "
 "opportunity"
@@ -1566,8 +1564,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "to improve resilience against DDoS attacks and aims to thwart DDoS attacks "
 "by:"
@@ -1575,8 +1571,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "(1) dispersing cyber assets (physically and/or logically) to complicate "
 "adversarial"
@@ -1584,8 +1578,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "targeting; (2) disguising the characteristics and behaviors of those assets "
 "through"
@@ -1593,8 +1585,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "networked maneuver to confuse or deceive the adversary; and (3) using "
 "adaptive"
@@ -1602,8 +1592,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "mitigation techniques on endpoints (e.g., mission-critical servers) to blunt"
 " the"
@@ -1611,8 +1599,6 @@ msgstr ""
 
 #: https//torproject.org/about/sponsors/DARPA-nrl/
 #: (content/about/sponsors/DARPA-nrl/contents+en.lrsponsor.description)
-#: https//torproject.org/about/sponsors/DARPA-penn/
-#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
 msgid ""
 "effects of attacks that succeed in penetrating other defensive measures."
 msgstr ""
@@ -1622,6 +1608,19 @@ msgstr ""
 msgid "DARPA via University of Pennsylvania"
 msgstr ""
 
+#: https//torproject.org/about/sponsors/DARPA-penn/
+#: (content/about/sponsors/DARPA-penn/contents+en.lrsponsor.description)
+msgid ""
+"DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of "
+"opportunity to improve resilience against DDoS attacks and aims to thwart "
+"DDoS attacks by: (1) dispersing cyber assets (physically and/or logically) "
+"to complicate adversarial targeting; (2) disguising the characteristics and "
+"behaviors of those assets through networked maneuver to confuse or deceive "
+"the adversary; and (3) using adaptive mitigation techniques on endpoints "
+"(e.g., mission-critical servers) to blunt the effects of attacks that "
+"succeed in penetrating other defensive measures."
+msgstr ""
+
 #: https//torproject.org/about/sponsors/disconnect/
 #: (content/about/sponsors/disconnect/contents+en.lrsponsor.name)
 msgid "Disconnect"
@@ -1731,31

[tor-commits] [torbutton/master] Bug 28836: Links on about:tor are not clickable.

2019-01-18 Thread gk

commit 0a628166a527bb643fa256e20332fbf54357697c
Author: Kathy Brade 
Date:   Wed Jan 16 10:08:38 2019 -0500

Bug 28836: Links on about:tor are not clickable.

When the about:tor window was short, links such as the Tor Browser
manual one were not clickable (the fundraising banner made this
problem more likely). The root cause was that the onions/circles
at the bottom of the page overlapped with the links, and the divs
that were used to generate the circles were in front of the links.

This patch changes the behavior on desktop to not allow the onions
to be placed under any page content; instead, they are displayed
at the bottom of the page after all other content. If they won't
fit on the page, a vertical scrollbar is shown.

On mobile, the existing behavior is preserved (onions can appear
behind content). We added `z-index: -1` to ensure that all tappable
content will be usable (although no links are currently displayed
on mobile, we might add some in the future).
---
 src/chrome/content/aboutTor/aboutTor.xhtml |  4 ++--
 src/chrome/skin/aboutTor.css   | 28 
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml 
b/src/chrome/content/aboutTor/aboutTor.xhtml
index 5f5fccdc..1a9c701e 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -1,6 +1,6 @@
 
 
@@ -120,7 +120,7 @@ window.addEventListener("pageshow", function() {
- "onion-pattern-row" elements, each containing 14 circles. The width
- of "onion-pattern-row" is fixed at a value that is wide enough so the
- circles are not distorted by the flex-based layout. The parent
-   - "onion-pattern-container" element has overflow: hidden and is designed
+   - "onion-pattern-container" element has overflow-x: hidden and is designed
- to expand to the width of the page, until it reaches a maximum width
- that can accommodate all 14 circles. Since the rows are wider than
- most browser windows, typically the two rows of onions will fill the
diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css
index 37fa30fe..02d18b78 100644
--- a/src/chrome/skin/aboutTor.css
+++ b/src/chrome/skin/aboutTor.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, The Tor Project, Inc.
+ * Copyright (c) 2019, The Tor Project, Inc.
  * See LICENSE for licensing information.
  *
  * vim: set sw=2 sts=2 ts=8 et syntax=css:
@@ -16,7 +16,13 @@
   margin: 0px;
 }
 
+html {
+  height: 100%;
+}
+
 body {
+  display: flex;
+  flex-direction: column;
   width: 100%;
   height: 100%;
   margin: 0px auto;
@@ -194,12 +200,15 @@ body:not([showmanual]) .showForManual {
 }
 
 .onion-pattern-container {
+  flex: auto;   /* grow to consume remaining space on the page */
+  display: flex;
+  flex-direction: column;
+  justify-content: end; /* position circles at the bottom */
   margin: 0px auto;
   width: 100%;
   max-width: 2200px;/* room for our 20 circles */
-  overflow: hidden;
-  position: absolute;
-  bottom: 0px;
+  min-height: 232px;/* room for 2 rows of circles */
+  overflow-x: hidden;   /* clip extra circles on the sides */
 }
 
 .onion-pattern-row {
@@ -386,10 +395,6 @@ body[show-donation-banner="true"] .onion-pattern-container 
{
   transition: transform 0ms;
 }
 
-body[show-donation-banner="true"] .onion-pattern-container {
-  position: fixed;
-}
-
 body[show-donation-banner="true"] #torstatus-version,
 body[show-donation-banner="true"] #onboarding-overlay-button {
   transform: translateY(200px);
@@ -431,6 +436,13 @@ body[mobile] .top .heading1 {
   line-height: 1.1
 }
 
+body[mobile] .onion-pattern-container {
+  flex: none;
+  z-index: -1; /* ensure that circles do not block access to clickable links */
+  position: absolute;
+  bottom: 0px;
+}
+
 body[mobile] #donation-banner {
   position: static;
 }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-01-18 Thread translation

commit e6abd2b6537ca5b675332a1ececa9947914a
Author: Translation commit bot 
Date:   Fri Jan 18 09:19:24 2019 +

Update translations for tpo-web_completed
---
 contents.pot | 681 +++
 1 file changed, 638 insertions(+), 43 deletions(-)

diff --git a/contents.pot b/contents.pot
index 5dfb509a5..073e4f7f8 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 17:59+CET\n"
+"POT-Creation-Date: 2019-01-18 10:14+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -97,12 +97,10 @@ msgstr "history"
 #: (content/about/history/contents+en.lrpage.section)
 #: https//torproject.org/about/people/
 #: (content/about/people/contents+en.lrpeople.section)
-#: https//torproject.org/about/sponsors/
-#: (content/about/sponsors/contents+en.lrpage.section)
 #: https//torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrpage.section)
 #: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrpage.section)
+#: (content/about/jobs/contents+en.lrjobs.section)
 msgid "about"
 msgstr "about"
 
@@ -349,22 +347,6 @@ msgstr ""
 "We are an international team who believes everyone should have private "
 "access to the uncensored web."
 
-#: https//torproject.org/about/sponsors/
-#: (content/about/sponsors/contents+en.lrpage.title)
-msgid "Sponsors"
-msgstr "Sponsors"
-
-#: https//torproject.org/about/sponsors/
-#: (content/about/sponsors/contents+en.lrpage.body)
-msgid ""
-"Having a diverse user base means we have diverse funding sources, too.  We "
-"want to continue diversifying our funding. To inquire about sponsorship, "
-"please email giving(at)torproject.org."
-msgstr ""
-"Having a diverse user base means we have diverse funding sources, too.  We "
-"want to continue diversifying our funding. To inquire about sponsorship, "
-"please email giving(at)torproject.org."
-
 #: https//torproject.org/about/reports/
 #: (content/about/reports/contents+en.lrpage.title)
 msgid "Reports"
@@ -380,32 +362,22 @@ msgstr ""
 "transparency in its work and reporting."
 
 #: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrpage.title)
+#: (content/about/jobs/contents+en.lrjobs.title)
 msgid "Jobs"
 msgstr "Jobs"
 
 #: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrpage.body)
-msgid "Weâre always looking for more great people to join our team."
-msgstr "Weâre always looking for more great people to join our team."
-
-#: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrpage.body)
-msgid ""
-"Join us in our Seattle office or work remotely from wherever you are in the "
-"world."
-msgstr ""
-"Join us in our Seattle office or work remotely from wherever you are in the "
-"world."
-
-#: https//torproject.org/about/jobs/
-#: (content/about/jobs/contents+en.lrpage.body)
+#: (content/about/jobs/contents+en.lrjobs.body)
 msgid ""
-"Youâll work with a diverse group of bright and passionate folks committed 
to"
-" fostering internet freedom worldwide."
+"Weâre always looking for more great people to join our team. Join us in our 
"
+"Seattle office or work remotely from wherever you are in the world. Youâll "
+"work with a diverse group of bright and passionate folks committed to "
+"fostering internet freedom worldwide."
 msgstr ""
-"Youâll work with a diverse group of bright and passionate folks committed 
to"
-" fostering internet freedom worldwide."
+"Weâre always looking for more great people to join our team. Join us in our 
"
+"Seattle office or work remotely from wherever you are in the world. Youâll "
+"work with a diverse group of bright and passionate folks committed to "
+"fostering internet freedom worldwide."
 
 #: https//torproject.org/about/people/hc/
 #: (content/about/people/hc/contents+en.lrperson.role)
@@ -1820,6 +1792,629 @@ msgstr ""
 msgid "Author and maintainer of the Linux Tor Browser sandbox."
 msgstr "Author and maintainer of the Linux Tor Browser sandbox."
 
+#: https//torproject.org/about/sponsors/access-now/
+#: (content/about/sponsors/access-now/contents+en.lrsponsor.name)
+msgid "Access Now"
+msgstr "Access Now"
+
+#: https//torproject.org/about/sponsors/anonymous-ngo/
+#: (content/about/sponsors/anonymous-ngo/contents+en.lrsponsor.name)
+msgid "An anonymous North American NGO"
+msgstr "An anonymous North American NGO"
+
+#: https//torproject.org/about/sponsors/bell-security/
+#: (content/about/sponsors/bell-security/contents+en.lrsponsor.name)
+msgid "Bell Security Solutions Inc"
+msgstr "Bell Security Solutions Inc"
+
+#: https//torproject.org/about/sponsors/bbg/
+#: (content/about/sponsors/bbg/contents+en.lrsponsor.name)
+msgid "Broadcasting Board of Governors"
+msgstr "Broadcasting Board of Governors"
+
+#: https//torproject.org/about/sponsors/cyber-ta/
+#:

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-01-18 Thread translation

commit 6095328b2cef3b0bce71e29724a5dbaadfb1181b
Author: Translation commit bot 
Date:   Fri Jan 18 08:19:22 2019 +

Update translations for tpo-web
---
 contents+es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 86a01bddf..27376a2f0 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-17 17:59+CET\n"
+"POT-Creation-Date: 2019-01-18 09:03+CET\n"
 "PO-Revision-Date: 2019-01-10 12:38+\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/94225/es/)\n"
@@ -88,7 +88,7 @@ msgstr ""
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.title)
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.title)
 msgid "history"
-msgstr ""
+msgstr "historia"
 
 #: https//torproject.org/menu/ (content/menu/contents+en.lrpage.section)
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.section)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

81 matches

Mail list logo