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

2019-05-13 Thread translation
commit 9c49c70c5e6c32bd9fa1234e52c0dce0c4cc0bea
Author: Translation commit bot 
Date:   Tue May 14 02:21:53 2019 +

Update translations for support-portal
---
 contents+zh-CN.po | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index cee13dea6..4843d6624 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -4072,6 +4072,8 @@ msgid ""
 "of the HTTP channel used to transfer files and data between devices on a "
 "network."
 msgstr ""
+"安全超文本传输协议 (Hypertext Transfer Protocol Secure, HTTPS) 
是用于在网络中的设备之间传输文件和数据的 "
+"HTTP 通道的[加密](#encryption)版本。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4089,7 +4091,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "HTTPS Everywhere is installed in [Tor Browser](#tor-browser)."
-msgstr ""
+msgstr "HTTPS Everywhere 已经内置于 [Tor Browser](#tor-browser) 中。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4580,6 +4582,8 @@ msgid ""
 "A proxy is a middle man between a [client](#client) (like a [web browser"
 "](#web-browser)) and a service (like a [web server](#server))."
 msgstr ""
+"代理是介于[客户端](#client) (例如[浏览器](#web-browser)) 
和服务端 (例如[网页服务器](#server)) "
+"之间的中间人."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4629,7 +4633,7 @@ msgid ""
 "Any person can [encrypt](#encryption) a message using the public key of the "
 "receiver but only the receiver in possession of the private key is able to "
 "decrypt the message."
-msgstr ""
+msgstr "任何人都可以使用接收者的公钥[加
密](#encryption)信息,但只有拥有私钥的接收者
才能解密信息。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/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/tpo-web_completed] Update translations for tpo-web_completed

2019-05-13 Thread translation
commit 202436e6ac46bc340bc2854503a29fe474965242
Author: Translation commit bot 
Date:   Tue May 14 01:50:34 2019 +

Update translations for tpo-web_completed
---
 contents+zh-CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index e6c193953..d5e24eaa1 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -706,7 +706,7 @@ msgstr "验证Tor Browser签名"
 
 #: templates/download.html:54
 msgid "Stand up for privacy and freedom online."
-msgstr ""
+msgstr "为保护隐私和网络自由而战。"
 
 #: templates/download.html:55
 msgid ""

___
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-05-13 Thread translation
commit 1b7749d80e694a399f89e25de8158544e0650ad8
Author: Translation commit bot 
Date:   Tue May 14 01:50:53 2019 +

Update translations for support-portal
---
 contents+zh-CN.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 08699fb1e..cee13dea6 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -1586,7 +1586,7 @@ msgstr 
"对于想在HTTP站点上禁用JavaScrip的用户,我们推荐配置To
 msgid ""
 "The standard level allows JavaScript, but the safer and safest levels both "
 "block JavaScript on HTTP sites."
-msgstr ""
+msgstr "标准级别允许运行 JavaScript,但更安全和最安å…
¨çº§åˆ«éƒ½ä¼šé˜»æ­¢ HTTP 网站上的 JavaScript。"
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
@@ -1618,7 +1618,7 @@ msgstr "我能同时运行多个 Tor Browser 吗?"
 msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
-msgstr ""
+msgstr "我们不建议运行多个 Tor Browser 
实例,在很多平台中这样做可能会导致运行不正常。"
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
@@ -2151,7 +2151,7 @@ msgstr "给 get...@torproject.org 
发送一封电子邮件。"
 msgid ""
 "Write your operating system (such as Windows, macOS, or Linux) in the body "
 "of the message and send."
-msgstr ""
+msgstr "在信息的正文中写下您的操作系统 (例如 Windows, macOS, 
或 Linux) 并发送。"
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/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/tpo-web] Update translations for tpo-web

2019-05-13 Thread translation
commit 33543a89d49100c4c11baef5408df33a7309c2bf
Author: Translation commit bot 
Date:   Tue May 14 01:50:29 2019 +

Update translations for tpo-web
---
 contents+zh-CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index e6c193953..d5e24eaa1 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -706,7 +706,7 @@ msgstr "验证Tor Browser签名"
 
 #: templates/download.html:54
 msgid "Stand up for privacy and freedom online."
-msgstr ""
+msgstr "为保护隐私和网络自由而战。"
 
 #: templates/download.html:55
 msgid ""

___
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-05-13 Thread translation
commit 274cae0c38b0031c8cd045fad7d1f71a9d74d04a
Author: Translation commit bot 
Date:   Tue May 14 01:45:56 2019 +

Update translations for https_everywhere
---
 zh_CN/https-everywhere.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd
index d645261c7..bd5ec7d35 100644
--- a/zh_CN/https-everywhere.dtd
+++ b/zh_CN/https-everywhere.dtd
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 
@@ -45,8 +45,8 @@
 
 
 
-
-
+
+
 
 
 

___
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-05-13 Thread translation
commit e943fe1d779fc16d4a6538742be3e61d06b2f150
Author: Translation commit bot 
Date:   Tue May 14 01:15:54 2019 +

Update translations for https_everywhere
---
 zh_CN/https-everywhere.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd
index 31128741e..d645261c7 100644
--- a/zh_CN/https-everywhere.dtd
+++ b/zh_CN/https-everywhere.dtd
@@ -7,13 +7,13 @@
 
 
 
-
-
+
+
 
 
-
-
-
+
+
+
 
 
 

___
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-05-13 Thread translation
commit e19f7b86d76ae78410a3c26447755162962173fa
Author: Translation commit bot 
Date:   Mon May 13 22:20:50 2019 +

Update translations for support-portal
---
 contents+fr.po | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index b365e1d73..e9417692c 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4091,8 +4091,8 @@ msgid ""
 "App can also refer to software that you install on mobile [operating systems"
 "](#operating-system-os)."
 msgstr ""
-"L’application peut également faire référence aux logiciels que vous "
-"installez sur les systèmes d’exploitation mobiles (#operating-system-os)."
+"Appli peut également faire référence à des logiciels que vous installez 
sur "
+"les [systèmes d’exploitation](#operating-system-os) pour appareils 
mobiles."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4105,8 +4105,8 @@ msgid ""
 "Atlas is a web application to learn about currently running Tor "
 "[relays](#relay)."
 msgstr ""
-"Atlas est une application Web pour en savoir plus sur le fonctionnement "
-"actuel de Tor [relais](#relais)."
+"Atlas est une application Web pour connaître les [relais](#relais) Tor qui "
+"fonctionnent actuellement."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4151,8 +4151,8 @@ msgid ""
 "[Pluggable transports](#pluggable-transports) are a type of bridge that help"
 " disguise the fact that you are using Tor."
 msgstr ""
-"Pluggable transports](#pluggable-transports) sont un type de pont qui aide à"
-" masquer le fait que vous utilisez Tor."
+"Un [transport enfichable](#pluggable-transports) est un type de pont qui "
+"aide à dissimuler le fait que vous utilisez Tor."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4162,7 +4162,7 @@ msgstr "### autorité de ponts"
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "A special-purpose relay that maintains the list of [bridges](#bridge)."
-msgstr "Un relais spécial qui maintient la liste des [ponts](#bridge)."
+msgstr "Un relais spécialisé qui maintient la liste des [ponts](#bridge)."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4206,7 +4206,7 @@ msgid ""
 "A browser history is a record of requests made while using a [web browser"
 "](#web-browser), and includes information like websites visited and when."
 msgstr ""
-"Un historique de navigateur est un enregistrement des requêtes effectuées "
+"L’historique d’un navigateur est un enregistrement des requêtes 
effectuées "
 "lors de l’utilisation d’un [navigateur Web](#Web-browser). Il comprend 
des "
 "renseignements tels que les sites Web visités et l’estampille temporelle 
des"
 " visites."
@@ -4236,8 +4236,8 @@ msgid ""
 "Captchas are a challenge-response test used in computing to determine "
 "whether the user is human or not."
 msgstr ""
-"Les captchas sont un test de réponse par défi utilisé en informatique pour 
"
-"déterminer si l’utilisateur est humain ou non."
+"Les captchas sont des tests de réponses de vérification utilisés en "
+"informatique pour déterminer si l’utilisateur est humain ou non."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4247,10 +4247,10 @@ msgid ""
 "hard time determining whether or not those requests are coming from humans "
 "or from bots."
 msgstr ""
-"[Les utilisateurs de Tor](#tor-/-tor-tor-network/-core-tor) se voient "
-"souvent servir des captchas parce que Tor [relais](#relais) fait tellement "
-"de requêtes que parfois les sites Web ont du mal à déterminer si ces "
-"requêtes viennent d’humains ou de bots."
+"Les utilisateurs de [Tor](#tor-/-tor-tor-network/-core-tor) se voient "
+"souvent servir des captchas, car les [relais](#relais) Tor font tellement de"
+" requêtes que les sites Web ont parfois de la difficulté à déterminer si 
ces"
+" requêtes proviennent d’humains ou de robots."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4264,9 +4264,9 @@ msgid ""
 "software without errors, the given checksum and the checksum of your "
 "downloaded file will be identical."
 msgstr ""
-"Les sommes de contrôle sont les valeurs [hash](#hash) des fichiers. Si vous "
-"téléchargez le logiciel sans erreur, la somme de contrôle donnée et la 
somme"
-" de contrôle de votre fichier téléchargé seront identiques."
+"Les sommes de contrôle sont des [condensés](#hash) de fichiers. Si vous 
avez"
+" téléchargé le l#ogiciel sans erreur, la somme de contrôle donnée et la "
+"somme de contrôle de votre 

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

2019-05-13 Thread translation
commit c61e74ca4f7d11e57d5c151eb6806f58531893f4
Author: Translation commit bot 
Date:   Mon May 13 22:20:57 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index b365e1d73..e9417692c 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4091,8 +4091,8 @@ msgid ""
 "App can also refer to software that you install on mobile [operating systems"
 "](#operating-system-os)."
 msgstr ""
-"L’application peut également faire référence aux logiciels que vous "
-"installez sur les systèmes d’exploitation mobiles (#operating-system-os)."
+"Appli peut également faire référence à des logiciels que vous installez 
sur "
+"les [systèmes d’exploitation](#operating-system-os) pour appareils 
mobiles."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4105,8 +4105,8 @@ msgid ""
 "Atlas is a web application to learn about currently running Tor "
 "[relays](#relay)."
 msgstr ""
-"Atlas est une application Web pour en savoir plus sur le fonctionnement "
-"actuel de Tor [relais](#relais)."
+"Atlas est une application Web pour connaître les [relais](#relais) Tor qui "
+"fonctionnent actuellement."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4151,8 +4151,8 @@ msgid ""
 "[Pluggable transports](#pluggable-transports) are a type of bridge that help"
 " disguise the fact that you are using Tor."
 msgstr ""
-"Pluggable transports](#pluggable-transports) sont un type de pont qui aide à"
-" masquer le fait que vous utilisez Tor."
+"Un [transport enfichable](#pluggable-transports) est un type de pont qui "
+"aide à dissimuler le fait que vous utilisez Tor."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4162,7 +4162,7 @@ msgstr "### autorité de ponts"
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "A special-purpose relay that maintains the list of [bridges](#bridge)."
-msgstr "Un relais spécial qui maintient la liste des [ponts](#bridge)."
+msgstr "Un relais spécialisé qui maintient la liste des [ponts](#bridge)."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4206,7 +4206,7 @@ msgid ""
 "A browser history is a record of requests made while using a [web browser"
 "](#web-browser), and includes information like websites visited and when."
 msgstr ""
-"Un historique de navigateur est un enregistrement des requêtes effectuées "
+"L’historique d’un navigateur est un enregistrement des requêtes 
effectuées "
 "lors de l’utilisation d’un [navigateur Web](#Web-browser). Il comprend 
des "
 "renseignements tels que les sites Web visités et l’estampille temporelle 
des"
 " visites."
@@ -4236,8 +4236,8 @@ msgid ""
 "Captchas are a challenge-response test used in computing to determine "
 "whether the user is human or not."
 msgstr ""
-"Les captchas sont un test de réponse par défi utilisé en informatique pour 
"
-"déterminer si l’utilisateur est humain ou non."
+"Les captchas sont des tests de réponses de vérification utilisés en "
+"informatique pour déterminer si l’utilisateur est humain ou non."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4247,10 +4247,10 @@ msgid ""
 "hard time determining whether or not those requests are coming from humans "
 "or from bots."
 msgstr ""
-"[Les utilisateurs de Tor](#tor-/-tor-tor-network/-core-tor) se voient "
-"souvent servir des captchas parce que Tor [relais](#relais) fait tellement "
-"de requêtes que parfois les sites Web ont du mal à déterminer si ces "
-"requêtes viennent d’humains ou de bots."
+"Les utilisateurs de [Tor](#tor-/-tor-tor-network/-core-tor) se voient "
+"souvent servir des captchas, car les [relais](#relais) Tor font tellement de"
+" requêtes que les sites Web ont parfois de la difficulté à déterminer si 
ces"
+" requêtes proviennent d’humains ou de robots."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4264,9 +4264,9 @@ msgid ""
 "software without errors, the given checksum and the checksum of your "
 "downloaded file will be identical."
 msgstr ""
-"Les sommes de contrôle sont les valeurs [hash](#hash) des fichiers. Si vous "
-"téléchargez le logiciel sans erreur, la somme de contrôle donnée et la 
somme"
-" de contrôle de votre fichier téléchargé seront identiques."
+"Les sommes de contrôle sont des [condensés](#hash) de fichiers. Si vous 
avez"
+" téléchargé le l#ogiciel sans erreur, la somme de contrôle donnée et la "
+"somme de contrôle de 

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

2019-05-13 Thread translation
commit 48f50aab2d24ea6da2859c764ea468c55bb3755f
Author: Translation commit bot 
Date:   Mon May 13 21:50:52 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 29 ++---
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index a750097d7..b365e1d73 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3920,8 +3920,8 @@ msgid ""
 "Onion services allow people to browse but also to publish anonymously, "
 "including publishing anonymous websites."
 msgstr ""
-"Les service onion permettent aux gens de naviguer, mais aussi de publier "
-"dans l’anonymat, même des sites Web anonymes."
+"Les services onion permettent aux gens de naviguer, mais aussi de publier "
+"dans l’anonymat, même de publier des sites Web anonymes."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
@@ -3961,10 +3961,9 @@ msgid ""
 "at the URL bar an icon of a little green onion displaying the state of your "
 "connection: secure and using an onion service."
 msgstr ""
-"Lorsque vous accédez à un site Web qui utilise un service onion, le "
-"Navigateur Tor affichera dans la barre URL une icône d’un petit oignon 
vert "
-"affichant l’état de votre connexion : sécurisé et utilisant un service "
-"onion."
+"Lors de l’accès à un site Web qui utilise un service onion, le 
Navigateur "
+"Tor affichera dans la barre URL l’icône d’un petit oignon vert qui 
affiche "
+"l’état de votre connexion : sécurisée et qui utilise un service onion."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
@@ -3977,8 +3976,8 @@ msgid ""
 "And if you're accessing a website with https and onion service, it will show"
 " an icon of a green onion and a padlock."
 msgstr ""
-"Et si vous accédez à un site Web avec service https et onion, il affichera "
-"l’icône d’un oignon vert et un cadenas."
+"Et si vous accédez à un site Web avec HTTPS et un service onion, il "
+"affichera l’icône d’un oignon vert et un cadenas."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
@@ -3992,7 +3991,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.title)
 msgid "Tor Glossary"
-msgstr "Glossaire Tor"
+msgstr "Glossaire de Tor"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4060,8 +4059,8 @@ msgid ""
 "Antivirus software can interfere with [Tor](#tor-/-tor-network/-core-tor) "
 "running on your computer."
 msgstr ""
-"Un logiciel antivirus peut interférer avec [Tor](#tor-/-tor-tor-network"
-"/-core-tor) qui s’exécute sur votre ordinateur."
+"Un logiciel antivirus peut interférer avec le fonctionnement de [Tor](#tor"
+"-/-tor-tor-network/-core-tor) sur votre ordinateur."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4069,8 +4068,8 @@ msgid ""
 "You may need to consult the documentation for your antivirus software if you"
 " do not know how to allow Tor."
 msgstr ""
-"Vous devrez peut-être consulter la documentation de votre logiciel antivirus"
-" si vous ne savez pas comment autoriser Tor."
+"Vous aurez peut-être à consulter la documentation de votre logiciel "
+"antivirus si vous ne savez pas comment autoriser Tor."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4083,8 +4082,8 @@ msgid ""
 "A web application (web app), is an application which the [client](#client) "
 "runs in a [web browser](#web-browser)."
 msgstr ""
-"Une application Web (Web app), est une application que le [client](#client) "
-"exécute dans un [navigateur Web](#Web-browser)."
+"Une application Web (appli Web) est une application que le [client](#client)"
+" exécute dans un [navigateur Web](#web-browser)."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/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-05-13 Thread translation
commit b3b534d53bbffd556debd6b42ae666c6acd2f71a
Author: Translation commit bot 
Date:   Mon May 13 21:50:45 2019 +

Update translations for support-portal
---
 contents+fr.po | 29 ++---
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index a750097d7..b365e1d73 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3920,8 +3920,8 @@ msgid ""
 "Onion services allow people to browse but also to publish anonymously, "
 "including publishing anonymous websites."
 msgstr ""
-"Les service onion permettent aux gens de naviguer, mais aussi de publier "
-"dans l’anonymat, même des sites Web anonymes."
+"Les services onion permettent aux gens de naviguer, mais aussi de publier "
+"dans l’anonymat, même de publier des sites Web anonymes."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
@@ -3961,10 +3961,9 @@ msgid ""
 "at the URL bar an icon of a little green onion displaying the state of your "
 "connection: secure and using an onion service."
 msgstr ""
-"Lorsque vous accédez à un site Web qui utilise un service onion, le "
-"Navigateur Tor affichera dans la barre URL une icône d’un petit oignon 
vert "
-"affichant l’état de votre connexion : sécurisé et utilisant un service "
-"onion."
+"Lors de l’accès à un site Web qui utilise un service onion, le 
Navigateur "
+"Tor affichera dans la barre URL l’icône d’un petit oignon vert qui 
affiche "
+"l’état de votre connexion : sécurisée et qui utilise un service onion."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
@@ -3977,8 +3976,8 @@ msgid ""
 "And if you're accessing a website with https and onion service, it will show"
 " an icon of a green onion and a padlock."
 msgstr ""
-"Et si vous accédez à un site Web avec service https et onion, il affichera "
-"l’icône d’un oignon vert et un cadenas."
+"Et si vous accédez à un site Web avec HTTPS et un service onion, il "
+"affichera l’icône d’un oignon vert et un cadenas."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)
@@ -3992,7 +3991,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.title)
 msgid "Tor Glossary"
-msgstr "Glossaire Tor"
+msgstr "Glossaire de Tor"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4060,8 +4059,8 @@ msgid ""
 "Antivirus software can interfere with [Tor](#tor-/-tor-network/-core-tor) "
 "running on your computer."
 msgstr ""
-"Un logiciel antivirus peut interférer avec [Tor](#tor-/-tor-tor-network"
-"/-core-tor) qui s’exécute sur votre ordinateur."
+"Un logiciel antivirus peut interférer avec le fonctionnement de [Tor](#tor"
+"-/-tor-tor-network/-core-tor) sur votre ordinateur."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4069,8 +4068,8 @@ msgid ""
 "You may need to consult the documentation for your antivirus software if you"
 " do not know how to allow Tor."
 msgstr ""
-"Vous devrez peut-être consulter la documentation de votre logiciel antivirus"
-" si vous ne savez pas comment autoriser Tor."
+"Vous aurez peut-être à consulter la documentation de votre logiciel "
+"antivirus si vous ne savez pas comment autoriser Tor."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4083,8 +4082,8 @@ msgid ""
 "A web application (web app), is an application which the [client](#client) "
 "runs in a [web browser](#web-browser)."
 msgstr ""
-"Une application Web (Web app), est une application que le [client](#client) "
-"exécute dans un [navigateur Web](#Web-browser)."
+"Une application Web (appli Web) est une application que le [client](#client)"
+" exécute dans un [navigateur Web](#web-browser)."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/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_completed] Update translations for support-portal_completed

2019-05-13 Thread translation
commit abfdc4ea2261340eac793a6653460605436facb2
Author: Translation commit bot 
Date:   Mon May 13 21:21:03 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 98ffa632a..a750097d7 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3706,12 +3706,12 @@ msgstr ""
 #: https//support.torproject.org/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ deb http://deb.torproject.org/torproject.org  main"
-msgstr "$ deb http://deb.torproject.org/torproject.org  main"
+msgstr "$ deb https://deb.torproject.org/torproject.org  main"
 
 #: https//support.torproject.org/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ deb-src http://deb.torproject.org/torproject.org  main"
-msgstr "$ deb-src http://deb.torproject.org/torproject.org  main"
+msgstr "$ deb-src https://deb.torproject.org/torproject.org  main"
 
 #: https//support.torproject.org/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -3799,8 +3799,8 @@ msgid ""
 "* Look for a log entry in /var/log/syslog such as \"Self-testing indicates "
 "your ORPort is reachable from the outside. Excellent.\""
 msgstr ""
-"* Cherchez une entrée de journal dans /var/log/syslog comme « Self-testing 
"
-"indicates your ORPort is reachable from the outside. Excellent. »"
+"* Cherchez une entrée de journal dans /var/log/syslog telle que « Self-"
+"testing indicates your ORPort is reachable from the outside. Excellent. »"
 
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
@@ -3838,7 +3838,7 @@ msgid ""
 "your home internet connection."
 msgstr ""
 "C’est pourquoi il est préférable de ne pas faire fonctionner votre relais 
de"
-" sortie chez vous ou en utilisant votre connexion à Internet résidentielle."
+" sortie chez vous ou en utilisant votre connexion résidentielle à Internet."
 
 #: https//support.torproject.org/operators/operators-7/
 #: (content/operators/operators-7/contents+en.lrquestion.description)
@@ -3846,8 +3846,8 @@ msgid ""
 "Instead, consider running your exit relay in a commercial facility that is "
 "supportive of Tor."
 msgstr ""
-"Envisagez plutôt de faire fonctionner votre relais de sortie dans une "
-"installation commerciale favorable à Tor."
+"Envisagez plutôt de faire fonctionner votre relais de sortie dans centre "
+"informatique commerciale favorable à Tor."
 
 #: https//support.torproject.org/operators/operators-7/
 #: (content/operators/operators-7/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-05-13 Thread translation
commit 59a2bd46644ae14098f794bf28037313b9a55f94
Author: Translation commit bot 
Date:   Mon May 13 21:20:56 2019 +

Update translations for support-portal
---
 contents+fr.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 98ffa632a..a750097d7 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3706,12 +3706,12 @@ msgstr ""
 #: https//support.torproject.org/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ deb http://deb.torproject.org/torproject.org  main"
-msgstr "$ deb http://deb.torproject.org/torproject.org  main"
+msgstr "$ deb https://deb.torproject.org/torproject.org  main"
 
 #: https//support.torproject.org/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ deb-src http://deb.torproject.org/torproject.org  main"
-msgstr "$ deb-src http://deb.torproject.org/torproject.org  main"
+msgstr "$ deb-src https://deb.torproject.org/torproject.org  main"
 
 #: https//support.torproject.org/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -3799,8 +3799,8 @@ msgid ""
 "* Look for a log entry in /var/log/syslog such as \"Self-testing indicates "
 "your ORPort is reachable from the outside. Excellent.\""
 msgstr ""
-"* Cherchez une entrée de journal dans /var/log/syslog comme « Self-testing 
"
-"indicates your ORPort is reachable from the outside. Excellent. »"
+"* Cherchez une entrée de journal dans /var/log/syslog telle que « Self-"
+"testing indicates your ORPort is reachable from the outside. Excellent. »"
 
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
@@ -3838,7 +3838,7 @@ msgid ""
 "your home internet connection."
 msgstr ""
 "C’est pourquoi il est préférable de ne pas faire fonctionner votre relais 
de"
-" sortie chez vous ou en utilisant votre connexion à Internet résidentielle."
+" sortie chez vous ou en utilisant votre connexion résidentielle à Internet."
 
 #: https//support.torproject.org/operators/operators-7/
 #: (content/operators/operators-7/contents+en.lrquestion.description)
@@ -3846,8 +3846,8 @@ msgid ""
 "Instead, consider running your exit relay in a commercial facility that is "
 "supportive of Tor."
 msgstr ""
-"Envisagez plutôt de faire fonctionner votre relais de sortie dans une "
-"installation commerciale favorable à Tor."
+"Envisagez plutôt de faire fonctionner votre relais de sortie dans centre "
+"informatique commerciale favorable à Tor."
 
 #: https//support.torproject.org/operators/operators-7/
 #: (content/operators/operators-7/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-05-13 Thread translation
commit d8b3d587225762316be672e1dfecffd1d0559333
Author: Translation commit bot 
Date:   Mon May 13 20:50:46 2019 +

Update translations for support-portal
---
 contents+fr.po | 39 ++-
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 8010ce4cd..98ffa632a 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3408,9 +3408,7 @@ msgstr "DirPort 9030"
 msgid ""
 "## Set your bandwidth rate (leave commented and Tor will run without "
 "bandwidth caps)"
-msgstr ""
-"## Définissez le débit de votre bande passante (laissez en commentaire et "
-"Tor s’exécutera sans limite de bande passante)"
+msgstr "## Define these to limit how much relayed traffic you will allow"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3483,8 +3481,8 @@ msgid ""
 "Look for a log entry in /var/log/syslog such as \"Self-testing indicates "
 "your ORPort is reachable from the outside. Excellent.\""
 msgstr ""
-"Cherchez une entrée de journal dans /var/log/syslog comme « Self-testing "
-"indicates your ORPort is reachable from the outside. Excellent. »"
+"Cherchez une entrée de journal dans /var/log/syslog telle que « 
Self-testing"
+" indicates your ORPort is reachable from the outside. Excellent. »"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3498,8 +3496,8 @@ msgid ""
 "If you don't see this message, it means that your relay is not reachable "
 "from the outside."
 msgstr ""
-"Si vous me voyez pas ce message, cela signifie que votre relais n’est pas "
-"accessible depuis l’extérieur."
+"Si vous ne voyez pas ce message, cela signifie que votre relais n’est pas "
+"accessible de l’extérieur."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3513,8 +3511,8 @@ msgid ""
 "You should re-check your firewalls, check that the IP and ports you "
 "specified in your torrc are correct, etc."
 msgstr ""
-"Vous devriez à nouveau vérifier vos pare-feux, que l’IP et les ports que "
-"vous avez spécifié dans votre torrc sont corrects, etc."
+"Vous devriez revérifier vos pare-feu, vérifier que l’IP et les ports que "
+"vous avez indiqués dans votre torrc sont corrects, etc."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3525,7 +3523,7 @@ msgid ""
 msgstr ""
 "Quand il aura confirmé qu’il est accessible, il téléversera un « 
descripteur"
 " de serveur » vers les autorités d’annuaire pour informer les clients de 
"
-"l’adresse, des ports, clés, etc. que votre relais utilise."
+"l’adresse, des ports, des clés, etc. que votre relais utilise."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3539,10 +3537,10 @@ msgid ""
 "href=\"https://metrics.torproject.org/rs.html#search\;>Metrics to"
 " see whether your relay has successfully registered in the network."
 msgstr ""
-"Après quelques heures (le temps que l’information se propage), vous pouvez 
"
-"envoyer une requête à https://metrics.torproject.org/rs.html#search\;>Metrics "
-"pour voir si votre relais a été enregistré dans le réseau avec succès."
+"pour voir si votre relais a été référencé dans le réseau avec succès."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3551,9 +3549,7 @@ msgstr ""
 #: https//support.torproject.org/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "If it hasn't, re-check firewalls, IP and ports again."
-msgstr ""
-"Si ce n’est pas le cas, vérifiez à nouveau vos pare-feux, votre IP et vos 
"
-"ports."
+msgstr "Si ce n’est pas le cas, revérifiez pare-feu, IP et ports."
 
 #: https//support.torproject.org/operators/operators-2/
 #: (content/operators/operators-2/contents+en.lrquestion.title)
@@ -3577,7 +3573,7 @@ msgid ""
 "Look for a log entry in your /var/log/syslog such as \"Self-testing "
 "indicates your ORPort is reachable from the outside. Excellent.\""
 msgstr ""
-"Cherchez une entrée de journal dans votre /var/log/syslog comme « Self-"
+"Cherchez une entrée de journal dans votre /var/log/syslog telle que « 
Self-"
 "testing indicates your ORPort is reachable from the outside. Excellent. »"
 
 #: https//support.torproject.org/operators/operators-2/
@@ -3591,7 +3587,7 @@ msgid ""
 msgstr ""
 "* Quand il aura confirmé qu’il est accessible, il téléversera un « "
 "descripteur de serveur » vers les autorités d’annuaire pour informer les 
"
-"clients de l’adresse, des ports, clés, etc. que votre relais utilise."
+"clients de 

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

2019-05-13 Thread translation
commit 36e641d6ad4fda798127c6a1b1757824b38220fc
Author: Translation commit bot 
Date:   Mon May 13 20:50:53 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 39 ++-
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 8010ce4cd..98ffa632a 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3408,9 +3408,7 @@ msgstr "DirPort 9030"
 msgid ""
 "## Set your bandwidth rate (leave commented and Tor will run without "
 "bandwidth caps)"
-msgstr ""
-"## Définissez le débit de votre bande passante (laissez en commentaire et "
-"Tor s’exécutera sans limite de bande passante)"
+msgstr "## Define these to limit how much relayed traffic you will allow"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3483,8 +3481,8 @@ msgid ""
 "Look for a log entry in /var/log/syslog such as \"Self-testing indicates "
 "your ORPort is reachable from the outside. Excellent.\""
 msgstr ""
-"Cherchez une entrée de journal dans /var/log/syslog comme « Self-testing "
-"indicates your ORPort is reachable from the outside. Excellent. »"
+"Cherchez une entrée de journal dans /var/log/syslog telle que « 
Self-testing"
+" indicates your ORPort is reachable from the outside. Excellent. »"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3498,8 +3496,8 @@ msgid ""
 "If you don't see this message, it means that your relay is not reachable "
 "from the outside."
 msgstr ""
-"Si vous me voyez pas ce message, cela signifie que votre relais n’est pas "
-"accessible depuis l’extérieur."
+"Si vous ne voyez pas ce message, cela signifie que votre relais n’est pas "
+"accessible de l’extérieur."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3513,8 +3511,8 @@ msgid ""
 "You should re-check your firewalls, check that the IP and ports you "
 "specified in your torrc are correct, etc."
 msgstr ""
-"Vous devriez à nouveau vérifier vos pare-feux, que l’IP et les ports que "
-"vous avez spécifié dans votre torrc sont corrects, etc."
+"Vous devriez revérifier vos pare-feu, vérifier que l’IP et les ports que "
+"vous avez indiqués dans votre torrc sont corrects, etc."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3525,7 +3523,7 @@ msgid ""
 msgstr ""
 "Quand il aura confirmé qu’il est accessible, il téléversera un « 
descripteur"
 " de serveur » vers les autorités d’annuaire pour informer les clients de 
"
-"l’adresse, des ports, clés, etc. que votre relais utilise."
+"l’adresse, des ports, des clés, etc. que votre relais utilise."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3539,10 +3537,10 @@ msgid ""
 "href=\"https://metrics.torproject.org/rs.html#search\;>Metrics to"
 " see whether your relay has successfully registered in the network."
 msgstr ""
-"Après quelques heures (le temps que l’information se propage), vous pouvez 
"
-"envoyer une requête à https://metrics.torproject.org/rs.html#search\;>Metrics "
-"pour voir si votre relais a été enregistré dans le réseau avec succès."
+"pour voir si votre relais a été référencé dans le réseau avec succès."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3551,9 +3549,7 @@ msgstr ""
 #: https//support.torproject.org/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "If it hasn't, re-check firewalls, IP and ports again."
-msgstr ""
-"Si ce n’est pas le cas, vérifiez à nouveau vos pare-feux, votre IP et vos 
"
-"ports."
+msgstr "Si ce n’est pas le cas, revérifiez pare-feu, IP et ports."
 
 #: https//support.torproject.org/operators/operators-2/
 #: (content/operators/operators-2/contents+en.lrquestion.title)
@@ -3577,7 +3573,7 @@ msgid ""
 "Look for a log entry in your /var/log/syslog such as \"Self-testing "
 "indicates your ORPort is reachable from the outside. Excellent.\""
 msgstr ""
-"Cherchez une entrée de journal dans votre /var/log/syslog comme « Self-"
+"Cherchez une entrée de journal dans votre /var/log/syslog telle que « 
Self-"
 "testing indicates your ORPort is reachable from the outside. Excellent. »"
 
 #: https//support.torproject.org/operators/operators-2/
@@ -3591,7 +3587,7 @@ msgid ""
 msgstr ""
 "* Quand il aura confirmé qu’il est accessible, il téléversera un « "
 "descripteur de serveur » vers les autorités d’annuaire pour informer les 
"
-"clients de l’adresse, des ports, clés, etc. que votre relais utilise."

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

2019-05-13 Thread translation
commit bbcc5c2cf4b7338e3130bd9741c9e306f3cb4913
Author: Translation commit bot 
Date:   Mon May 13 20:21:02 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 26c31be3f..8010ce4cd 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3302,8 +3302,8 @@ msgid ""
 "## The IP address or hostname for incoming connections (leave commented and "
 "Tor will guess)"
 msgstr ""
-"## L’adresse IP ou le nom d’hôte pour les connexions entrantes (laissez "
-"commenté et Tor déterminera cela)"
+"## The IP address or full DNS name for incoming connections to your relay. "
+"Leave commented out and Tor will guess"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3312,7 +3312,7 @@ msgstr ""
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "#Address noname.example.com"
-msgstr "#Adresse sansnom.exemple.com"
+msgstr "#Address noname.example.com"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3323,7 +3323,8 @@ msgstr "#Adresse sansnom.exemple.com"
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "## Set the nickname of this relay"
-msgstr "## Définissez le pseudonyme de ce relais"
+msgstr ""
+"## A handle for your relay, so people don't have to refer to it by key"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3334,7 +3335,7 @@ msgstr "## Définissez le pseudonyme de ce relais"
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "Nickname ididnteditheconfig"
-msgstr "Nickname jaipasmodifiélaconfig"
+msgstr "Nickname ididnteditheconfig"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3345,7 +3346,7 @@ msgstr "Nickname jaipasmodifiélaconfig"
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "## Set your own contact info"
-msgstr "## Définissez vos propres renseignements de contact"
+msgstr "## Administrative contact information for this relay or bridge"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3356,7 +3357,7 @@ msgstr "## Définissez vos propres renseignements de 
contact"
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "ContactInfo 0x Random Person "
-msgstr "ContactInfo 0x Personne au hasard "
+msgstr "ContactInfo 0x Random Person "
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3365,7 +3366,7 @@ msgstr "ContactInfo 0x Personne au hasard "
 #: https//support.torproject.org/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "## If you control multiple relays, include them in the family"
-msgstr "## Si vous contrôlez plusieurs relais, incluez-les dans la famille"
+msgstr "## Uncomment this if you run more than one Tor relay"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3374,7 +3375,7 @@ msgstr "## Si vous contrôlez plusieurs relais, 
incluez-les dans la famille"
 #: https//support.torproject.org/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "#MyFamily $keyid,$keyid,..."
-msgstr "#MaFamille $keyid,$keyid,…"
+msgstr "#MyFamily $keyid,$keyid,..."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/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-05-13 Thread translation
commit 3fe5f5d910adee79a51105003bbd5a13044f3dc2
Author: Translation commit bot 
Date:   Mon May 13 20:20:54 2019 +

Update translations for support-portal
---
 contents+fr.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 26c31be3f..8010ce4cd 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3302,8 +3302,8 @@ msgid ""
 "## The IP address or hostname for incoming connections (leave commented and "
 "Tor will guess)"
 msgstr ""
-"## L’adresse IP ou le nom d’hôte pour les connexions entrantes (laissez "
-"commenté et Tor déterminera cela)"
+"## The IP address or full DNS name for incoming connections to your relay. "
+"Leave commented out and Tor will guess"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3312,7 +3312,7 @@ msgstr ""
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "#Address noname.example.com"
-msgstr "#Adresse sansnom.exemple.com"
+msgstr "#Address noname.example.com"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3323,7 +3323,8 @@ msgstr "#Adresse sansnom.exemple.com"
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "## Set the nickname of this relay"
-msgstr "## Définissez le pseudonyme de ce relais"
+msgstr ""
+"## A handle for your relay, so people don't have to refer to it by key"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3334,7 +3335,7 @@ msgstr "## Définissez le pseudonyme de ce relais"
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "Nickname ididnteditheconfig"
-msgstr "Nickname jaipasmodifiélaconfig"
+msgstr "Nickname ididnteditheconfig"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3345,7 +3346,7 @@ msgstr "Nickname jaipasmodifiélaconfig"
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "## Set your own contact info"
-msgstr "## Définissez vos propres renseignements de contact"
+msgstr "## Administrative contact information for this relay or bridge"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3356,7 +3357,7 @@ msgstr "## Définissez vos propres renseignements de 
contact"
 #: https//support.torproject.org/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "ContactInfo 0x Random Person "
-msgstr "ContactInfo 0x Personne au hasard "
+msgstr "ContactInfo 0x Random Person "
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3365,7 +3366,7 @@ msgstr "ContactInfo 0x Personne au hasard "
 #: https//support.torproject.org/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "## If you control multiple relays, include them in the family"
-msgstr "## Si vous contrôlez plusieurs relais, incluez-les dans la famille"
+msgstr "## Uncomment this if you run more than one Tor relay"
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3374,7 +3375,7 @@ msgstr "## Si vous contrôlez plusieurs relais, 
incluez-les dans la famille"
 #: https//support.torproject.org/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "#MyFamily $keyid,$keyid,..."
-msgstr "#MaFamille $keyid,$keyid,…"
+msgstr "#MyFamily $keyid,$keyid,..."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/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/exoneratorproperties_completed] Update translations for exoneratorproperties_completed

2019-05-13 Thread translation
commit 2230a1015f0ef05350497a104b92eb6c53ce0d4d
Author: Translation commit bot 
Date:   Mon May 13 19:45:57 2019 +

Update translations for exoneratorproperties_completed
---
 lt/exonerator.properties | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lt/exonerator.properties b/lt/exonerator.properties
index b100b072c..7581d5ba8 100644
--- a/lt/exonerator.properties
+++ b/lt/exonerator.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Taip
 technicaldetails.exit.no=Ne
 permanentlink.heading=Pastovioji nuoroda
 footer.abouttor.heading=Apie Tor
-footer.abouttor.body.text=Tor yra tarptautinis programinės įrangos 
projektas, skirtas anonimizuoti interneto srautą %s. Štai kodėl, kai 
matote srautą iš Tor retransliavimo, šis srautas, dažniausiai, eina iš 
asmens besinaudojančio Tor, o ne iš paties retransliavimo operatoriaus. 
Tor projektas ir Tor retransliavimo operatoriai neturi jokių įrašų apie 
srautą, kuris praeina per tinklą ir todėl, negali pateikti jokios 
informacijos apie srauto kilmę. Būtinai %s ir išsamesnei informacijai, 
nesivaržykite %s.
-footer.abouttor.body.link1=šifruojant paketus ir, prieš jiems pasiekiant 
galutinę paskirtį, siunčiant juos per šuolių seriją
-footer.abouttor.body.link2=sužinokite daugiau apie Tor
-footer.abouttor.body.link3=susisiekti su Tor Project, Inc.
+footer.abouttor.body.text=Tor yra tarptautinis programinės įrangos 
projektas, skirtas anonimizuoti interneto srautą šifruojant paketus ir, 
prieš jiems pasiekiant paskirties vietą, siunčiant juos per kelių šuolių 
seriją. Štai kodėl, kai matote srautą iš Tor retransliavimo, šis 
srautas, dažniausiai, eina iš asmens besinaudojančio Tor, o ne iš paties 
retransliavimo operatoriaus. Tor projektas ir Tor retransliavimo 
operatoriai neturi jokių įrašų apie srautą, kuris praeina per tinklą ir 
todėl, negali pateikti jokios informacijos apie srauto kilmę. Būtinai 
%s, ir išsamesnei informacijai nesivaržykite %s.
+footer.abouttor.body.link1=sužinokite daugiau apie Tor
+footer.abouttor.body.link2=susisiekti su Tor Project, Inc.
 footer.aboutexonerator.heading=Apie ExoneraTor
 footer.aboutexonerator.body=ExoneraTor paslauga prižiūri IP adresų, kurie 
buvo Tor tinklo dalimi, duomenų bazę. Ji atsako į klausimą ar 
nurodytame IP adrese, nurodytą datą, veikė Tor retransliavimas. Jeigu 
retransliavimai išėjimui į internetą naudoja kitokį IP adresą nei 
prisiregistravimui Tor tinkle, tuomet ExoneraTor gali saugoti daugiau nei vieną
 IP adresą ir ši paslauga saugo informaciją apie tai, ar retransliavimas tuo 
metu leido Tor srauto tranzitą į atvirą internetą.
 footer.language.name=Anglų

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


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

2019-05-13 Thread translation
commit a655b0b27de17cb019708d23f29e6d47362fbf29
Author: Translation commit bot 
Date:   Mon May 13 19:45:50 2019 +

Update translations for exoneratorproperties
---
 lt/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lt/exonerator.properties b/lt/exonerator.properties
index a6d12157c..7581d5ba8 100644
--- a/lt/exonerator.properties
+++ b/lt/exonerator.properties
@@ -43,7 +43,7 @@ technicaldetails.exit.yes=Taip
 technicaldetails.exit.no=Ne
 permanentlink.heading=Pastovioji nuoroda
 footer.abouttor.heading=Apie Tor
-footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by encrypting packets and sending them through a 
series of hops before they reach their destination. Therefore, if you see 
traffic from a Tor relay, this traffic usually originates from someone using 
Tor, rather than from the relay operator. The Tor Project and Tor relay 
operators have no records of the traffic that passes over the network and 
therefore cannot provide any information about its origin. Be sure to %s, 
and don't hesitate to %s for more information.
+footer.abouttor.body.text=Tor yra tarptautinis programinės įrangos 
projektas, skirtas anonimizuoti interneto srautą šifruojant paketus ir, 
prieš jiems pasiekiant paskirties vietą, siunčiant juos per kelių šuolių 
seriją. Štai kodėl, kai matote srautą iš Tor retransliavimo, šis 
srautas, dažniausiai, eina iš asmens besinaudojančio Tor, o ne iš paties 
retransliavimo operatoriaus. Tor projektas ir Tor retransliavimo 
operatoriai neturi jokių įrašų apie srautą, kuris praeina per tinklą ir 
todėl, negali pateikti jokios informacijos apie srauto kilmę. Būtinai 
%s, ir išsamesnei informacijai nesivaržykite %s.
 footer.abouttor.body.link1=sužinokite daugiau apie Tor
 footer.abouttor.body.link2=susisiekti su Tor Project, Inc.
 footer.aboutexonerator.heading=Apie ExoneraTor

___
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-05-13 Thread translation
commit cefedf5a57a3a3db10ba85f2e12f57373b11532b
Author: Translation commit bot 
Date:   Mon May 13 19:21:12 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 31 +++
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 62777c6dc..26c31be3f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3089,10 +3089,10 @@ msgid ""
 "who want an extra layer of security because they're worried somebody will "
 "recognize that they are contacting a public Tor relay IP address."
 msgstr ""
-"Les ponts sont utiles pour les utilisateurs de Tor dans des régimes "
-"oppressants, et pour les gens qui veulent une couche supplémentaire de "
-"sécurité parce qu’ils se préoccupent du fait que quelqu’un puisse 
savoir "
-"qu’ils contactent l’adresse IP d’un relais Tor public."
+"Les ponts sont utiles pour les utilisateurs de Tor qui subissent des régimes"
+" oppressants et pour les gens qui veulent une couche supplémentaire de "
+"sécurité parce qu’ils s’inquiètent que quelqu’un puisse découvrir 
qu’ils "
+"contactent l’adresse IP d’un relais Tor public."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -3129,7 +3129,7 @@ msgid ""
 msgstr ""
 "Les ponts https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt\;>Obfsproxy"
-" y remédient en ajoutant une  couche supplémentaire de brouillage."
+" y remédient en ajoutant une couche supplémentaire de brouillage."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -3146,10 +3146,9 @@ msgid ""
 "See our page on https://www.torproject.org/docs/pluggable-;
 "transports.html.en\">pluggable transports for more info."
 msgstr ""
-"Consultez notre page concernant les https://www.torproject.org/docs/pluggable-;
-"transports.html.en\">transports enfichables pour de plus amples "
-"renseignements."
+"Consultez notre page sur les https://www.torproject.org/docs;
+"/pluggable-transports.html.en\">transports enfichables pour de "
+"plus de précisions."
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.title)
@@ -3159,13 +3158,13 @@ msgid ""
 msgstr ""
 "Quand j’utilise Tor, les systèmes d’écoute peuvent-ils encore voir les "
 "renseignements que je partage avec les sites Web, comme les renseignements "
-"de connexion et ce que je tape dans les formulaires ?"
+"de connexion, et ce que je tape dans les formulaires ?"
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
 msgid "Tor prevents eavesdroppers from learning sites that you visit."
 msgstr ""
-"Tor empêche aux systèmes d’écoute de connaître les sites que vous 
visitez."
+"Tor empêche aux systèmes d’écoute de découvrir quels sites vous 
visitez."
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
@@ -3175,8 +3174,8 @@ msgid ""
 "traffic between your exit relay and your destination website."
 msgstr ""
 "Cependant, les renseignements envoyés par Internet sans chiffrement en "
-"utilisant une simple connexion HTTP peuvent toujours être interceptés par "
-"les opérateurs de relais de sortie ou par quiconque observe le trafic entre "
+"utilisant une simple connexion HTTP peuvent encore être interceptés par les 
"
+"opérateurs de relais de sortie ou par quiconque observe le trafic entre "
 "votre relais de sortie et votre site Web de destination."
 
 #: https//support.torproject.org/https/https-1/
@@ -3185,8 +3184,8 @@ msgid ""
 "If the site you are visiting uses HTTPS, then the traffic leaving your exit "
 "relay will be encrypted, and won't be visible to eavesdroppers."
 msgstr ""
-"Si le site que vous visitez utilise HTTPS, le trafic quittant votre relais "
-"de sortie sera alors chiffré et invisible aux systèmes d’écoute."
+"Si le site que vous visitez utilise HTTPS, le trafic qui quitte votre relais"
+" de sortie sera alors chiffré et invisible aux systèmes d’écoute."
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
@@ -3241,7 +3240,7 @@ msgid ""
 msgstr ""
 "Cette représentation montre quels renseignements "
 "sont visibles aux systèmes d’écoute, avec et sans le Navigateur Tor et 
le "
-"chiffrement HTTPS."
+"chiffrement HTTPS."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.title)

___
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-05-13 Thread translation
commit 569f604cf6766a6def7e207c22a883826c5d61e9
Author: Translation commit bot 
Date:   Mon May 13 19:21:04 2019 +

Update translations for support-portal
---
 contents+fr.po | 31 +++
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 62777c6dc..26c31be3f 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3089,10 +3089,10 @@ msgid ""
 "who want an extra layer of security because they're worried somebody will "
 "recognize that they are contacting a public Tor relay IP address."
 msgstr ""
-"Les ponts sont utiles pour les utilisateurs de Tor dans des régimes "
-"oppressants, et pour les gens qui veulent une couche supplémentaire de "
-"sécurité parce qu’ils se préoccupent du fait que quelqu’un puisse 
savoir "
-"qu’ils contactent l’adresse IP d’un relais Tor public."
+"Les ponts sont utiles pour les utilisateurs de Tor qui subissent des régimes"
+" oppressants et pour les gens qui veulent une couche supplémentaire de "
+"sécurité parce qu’ils s’inquiètent que quelqu’un puisse découvrir 
qu’ils "
+"contactent l’adresse IP d’un relais Tor public."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -3129,7 +3129,7 @@ msgid ""
 msgstr ""
 "Les ponts https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt\;>Obfsproxy"
-" y remédient en ajoutant une  couche supplémentaire de brouillage."
+" y remédient en ajoutant une couche supplémentaire de brouillage."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -3146,10 +3146,9 @@ msgid ""
 "See our page on https://www.torproject.org/docs/pluggable-;
 "transports.html.en\">pluggable transports for more info."
 msgstr ""
-"Consultez notre page concernant les https://www.torproject.org/docs/pluggable-;
-"transports.html.en\">transports enfichables pour de plus amples "
-"renseignements."
+"Consultez notre page sur les https://www.torproject.org/docs;
+"/pluggable-transports.html.en\">transports enfichables pour de "
+"plus de précisions."
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.title)
@@ -3159,13 +3158,13 @@ msgid ""
 msgstr ""
 "Quand j’utilise Tor, les systèmes d’écoute peuvent-ils encore voir les "
 "renseignements que je partage avec les sites Web, comme les renseignements "
-"de connexion et ce que je tape dans les formulaires ?"
+"de connexion, et ce que je tape dans les formulaires ?"
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
 msgid "Tor prevents eavesdroppers from learning sites that you visit."
 msgstr ""
-"Tor empêche aux systèmes d’écoute de connaître les sites que vous 
visitez."
+"Tor empêche aux systèmes d’écoute de découvrir quels sites vous 
visitez."
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
@@ -3175,8 +3174,8 @@ msgid ""
 "traffic between your exit relay and your destination website."
 msgstr ""
 "Cependant, les renseignements envoyés par Internet sans chiffrement en "
-"utilisant une simple connexion HTTP peuvent toujours être interceptés par "
-"les opérateurs de relais de sortie ou par quiconque observe le trafic entre "
+"utilisant une simple connexion HTTP peuvent encore être interceptés par les 
"
+"opérateurs de relais de sortie ou par quiconque observe le trafic entre "
 "votre relais de sortie et votre site Web de destination."
 
 #: https//support.torproject.org/https/https-1/
@@ -3185,8 +3184,8 @@ msgid ""
 "If the site you are visiting uses HTTPS, then the traffic leaving your exit "
 "relay will be encrypted, and won't be visible to eavesdroppers."
 msgstr ""
-"Si le site que vous visitez utilise HTTPS, le trafic quittant votre relais "
-"de sortie sera alors chiffré et invisible aux systèmes d’écoute."
+"Si le site que vous visitez utilise HTTPS, le trafic qui quitte votre relais"
+" de sortie sera alors chiffré et invisible aux systèmes d’écoute."
 
 #: https//support.torproject.org/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
@@ -3241,7 +3240,7 @@ msgid ""
 msgstr ""
 "Cette représentation montre quels renseignements "
 "sont visibles aux systèmes d’écoute, avec et sans le Navigateur Tor et 
le "
-"chiffrement HTTPS."
+"chiffrement HTTPS."
 
 #: https//support.torproject.org/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.title)

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


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

2019-05-13 Thread translation
commit e71e7a2a2184a1e0eda9b7d908a20f37ba1efcd7
Author: Translation commit bot 
Date:   Mon May 13 19:16:05 2019 +

Update translations for https_everywhere_completed
---
 uk/https-everywhere.dtd | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd
index 313b60a9a..35913d05a 100644
--- a/uk/https-everywhere.dtd
+++ b/uk/https-everywhere.dtd
@@ -7,13 +7,14 @@
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
+
 
 
 
@@ -45,7 +46,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-05-13 Thread translation
commit e440c5010a3147dc12aa5925e1a2bb8e6fbfe14f
Author: Translation commit bot 
Date:   Mon May 13 19:15:57 2019 +

Update translations for https_everywhere
---
 uk/https-everywhere.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd
index 560202871..35913d05a 100644
--- a/uk/https-everywhere.dtd
+++ b/uk/https-everywhere.dtd
@@ -8,13 +8,13 @@
 
 
 
-
+
 
-
+
 
-
+
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 

___
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-05-13 Thread translation
commit 58bef7a0ee6dae56a41c7c97cb9fcbfcfa1e4361
Author: Translation commit bot 
Date:   Mon May 13 18:51:22 2019 +

Update translations for support-portal
---
 contents+fr.po | 74 +-
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index b232772cc..62777c6dc 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1290,9 +1290,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 ""
-"Cliquez sur le bouton « Copier le journal de Tor dans le presse-papiers » 
"
-"qui apparaît dans la fenêtre de dialogue quand le Navigateur Tor se 
connecte"
-" initialement au réseau."
+"Cliquez sur le bouton « Copier le journal Tor dans le presse-papiers » 
qui "
+"apparaît dans la fenêtre de dialogue quand le Navigateur Tor se connecte "
+"initialement au réseau."
 
 #: https//support.torproject.org/tbb/tbb-21/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
@@ -1303,7 +1303,7 @@ msgid ""
 msgstr ""
 "Si le navigateur est déjà ouvert, cliquez sur l’icône BoutonTor (le 
petit "
 "oignon vert en haut à gauche de l’écran), sur « Paramètres du réseau 
Tor », "
-"puis sur « Copier le journal de Tor dans le presse-papiers »."
+"puis sur « Copier le journal Tor dans le presse-papiers »."
 
 #: https//support.torproject.org/tbb/tbb-21/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
@@ -1580,7 +1580,7 @@ msgid ""
 " \"New Tor Circuit for this Site\"."
 msgstr ""
 "Le Navigateur Tor propose deux façons de changer votre circuit de relais : 
«"
-" Nouvelle identité » et « Nouveau circuit Tor pour ce site »."
+" Nouvelle identité » et « Nouveau circuit Tor pour ce site »."
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -1640,7 +1640,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
 msgid "# New Tor Circuit for this Site"
-msgstr "# Nouveau circuit Tor pour ce site"
+msgstr "# Nouveau circuit Tor pour ce site"
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -1659,7 +1659,7 @@ msgid ""
 "over a new Tor circuit."
 msgstr ""
 "Sélectionner cette option entraînera le rechargement avec un nouveau 
circuit"
-" Tor de l’onglet ou de la fenêtre actuellement actifs."
+" Tor de l’onglet ou de la fenêtre actuellement actifs."
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -2630,7 +2630,7 @@ msgid ""
 "get...@torproject.org with one of the following codes in it:"
 msgstr ""
 "Pour obtenir des liens pour télécharger le Navigateur Tor, envoyez un "
-"courriel à get...@torproject.org en incluant l’un des codes suivants :"
+"message à get...@torproject.org en incluant l’un des codes suivants :"
 
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.title)
@@ -2651,7 +2651,7 @@ msgid ""
 "log to clipboard.\""
 msgstr ""
 "Si vous éprouvez des difficultés à vous connecter, veuillez sélectionner "
-"l’option « Copier le journal de Tor dans le presse-papiers »."
+"l’option pour « copier le journal Tor dans le presse-papiers »."
 
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2659,7 +2659,7 @@ msgstr ""
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid "Then paste the Tor log into a text file or other document."
 msgstr ""
-"Collez ensuite le journal de Tor dans un fichier texte ou dans un autre "
+"Collez ensuite le journal Tor dans un fichier texte ou dans un autre "
 "document."
 
 #: https//support.torproject.org/connecting/connecting-2/
@@ -2670,8 +2670,8 @@ msgid ""
 "You should see one of these common log errors (look for the following lines "
 "in your Tor log):"
 msgstr ""
-"Vous devriez trouver l’une de ces erreurs de journal courantes (cherchez 
les"
-" lignes suivantes dans votre journal de Tor) :"
+"Vous devriez voir l’une de ces erreurs de journal courantes (cherchez les "
+"lignes suivantes dans votre journal Tor) :"
 
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2731,8 +2731,8 @@ msgid ""
 "If you see lines like these in your Tor log, it means you are failing to "
 "connect to a SOCKS proxy."
 msgstr ""
-"Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie"
-" que vous n’arrivez pas à vous connecter à un mandataire SOCKS."
+"Si vous trouvez de telles lignes dans votre journal Tor, cela signifie que "
+"vous 

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

2019-05-13 Thread translation
commit 5b37214f6e9db41b42b672901eda8e86ed8c8e6c
Author: Translation commit bot 
Date:   Mon May 13 18:51:29 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 74 +-
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index b232772cc..62777c6dc 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1290,9 +1290,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 ""
-"Cliquez sur le bouton « Copier le journal de Tor dans le presse-papiers » 
"
-"qui apparaît dans la fenêtre de dialogue quand le Navigateur Tor se 
connecte"
-" initialement au réseau."
+"Cliquez sur le bouton « Copier le journal Tor dans le presse-papiers » 
qui "
+"apparaît dans la fenêtre de dialogue quand le Navigateur Tor se connecte "
+"initialement au réseau."
 
 #: https//support.torproject.org/tbb/tbb-21/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
@@ -1303,7 +1303,7 @@ msgid ""
 msgstr ""
 "Si le navigateur est déjà ouvert, cliquez sur l’icône BoutonTor (le 
petit "
 "oignon vert en haut à gauche de l’écran), sur « Paramètres du réseau 
Tor », "
-"puis sur « Copier le journal de Tor dans le presse-papiers »."
+"puis sur « Copier le journal Tor dans le presse-papiers »."
 
 #: https//support.torproject.org/tbb/tbb-21/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
@@ -1580,7 +1580,7 @@ msgid ""
 " \"New Tor Circuit for this Site\"."
 msgstr ""
 "Le Navigateur Tor propose deux façons de changer votre circuit de relais : 
«"
-" Nouvelle identité » et « Nouveau circuit Tor pour ce site »."
+" Nouvelle identité » et « Nouveau circuit Tor pour ce site »."
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -1640,7 +1640,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
 msgid "# New Tor Circuit for this Site"
-msgstr "# Nouveau circuit Tor pour ce site"
+msgstr "# Nouveau circuit Tor pour ce site"
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -1659,7 +1659,7 @@ msgid ""
 "over a new Tor circuit."
 msgstr ""
 "Sélectionner cette option entraînera le rechargement avec un nouveau 
circuit"
-" Tor de l’onglet ou de la fenêtre actuellement actifs."
+" Tor de l’onglet ou de la fenêtre actuellement actifs."
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -2630,7 +2630,7 @@ msgid ""
 "get...@torproject.org with one of the following codes in it:"
 msgstr ""
 "Pour obtenir des liens pour télécharger le Navigateur Tor, envoyez un "
-"courriel à get...@torproject.org en incluant l’un des codes suivants :"
+"message à get...@torproject.org en incluant l’un des codes suivants :"
 
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.title)
@@ -2651,7 +2651,7 @@ msgid ""
 "log to clipboard.\""
 msgstr ""
 "Si vous éprouvez des difficultés à vous connecter, veuillez sélectionner "
-"l’option « Copier le journal de Tor dans le presse-papiers »."
+"l’option pour « copier le journal Tor dans le presse-papiers »."
 
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2659,7 +2659,7 @@ msgstr ""
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid "Then paste the Tor log into a text file or other document."
 msgstr ""
-"Collez ensuite le journal de Tor dans un fichier texte ou dans un autre "
+"Collez ensuite le journal Tor dans un fichier texte ou dans un autre "
 "document."
 
 #: https//support.torproject.org/connecting/connecting-2/
@@ -2670,8 +2670,8 @@ msgid ""
 "You should see one of these common log errors (look for the following lines "
 "in your Tor log):"
 msgstr ""
-"Vous devriez trouver l’une de ces erreurs de journal courantes (cherchez 
les"
-" lignes suivantes dans votre journal de Tor) :"
+"Vous devriez voir l’une de ces erreurs de journal courantes (cherchez les "
+"lignes suivantes dans votre journal Tor) :"
 
 #: https//support.torproject.org/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2731,8 +2731,8 @@ msgid ""
 "If you see lines like these in your Tor log, it means you are failing to "
 "connect to a SOCKS proxy."
 msgstr ""
-"Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie"
-" que vous n’arrivez pas à vous connecter à un mandataire SOCKS."
+"Si vous trouvez de telles lignes dans votre journal Tor, cela signifie que "
+"vous 

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

2019-05-13 Thread translation
commit e024b87d742835245e06c21a83aca96f36722210
Author: Translation commit bot 
Date:   Mon May 13 18:50:58 2019 +

Update translations for tpo-web
---
 contents+fr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 823831ba4..654aa8e3a 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -349,7 +349,7 @@ msgid ""
 "That's why in October 2002 when the Tor network was initially deployed, its "
 "code was released under a free and open software license."
 msgstr ""
-"C’est pourquoi en octobre 2002, lors du déploiement initial du réseau 
Tor, "
+"C’est pourquoi en octobre 2002, lors du déploiement initial du réseau 
Tor, "
 "son code fut distribué sous une licence de logiciel libre et ouvert."
 
 #: https//www.torproject.org/about/history/
@@ -383,7 +383,7 @@ msgid ""
 "address censorship, such as the need to get around government firewalls, in "
 "order for its users to access the open web."
 msgstr ""
-"En 2007, l’organisme commença le développement de ponts vers le réseau 
Tor "
+"En 2007, l’organisme commença le développement de ponts vers le réseau 
Tor "
 "pour répondre à la censure, telle que le besoin de contourner les pare-feu "
 "gouvernementaux afin que ses utilisateurs accèdent au Web ouvert."
 
@@ -581,7 +581,7 @@ msgstr ""
 "href=\"https://www.torproject.org/fr/download/#downloads-alpha\;>page de "
 "téléchargement du Navigateur Tor et aussi de notre https://www.torproject.org/dist/torbrowser/8.5a12/\;>répertoire de "
-"version.."
+"distribution.."
 
 #: templates/contact.html:8
 msgid "Chat with us on"

___
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-05-13 Thread translation
commit 3d5e30fe4435920326b145901fdb307c25bad35c
Author: Translation commit bot 
Date:   Mon May 13 18:51:04 2019 +

Update translations for tpo-web_completed
---
 contents+fr.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 823831ba4..654aa8e3a 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -349,7 +349,7 @@ msgid ""
 "That's why in October 2002 when the Tor network was initially deployed, its "
 "code was released under a free and open software license."
 msgstr ""
-"C’est pourquoi en octobre 2002, lors du déploiement initial du réseau 
Tor, "
+"C’est pourquoi en octobre 2002, lors du déploiement initial du réseau 
Tor, "
 "son code fut distribué sous une licence de logiciel libre et ouvert."
 
 #: https//www.torproject.org/about/history/
@@ -383,7 +383,7 @@ msgid ""
 "address censorship, such as the need to get around government firewalls, in "
 "order for its users to access the open web."
 msgstr ""
-"En 2007, l’organisme commença le développement de ponts vers le réseau 
Tor "
+"En 2007, l’organisme commença le développement de ponts vers le réseau 
Tor "
 "pour répondre à la censure, telle que le besoin de contourner les pare-feu "
 "gouvernementaux afin que ses utilisateurs accèdent au Web ouvert."
 
@@ -581,7 +581,7 @@ msgstr ""
 "href=\"https://www.torproject.org/fr/download/#downloads-alpha\;>page de "
 "téléchargement du Navigateur Tor et aussi de notre https://www.torproject.org/dist/torbrowser/8.5a12/\;>répertoire de "
-"version.."
+"distribution.."
 
 #: templates/contact.html:8
 msgid "Chat with us on"

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


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

2019-05-13 Thread translation
commit f286a50cea173240a88a60df76486282d733379d
Author: Translation commit bot 
Date:   Mon May 13 18:48:23 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+fr.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 263e99563..64742c8ec 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -997,7 +997,7 @@ msgid ""
 "functionality."
 msgstr ""
 "Par ailleurs, toutes les connexions vers une même adresse de site Web seront"
-" acheminées par le même circuit Tor, ce qui signifie que vous pouvez "
+" acheminées par le même circuit Tor, ce qui signifie que vous pouvez "
 "parcourir différentes pages d’un même site Web dans des onglets ou des "
 "fenêtres différents sans perte de fonctionnalité."
 
@@ -1125,7 +1125,7 @@ msgid ""
 "options, located in the main menu (hamburger menu)."
 msgstr ""
 "Le Navigateur Tor propose les options « Nouvelle identité » et « Nouveau 
"
-"circuit Tor pour ce site », situées dans le menu BoutonTor."
+"circuit Tor pour ce site », situées dans le menu BoutonTor."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1154,7 +1154,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
 msgid "## New Tor circuit for this site"
-msgstr "# Nouveau circuit Tor pour ce site"
+msgstr "# Nouveau circuit Tor pour ce site"
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1170,7 +1170,7 @@ msgstr ""
 "Cette option est utile si le relais de sortie ne peut pas se connecter au site Web que vous "
 "demandez, ou ne le charge pas correctement. En la sélectionnant, la fenêtre 
"
-"ou l’onglet actif sera rechargé sur un nouveau circuit Tor. Les autres "
+"ou l’onglet actif sera rechargé sur un nouveau circuit Tor. Les autres "
 "fenêtres ou onglets ouverts à partir du même site Web utiliseront aussi le 
"
 "nouveau circuit après avoir été rechargés. Cette option n’efface aucune 
"
 "information confidentielle, ne délie pas votre activité, ni n’affecte vos 
"

___
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-05-13 Thread translation
commit 97760427cdda36f19199e519a813e3c090fe6d45
Author: Translation commit bot 
Date:   Mon May 13 18:48:15 2019 +

Update translations for tbmanual-contentspot
---
 contents+fr.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 263e99563..64742c8ec 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -997,7 +997,7 @@ msgid ""
 "functionality."
 msgstr ""
 "Par ailleurs, toutes les connexions vers une même adresse de site Web seront"
-" acheminées par le même circuit Tor, ce qui signifie que vous pouvez "
+" acheminées par le même circuit Tor, ce qui signifie que vous pouvez "
 "parcourir différentes pages d’un même site Web dans des onglets ou des "
 "fenêtres différents sans perte de fonctionnalité."
 
@@ -1125,7 +1125,7 @@ msgid ""
 "options, located in the main menu (hamburger menu)."
 msgstr ""
 "Le Navigateur Tor propose les options « Nouvelle identité » et « Nouveau 
"
-"circuit Tor pour ce site », situées dans le menu BoutonTor."
+"circuit Tor pour ce site », situées dans le menu BoutonTor."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1154,7 +1154,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
 msgid "## New Tor circuit for this site"
-msgstr "# Nouveau circuit Tor pour ce site"
+msgstr "# Nouveau circuit Tor pour ce site"
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -1170,7 +1170,7 @@ msgstr ""
 "Cette option est utile si le relais de sortie ne peut pas se connecter au site Web que vous "
 "demandez, ou ne le charge pas correctement. En la sélectionnant, la fenêtre 
"
-"ou l’onglet actif sera rechargé sur un nouveau circuit Tor. Les autres "
+"ou l’onglet actif sera rechargé sur un nouveau circuit Tor. Les autres "
 "fenêtres ou onglets ouverts à partir du même site Web utiliseront aussi le 
"
 "nouveau circuit après avoir été rechargés. Cette option n’efface aucune 
"
 "information confidentielle, ne délie pas votre activité, ni n’affecte vos 
"

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


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

2019-05-13 Thread translation
commit 00d7bce67d4a18edebe3b3d104300680c2ae192c
Author: Translation commit bot 
Date:   Mon May 13 18:46:02 2019 +

Update translations for exoneratorproperties_completed
---
 es/exonerator.properties | 7 +++
 fr/exonerator.properties | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/es/exonerator.properties b/es/exonerator.properties
index 3a0a318bd..611239f3c 100644
--- a/es/exonerator.properties
+++ b/es/exonerator.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Sí
 technicaldetails.exit.no=No
 permanentlink.heading=Enlace permanente
 footer.abouttor.heading=Acerca de Tor
-footer.abouttor.body.text=Tor es un proyecto internacional de software para 
anonimizar el tráfico de Internet por %s. Por tanto, si ves tráfico 
desde un repetidor Tor, este tráfico se origina generalmente desde alguien que 
usa Tor, en lugar de desde el operador del repetidor.  The Tor Project 
(el proyecto Tor) y los operadores de repetidores Tor no tienen registros del 
tráfico que pasa por la red y por tanto no pueden proporcionar ninguna 
información sobre su origen. Asegúrate de %s, y no dudes en %s para 
más información.
-footer.abouttor.body.link1=cifrando paquetes y enviándolos a través de una 
serie de saltos antes de que alcancen su destino
-footer.abouttor.body.link2=aprende acerca de Tor
-footer.abouttor.body.link3=contacta con The Tor Project, Inc.
+footer.abouttor.body.text=Tor es un proyecto de software internacional para 
hacer anónimo el tráfico de Internet, cifrando paquetes y enviándolos a 
través de una serie de saltos antes de que lleguen a su destination. Por 
lo tanto, si ves tráfico de un relé de Tor, este tráfico generalmente lo 
origina alguien que usa Tor, en lugar de hacerlo por el operador del relé 
operator. Los operadores de retransmisión del Proyecto Tor y de Tor no 
tienen registros del tráfico que pasa por la red y, por lo tanto, no pueden 
proporcionar información alguna sobre su origin. Asegúrate de%s, y no 
dudes en %s para más información. 
+footer.abouttor.body.link1=aprende acerca de Tor
+footer.abouttor.body.link2=contacta con The Tor Project, Inc.
 footer.aboutexonerator.heading=Acerca de ExoneraTor
 footer.aboutexonerator.body=El servicio ExoneraTor mantiene una base de datos 
de direcciones IP que han sido parte de la red Tor. Responde a la 
pregunta de si había un repetidor Tor ejecutándose en una dirección IP dada 
en una fecha determinada. ExoneraTor puede almacenar más de una 
dirección IP por repetidor si los repetidores usan una dirección IP distinta 
para salir hacia Internet que para registrarse en la red Tor, y al mismo tiempo 
almacena si un repetidor permitió el tránsito de tráfico de Tor hacia la 
Internet abierta.
 footer.language.name=Inglés
diff --git a/fr/exonerator.properties b/fr/exonerator.properties
index cff328191..da2eb14e7 100644
--- a/fr/exonerator.properties
+++ b/fr/exonerator.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Oui
 technicaldetails.exit.no=Non
 permanentlink.heading=Lien permanent
 footer.abouttor.heading=À propos de Tor
-footer.abouttor.body.text=Tor est un projet international développant des 
logiciels pour anonymiser le trafic Internet en %s. Par conséquent, si vous 
voyez du trafic en provenance d’un relais Tor, ce trafic provient 
habituellement de quelqu’un qui utilise Tor, plutôt que de l’opérateur du 
relais. Le Projet Tor et les opérateurs de relais Tor n’ont aucune trace 
du trafic relayé par le réseau et ne peuvent donc fournir aucune information 
sur son origine. N’hésitez pas à vous %s ni à %s pour obtenir plus de 
précisions.
-footer.abouttor.body.link1=chiffrant les paquets et en les faisant transiter 
par une série de relais avant qu’ils n’atteignent leur destination
-footer.abouttor.body.link2=renseigner d’avantage au sujet de Tor
-footer.abouttor.body.link3=contacter « The Projet Tor, Inc. »
+footer.abouttor.body.text=Tor est un projet international de logiciels pour 
anonymiser le trafic d’Internet en chiffrant les paquets et en les envoyant 
par une série de sauts avant qu’ils n’atteignent leur destination. 
Par conséquent, si vous voyez du trafic en provenance d’un relais Tor, ce 
trafic provient habituellement de quelqu’un qui utilise Tor, plutôt que de 
l’opérateur du relais. Le Projet Tor et les opérateurs de relais 
Tor n’ont aucune trace du trafic relayé par le réseau et ne peuvent donc 
fournir aucune information sur son origine. Assurez-vous %s et 
n’hésitez pas à %s pour obtenir plus de précisions.
+footer.abouttor.body.link1=d’en apprendre davantage au sujet de Tor
+footer.abouttor.body.link2=contacter « The Projet Tor, Inc. »
 footer.aboutexonerator.heading=À propos d’ExoneraTor
 footer.aboutexonerator.body=Le service ExoneraTor gère une base de données 
d’adresses IP qui ont fait partie du réseau Tor. Il permet de savoir si un 
relais Tor fonctionnait 

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

2019-05-13 Thread translation
commit e39c5b40a9ad89201aeaa857aeb0123148e03784
Author: Translation commit bot 
Date:   Mon May 13 18:45:47 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index fe525845d..45e00e4bf 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -86,7 +86,7 @@ msgid ""
 "your monthly donation now and stand with the Tor Project at this critical "
 "time."
 msgstr ""
-"Avec votre aide, nous rendrons le réseau Tor accessible à tous. Ensemble, "
+"Avec votre aide, nous rendrons le réseau Tor accessible à tous. Ensemble, "
 "nous défendrons le droit universel à la vie privée. S’il vous plaît, 
faites "
 "votre don mensuel dès maintenant et soutenez le Projet Tor en cette 
période "
 "critique."

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


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

2019-05-13 Thread translation
commit 45c383b08d527739dee7a4a35257470a21abb23a
Author: Translation commit bot 
Date:   Mon May 13 18:45:55 2019 +

Update translations for exoneratorproperties
---
 es/exonerator.properties | 2 +-
 fr/exonerator.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/exonerator.properties b/es/exonerator.properties
index 6d7653535..611239f3c 100644
--- a/es/exonerator.properties
+++ b/es/exonerator.properties
@@ -43,7 +43,7 @@ technicaldetails.exit.yes=Sí
 technicaldetails.exit.no=No
 permanentlink.heading=Enlace permanente
 footer.abouttor.heading=Acerca de Tor
-footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by encrypting packets and sending them through a 
series of hops before they reach their destination. Therefore, if you see 
traffic from a Tor relay, this traffic usually originates from someone using 
Tor, rather than from the relay operator. The Tor Project and Tor relay 
operators have no records of the traffic that passes over the network and 
therefore cannot provide any information about its origin. Be sure to %s, 
and don't hesitate to %s for more information.
+footer.abouttor.body.text=Tor es un proyecto de software internacional para 
hacer anónimo el tráfico de Internet, cifrando paquetes y enviándolos a 
través de una serie de saltos antes de que lleguen a su destination. Por 
lo tanto, si ves tráfico de un relé de Tor, este tráfico generalmente lo 
origina alguien que usa Tor, en lugar de hacerlo por el operador del relé 
operator. Los operadores de retransmisión del Proyecto Tor y de Tor no 
tienen registros del tráfico que pasa por la red y, por lo tanto, no pueden 
proporcionar información alguna sobre su origin. Asegúrate de%s, y no 
dudes en %s para más información. 
 footer.abouttor.body.link1=aprende acerca de Tor
 footer.abouttor.body.link2=contacta con The Tor Project, Inc.
 footer.aboutexonerator.heading=Acerca de ExoneraTor
diff --git a/fr/exonerator.properties b/fr/exonerator.properties
index 965d65ec8..da2eb14e7 100644
--- a/fr/exonerator.properties
+++ b/fr/exonerator.properties
@@ -43,8 +43,8 @@ technicaldetails.exit.yes=Oui
 technicaldetails.exit.no=Non
 permanentlink.heading=Lien permanent
 footer.abouttor.heading=À propos de Tor
-footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by encrypting packets and sending them through a 
series of hops before they reach their destination. Therefore, if you see 
traffic from a Tor relay, this traffic usually originates from someone using 
Tor, rather than from the relay operator. The Tor Project and Tor relay 
operators have no records of the traffic that passes over the network and 
therefore cannot provide any information about its origin. Be sure to %s, 
and don't hesitate to %s for more information.
-footer.abouttor.body.link1=Renseignez-vous davantage au sujet de Tor
+footer.abouttor.body.text=Tor est un projet international de logiciels pour 
anonymiser le trafic d’Internet en chiffrant les paquets et en les envoyant 
par une série de sauts avant qu’ils n’atteignent leur destination. 
Par conséquent, si vous voyez du trafic en provenance d’un relais Tor, ce 
trafic provient habituellement de quelqu’un qui utilise Tor, plutôt que de 
l’opérateur du relais. Le Projet Tor et les opérateurs de relais 
Tor n’ont aucune trace du trafic relayé par le réseau et ne peuvent donc 
fournir aucune information sur son origine. Assurez-vous %s et 
n’hésitez pas à %s pour obtenir plus de précisions.
+footer.abouttor.body.link1=d’en apprendre davantage au sujet de Tor
 footer.abouttor.body.link2=contacter « The Projet Tor, Inc. »
 footer.aboutexonerator.heading=À propos d’ExoneraTor
 footer.aboutexonerator.body=Le service ExoneraTor gère une base de données 
d’adresses IP qui ont fait partie du réseau Tor. Il permet de savoir si un 
relais Tor fonctionnait pour une adresse IP donnée à une date précise. 
ExoneraTor peut enregistrer plus d’une adresse IP par relais si ces derniers 
utilisent une adresse IP différente pour se connecter à Internet de celle 
utilisée pour s’enregistrer sur le réseau Tor. ExoneraTor enregistre 
également les dates et heures auxquelles un relais a permis de faire transiter 
du trafic en provenance de Tor vers Internet.

___
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-05-13 Thread translation
commit aa503e4cf68b95e883b8a3426084e3bbc889cc44
Author: Translation commit bot 
Date:   Mon May 13 18:45:38 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index fe525845d..45e00e4bf 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -86,7 +86,7 @@ msgid ""
 "your monthly donation now and stand with the Tor Project at this critical "
 "time."
 msgstr ""
-"Avec votre aide, nous rendrons le réseau Tor accessible à tous. Ensemble, "
+"Avec votre aide, nous rendrons le réseau Tor accessible à tous. Ensemble, "
 "nous défendrons le droit universel à la vie privée. S’il vous plaît, 
faites "
 "votre don mensuel dès maintenant et soutenez le Projet Tor en cette 
période "
 "critique."

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


[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/78'

2019-05-13 Thread nickm
commit ddcc8f95518579b986a7eaec02e6dd2b98a66cd5
Merge: cfe12e6 a1935ef
Author: Nick Mathewson 
Date:   Mon May 13 14:35:55 2019 -0400

Merge remote-tracking branch 'tor-github/pr/78'

 proposals/254-padding-negotiation.txt | 11 +++
 1 file changed, 11 insertions(+)

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


[tor-commits] [torspec/master] Bug 30173+29203: Document reduced+disabled padding consensus params

2019-05-13 Thread nickm
commit a1935efba2dcaa1888d85284a26e47ed20e3f4e0
Author: Mike Perry 
Date:   Thu Apr 18 19:27:31 2019 +

Bug 30173+29203: Document reduced+disabled padding consensus params
---
 proposals/254-padding-negotiation.txt | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/proposals/254-padding-negotiation.txt 
b/proposals/254-padding-negotiation.txt
index 087f060..0d14c09 100644
--- a/proposals/254-padding-negotiation.txt
+++ b/proposals/254-padding-negotiation.txt
@@ -367,6 +367,17 @@ When either global or machine limits are reached, padding 
is no longer
 scheduled. The machine simply becomes idle until the overhead drops below
 the threshold.
 
+Finally, the consensus can also be used to specify that clients should
+use only machines that are flagged as reduced padding, or disable circuit
+padding entirely, with the following two parameters:
+
+   * circpad_padding_reduced=1
+ - Tells clients to only use padding machines with the
+   'reduced_padding_ok' machine condition flag set.
+   * circpad_padding_disabled=1
+ - Tells clients to stop circuit padding immediately, and not negotiate
+   any further padding machines.
+
 5.2. Overhead accounting
 
 In order to monitor the quantity of padding to decide if we should alter



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


[tor-commits] [tor/master] Fix a compilation warning: function does not have to be STATIC.

2019-05-13 Thread nickm
commit 5d950f3edd7f9c46f0149327c20c01a5f1cc40e2
Author: Nick Mathewson 
Date:   Mon May 13 14:34:16 2019 -0400

Fix a compilation warning: function does not have to be STATIC.
---
 src/core/or/circuitpadding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index f21cf113c..58e8e053c 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -1107,7 +1107,7 @@ circpad_new_consensus_params(const networkstatus_t *ns)
 /**
  * Return true if padding is allowed by torrc and consensus.
  */
-STATIC bool
+static bool
 circpad_is_padding_allowed(void)
 {
   /* If padding has been disabled in the consensus, don't send any more

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


[tor-commits] [tor/master] Bug 29203: Provide ReducedCircuitPadding torrc and consensus params

2019-05-13 Thread nickm
commit 621ea2315b3f53a9ef4ace9f3f6cb2f03a241042
Author: Mike Perry 
Date:   Wed Apr 17 06:09:06 2019 +

Bug 29203: Provide ReducedCircuitPadding torrc and consensus params
---
 doc/tor.1.txt  |  6 ++
 src/app/config/config.c|  5 +
 src/app/config/or_options_st.h |  6 ++
 src/core/or/circuitpadding.c   | 13 +
 src/core/or/circuitpadding.h   | 11 +++
 5 files changed, 41 insertions(+)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 6c125e374..13a85f995 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -963,6 +963,12 @@ The following options are useful only for clients (that 
is, if
 support (unlike ConnectionPadding, CircuitPadding cannot be force-enabled).
 (Default: 1)
 
+[[ReducedCircuitPadding]] **ReducedCircuitPadding** **0**|**1**::
+If set to 1, Tor will only use circuit padding algorithms that have low
+overhead. Only clients may set this option. This option should be offered
+via the UI to mobile users for use where bandwidth may be expensive.
+(Default: 0)
+
 [[ExcludeNodes]] **ExcludeNodes** __node__,__node__,__...__::
 A list of identity fingerprints, country codes, and address
 patterns of nodes to avoid when building a circuit. Country codes are
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 7ad970625..1c7cb1d57 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -597,6 +597,7 @@ static config_var_t option_vars_[] = {
   V(ConnectionPadding,   AUTOBOOL, "auto"),
   V(RefuseUnknownExits,  AUTOBOOL, "auto"),
   V(CircuitPadding,  BOOL, "1"),
+  V(ReducedCircuitPadding,   BOOL, "0"),
   V(RejectPlaintextPorts,CSV,  ""),
   V(RelayBandwidthBurst, MEMUNIT,  "0"),
   V(RelayBandwidthRate,  MEMUNIT,  "0"),
@@ -3746,6 +3747,10 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 REJECT("Relays cannot set CircuitPadding to 0. ");
   }
 
+  if (server_mode(options) && options->ReducedCircuitPadding == 1) {
+REJECT("Relays cannot set ReducedCircuitPadding. ");
+  }
+
   if (options->BridgeDistribution) {
 if (!options->BridgeRelay) {
   REJECT("You set BridgeDistribution, but you didn't set BridgeRelay!");
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 0fdeb94b4..4e03bec7f 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -253,6 +253,12 @@ struct or_options_t {
* disabled. */
   int CircuitPadding;
 
+  /** Boolean: if true, then this client will only use circuit padding
+   * algorithms that are known to use a low amount of overhead. If false,
+   * we will use all available circuit padding algorithms.
+   */
+  int ReducedCircuitPadding;
+
   /** To what authority types do we publish our descriptor? Choices are
* "v1", "v2", "v3", "bridge", or "". */
   struct smartlist_t *PublishServerDescriptor;
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index dcd8f645c..8d2749906 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -82,6 +82,7 @@ static double 
circpad_distribution_sample(circpad_distribution_t dist);
 
 /** Cached consensus params */
 static uint8_t circpad_padding_disabled;
+static uint8_t circpad_padding_reduced;
 static uint8_t circpad_global_max_padding_percent;
 static uint16_t circpad_global_allowed_cells;
 static uint16_t circpad_max_circ_queued_cells;
@@ -1086,6 +1087,10 @@ circpad_new_consensus_params(const networkstatus_t *ns)
   networkstatus_get_param(ns, "circpad_padding_disabled",
  0, 0, 1);
 
+  circpad_padding_reduced =
+  networkstatus_get_param(ns, "circpad_padding_reduced",
+ 0, 0, 1);
+
   circpad_global_allowed_cells =
   networkstatus_get_param(ns, "circpad_global_allowed_cells",
  0, 0, UINT16_MAX-1);
@@ -1662,6 +1667,14 @@ circpad_machine_conditions_met(origin_circuit_t *circ,
   if (circpad_padding_disabled || !get_options()->CircuitPadding)
 return 0;
 
+  /* If the consensus or our torrc has selected reduced connection padding,
+   * then only allow this machine if it is flagged as acceptable under
+   * reduced padding conditions */
+  if (circpad_padding_reduced || get_options()->ReducedCircuitPadding) {
+if (!machine->conditions.reduced_padding_ok)
+  return 0;
+  }
+
   if (!(circpad_circ_purpose_to_mask(TO_CIRCUIT(circ)->purpose)
   & machine->conditions.purpose_mask))
 return 0;
diff --git a/src/core/or/circuitpadding.h b/src/core/or/circuitpadding.h
index bc2522c21..f00369eb0 100644
--- a/src/core/or/circuitpadding.h
+++ b/src/core/or/circuitpadding.h
@@ -152,6 +152,17 @@ typedef struct circpad_machine_conditions_t {
   /** Only apply the machine *if* vanguards are enabled */
   unsigned requires_vanguards : 1;
 
+  /**
+   * This machine is ok to use if reduced padding is set in consensus
+   * or torrc. This machine will still be applied 

[tor-commits] [tor/master] Tests for bugs 28683, 30173, and 29203.

2019-05-13 Thread nickm
commit 42eb02a32730099e0320c7ee8b9fb0035d948bb4
Author: Mike Perry 
Date:   Wed Apr 17 23:21:54 2019 +

Tests for bugs 28683, 30173, and 29203.
---
 src/core/or/circuitpadding.c   |   1 +
 src/test/test_circuitpadding.c | 157 -
 src/test/test_options.c|   1 +
 3 files changed, 157 insertions(+), 2 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 8d2749906..7094e48d9 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2220,6 +2220,7 @@ circpad_circ_client_machine_init(void)
   circ_client_machine->conditions.state_mask =
   CIRCPAD_CIRC_BUILDING|CIRCPAD_CIRC_OPENED|CIRCPAD_CIRC_HAS_RELAY_EARLY;
   circ_client_machine->conditions.purpose_mask = CIRCPAD_PURPOSE_ALL;
+  circ_client_machine->conditions.reduced_padding_ok = 1;
 
   circ_client_machine->target_hopnum = 2;
   circ_client_machine->is_origin_side = 1;
diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c
index 3289c866c..dd84c4aff 100644
--- a/src/test/test_circuitpadding.c
+++ b/src/test/test_circuitpadding.c
@@ -1683,8 +1683,11 @@ static void
 helper_create_conditional_machines(void)
 {
   circpad_machine_spec_t *add = helper_create_conditional_machine();
-  origin_padding_machines = smartlist_new();
-  relay_padding_machines = smartlist_new();
+
+  if (!origin_padding_machines)
+origin_padding_machines = smartlist_new();
+  if (!relay_padding_machines)
+relay_padding_machines = smartlist_new();
 
   add->machine_num = 2;
   add->is_origin_side = 1;
@@ -2396,6 +2399,155 @@ test_circuitpadding_global_rate_limiting(void *arg)
   smartlist_free(vote1.net_params);
 }
 
+/* Test reduced and disabled padding */
+static void
+test_circuitpadding_reduce_disable(void *arg)
+{
+  (void) arg;
+  int64_t actual_mocked_monotime_start;
+
+  MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock);
+
+  nodes_init();
+  dummy_channel.cmux = circuitmux_alloc();
+  relay_side = (circuit_t *)new_fake_orcirc(_channel,
+_channel);
+  client_side = (circuit_t *)origin_circuit_new();
+  relay_side->purpose = CIRCUIT_PURPOSE_OR;
+  client_side->purpose = CIRCUIT_PURPOSE_C_GENERAL;
+
+  circpad_machines_init();
+  helper_create_conditional_machines();
+
+  monotime_init();
+  monotime_enable_test_mocking();
+  actual_mocked_monotime_start = MONOTIME_MOCK_START;
+  monotime_set_mock_time_nsec(actual_mocked_monotime_start);
+  monotime_coarse_set_mock_time_nsec(actual_mocked_monotime_start);
+  curr_mocked_time = actual_mocked_monotime_start;
+  timers_initialize();
+
+  /* This is needed so that we are not considered to be dormant */
+  note_user_activity(20);
+
+  MOCK(circuit_package_relay_cell,
+   circuit_package_relay_cell_mock);
+  MOCK(node_get_by_id,
+   node_get_by_id_mock);
+
+  /* Simulate extend. This should result in the original machine getting
+   * added, since the circuit is not built */
+  simulate_single_hop_extend(client_side, relay_side, 1);
+  simulate_single_hop_extend(client_side, relay_side, 1);
+
+  /* Verify that machine #2 is added */
+  tt_int_op(client_side->padding_machine[0]->machine_num, OP_EQ, 2);
+  tt_int_op(relay_side->padding_machine[0]->machine_num, OP_EQ, 2);
+
+  /* Deliver a padding cell to the client, to trigger burst state */
+  circpad_cell_event_padding_sent(client_side);
+
+  /* This should have trigger length shutdown condition on client.. */
+  tt_ptr_op(client_side->padding_info[0], OP_EQ, NULL);
+  tt_ptr_op(client_side->padding_machine[0], OP_EQ, NULL);
+
+  /* Verify machine is gone from both sides */
+  tt_ptr_op(relay_side->padding_info[0], OP_EQ, NULL);
+  tt_ptr_op(relay_side->padding_machine[0], OP_EQ, NULL);
+
+  /* Now test the reduced padding machine by setting up the consensus */
+  networkstatus_t vote1;
+  vote1.net_params = smartlist_new();
+  smartlist_split_string(vote1.net_params,
+ "circpad_padding_reduced=1", NULL, 0, 0);
+
+  /* Register reduced padding machine with the padding subsystem */
+  circpad_new_consensus_params();
+
+  simulate_single_hop_extend(client_side, relay_side, 1);
+
+  /* Verify that machine #0 is added */
+  tt_int_op(client_side->padding_machine[0]->machine_num, OP_EQ, 0);
+  tt_int_op(relay_side->padding_machine[0]->machine_num, OP_EQ, 0);
+
+  tt_int_op(
+circpad_machine_reached_padding_limit(client_side->padding_info[0]),
+OP_EQ, 0);
+  tt_int_op(
+circpad_machine_reached_padding_limit(relay_side->padding_info[0]),
+OP_EQ, 0);
+
+  /* Test that machines get torn down when padding is disabled */
+  SMARTLIST_FOREACH(vote1.net_params, char *, cp, tor_free(cp));
+  smartlist_free(vote1.net_params);
+  vote1.net_params = smartlist_new();
+  smartlist_split_string(vote1.net_params,
+ "circpad_padding_disabled=1", NULL, 0, 0);
+
+  /* Register reduced padding machine with the padding subsystem */
+  circpad_new_consensus_params();

[tor-commits] [tor/master] The practracker beatings will continue until the functions get smaller.

2019-05-13 Thread nickm
commit 507df74b319f37462d1540495f04b9b0838cb3a3
Author: Mike Perry 
Date:   Thu Apr 18 18:14:31 2019 +

The practracker beatings will continue until the functions get smaller.
---
 scripts/maint/practracker/exceptions.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index 7d03bf27d..d51e3edb5 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -29,12 +29,12 @@
 #
 # Remember: It is better to fix the problem than to add a new exception!
 
-problem file-size /src/app/config/config.c 8491
+problem file-size /src/app/config/config.c 8501
 problem include-count /src/app/config/config.c 86
 problem function-size /src/app/config/config.c:options_act_reversible() 296
 problem function-size /src/app/config/config.c:options_act() 588
 problem function-size /src/app/config/config.c:resolve_my_address() 192
-problem function-size /src/app/config/config.c:options_validate() 1207
+problem function-size /src/app/config/config.c:options_validate() 1215
 problem function-size /src/app/config/config.c:options_init_from_torrc() 202
 problem function-size /src/app/config/config.c:options_init_from_string() 173
 problem function-size /src/app/config/config.c:options_init_logs() 146
@@ -187,7 +187,7 @@ problem function-size 
/src/feature/dirclient/dirclient.c:handle_response_fetch_c
 problem function-size /src/feature/dircommon/consdiff.c:gen_ed_diff() 204
 problem function-size /src/feature/dircommon/consdiff.c:apply_ed_diff() 159
 problem function-size 
/src/feature/dirparse/authcert_parse.c:authority_cert_parse_from_string() 182
-problem function-size 
/src/feature/dirparse/microdesc_parse.c:microdescs_parse_from_string() 154
+problem function-size 
/src/feature/dirparse/microdesc_parse.c:microdescs_parse_from_string() 169
 problem function-size 
/src/feature/dirparse/ns_parse.c:routerstatus_parse_entry_from_string() 286
 problem function-size 
/src/feature/dirparse/ns_parse.c:networkstatus_verify_bw_weights() 389
 problem function-size 
/src/feature/dirparse/ns_parse.c:networkstatus_parse_vote_from_string() 638



___
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 'bug28683_30173_29203_squashed'

2019-05-13 Thread nickm
commit 9ad2eb8f73b70292e36511424d676b223d4cdff0
Merge: c6523a639 507df74b3
Author: Nick Mathewson 
Date:   Mon May 13 14:33:31 2019 -0400

Merge branch 'bug28683_30173_29203_squashed'

 changes/bugs28693+30173+29203|  12 +++
 doc/tor.1.txt|  14 +++
 scripts/maint/practracker/exceptions.txt |   6 +-
 src/app/config/config.c  |  10 ++
 src/app/config/or_options_st.h   |  11 +++
 src/core/or/circuitpadding.c |  59 +++-
 src/core/or/circuitpadding.h |  11 +++
 src/test/test_circuitpadding.c   | 157 ++-
 src/test/test_options.c  |   1 +
 9 files changed, 274 insertions(+), 7 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index 7ed90482c,d51e3edb5..ee4f421bd
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -29,12 -29,12 +29,12 @@@
  #
  # Remember: It is better to fix the problem than to add a new exception!
  
- problem file-size /src/app/config/config.c 8494
- problem include-count /src/app/config/config.c 87
 -problem file-size /src/app/config/config.c 8501
 -problem include-count /src/app/config/config.c 86
++problem file-size /src/app/config/config.c 8510
++problem include-count /src/app/config/config.c 88
  problem function-size /src/app/config/config.c:options_act_reversible() 296
  problem function-size /src/app/config/config.c:options_act() 588
  problem function-size /src/app/config/config.c:resolve_my_address() 192
- problem function-size /src/app/config/config.c:options_validate() 1209
 -problem function-size /src/app/config/config.c:options_validate() 1215
++problem function-size /src/app/config/config.c:options_validate() 1220
  problem function-size /src/app/config/config.c:options_init_from_torrc() 202
  problem function-size /src/app/config/config.c:options_init_from_string() 173
  problem function-size /src/app/config/config.c:options_init_logs() 146



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


[tor-commits] [tor/master] Bug 30173: Rate limit padding rate limit log message.

2019-05-13 Thread nickm
commit 17a164a8275970aed53076ba58296ffc424c3b75
Author: Mike Perry 
Date:   Wed Apr 17 02:51:48 2019 +

Bug 30173: Rate limit padding rate limit log message.

Gotta limit to the limit when the limit is reached.
---
 src/core/or/circuitpadding.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index f6385f32e..bf74ecc3f 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -1196,7 +1196,8 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
"Padding machine has reached padding limit on circuit %u",
  TO_ORIGIN_CIRCUIT(mi->on_circ)->global_identifier);
 } else {
-  log_fn(LOG_INFO, LD_CIRC,
+  static ratelim_t padding_lim = RATELIM_INIT(600);
+  log_fn_ratelim(_lim,LOG_INFO,LD_CIRC,
"Padding machine has reached padding limit on circuit %"PRIu64
", %d",
mi->on_circ->n_chan ? mi->on_circ->n_chan->global_identifier : 0,



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


[tor-commits] [tor/master] Changes file for bugs28693+30173+29203.

2019-05-13 Thread nickm
commit 0d275ec592761390c5ee05b2acdf5ae193c2a0ca
Author: Mike Perry 
Date:   Wed Apr 17 23:37:22 2019 +

Changes file for bugs28693+30173+29203.
---
 changes/bugs28693+30173+29203 | 12 
 1 file changed, 12 insertions(+)

diff --git a/changes/bugs28693+30173+29203 b/changes/bugs28693+30173+29203
new file mode 100644
index 0..9faa6279b
--- /dev/null
+++ b/changes/bugs28693+30173+29203
@@ -0,0 +1,12 @@
+  o Minor bugfixes (circuit padding):
+- Add a torrc option to disable circuit padding. Fixes bug 28693; bugfix
+  on 0.4.0.1-alpha.
+  o Minor bugfixes (circuit padding):
+- Provide consensus parameter to fully disable circuit padding, to be used
+  in emergency network overload situations. Fixes bug 30173; bugfix on
+  0.4.0.1-alpha.
+  o Minor bugfixes (circuit padding):
+- Allow circuit padding machines to specify that they do not contribute
+  much overhead, and provide consensus flags and torrc options to force
+  clients to only use low overhead machines. Fixes bug 29203; bugfix on
+  0.4.0.1-alpha.



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


[tor-commits] [tor/master] Bug 28693: Provide Torrc option to disable circuit padding.

2019-05-13 Thread nickm
commit f4064d6ce214b4b79017280a6c9db9b3f945ece1
Author: Mike Perry 
Date:   Wed Apr 17 05:51:39 2019 +

Bug 28693: Provide Torrc option to disable circuit padding.
---
 doc/tor.1.txt  |  8 
 src/app/config/config.c|  5 +
 src/app/config/or_options_st.h |  5 +
 src/core/or/circuitpadding.c   | 41 +++--
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f99217240..6c125e374 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -955,6 +955,14 @@ The following options are useful only for clients (that 
is, if
 this option. This option should be offered via the UI to mobile users
 for use where bandwidth may be expensive. (Default: 0)
 
+[[CircuitPadding]] **CircuitPadding** **0**|**1**::
+If set to 0, Tor will not pad client circuits with additional cover
+traffic. Only clients may set this option. This option should be offered
+via the UI to mobile users for use where bandwidth may be expensive. If
+set to 1, padding will be negotiated as per the consensus and relay
+support (unlike ConnectionPadding, CircuitPadding cannot be force-enabled).
+(Default: 1)
+
 [[ExcludeNodes]] **ExcludeNodes** __node__,__node__,__...__::
 A list of identity fingerprints, country codes, and address
 patterns of nodes to avoid when building a circuit. Country codes are
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 46dc15b06..7ad970625 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -596,6 +596,7 @@ static config_var_t option_vars_[] = {
   V(ReducedConnectionPadding,BOOL, "0"),
   V(ConnectionPadding,   AUTOBOOL, "auto"),
   V(RefuseUnknownExits,  AUTOBOOL, "auto"),
+  V(CircuitPadding,  BOOL, "1"),
   V(RejectPlaintextPorts,CSV,  ""),
   V(RelayBandwidthBurst, MEMUNIT,  "0"),
   V(RelayBandwidthRate,  MEMUNIT,  "0"),
@@ -3741,6 +3742,10 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 REJECT("Relays cannot set ReducedConnectionPadding. ");
   }
 
+  if (server_mode(options) && options->CircuitPadding == 0) {
+REJECT("Relays cannot set CircuitPadding to 0. ");
+  }
+
   if (options->BridgeDistribution) {
 if (!options->BridgeRelay) {
   REJECT("You set BridgeDistribution, but you didn't set BridgeRelay!");
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index bd707fd19..0fdeb94b4 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -248,6 +248,11 @@ struct or_options_t {
* pad to the server regardless of server support. */
   int ConnectionPadding;
 
+  /** Boolean: if true, then circuit padding will be negotiated by client
+   * and server, subject to consenus limits (default). If 0, it will be fully
+   * disabled. */
+  int CircuitPadding;
+
   /** To what authority types do we publish our descriptor? Choices are
* "v1", "v2", "v3", "bridge", or "". */
   struct smartlist_t *PublishServerDescriptor;
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index bf74ecc3f..dcd8f645c 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -1100,6 +1100,24 @@ circpad_new_consensus_params(const networkstatus_t *ns)
 }
 
 /**
+ * Return true if padding is allowed by torrc and consensus.
+ */
+STATIC bool
+circpad_is_padding_allowed(void)
+{
+  /* If padding has been disabled in the consensus, don't send any more
+   * padding. Technically the machine should be shut down when the next
+   * machine condition check happens, but machine checks only happen on
+   * certain circuit events, and if padding is disabled due to some
+   * network overload or DoS condition, we really want to stop ASAP. */
+  if (circpad_padding_disabled || !get_options()->CircuitPadding) {
+return 0;
+  }
+
+  return 1;
+}
+
+/**
  * Check this machine against its padding limits, as well as global
  * consensus limits.
  *
@@ -1117,15 +1135,6 @@ 
circpad_machine_reached_padding_limit(circpad_machine_runtime_t *mi)
 {
   const circpad_machine_spec_t *machine = CIRCPAD_GET_MACHINE(mi);
 
-  /* If padding has been disabled in the consensus, don't send any more
-   * padding. Technically the machine should be shut down when the next
-   * machine condition check happens, but machine checks only happen on
-   * certain circuit events, and if padding is disabled due to some
-   * network overload or DoS condition, we really want to stop ASAP. */
-  if (circpad_padding_disabled) {
-return 1;
-  }
-
   /* If machine_padding_pct is non-zero, and we've sent more
* than the allowed count of padding cells, then check our
* percent limits for this machine. */
@@ -1176,6 +1185,18 @@ 
circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi))
   struct timeval timeout;
   tor_assert(mi);
 
+  /* Don't schedule padding if it is 

[tor-commits] [tor/master] Bug 30173: Add consensus param to disable padding.

2019-05-13 Thread nickm
commit 21a4438c58d2c3923499b0a8c3f2240eeca5e2a8
Author: Mike Perry 
Date:   Wed Apr 17 02:44:42 2019 +

Bug 30173: Add consensus param to disable padding.

Disable padding via limit check and machine condition. Limits cause us to 
stop
sending padding. Machine conditions cause the machines to be shut down, and
not restarted.
---
 src/core/or/circuitpadding.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index d30edf9db..f6385f32e 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -81,6 +81,7 @@ static void circpad_setup_machine_on_circ(circuit_t *on_circ,
 static double circpad_distribution_sample(circpad_distribution_t dist);
 
 /** Cached consensus params */
+static uint8_t circpad_padding_disabled;
 static uint8_t circpad_global_max_padding_percent;
 static uint16_t circpad_global_allowed_cells;
 static uint16_t circpad_max_circ_queued_cells;
@@ -1081,6 +1082,10 @@ circpad_send_padding_callback(tor_timer_t *timer, void 
*args,
 void
 circpad_new_consensus_params(const networkstatus_t *ns)
 {
+  circpad_padding_disabled =
+  networkstatus_get_param(ns, "circpad_padding_disabled",
+ 0, 0, 1);
+
   circpad_global_allowed_cells =
   networkstatus_get_param(ns, "circpad_global_allowed_cells",
  0, 0, UINT16_MAX-1);
@@ -1112,10 +1117,19 @@ 
circpad_machine_reached_padding_limit(circpad_machine_runtime_t *mi)
 {
   const circpad_machine_spec_t *machine = CIRCPAD_GET_MACHINE(mi);
 
+  /* If padding has been disabled in the consensus, don't send any more
+   * padding. Technically the machine should be shut down when the next
+   * machine condition check happens, but machine checks only happen on
+   * certain circuit events, and if padding is disabled due to some
+   * network overload or DoS condition, we really want to stop ASAP. */
+  if (circpad_padding_disabled) {
+return 1;
+  }
+
   /* If machine_padding_pct is non-zero, and we've sent more
* than the allowed count of padding cells, then check our
* percent limits for this machine. */
-   if (machine->max_padding_percent &&
+  if (machine->max_padding_percent &&
   mi->padding_sent >= machine->allowed_padding_count) {
 uint32_t total_cells = mi->padding_sent + mi->nonpadding_sent;
 
@@ -1621,6 +1635,11 @@ static inline bool
 circpad_machine_conditions_met(origin_circuit_t *circ,
const circpad_machine_spec_t *machine)
 {
+  /* If padding is disabled, no machines should match/apply. This has
+   * the effect of shutting down all machines, and not adding any more. */
+  if (circpad_padding_disabled)
+return 0;
+
   if (!(circpad_circ_purpose_to_mask(TO_CIRCUIT(circ)->purpose)
   & machine->conditions.purpose_mask))
 return 0;



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


[tor-commits] [tor/master] Bug 29231: Report correct padding write totals and enabled totals.

2019-05-13 Thread nickm
commit d0fb74c902e19bdec6e3a84a9ec5c70dccbf88d0
Author: Mike Perry 
Date:   Wed May 1 21:00:26 2019 +

Bug 29231: Report correct padding write totals and enabled totals.
---
 src/core/or/channel.c| 11 +++
 src/core/or/channeltls.c |  4 ++--
 src/core/or/circuitpadding.c |  2 +-
 src/core/or/connection_or.c  |  5 -
 src/core/or/relay.c  |  2 +-
 src/core/or/relay.h  |  1 +
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/core/or/channel.c b/src/core/or/channel.c
index fd7bf6278..0e190809b 100644
--- a/src/core/or/channel.c
+++ b/src/core/or/channel.c
@@ -1418,6 +1418,7 @@ write_packed_cell(channel_t *chan, packed_cell_t *cell)
 {
   int ret = -1;
   size_t cell_bytes;
+  uint8_t command = packed_cell_get_command(cell, chan->wide_circ_ids);
 
   tor_assert(chan);
   tor_assert(cell);
@@ -1452,6 +1453,16 @@ write_packed_cell(channel_t *chan, packed_cell_t *cell)
   /* Successfully sent the cell. */
   ret = 0;
 
+  /* Update padding statistics for the packed codepath.. */
+  rep_hist_padding_count_write(PADDING_TYPE_TOTAL);
+  if (command == CELL_PADDING)
+rep_hist_padding_count_write(PADDING_TYPE_CELL);
+  if (chan->padding_enabled) {
+rep_hist_padding_count_write(PADDING_TYPE_ENABLED_TOTAL);
+if (command == CELL_PADDING)
+  rep_hist_padding_count_write(PADDING_TYPE_ENABLED_CELL);
+  }
+
  done:
   return ret;
 }
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index f552b2077..96d50f8a5 100644
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1094,13 +1094,13 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t 
*conn)
   entry_guards_note_internet_connectivity(get_guard_selection_info());
   rep_hist_padding_count_read(PADDING_TYPE_TOTAL);
 
-  if (TLS_CHAN_TO_BASE(chan)->currently_padding)
+  if (TLS_CHAN_TO_BASE(chan)->padding_enabled)
 rep_hist_padding_count_read(PADDING_TYPE_ENABLED_TOTAL);
 
   switch (cell->command) {
 case CELL_PADDING:
   rep_hist_padding_count_read(PADDING_TYPE_CELL);
-  if (TLS_CHAN_TO_BASE(chan)->currently_padding)
+  if (TLS_CHAN_TO_BASE(chan)->padding_enabled)
 rep_hist_padding_count_read(PADDING_TYPE_ENABLED_CELL);
   ++stats_n_padding_cells_processed;
   /* do nothing */
diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index d30edf9db..9253c9e28 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -1020,6 +1020,7 @@ 
circpad_send_padding_cell_for_callback(circpad_machine_runtime_t *mi)
  "Callback: Sending padding to non-origin circuit.");
   relay_send_command_from_edge(0, mi->on_circ, RELAY_COMMAND_DROP, NULL,
0, NULL);
+  rep_hist_padding_count_write(PADDING_TYPE_DROP);
 } else {
   static ratelim_t cell_lim = RATELIM_INIT(600);
   log_fn_ratelim(_lim,LOG_NOTICE,LD_CIRC,
@@ -1028,7 +1029,6 @@ 
circpad_send_padding_cell_for_callback(circpad_machine_runtime_t *mi)
 }
   }
 
-  rep_hist_padding_count_write(PADDING_TYPE_DROP);
   /* This is a padding cell sent from the client or from the middle node,
* (because it's invoked from circuitpadding.c) */
   circpad_cell_event_padding_sent(circ);
diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c
index e9b4b2195..830e09fd5 100644
--- a/src/core/or/connection_or.c
+++ b/src/core/or/connection_or.c
@@ -2308,6 +2308,8 @@ connection_or_write_cell_to_buf(const cell_t *cell, 
or_connection_t *conn)
 
   cell_pack(, cell, conn->wide_circ_ids);
 
+  /* We need to count padding cells from this non-packed code path
+   * since they are sent via chan->write_cell() (which is not packed) */
   rep_hist_padding_count_write(PADDING_TYPE_TOTAL);
   if (cell->command == CELL_PADDING)
 rep_hist_padding_count_write(PADDING_TYPE_CELL);
@@ -2318,7 +2320,7 @@ connection_or_write_cell_to_buf(const cell_t *cell, 
or_connection_t *conn)
   if (conn->chan) {
 channel_timestamp_active(TLS_CHAN_TO_BASE(conn->chan));
 
-if (TLS_CHAN_TO_BASE(conn->chan)->currently_padding) {
+if (TLS_CHAN_TO_BASE(conn->chan)->padding_enabled) {
   rep_hist_padding_count_write(PADDING_TYPE_ENABLED_TOTAL);
   if (cell->command == CELL_PADDING)
 rep_hist_padding_count_write(PADDING_TYPE_ENABLED_CELL);
@@ -2348,6 +2350,7 @@ connection_or_write_var_cell_to_buf,(const var_cell_t 
*cell,
   if (conn->base_.state == OR_CONN_STATE_OR_HANDSHAKING_V3)
 or_handshake_state_record_var_cell(conn, conn->handshake_state, cell, 0);
 
+  rep_hist_padding_count_write(PADDING_TYPE_TOTAL);
   /* Touch the channel's active timestamp if there is one */
   if (conn->chan)
 channel_timestamp_active(TLS_CHAN_TO_BASE(conn->chan));
diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index a166904a5..59b580c14 100644
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -2770,7 +2770,7 @@ set_streams_blocked_on_circ(circuit_t *circ, channel_t 
*chan,
 }
 
 /** 

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/998'

2019-05-13 Thread nickm
commit c6523a6398efb07831ede8234486ee8f385ed558
Merge: def96ce83 e1771aeb5
Author: Nick Mathewson 
Date:   Mon May 13 14:25:54 2019 -0400

Merge remote-tracking branch 'tor-github/pr/998'

 changes/bug29231 |  4 
 scripts/maint/practracker/exceptions.txt |  4 ++--
 src/core/or/channel.c| 11 +++
 src/core/or/channeltls.c |  4 ++--
 src/core/or/circuitpadding.c |  2 +-
 src/core/or/connection_or.c  |  5 -
 src/core/or/relay.c  |  2 +-
 src/core/or/relay.h  |  1 +
 8 files changed, 26 insertions(+), 7 deletions(-)

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


[tor-commits] [tor/master] The practracker beatings will continue until our files get smaller.

2019-05-13 Thread nickm
commit e1771aeb51fd8f92db66fc1e9d0d8aad5ff9f169
Author: Mike Perry 
Date:   Wed May 1 21:04:40 2019 +

The practracker beatings will continue until our files get smaller.
---
 scripts/maint/practracker/exceptions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/maint/practracker/exceptions.txt 
b/scripts/maint/practracker/exceptions.txt
index d90ed1f4b..49384029b 100644
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -72,7 +72,7 @@ problem include-count /src/core/mainloop/mainloop.c 66
 problem function-size /src/core/mainloop/mainloop.c:conn_close_if_marked() 108
 problem function-size 
/src/core/mainloop/mainloop.c:run_connection_housekeeping() 123
 problem function-size /src/core/mainloop/mainloop.c:CALLBACK() 116
-problem file-size /src/core/or/channel.c 3476
+problem file-size /src/core/or/channel.c 3487
 problem function-size /src/core/or/channeltls.c:channel_tls_handle_var_cell() 
160
 problem function-size 
/src/core/or/channeltls.c:channel_tls_process_versions_cell() 170
 problem function-size 
/src/core/or/channeltls.c:channel_tls_process_netinfo_cell() 214
@@ -112,7 +112,7 @@ problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_sen
 problem function-size 
/src/core/or/connection_edge.c:connection_ap_handshake_socks_resolved() 106
 problem function-size 
/src/core/or/connection_edge.c:connection_exit_begin_conn() 184
 problem function-size /src/core/or/connection_edge.c:connection_exit_connect() 
102
-problem file-size /src/core/or/connection_or.c 3121
+problem file-size /src/core/or/connection_or.c 3124
 problem include-count /src/core/or/connection_or.c 51
 problem function-size 
/src/core/or/connection_or.c:connection_or_group_set_badness_() 105
 problem function-size 
/src/core/or/connection_or.c:connection_or_client_learned_peer_id() 144



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


[tor-commits] [tor/master] Changes file for bug29231.

2019-05-13 Thread nickm
commit 332617a81a874412bbadf331be74b7414545c197
Author: Mike Perry 
Date:   Wed May 1 21:03:23 2019 +

Changes file for bug29231.
---
 changes/bug29231 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/bug29231 b/changes/bug29231
new file mode 100644
index 0..bcc19e1b4
--- /dev/null
+++ b/changes/bug29231
@@ -0,0 +1,4 @@
+  o Minor bugfixes (Channel padding statistics):
+- Channel padding write totals and padding-enabled totals are now
+  counted properly in relay extrainfo descriptors. Fixes bug 29231;
+  bugfix on 0.3.1.1-alpha



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


[tor-commits] [tor/master] sendme: Fix coverity CID 1444999

2019-05-13 Thread nickm
commit def96ce83858b214ebc01797e41e4f0419f9d104
Author: David Goulet 
Date:   Mon May 13 10:00:39 2019 -0400

sendme: Fix coverity CID 1444999

The code flow in theory can end up with a layer_hint to be NULL but in
practice it should never happen because with an origin circuit, we must have
the layer_hint.

Just in case, BUG() on it if we ever end up in this situation and recover by
closing the circuit.

Fixes #30467.

Signed-off-by: David Goulet 
---
 src/core/or/sendme.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c
index 46fdc3ca1..e7c65d99e 100644
--- a/src/core/or/sendme.c
+++ b/src/core/or/sendme.c
@@ -412,6 +412,11 @@ sendme_process_circuit_level(crypt_path_t *layer_hint,
   /* If we are the origin of the circuit, we are the Client so we use the
* layer hint (the Exit hop) for the package window tracking. */
   if (CIRCUIT_IS_ORIGIN(circ)) {
+/* If we are the origin of the circuit, it is impossible to not have a
+ * cpath. Just in case, bug on it and close the circuit. */
+if (BUG(layer_hint == NULL)) {
+  return -END_CIRC_REASON_TORPROTOCOL;
+}
 if ((layer_hint->package_window + CIRCWINDOW_INCREMENT) >
 CIRCWINDOW_START_MAX) {
   static struct ratelim_t exit_warn_ratelim = RATELIM_INIT(600);

___
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-05-13 Thread translation
commit d4836a4f674699cac591841292a4ec15607aa126
Author: Translation commit bot 
Date:   Mon May 13 18:21:00 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 5b1231654..b232772cc 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2577,8 +2577,8 @@ msgid ""
 "about your computer to find out more."
 msgstr ""
 "Selon le modèle d’ordinateur que vous utilisez, le choix entre un logiciel 
"
-"32 bits ou 64 bits vous sera proposé ; consultez la documentation de votre 
"
-"ordinateur pour en apprendre davantage."
+"32 bits ou 64 bits vous sera proposé ; consultez la documentation de 
votre "
+"ordinateur pour plus de précisions."
 
 #: https//support.torproject.org/gettor/gettor-3/
 #: (content/gettor/gettor-3/contents+en.lrquestion.title)
@@ -6691,7 +6691,7 @@ msgstr ""
 
 #: templates/footer.html:24
 msgid "SUBSCRIBE TO OUR NEWSLETTER"
-msgstr "S’ABONNER À NOTRE LETTRE D’INFORMATION ÉLECTRONIQUE"
+msgstr "S’ABONNER À NOTRE LETTRE D’INFORMATION"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the Tor Project:"
@@ -6699,7 +6699,7 @@ msgstr "Recevez les mises à jours et opportunités 
mensuelles du Projet Tor :"
 
 #: templates/footer.html:26
 msgid "SIGN UP"
-msgstr ""
+msgstr "S’ABONNER"
 
 #: templates/footer.html:32
 msgid ""
@@ -6719,7 +6719,7 @@ msgstr "Logo de Tor"
 
 #: templates/navbar.html:6
 msgid "DONATE NOW"
-msgstr ""
+msgstr "FAIRE UN DON MAINTENANT"
 
 #: templates/navbar.html:41
 msgid "Download Tor Browser"

___
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-05-13 Thread translation
commit 865b4ec90296aad5f634888e3c2d16ff68b2b88f
Author: Translation commit bot 
Date:   Mon May 13 18:20:53 2019 +

Update translations for support-portal
---
 contents+fr.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index b3635deee..b232772cc 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2577,8 +2577,8 @@ msgid ""
 "about your computer to find out more."
 msgstr ""
 "Selon le modèle d’ordinateur que vous utilisez, le choix entre un logiciel 
"
-"32 bits ou 64 bits vous sera proposé ; consultez la documentation de votre 
"
-"ordinateur pour en apprendre davantage."
+"32 bits ou 64 bits vous sera proposé ; consultez la documentation de 
votre "
+"ordinateur pour plus de précisions."
 
 #: https//support.torproject.org/gettor/gettor-3/
 #: (content/gettor/gettor-3/contents+en.lrquestion.title)
@@ -6691,7 +6691,7 @@ msgstr ""
 
 #: templates/footer.html:24
 msgid "SUBSCRIBE TO OUR NEWSLETTER"
-msgstr ""
+msgstr "S’ABONNER À NOTRE LETTRE D’INFORMATION"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the Tor Project:"
@@ -6699,7 +6699,7 @@ msgstr "Recevez les mises à jours et opportunités 
mensuelles du Projet Tor :"
 
 #: templates/footer.html:26
 msgid "SIGN UP"
-msgstr ""
+msgstr "S’ABONNER"
 
 #: templates/footer.html:32
 msgid ""
@@ -6719,7 +6719,7 @@ msgstr "Logo de Tor"
 
 #: templates/navbar.html:6
 msgid "DONATE NOW"
-msgstr ""
+msgstr "FAIRE UN DON MAINTENANT"
 
 #: templates/navbar.html:41
 msgid "Download Tor Browser"

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


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

2019-05-13 Thread translation
commit c3e5814c2a3bc69e87c4c4e39f79773203c9290b
Author: Translation commit bot 
Date:   Mon May 13 18:18:01 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+fr.po | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 6b65d2a2b..263e99563 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -307,7 +307,7 @@ msgid ""
 "follow the account)."
 msgstr ""
 "Pour obtenir des liens de téléchargement du Navigateur Tor en anglais pour 
"
-"OS X, envoyez un message direct à @get_tor avec les mots « osx en » 
(vous "
+"macOS, envoyez un message direct à @get_tor avec les mots « osx en » 
(vous "
 "n’avez pas à suivre le compte)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
@@ -2140,10 +2140,9 @@ msgid ""
 "you are running the English Tor Browser."
 msgstr ""
 "1. Repérez le dossier de votre Navigateur Tor. L’emplacement par défaut 
est "
-"le bureau sous Windows et le dossier Applications sous macOS (OS X). Sous "
-"Linux, il n’y a pas d’emplacement par défaut, cependant le dossier sera "
-"nommé « tor-browser_fr » si vous utilisez la version en français du "
-"Navigateur Tor."
+"le bureau sous Windows et le dossier Applications sous macOS. Sous Linux, il"
+" n’y a pas d’emplacement par défaut, cependant le dossier sera nommé 
« tor-"
+"browser_fr » si vous utilisez la version en français du Navigateur Tor."
 
 #: https//tb-manual.torproject.org/en-US/uninstalling/
 #: (content/uninstalling/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/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-05-13 Thread translation
commit 1d3e4331ac410a7cb6e745a1dcd50cc314eceb0a
Author: Translation commit bot 
Date:   Mon May 13 18:17:55 2019 +

Update translations for tbmanual-contentspot
---
 contents+fr.po | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 6b65d2a2b..263e99563 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -307,7 +307,7 @@ msgid ""
 "follow the account)."
 msgstr ""
 "Pour obtenir des liens de téléchargement du Navigateur Tor en anglais pour 
"
-"OS X, envoyez un message direct à @get_tor avec les mots « osx en » 
(vous "
+"macOS, envoyez un message direct à @get_tor avec les mots « osx en » 
(vous "
 "n’avez pas à suivre le compte)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
@@ -2140,10 +2140,9 @@ msgid ""
 "you are running the English Tor Browser."
 msgstr ""
 "1. Repérez le dossier de votre Navigateur Tor. L’emplacement par défaut 
est "
-"le bureau sous Windows et le dossier Applications sous macOS (OS X). Sous "
-"Linux, il n’y a pas d’emplacement par défaut, cependant le dossier sera "
-"nommé « tor-browser_fr » si vous utilisez la version en français du "
-"Navigateur Tor."
+"le bureau sous Windows et le dossier Applications sous macOS. Sous Linux, il"
+" n’y a pas d’emplacement par défaut, cependant le dossier sera nommé 
« tor-"
+"browser_fr » si vous utilisez la version en français du Navigateur Tor."
 
 #: https//tb-manual.torproject.org/en-US/uninstalling/
 #: (content/uninstalling/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/exoneratorproperties] Update translations for exoneratorproperties

2019-05-13 Thread translation
commit da5d9a5c50e7f62f3c0508e23c0a45bc9c80c55e
Author: Translation commit bot 
Date:   Mon May 13 18:15:45 2019 +

Update translations for exoneratorproperties
---
 fr/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr/exonerator.properties b/fr/exonerator.properties
index 323e9a5a1..965d65ec8 100644
--- a/fr/exonerator.properties
+++ b/fr/exonerator.properties
@@ -44,7 +44,7 @@ technicaldetails.exit.no=Non
 permanentlink.heading=Lien permanent
 footer.abouttor.heading=À propos de Tor
 footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by encrypting packets and sending them through a 
series of hops before they reach their destination. Therefore, if you see 
traffic from a Tor relay, this traffic usually originates from someone using 
Tor, rather than from the relay operator. The Tor Project and Tor relay 
operators have no records of the traffic that passes over the network and 
therefore cannot provide any information about its origin. Be sure to %s, 
and don't hesitate to %s for more information.
-footer.abouttor.body.link1=renseigner d’avantage au sujet de Tor
+footer.abouttor.body.link1=Renseignez-vous davantage au sujet de Tor
 footer.abouttor.body.link2=contacter « The Projet Tor, Inc. »
 footer.aboutexonerator.heading=À propos d’ExoneraTor
 footer.aboutexonerator.body=Le service ExoneraTor gère une base de données 
d’adresses IP qui ont fait partie du réseau Tor. Il permet de savoir si un 
relais Tor fonctionnait pour une adresse IP donnée à une date précise. 
ExoneraTor peut enregistrer plus d’une adresse IP par relais si ces derniers 
utilisent une adresse IP différente pour se connecter à Internet de celle 
utilisée pour s’enregistrer sur le réseau Tor. ExoneraTor enregistre 
également les dates et heures auxquelles un relais a permis de faire transiter 
du trafic en provenance de Tor vers Internet.

___
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-05-13 Thread translation
commit f91146cb5ddfc9a9e9612ae96189fcfe5ae75a31
Author: Translation commit bot 
Date:   Mon May 13 17:50:53 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 33 +
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index db8b9f072..5b1231654 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -235,6 +235,10 @@ msgid ""
 "href=\"https://www.torproject.org/download/download-;
 "easy.html.en#mac\">macOS."
 msgstr ""
+"Le Navigateur Tor est actuellement proposé pour https://www.torproject.org/fr/download#windows\;>Windows, https://www.torproject.org/fr/download#linux\;>Linux et https://www.torproject.org/fr/download#mac\;>macOS."
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -263,6 +267,8 @@ msgid ""
 "There is no official version of Tor for iOS yet, though we recommend https://onionbrowser.com/\;>Onion Browser."
 msgstr ""
+"Il n’existe pas encore de version officielle de Tor pour iOS, bien que nous 
"
+"recommandions le https://onionbrowser.com/\;>Navigateur Onion."
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.title)
@@ -624,7 +630,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "### MacOS and Linux"
-msgstr ""
+msgstr "### macOS et Linux"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -637,6 +643,8 @@ msgstr ""
 msgid ""
 "If you are using macOS, you can install it from https://www.gpgtools.org/.;
 msgstr ""
+"Si vous utilisez macOS, vous pouvez le télécharger de "
+"https://www.gpgtools.org/.;
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -661,6 +669,8 @@ msgid ""
 "Import its key (0x4E2C6E8793298290) by starting the terminal (under "
 "\"Applications\" in macOS) and typing:"
 msgstr ""
+"Importez sa clé (0x4E2E2C6E8793298290) en lançant le terminal (sous « "
+"Applications » dans macOS) et en tapant :"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -685,7 +695,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid " For macOS users:"
-msgstr ""
+msgstr " Pour les utilisateurs de macOS :"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -837,7 +847,7 @@ msgstr "* obfs4proxy.exe (si vous utilisez des ponts)"
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* For macOS"
-msgstr ""
+msgstr "* Pour macOS"
 
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -1853,6 +1863,8 @@ msgid ""
 "The standard level allows JavaScript, but the safer and safest levels both "
 "block JavaScript on HTTP sites."
 msgstr ""
+"Le réglage « Normal » autorise JavaScript, mais les niveaux « Plus 
sûr » et "
+"« Le plus sûr » bloquent JavaScript sur les sites HTTP."
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
@@ -1890,6 +1902,9 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"Nous ne recommandons pas d’exécuter le Navigateur Tor plusieurs fois en 
même"
+" temps, ce qui pourrait, sur plusieurs plateformes, ne pas fonctionner comme"
+" souhaité."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
@@ -2537,6 +2552,8 @@ msgid ""
 "Write your operating system (such as Windows, macOS, or Linux) in the body "
 "of the message and send."
 msgstr ""
+"Indiquez votre système d’exploitation (tel que Windows, macOS ou Linux) 
dans"
+" le corps de votre message et envoyez-le."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.description)
@@ -4544,6 +4561,9 @@ msgid ""
 "](#operating-system-os), with its mobile versions available for Android, and"
 " Firefox OS."
 msgstr ""
+"Firefox est proposé pour les [systèmes 
d’exploitation](#operating-system-os)"
+" Windows, macOS et Linux, avec ses versions mobiles proposées pour Android "
+"et Firefox OS."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5265,6 +5285,11 @@ msgid ""
 "desktop operating systems are Windows, macOS and Linux. Android and iOS are "
 "the dominant 

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

2019-05-13 Thread translation
commit a10d5c9934a90242c1f0bf767f5ddd6db98a6e95
Author: Translation commit bot 
Date:   Mon May 13 17:50:46 2019 +

Update translations for support-portal
---
 contents+fr.po | 31 ---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index db8b9f072..b3635deee 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -235,6 +235,10 @@ msgid ""
 "href=\"https://www.torproject.org/download/download-;
 "easy.html.en#mac\">macOS."
 msgstr ""
+"Le Navigateur Tor est actuellement proposé pour https://www.torproject.org/fr/download#windows\;>Windows, https://www.torproject.org/fr/download#linux\;>Linux et https://www.torproject.org/fr/download#mac\;>macOS."
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -263,6 +267,8 @@ msgid ""
 "There is no official version of Tor for iOS yet, though we recommend https://onionbrowser.com/\;>Onion Browser."
 msgstr ""
+"Il n’existe pas encore de version officielle de Tor pour iOS, bien que nous 
"
+"recommandions le https://onionbrowser.com/\;>Navigateur Onion."
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.title)
@@ -624,7 +630,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "### MacOS and Linux"
-msgstr ""
+msgstr "### macOS et Linux"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -637,6 +643,8 @@ msgstr ""
 msgid ""
 "If you are using macOS, you can install it from https://www.gpgtools.org/.;
 msgstr ""
+"Si vous utilisez macOS, vous pouvez le télécharger de "
+"https://www.gpgtools.org/.;
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -661,6 +669,8 @@ msgid ""
 "Import its key (0x4E2C6E8793298290) by starting the terminal (under "
 "\"Applications\" in macOS) and typing:"
 msgstr ""
+"Importez sa clé (0x4E2E2C6E8793298290) en lançant le terminal (sous « "
+"Applications » dans macOS) et en tapant :"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -685,7 +695,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid " For macOS users:"
-msgstr ""
+msgstr " Pour les utilisateurs de macOS :"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -837,7 +847,7 @@ msgstr "* obfs4proxy.exe (si vous utilisez des ponts)"
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* For macOS"
-msgstr ""
+msgstr "* Pour macOS"
 
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -1853,6 +1863,8 @@ msgid ""
 "The standard level allows JavaScript, but the safer and safest levels both "
 "block JavaScript on HTTP sites."
 msgstr ""
+"Le réglage « Normal » autorise JavaScript, mais les niveaux « Plus 
sûr » et "
+"« Le plus sûr » bloquent JavaScript sur les sites HTTP."
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
@@ -1890,6 +1902,9 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"Nous ne recommandons pas d’exécuter le Navigateur Tor plusieurs fois en 
même"
+" temps, ce qui pourrait, sur plusieurs plateformes, ne pas fonctionner comme"
+" souhaité."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
@@ -2537,6 +2552,8 @@ msgid ""
 "Write your operating system (such as Windows, macOS, or Linux) in the body "
 "of the message and send."
 msgstr ""
+"Indiquez votre système d’exploitation (tel que Windows, macOS ou Linux) 
dans"
+" le corps de votre message et envoyez-le."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.description)
@@ -4544,6 +4561,9 @@ msgid ""
 "](#operating-system-os), with its mobile versions available for Android, and"
 " Firefox OS."
 msgstr ""
+"Firefox est proposé pour les [systèmes 
d’exploitation](#operating-system-os)"
+" Windows, macOS et Linux, avec ses versions mobiles proposées pour Android "
+"et Firefox OS."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5265,6 +5285,11 @@ msgid ""
 "desktop operating systems are Windows, macOS and Linux. Android and iOS are "
 "the dominant mobile 

[tor-commits] [torspec/master] bandwidth-file: Add HeaderLine non-terminal

2019-05-13 Thread nickm
commit cfe12e6a0e19482c7f4c228875aa209c6d65eb30
Author: juga0 
Date:   Sun May 5 06:28:26 2019 +

bandwidth-file: Add HeaderLine non-terminal

To make more clear that header lines do not contain spaces and simplify
parsers.
This does not change the format.

Closes: #30311
---
 bandwidth-file-spec.txt | 9 +
 1 file changed, 9 insertions(+)

diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt
index 1c36558..2776fab 100644
--- a/bandwidth-file-spec.txt
+++ b/bandwidth-file-spec.txt
@@ -112,6 +112,7 @@
 
 Line ::= ArgumentChar* NL
 RelayLine ::= KeyValue (SP KeyValue)* NL
+HeaderLine ::= KeyValue NL
 KeyValue ::= Keyword "=" Value
 Value ::= ArgumentCharValue+
 ArgumentCharValue ::= any printing ASCII character except NL and SP.
@@ -141,6 +142,14 @@
 
 2.2. Header List format
 
+  It consists of a Timestamp line and zero or more HeaderLines.
+
+  All the header lines MUST conform to the HeaderLine format, except
+  the first Timestamp line.
+
+  The Timestamp line is not a HeaderLine to keep compatibility with
+  the legacy Bandwidth File format.
+
   Some header Lines MUST appear in specific positions, as documented
   below. All other Lines can appear in any order.
 

___
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-05-13 Thread translation
commit 22e90b7bc840015754bbcc5a5406ef98237317e7
Author: Translation commit bot 
Date:   Mon May 13 16:51:05 2019 +

Update translations for support-portal_completed
---
 contents+pl.po | 33 +
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/contents+pl.po b/contents+pl.po
index 636570de3..ebdf4ffa2 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -3,10 +3,10 @@
 # Filip , 2019
 # Dawid Job , 2019
 # erinm, 2019
-# Emma Peel, 2019
 # Kret Kretkowski , 2019
 # Waldemar Stoczkowski, 2019
 # Dawid Potocki , 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-13 17:53+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Dawid Potocki , 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -237,6 +237,13 @@ msgid ""
 "href=\"https://www.torproject.org/download/download-;
 "easy.html.en#mac\">macOS."
 msgstr ""
+"Tor Browser jest na ten moment dostępna na https://www.torproject.org/download/download-;
+"easy.html.en#windows\">Windows, https://www.torproject.org/download/download-;
+"easy.html.en#linux\">Linux i https://www.torproject.org/download/download-;
+"easy.html.en#mac\">macOS."
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -265,6 +272,8 @@ msgid ""
 "There is no official version of Tor for iOS yet, though we recommend https://onionbrowser.com/\;>Onion Browser."
 msgstr ""
+"Nie ma jeszcze oficjalnej wersji Tor dla iOS, ale rekomendujemy https://onionbrowser.com/\;>Onion Browser."
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.title)
@@ -620,7 +629,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "### MacOS and Linux"
-msgstr ""
+msgstr "### macOS i Linux"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -633,6 +642,8 @@ msgstr ""
 msgid ""
 "If you are using macOS, you can install it from https://www.gpgtools.org/.;
 msgstr ""
+"Jeśli korzystasz z macOS, możesz zainstalować go z "
+"https://www.gpgtools.org/.;
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -658,6 +669,8 @@ msgid ""
 "Import its key (0x4E2C6E8793298290) by starting the terminal (under "
 "\"Applications\" in macOS) and typing:"
 msgstr ""
+"Zaimportuj jego klucz (0x4E2C6E8793298290), uruchamiając terminal (w "
+"obszarze „Aplikacje” w systemie macOS) i wpisując:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -681,7 +694,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid " For macOS users:"
-msgstr ""
+msgstr " Dla użytkowników macOS:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1857,6 +1870,8 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"Nie zalecamy uruchamiania wielu instancji Przeglądarki Tor i może nie "
+"działać zgodnie z oczekiwaniami na wielu platformach."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
@@ -2484,6 +2499,8 @@ msgid ""
 "Write your operating system (such as Windows, macOS, or Linux) in the body "
 "of the message and send."
 msgstr ""
+"Zapisz system operacyjny (taki jak Windows, macOS lub Linux) w treści "
+"wiadomości i wyślij."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.description)
@@ -4469,6 +4486,9 @@ msgid ""
 "](#operating-system-os), with its mobile versions available for Android, and"
 " Firefox OS."
 msgstr ""
+"Firefox jest dostępny dla [systemu operacyjnego](#operating-system-os) "
+"Windows, macOS i Linux , z jego mobilnymi wersjami dostępnymi dla systemu "
+"Android i Firefox OS."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5184,6 +5204,11 @@ msgid ""
 "desktop operating systems are Windows, macOS and Linux. Android and iOS are "
 "the dominant mobile operating systems."
 msgstr ""
+"Główne oprogramowanie systemowe, które zarządza sprzętem komputerowym i "
+"zasobami oprogramowania oraz świadczy wspólne usługi dla programów "
+"komputerowych. Najczęściej używane 

[tor-commits] [tpo/master] Remove 8.5a10 and 8.5a11 from RecommendedTBBVersions

2019-05-13 Thread boklm
commit 81d875c631b9369fd249c5f5d99af4eaecd2a047
Author: Nicolas Vigier 
Date:   Mon May 13 18:49:38 2019 +0200

Remove 8.5a10 and 8.5a11 from RecommendedTBBVersions
---
 content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 8 
 1 file changed, 8 deletions(-)

diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr 
b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
index 0da3080..ccb9225 100644
--- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
+++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
@@ -9,14 +9,6 @@ body:
 "8.0.9-MacOS",
 "8.0.9-Linux",
 "8.0.9-Windows",
-"8.5a10",
-"8.5a10-MacOS",
-"8.5a10-Linux",
-"8.5a10-Windows",
-"8.5a11",
-"8.5a11-MacOS",
-"8.5a11-Linux",
-"8.5a11-Windows",
 "8.5a12",
 "8.5a12-MacOS",
 "8.5a12-Linux",

___
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-05-13 Thread translation
commit 7643f4d3b56203a038161df10a8c1d81d5999c79
Author: Translation commit bot 
Date:   Mon May 13 16:50:58 2019 +

Update translations for support-portal
---
 contents+bn.po |  4 +++-
 contents+ga.po |  3 +++
 contents+id.po |  3 +++
 contents+it.po |  6 --
 contents+pl.po | 33 +
 contents+ru.po |  6 --
 6 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/contents+bn.po b/contents+bn.po
index 68c640dec..459e9c93c 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -1778,6 +1778,8 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"আমরা টর ব্রাউজারের বহুবিধ 
দৃষ্টান্ত চালু করার সুপারিশ 
করি না এবং অনেক "
+"প্ল্যাটফর্মে অভাবিত হিসেবে 
কাজ নাও করতে পারি ।"
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
@@ -5987,7 +5989,7 @@ msgstr ""
 
 #: templates/footer.html:24
 msgid "SUBSCRIBE TO OUR NEWSLETTER"
-msgstr ""
+msgstr "আমাদের নিউজলেটার 
সাবস্ক্রাইব করুন"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the Tor Project:"
diff --git a/contents+ga.po b/contents+ga.po
index 5afa8c8c8..c6763d9df 100644
--- a/contents+ga.po
+++ b/contents+ga.po
@@ -1775,6 +1775,9 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"Ní mholaimid níos mó ná cóip amháin de Bhrabhsálaí Tor a rith san am 
céanna."
+" Seans nach bhfeidhmíonn sé sa chaoi a raibh tú ag súil leis ar mhórán "
+"ardán."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
diff --git a/contents+id.po b/contents+id.po
index 4e77c583c..0a38561f9 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -1788,6 +1788,9 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"Kami tidak merekomendasikan menjalankan beberapa Tor browser secara "
+"bersamaan, dan ini mungkin tidak bekerja seperti yang diantisipasi pada "
+"banyak platform."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
diff --git a/contents+it.po b/contents+it.po
index 0cb9afaea..66a1ed6ca 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -7,8 +7,8 @@
 # Davide Sant , 2019
 # erinm, 2019
 # Giandomenico Lombardi , 2019
-# Emma Peel, 2019
 # francesco ercolani , 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-13 17:53+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: francesco ercolani , 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1861,6 +1861,8 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"Non raccomandiamo di eseguire diverse istanze di Tor Browser, su molte "
+"piattaforme potrebbero non funzionare come previsto."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
diff --git a/contents+pl.po b/contents+pl.po
index 636570de3..ebdf4ffa2 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -3,10 +3,10 @@
 # Filip , 2019
 # Dawid Job , 2019
 # erinm, 2019
-# Emma Peel, 2019
 # Kret Kretkowski , 2019
 # Waldemar Stoczkowski, 2019
 # Dawid Potocki , 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-13 17:53+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Dawid Potocki , 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -237,6 +237,13 @@ msgid ""
 "href=\"https://www.torproject.org/download/download-;
 "easy.html.en#mac\">macOS."
 msgstr ""
+"Tor Browser jest na ten moment dostępna na https://www.torproject.org/download/download-;
+"easy.html.en#windows\">Windows, https://www.torproject.org/download/download-;
+"easy.html.en#linux\">Linux i https://www.torproject.org/download/download-;
+"easy.html.en#mac\">macOS."
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -265,6 +272,8 @@ msgid ""
 "There is no official version of Tor for iOS yet, though we recommend 

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

2019-05-13 Thread translation
commit e2b2f0b6d5ab6de8fcb324f92708f0d4ab088700
Author: Translation commit bot 
Date:   Mon May 13 16:25:04 2019 +

Update translations for support-portal_completed
---
 contents+de.po|  4 ++--
 contents+es.po| 10 +-
 contents+fr.po| 25 +
 contents+is.po|  4 ++--
 contents+ka.po|  4 ++--
 contents+pl.po|  4 ++--
 contents+pt-BR.po |  4 ++--
 contents+pt-PT.po |  4 ++--
 contents+tr.po| 26 --
 contents.pot  |  6 +++---
 10 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index e9b3e4189..68020f1a3 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-05-13 16:14+CET\n"
+"POT-Creation-Date: 2019-05-13 17:53+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Curtis Baltimore , 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -6597,7 +6597,7 @@ msgstr ""
 "Wissenschaft und der Allgemeinheit zu vergrößern."
 
 #: templates/footer.html:24
-msgid "SUBSCRIBE TO OUT NEWSLETTER"
+msgid "SUBSCRIBE TO OUR NEWSLETTER"
 msgstr ""
 
 #: templates/footer.html:25
diff --git a/contents+es.po b/contents+es.po
index 3d3584e49..e9a97e160 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-05-13 16:14+CET\n"
+"POT-Creation-Date: 2019-05-13 17:53+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -6592,8 +6592,8 @@ msgstr ""
 "fomento de su comprensión científica y popular."
 
 #: templates/footer.html:24
-msgid "SUBSCRIBE TO OUT NEWSLETTER"
-msgstr ""
+msgid "SUBSCRIBE TO OUR NEWSLETTER"
+msgstr "SUSBCRÍBETE A NUESTRA LISTA DE CORREO"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the Tor Project:"
@@ -6601,7 +6601,7 @@ msgstr "Recibe noticias mensuales y oportunidades del 
Proyecto Tor:"
 
 #: templates/footer.html:26
 msgid "SIGN UP"
-msgstr ""
+msgstr "AÑÁDETE"
 
 #: templates/footer.html:32
 msgid ""
@@ -6621,7 +6621,7 @@ msgstr "Tor Logo"
 
 #: templates/navbar.html:6
 msgid "DONATE NOW"
-msgstr ""
+msgstr "DONA AHORA"
 
 #: templates/navbar.html:41
 msgid "Download Tor Browser"
diff --git a/contents+fr.po b/contents+fr.po
index 769223ca8..db8b9f072 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-13 16:14+CET\n"
+"POT-Creation-Date: 2019-05-13 17:53+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
@@ -2482,8 +2482,8 @@ msgid ""
 "href=\"https://blog.torproject.org\;>blog for future "
 "announcements and details regarding this project."
 msgstr ""
-"Veuillez surveiller la publication d’annonces futures et de plus amples "
-"renseignements concernant ce projet sur notre https://blog.torproject.org\;>blogue."
 
 #: https//support.torproject.org/gettor/gettor-1/
@@ -2491,7 +2491,8 @@ msgstr ""
 #: https//support.torproject.org/censorship/censorship-3/
 #: (content/censorship/censorship-3/contents+en.lrquestion.title)
 msgid "How do I download Tor Browser if the torproject.org is blocked?"
-msgstr "Comment télécharger le Navigateur Tor si torproject.org est bloqué 
?"
+msgstr ""
+"Comment puis-je télécharger le Navigateur Tor si torproject.org est 
bloqué ?"
 
 #: https//support.torproject.org/gettor/gettor-1/
 #: (content/gettor/gettor-1/contents+en.lrquestion.description)
@@ -2502,9 +2503,9 @@ msgid ""
 "[website](https://www.torproject.org), you can get a copy of Tor Browser "
 "delivered to you via GetTor."
 msgstr ""
-"Si vous ne pouvez pas télécharger le Navigateur Tor via notre [site "
-"Web](https://www.torproject.org), vous pouvez obtenir une copie du "
-"Navigateur Tor qui vous est livré par GetTor."
+"Si vous ne pouvez pas télécharger le Navigateur Tor à partir de notre 
[site "
+"Web](https://www.torproject.org/fr), GetTor peut vous en livrer un "
+"exemplaire."
 
 #: https//support.torproject.org/gettor/gettor-1/
 #: (content/gettor/gettor-1/contents+en.lrquestion.description)
@@ -2515,10 +2516,10 @@ msgid ""
 "the latest version of Tor Browser, hosted at a variety of locations that are"
 " less likely to be censored, such as Dropbox, Google Drive, and GitHub."
 msgstr ""
-"GetTor est un service qui répond automatiquement aux messages en incluant "
-"des liens vers la dernière version du Navigateur Tor, hébergée en divers "
-"endroits qui risquent moins d’être censurée, tels que Dropbox, le disque "
-"Google Drive ou GitHub."
+"GetTor est un 

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

2019-05-13 Thread translation
commit a46bc06337b1c1d2d8c7625f1398c40f96dd4a36
Author: Translation commit bot 
Date:   Mon May 13 16:24:37 2019 +

Update translations for support-portal
---
 contents+ar.po|  4 ++--
 contents+bn.po| 15 +--
 contents+ca.po|  4 ++--
 contents+cs.po|  4 ++--
 contents+da.po|  4 ++--
 contents+de.po|  4 ++--
 contents+el.po| 13 +++--
 contents+es-AR.po |  4 ++--
 contents+es.po| 10 +-
 contents+fa.po|  4 ++--
 contents+fo.po|  4 ++--
 contents+fr.po| 25 +
 contents+ga.po|  4 ++--
 contents+gu.po|  4 ++--
 contents+he.po|  4 ++--
 contents+hi.po|  4 ++--
 contents+hu.po|  4 ++--
 contents+id.po| 13 +++--
 contents+is.po|  4 ++--
 contents+it.po|  4 ++--
 contents+ja.po|  4 ++--
 contents+ka.po|  4 ++--
 contents+ko.po|  4 ++--
 contents+mk.po|  4 ++--
 contents+my.po|  4 ++--
 contents+nb.po|  4 ++--
 contents+nl.po|  4 ++--
 contents+pl.po|  4 ++--
 contents+pt-BR.po |  4 ++--
 contents+pt-PT.po |  4 ++--
 contents+ro.po|  4 ++--
 contents+ru.po|  4 ++--
 contents+sv.po|  4 ++--
 contents+sw.po|  4 ++--
 contents+th.po|  4 ++--
 contents+tr.po| 26 --
 contents+uk.po|  4 ++--
 contents+zh-CN.po |  4 ++--
 contents+zh-TW.po |  4 ++--
 contents.pot  |  6 +++---
 40 files changed, 142 insertions(+), 98 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 7fa75b556..97df722fa 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-13 16:14+CET\n"
+"POT-Creation-Date: 2019-05-13 17:53+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
@@ -5413,7 +5413,7 @@ msgid ""
 msgstr ""
 
 #: templates/footer.html:24
-msgid "SUBSCRIBE TO OUT NEWSLETTER"
+msgid "SUBSCRIBE TO OUR NEWSLETTER"
 msgstr ""
 
 #: templates/footer.html:25
diff --git a/contents+bn.po b/contents+bn.po
index 983659d5c..68c640dec 100644
--- a/contents+bn.po
+++ b/contents+bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-13 16:14+CET\n"
+"POT-Creation-Date: 2019-05-13 17:53+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
@@ -234,6 +234,12 @@ msgid ""
 "href=\"https://www.torproject.org/download/download-;
 "easy.html.en#mac\">macOS."
 msgstr ""
+"টর ব্রাউজার বর্তমানে https://www.torproject.org/download/download-;
+"easy.html.en#windows\">উইন্ডোজ, https://www.torproject.org/download/download-;
+"easy.html.en#linux\">লিনাক্স এবং https://www.torproject.org/download/download-easy.html.en#mac\;>macOS"
+" (ওএস এক্স) এর জন্য পাওয়া 
যাচ্ছে ।"
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -2377,6 +2383,8 @@ msgid ""
 "Write your operating system (such as Windows, macOS, or Linux) in the body "
 "of the message and send."
 msgstr ""
+"আপনার অপারেটিং সিস্টেম (যেমন 
windows, MacOS (ওএস X), বা লিনাক্স)-এর 
শরীরে "
+"মেসেজ এবং সেন্ড করে লিখুন ।"
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.description)
@@ -4603,6 +4611,9 @@ msgid ""
 "the window, which allows you to control the [JavaScript](#javascript)that "
 "runs on individual web pages, or to block it entirely."
 msgstr ""
+"টর ব্রাউজারে নোটপ্যাড নামে 
একটি অ্যাড-অন রয়েছে, যা 
উইন্ডোটির উপরে বামে "
+"\"এস\" আইকন দ্বারা অ্যাক্সেস 
করে, যা আপনাকে জাভাস্ক্রিপ্ট 
নিয়ন্ত্রণ করতে "
+"দেয় যা পৃথক ওয়েব পেজগুলিতে 
চালায়, অথবা এটি সম্পূর্ণভাবে 
ব্লক করতে দেয়।"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5975,7 +5986,7 @@ msgstr ""
 "স্বাধীনতায় হস্তক্ষেপ করা ।"
 
 #: templates/footer.html:24
-msgid "SUBSCRIBE TO OUT NEWSLETTER"
+msgid "SUBSCRIBE TO OUR NEWSLETTER"
 msgstr ""
 
 #: templates/footer.html:25
diff --git a/contents+ca.po b/contents+ca.po
index cb1e5f2e3..d1c0a45f6 100644
--- 

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

2019-05-13 Thread translation
commit bd4fe017f83be58274a6b35a20460f979bcb68ae
Author: Translation commit bot 
Date:   Mon May 13 16:22:51 2019 +

Update translations for tpo-web_completed
---
 contents+fr.po | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 1b5bfc11f..823831ba4 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3,8 +3,8 @@
 # ducki2p , 2019
 # Emma Peel, 2019
 # erinm, 2019
-# AO , 2019
 # Curtis Baltimore , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-09 15:06+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Curtis Baltimore , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -520,8 +520,9 @@ msgid ""
 "The Tor Project, Inc. is a US 501(c)(3) nonprofit organization committed to "
 "transparency in its work and reporting."
 msgstr ""
-"The Tor Project, Inc. est une organisme sans but lucratif américaine "
-"501(c)(3) engagée à la transparence dans son travail et ses informations."
+"The Tor Project, Inc. est une organisme états-unien sans but lucratif "
+"501(c)(3) qui s’engage à faire preuve de transparence dans son travail et "
+"dans ses rapports et déclarations"
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)
@@ -576,10 +577,10 @@ msgid ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\;>distribution "
 "directory."
 msgstr ""
-"Le Navigateur Tor 8.5a10 est maintenant disponible à partir de la https://www.torproject.org/projects/torbrowser.html.en#downloads-;
-"alpha\">page du projet du Navigateur Tor et aussi de notre https://www.torproject.org/dist/torbrowser/8.5a10/\;>répertoire de "
+"Le Navigateur Tor 8.5a12 est maintenant proposé à partir de la https://www.torproject.org/fr/download/#downloads-alpha\;>page de "
+"téléchargement du Navigateur Tor et aussi de notre https://www.torproject.org/dist/torbrowser/8.5a12/\;>répertoire de "
 "version.."
 
 #: templates/contact.html:8

___
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-05-13 Thread translation
commit ee799bfd08ea4ea79edc3eadff40250523e1b1ad
Author: Translation commit bot 
Date:   Mon May 13 16:22:43 2019 +

Update translations for tpo-web
---
 contents+fr.po | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 1b5bfc11f..823831ba4 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3,8 +3,8 @@
 # ducki2p , 2019
 # Emma Peel, 2019
 # erinm, 2019
-# AO , 2019
 # Curtis Baltimore , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-09 15:06+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Curtis Baltimore , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -520,8 +520,9 @@ msgid ""
 "The Tor Project, Inc. is a US 501(c)(3) nonprofit organization committed to "
 "transparency in its work and reporting."
 msgstr ""
-"The Tor Project, Inc. est une organisme sans but lucratif américaine "
-"501(c)(3) engagée à la transparence dans son travail et ses informations."
+"The Tor Project, Inc. est une organisme états-unien sans but lucratif "
+"501(c)(3) qui s’engage à faire preuve de transparence dans son travail et "
+"dans ses rapports et déclarations"
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)
@@ -576,10 +577,10 @@ msgid ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\;>distribution "
 "directory."
 msgstr ""
-"Le Navigateur Tor 8.5a10 est maintenant disponible à partir de la https://www.torproject.org/projects/torbrowser.html.en#downloads-;
-"alpha\">page du projet du Navigateur Tor et aussi de notre https://www.torproject.org/dist/torbrowser/8.5a10/\;>répertoire de "
+"Le Navigateur Tor 8.5a12 est maintenant proposé à partir de la https://www.torproject.org/fr/download/#downloads-alpha\;>page de "
+"téléchargement du Navigateur Tor et aussi de notre https://www.torproject.org/dist/torbrowser/8.5a12/\;>répertoire de "
 "version.."
 
 #: templates/contact.html:8

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


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

2019-05-13 Thread translation
commit ea9afe1472cb3688e9a28c56c15c654d6ed87895
Author: Translation commit bot 
Date:   Mon May 13 16:17:15 2019 +

Update translations for https_everywhere_completed
---
 pt_BR/https-everywhere.dtd | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index 124cf9a2e..8717fe8ce 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -9,11 +9,12 @@
 
 
 
-
-
-
-
+
+
+
+
 
+
 
 
 

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


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

2019-05-13 Thread translation
commit 0f042de3a10eeb5fe5354c74a1649f5338463e8d
Author: Translation commit bot 
Date:   Mon May 13 16:16:55 2019 +

Update translations for exoneratorproperties_completed
---
 en/exonerator.properties | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/en/exonerator.properties b/en/exonerator.properties
index 936754ae5..05bb0cbe1 100644
--- a/en/exonerator.properties
+++ b/en/exonerator.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Yes
 technicaldetails.exit.no=No
 permanentlink.heading=Permanent link
 footer.abouttor.heading=About Tor
-footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by %s. Therefore, if you see traffic from a 
Tor relay, this traffic usually originates from someone using Tor, rather than 
from the relay operator. The Tor Project and Tor relay operators have no 
records of the traffic that passes over the network and therefore cannot 
provide any information about its origin. Be sure to %s, and don't 
hesitate to %s for more information.
-footer.abouttor.body.link1=encrypting packets and sending them through a 
series of hops before they reach their destination
-footer.abouttor.body.link2=learn more about Tor
-footer.abouttor.body.link3=contact The Tor Project, Inc.
+footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by encrypting packets and sending them through a 
series of hops before they reach their destination. Therefore, if you see 
traffic from a Tor relay, this traffic usually originates from someone using 
Tor, rather than from the relay operator. The Tor Project and Tor relay 
operators have no records of the traffic that passes over the network and 
therefore cannot provide any information about its origin. Be sure to %s, 
and don't hesitate to %s for more information.
+footer.abouttor.body.link1=learn more about Tor
+footer.abouttor.body.link2=contact The Tor Project, Inc.
 footer.aboutexonerator.heading=About ExoneraTor
 footer.aboutexonerator.body=The ExoneraTor service maintains a database of IP 
addresses that have been part of the Tor network. It answers the question 
whether there was a Tor relay running on a given IP address on a given 
date. ExoneraTor may store more than one IP address per relay if relays 
use a different IP address for exiting to the Internet than for registering in 
the Tor network, and it stores whether a relay permitted transit of Tor traffic 
to the open Internet at that time.
 footer.language.name=English

___
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-05-13 Thread translation
commit bc9951266ddc904a9ee1490d9b079ef6f3f9dec4
Author: Translation commit bot 
Date:   Mon May 13 16:17:05 2019 +

Update translations for https_everywhere
---
 pt_BR/https-everywhere.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd
index 650813a75..8717fe8ce 100644
--- a/pt_BR/https-everywhere.dtd
+++ b/pt_BR/https-everywhere.dtd
@@ -10,11 +10,11 @@
 
 
 
-
+
 
-
+
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 

___
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-05-13 Thread translation
commit d34b534b0576b6cc25b579eac0521073ac7b5925
Author: Translation commit bot 
Date:   Mon May 13 15:51:38 2019 +

Update translations for support-portal_completed
---
 contents+es.po | 32 +---
 contents+fr.po | 10 +-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index bc449bf03..3d3584e49 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -234,6 +234,13 @@ msgid ""
 "href=\"https://www.torproject.org/download/download-;
 "easy.html.en#mac\">macOS."
 msgstr ""
+"El Tor Browser está actualmente disponible para https://www.torproject.org/download/download-;
+"easy.html.en#windows\">Windows, https://www.torproject.org/download/download-;
+"easy.html.en#linux\">Linux y https://www.torproject.org/download/download-;
+"easy.html.en#mac\">macOS."
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -262,6 +269,8 @@ msgid ""
 "There is no official version of Tor for iOS yet, though we recommend https://onionbrowser.com/\;>Onion Browser."
 msgstr ""
+"Aún no hay versión oficial de Tor para iOS, aunque recomendamos el https://onionbrowser.com/\;>Navegador Onion."
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.title)
@@ -618,7 +627,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "### MacOS and Linux"
-msgstr ""
+msgstr "### MacOS y Linux"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -630,6 +639,7 @@ msgstr "Necesitas tener GnuPG instalado antes que puedas 
verificar firmas."
 msgid ""
 "If you are using macOS, you can install it from https://www.gpgtools.org/.;
 msgstr ""
+"Si estás usando macOS, puedes instalarlo desde https://www.gpgtools.org/.;
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -653,6 +663,8 @@ msgid ""
 "Import its key (0x4E2C6E8793298290) by starting the terminal (under "
 "\"Applications\" in macOS) and typing:"
 msgstr ""
+"Importa su llave (0x4E2C6E8793298290) ejecutando la terminal (bajo "
+"\"Aplicaciones\" en macOS) y escribiendo:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -677,7 +689,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid " For macOS users:"
-msgstr ""
+msgstr " Para usuarios macOS:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -826,7 +838,7 @@ msgstr "* obfs4proxy.exe (si usas puentes)"
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* For macOS"
-msgstr ""
+msgstr "* Para macOS"
 
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -1829,6 +1841,8 @@ msgid ""
 "The standard level allows JavaScript, but the safer and safest levels both "
 "block JavaScript on HTTP sites."
 msgstr ""
+"El nivel standard permite JavaScript, pero los niveles seguro y más seguro "
+"ambos bloquean JavaScript en los sitios HTTP."
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
@@ -1866,6 +1880,8 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"No recomendamos ejecutar múltiples instancias del Tor Browser, pueden no "
+"funcionar como se espera en muchas plataformas."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
@@ -2494,6 +2510,8 @@ msgid ""
 "Write your operating system (such as Windows, macOS, or Linux) in the body "
 "of the message and send."
 msgstr ""
+"Señala tu sistema operativo (Windows, macOS o Linux) en el cuerpo del "
+"mensaje y envíalo."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.description)
@@ -4475,6 +4493,9 @@ msgid ""
 "](#operating-system-os), with its mobile versions available for Android, and"
 " Firefox OS."
 msgstr ""
+"Firefox está disponible para Windows, macOS y Linux [operating systems"
+"](#operating-system-os), con sus versiones para móviles disponibles para "
+"Android y Firefox OS."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5188,6 +5209,11 @@ msgid ""
 "desktop operating systems are Windows, macOS and Linux. Android and iOS are "
 "the dominant mobile operating systems."
 

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

2019-05-13 Thread translation
commit a5550ae8f9da32062f96433a0842e3d6b3c6940c
Author: Translation commit bot 
Date:   Mon May 13 15:51:28 2019 +

Update translations for support-portal
---
 contents+es.po | 32 +---
 contents+fr.po | 10 +-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index bc449bf03..3d3584e49 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -234,6 +234,13 @@ msgid ""
 "href=\"https://www.torproject.org/download/download-;
 "easy.html.en#mac\">macOS."
 msgstr ""
+"El Tor Browser está actualmente disponible para https://www.torproject.org/download/download-;
+"easy.html.en#windows\">Windows, https://www.torproject.org/download/download-;
+"easy.html.en#linux\">Linux y https://www.torproject.org/download/download-;
+"easy.html.en#mac\">macOS."
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -262,6 +269,8 @@ msgid ""
 "There is no official version of Tor for iOS yet, though we recommend https://onionbrowser.com/\;>Onion Browser."
 msgstr ""
+"Aún no hay versión oficial de Tor para iOS, aunque recomendamos el https://onionbrowser.com/\;>Navegador Onion."
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.title)
@@ -618,7 +627,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "### MacOS and Linux"
-msgstr ""
+msgstr "### MacOS y Linux"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -630,6 +639,7 @@ msgstr "Necesitas tener GnuPG instalado antes que puedas 
verificar firmas."
 msgid ""
 "If you are using macOS, you can install it from https://www.gpgtools.org/.;
 msgstr ""
+"Si estás usando macOS, puedes instalarlo desde https://www.gpgtools.org/.;
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -653,6 +663,8 @@ msgid ""
 "Import its key (0x4E2C6E8793298290) by starting the terminal (under "
 "\"Applications\" in macOS) and typing:"
 msgstr ""
+"Importa su llave (0x4E2C6E8793298290) ejecutando la terminal (bajo "
+"\"Aplicaciones\" en macOS) y escribiendo:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -677,7 +689,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid " For macOS users:"
-msgstr ""
+msgstr " Para usuarios macOS:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -826,7 +838,7 @@ msgstr "* obfs4proxy.exe (si usas puentes)"
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* For macOS"
-msgstr ""
+msgstr "* Para macOS"
 
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -1829,6 +1841,8 @@ msgid ""
 "The standard level allows JavaScript, but the safer and safest levels both "
 "block JavaScript on HTTP sites."
 msgstr ""
+"El nivel standard permite JavaScript, pero los niveles seguro y más seguro "
+"ambos bloquean JavaScript en los sitios HTTP."
 
 #: https//support.torproject.org/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
@@ -1866,6 +1880,8 @@ msgid ""
 "We do not recommend running multiple instances of Tor Browser, and doing so "
 "may not work as anticipated on many platforms."
 msgstr ""
+"No recomendamos ejecutar múltiples instancias del Tor Browser, pueden no "
+"funcionar como se espera en muchas plataformas."
 
 #: https//support.torproject.org/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.title)
@@ -2494,6 +2510,8 @@ msgid ""
 "Write your operating system (such as Windows, macOS, or Linux) in the body "
 "of the message and send."
 msgstr ""
+"Señala tu sistema operativo (Windows, macOS o Linux) en el cuerpo del "
+"mensaje y envíalo."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.description)
@@ -4475,6 +4493,9 @@ msgid ""
 "](#operating-system-os), with its mobile versions available for Android, and"
 " Firefox OS."
 msgstr ""
+"Firefox está disponible para Windows, macOS y Linux [operating systems"
+"](#operating-system-os), con sus versiones para móviles disponibles para "
+"Android y Firefox OS."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -5188,6 +5209,11 @@ msgid ""
 "desktop operating systems are Windows, macOS and Linux. Android and iOS are "
 "the dominant mobile operating systems."
 msgstr ""

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

2019-05-13 Thread translation
commit e4f35d22fd71ca9ab8c5b36c1f5fe1f0b202b467
Author: Translation commit bot 
Date:   Mon May 13 15:21:38 2019 +

Update translations for support-portal_completed
---
 contents+fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+fr.po b/contents+fr.po
index 43e1ae739..250c7b773 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2472,7 +2472,7 @@ msgid ""
 "android)."
 msgstr ""
 "Nous travaillons actuellement sur le Navigateur Tor pour Android, et vous "
-"pouvez [tester nos versions alpha] (https://blog.torproject.org/new-alpha-;
+"pouvez [tester nos versions alpha](https://blog.torproject.org/new-alpha-;
 "release-tor-browser-android)."
 
 #: https//support.torproject.org/tormobile/tormobile-5/

___
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-05-13 Thread translation
commit 4f58ab1b6ae4eba7ac4d7198c36e163f0cd05ef3
Author: Translation commit bot 
Date:   Mon May 13 15:21:29 2019 +

Update translations for support-portal
---
 contents+fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+fr.po b/contents+fr.po
index 43e1ae739..250c7b773 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2472,7 +2472,7 @@ msgid ""
 "android)."
 msgstr ""
 "Nous travaillons actuellement sur le Navigateur Tor pour Android, et vous "
-"pouvez [tester nos versions alpha] (https://blog.torproject.org/new-alpha-;
+"pouvez [tester nos versions alpha](https://blog.torproject.org/new-alpha-;
 "release-tor-browser-android)."
 
 #: https//support.torproject.org/tormobile/tormobile-5/

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


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

2019-05-13 Thread translation
commit d5d1bb66b5abe8a697880faaf55ad289de408903
Author: Translation commit bot 
Date:   Mon May 13 15:20:57 2019 +

Update translations for tor_outreach_md_completed
---
 tor-outreach2019-2020-fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md
index 95911ef11..335a9cd93 100644
--- a/tor-outreach2019-2020-fr.md
+++ b/tor-outreach2019-2020-fr.md
@@ -158,5 +158,5 @@ TOR SUR APPAREIL MOBILE
 Le Navigateur Tor pour Android est proposée sur Google Play.
 
 ### iOS
-Le Navigateur Onion, développé par M. Tigas, est le seul navigateur que 
nous recommandons pour iOS.
+Le Navigateur Onion, développé par M. Tigas, est le seul navigateur que 
nous recommandons pour iOS.
 

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


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

2019-05-13 Thread translation
commit 78a47959161c26007ad9171eacc492fc67adcc67
Author: Translation commit bot 
Date:   Mon May 13 15:20:51 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tor-outreach2019-2020-fr.md b/tor-outreach2019-2020-fr.md
index 95911ef11..335a9cd93 100644
--- a/tor-outreach2019-2020-fr.md
+++ b/tor-outreach2019-2020-fr.md
@@ -158,5 +158,5 @@ TOR SUR APPAREIL MOBILE
 Le Navigateur Tor pour Android est proposée sur Google Play.
 
 ### iOS
-Le Navigateur Onion, développé par M. Tigas, est le seul navigateur que 
nous recommandons pour iOS.
+Le Navigateur Onion, développé par M. Tigas, est le seul navigateur que 
nous recommandons pour iOS.
 

___
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-05-13 Thread translation
commit a1608fe187af91dbc3e3e510c8d7d8b31b19b885
Author: Translation commit bot 
Date:   Mon May 13 14:53:02 2019 +

Update translations for support-portal_completed
---
 contents+de.po|  88 -
 contents+es.po|  89 -
 contents+fr.po| 116 ++
 contents+is.po|  89 -
 contents+ka.po|  90 --
 contents+pl.po|  90 --
 contents+pt-BR.po |  90 --
 contents+pt-PT.po |  90 --
 contents+tr.po|  88 -
 contents.pot  |  98 +++--
 10 files changed, 360 insertions(+), 568 deletions(-)

diff --git a/contents+de.po b/contents+de.po
index 818cb73ad..e9b3e4189 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-04-29 14:45+CET\n"
+"POT-Creation-Date: 2019-05-13 16:14+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
 "Last-Translator: Curtis Baltimore , 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -229,21 +229,14 @@ msgstr "Auf welchen Plattformen ist Tor Browser 
verfügbar?"
 #: https//support.torproject.org/tbb/tbb-31/
 #: (content/tbb/tbb-31/contents+en.lrquestion.description)
 msgid ""
-"Tor Browser is currently available on https://www.torproject.org/download/download-;
-"easy.html.en#windows\">Windows, Windows, https://www.torproject.org/download/download-;
-"easy.html.en#linux\">Linux and https://www.torproject.org/download/download-easy.html.en#mac\;>macOS"
-" (OS X)."
-msgstr ""
-"Tor Browser ist gegenwärtig verfügbar für https://www.torproject.org/download/download-;
-"easy.html.en#windows\">Windows, Linux and https://www.torproject.org/download/download-;
-"easy.html.en#linux\">Linux, https://www.torproject.org/download/download-easy.html.en#mac\;>macOS"
-" (OS X) und bald auch Android."
+"easy.html.en#mac\">macOS."
+msgstr ""
 
 #: https//support.torproject.org/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -269,11 +262,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-31/
 #: (content/tbb/tbb-31/contents+en.lrquestion.description)
 msgid ""
-"There is no official version of Tor for iOS yet, though we recommend "
-"https://onionbrowser.com/\;>Onion Browser."
+"There is no official version of Tor for iOS yet, though we recommend https://onionbrowser.com/\;>Onion Browser."
 msgstr ""
-"Es gibt bisher keine offizielle Version von Tor für iOS, aber wir empfehlen "
-"https://onionbrowser.com/\;>OnionBrowser."
 
 #: https//support.torproject.org/faq/faq-5/
 #: (content/faq/faq-5/contents+en.lrquestion.title)
@@ -639,8 +630,8 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
-msgid "### Mac OS X and Linux"
-msgstr "### Mac OS X und Linux"
+msgid "### MacOS and Linux"
+msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -651,11 +642,8 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
-"If you are using Mac OS X, you can install it from "
-"https://www.gpgtools.org/.;
+"If you are using macOS, you can install it from https://www.gpgtools.org/.;
 msgstr ""
-"Wenn du Mac OS X verwendest, kannst du es von https://www.gpgtools.org/ "
-"installieren."
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -679,10 +667,8 @@ msgstr ""
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid ""
 "Import its key (0x4E2C6E8793298290) by starting the terminal (under "
-"\"Applications\" in Mac OS X) and typing:"
+"\"Applications\" in macOS) and typing:"
 msgstr ""
-"Importiere den Schlüssel (0x4E2C6E8793298290), indem du das Terminal "
-"startest (unter Mac OS X unter \"Programme\") und Folgendes eingibst:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -706,8 +692,8 @@ msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
-msgid " For Mac OS X users:"
-msgstr " Für Mac OS X-Benutzer:"
+msgid " For macOS users:"
+msgstr ""
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: 

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

2019-05-13 Thread translation
commit 37999c2a28814b42342d22304c0f56da9559e160
Author: Translation commit bot 
Date:   Mon May 13 14:51:07 2019 +

Update translations for tpo-web_completed
---
 contents+pt-PT.po | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index f6ac2b39d..c5db000d7 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -4,8 +4,8 @@
 # Manuela Silva , 2019
 # Manuela Silva, 2019
 # Rui Melo , 2019
-# Hugo9191 , 2019
 # Rui , 2019
+# Hugo9191 , 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-09 15:06+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Rui , 2019\n"
+"Last-Translator: Hugo9191 , 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"
@@ -505,6 +505,8 @@ msgid ""
 "The Tor Project, Inc. is a US 501(c)(3) nonprofit organization committed to "
 "transparency in its work and reporting."
 msgstr ""
+"O Tor Project é uma organização sem fins lucrativos US 501(c)(3) "
+"comprometida à transparência do seu trabalho e comunicação."
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)
@@ -559,6 +561,11 @@ msgid ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\;>distribution "
 "directory."
 msgstr ""
+"O Tor Browser 8.5a10 está agora disponível na https://www.torproject.org/projects/torbrowser.html.en#downloads-;
+"alpha\">Página do projeto Tor Browser e também no nosso https://www.torproject.org/dist/torbrowser/8.5a10/\;>diretório de "
+"distribuição."
 
 #: templates/contact.html:8
 msgid "Chat with us on"
@@ -720,7 +727,7 @@ msgstr "Idioma"
 
 #: templates/download-tor.html:25 templates/download-tor.html:30
 msgid "sig"
-msgstr ""
+msgstr "sig"
 
 #: templates/download.html:5
 msgid "Get Connected"

___
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-05-13 Thread translation
commit 060ff713fd720cd16d69808c22cc21e3ffc6e5ef
Author: Translation commit bot 
Date:   Mon May 13 14:51:01 2019 +

Update translations for tpo-web
---
 contents+pt-PT.po | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/contents+pt-PT.po b/contents+pt-PT.po
index f6ac2b39d..c5db000d7 100644
--- a/contents+pt-PT.po
+++ b/contents+pt-PT.po
@@ -4,8 +4,8 @@
 # Manuela Silva , 2019
 # Manuela Silva, 2019
 # Rui Melo , 2019
-# Hugo9191 , 2019
 # Rui , 2019
+# Hugo9191 , 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-05-09 15:06+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Rui , 2019\n"
+"Last-Translator: Hugo9191 , 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"
@@ -505,6 +505,8 @@ msgid ""
 "The Tor Project, Inc. is a US 501(c)(3) nonprofit organization committed to "
 "transparency in its work and reporting."
 msgstr ""
+"O Tor Project é uma organização sem fins lucrativos US 501(c)(3) "
+"comprometida à transparência do seu trabalho e comunicação."
 
 #: https//www.torproject.org/press/-new-release-tails/
 #: (content/press/new-release-tails/contents+en.lrpost.title)
@@ -559,6 +561,11 @@ msgid ""
 "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\;>distribution "
 "directory."
 msgstr ""
+"O Tor Browser 8.5a10 está agora disponível na https://www.torproject.org/projects/torbrowser.html.en#downloads-;
+"alpha\">Página do projeto Tor Browser e também no nosso https://www.torproject.org/dist/torbrowser/8.5a10/\;>diretório de "
+"distribuição."
 
 #: templates/contact.html:8
 msgid "Chat with us on"
@@ -720,7 +727,7 @@ msgstr "Idioma"
 
 #: templates/download-tor.html:25 templates/download-tor.html:30
 msgid "sig"
-msgstr ""
+msgstr "sig"
 
 #: templates/download.html:5
 msgid "Get Connected"

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


[tor-commits] [exonerator/master] Adapt "About Tor" links to redesigned Tor website.

2019-05-13 Thread karsten
commit 41c7671ec0bd10e769d559c932d5cedebf080440
Author: Karsten Loesing 
Date:   Mon May 13 15:18:53 2019 +0200

Adapt "About Tor" links to redesigned Tor website.

Reported by nusenu, changes suggested by irl.

Fixes #30415.
---
 CHANGELOG.md  |  7 +++
 .../torproject/metrics/exonerator/ExoneraTorServlet.java  | 15 ++-
 src/main/resources/ExoneraTor.properties  |  7 +++
 src/main/resources/ExoneraTor_de.properties   |  7 +++
 src/main/resources/ExoneraTor_fr.properties   |  7 +++
 src/main/resources/ExoneraTor_ro.properties   |  7 +++
 src/main/resources/ExoneraTor_sv.properties   |  7 +++
 7 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a628fa..4b2646d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 4.1.0 - 2019-05-??
+
+ * Minor changes
+   - Remove first link under "About Tor" and change second and third
+ link to adapt to redesigned Tor website.
+
+
 # Changes in version 4.0.0 - 2018-08-14
 
  * Major changes
diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index 5909f26..a74aa60 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -373,7 +373,7 @@ public class ExoneraTorServlet extends HttpServlet {
   private void writeSummaryUnableToConnectToBackend(PrintWriter out,
   ResourceBundle rb) {
 String contactLink =
-"https://www.torproject.org/about/contact\;>"
+"https://www.torproject.org/contact\;>"
 + rb.getString("summary.serverproblem.dbempty.body.link")
 + "";
 this.writeSummary(out, rb.getString("summary.heading"),
@@ -385,7 +385,7 @@ public class ExoneraTorServlet extends HttpServlet {
 
   private void writeSummaryNoData(PrintWriter out, ResourceBundle rb) {
 String contactLink =
-"https://www.torproject.org/about/contact\;>"
+"https://www.torproject.org/contact\;>"
 + rb.getString("summary.serverproblem.dbempty.body.link")
 + "";
 this.writeSummary(out, rb.getString("summary.heading"),
@@ -453,7 +453,7 @@ public class ExoneraTorServlet extends HttpServlet {
   private void writeSummaryNoDataForThisInterval(PrintWriter out,
   ResourceBundle rb) {
 String contactLink =
-"https://www.torproject.org/about/contact\;>"
+"https://www.torproject.org/contact\;>"
 + rb.getString("summary.serverproblem.dbempty.body.link")
 + "";
 this.writeSummary(out, rb.getString("summary.heading"),
@@ -625,13 +625,10 @@ public class ExoneraTorServlet extends HttpServlet {
 + "\n",
 rb.getString("footer.abouttor.heading"),
 String.format(rb.getString("footer.abouttor.body.text"),
-"https://www.torproject.org/about/;
-+ "overview#thesolution\">"
+"https://www.torproject.org/about\;>"
 + rb.getString("footer.abouttor.body.link1") + "",
-"https://www.torproject.org/about/overview\;>"
-+ rb.getString("footer.abouttor.body.link2") + "",
-"https://www.torproject.org/about/contact\;>"
-+ rb.getString("footer.abouttor.body.link3") + ""));
+"https://www.torproject.org/contact\;>"
++ rb.getString("footer.abouttor.body.link2") + ""));
 out.printf("\n"
 + "  %s\n"
 + "  %s\n"
diff --git a/src/main/resources/ExoneraTor.properties 
b/src/main/resources/ExoneraTor.properties
index 936754a..05bb0cb 100644
--- a/src/main/resources/ExoneraTor.properties
+++ b/src/main/resources/ExoneraTor.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Yes
 technicaldetails.exit.no=No
 permanentlink.heading=Permanent link
 footer.abouttor.heading=About Tor
-footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by %s. Therefore, if you see traffic from a 
Tor relay, this traffic usually originates from someone using Tor, rather than 
from the relay operator. The Tor Project and Tor relay operators have no 
records of the traffic that passes over the network and therefore cannot 
provide any information about its origin. Be sure to %s, and don't 
hesitate to %s for more information.
-footer.abouttor.body.link1=encrypting packets and sending them through a 
series of hops before they reach their destination
-footer.abouttor.body.link2=learn more about Tor
-footer.abouttor.body.link3=contact The Tor Project, Inc.
+footer.abouttor.body.text=Tor is an international software project to 
anonymize Internet traffic by encrypting packets and sending them through a 
series of hops before they reach their destination. 

[tor-commits] [collector/master] Archive bandwidth files in relaydescs module.

2019-05-13 Thread karsten
commit dcbac68b48ae31b1bfbabab7a9c32f5577b78571
Author: Karsten Loesing 
Date:   Thu May 2 22:02:23 2019 +0200

Archive bandwidth files in relaydescs module.

Also update to metrics-lib 2.6.1.

Implements #30218.
---
 CHANGELOG.md   |  7 
 build.xml  |  4 +--
 .../metrics/collector/conf/Annotation.java |  1 +
 .../collector/relaydescs/ArchiveWriter.java| 42 +-
 .../relaydescs/RelayDescriptorDownloader.java  | 24 ++---
 .../relaydescs/RelayDescriptorParser.java  | 42 ++
 src/main/resources/create-tarballs.sh  |  7 
 7 files changed, 120 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0307748..0e592ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 1.9.0 - 2019-05-??
+
+ * Medium changes
+   - Archive bandwidth files in relaydescs module.
+   - Update to metrics-lib 2.6.1.
+
+
 # Changes in version 1.8.0 - 2018-10-11
 
  * Medium changes
diff --git a/build.xml b/build.xml
index 5cea51a..5874013 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,7 @@
   
   
   
-  
+  
   
 
   
@@ -21,7 +21,7 @@
   
   
   
-  
+  
   
   
   
diff --git 
a/src/main/java/org/torproject/metrics/collector/conf/Annotation.java 
b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java
index f90516b..2e47df0 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Annotation.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Annotation.java
@@ -6,6 +6,7 @@ package org.torproject.metrics.collector.conf;
 /** This enum contains all currently valid descriptor annotations. */
 public enum Annotation {
 
+  BandwidthFile("@type bandwidth-file 1.0\n"),
   BridgeExtraInfo("@type bridge-extra-info 1.3\n"),
   BridgeServer("@type bridge-server-descriptor 1.2\n"),
   Cert("@type dir-key-certificate-3 1.0\n"),
diff --git 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
index 966b649..e1279ee 100644
--- 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
+++ 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
@@ -3,6 +3,7 @@
 
 package org.torproject.metrics.collector.relaydescs;
 
+import org.torproject.descriptor.BandwidthFile;
 import org.torproject.descriptor.Descriptor;
 import org.torproject.descriptor.DescriptorParser;
 import org.torproject.descriptor.DescriptorSourceFactory;
@@ -33,6 +34,10 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -44,6 +49,7 @@ import java.util.SortedSet;
 import java.util.Stack;
 import java.util.TimeZone;
 import java.util.TreeMap;
+import java.util.TreeSet;
 
 public class ArchiveWriter extends CollecTorMain {
 
@@ -51,12 +57,15 @@ public class ArchiveWriter extends CollecTorMain {
   ArchiveWriter.class);
 
   private long now = System.currentTimeMillis();
+  private LocalDateTime nowLocalDateTime
+  = LocalDateTime.ofInstant(Instant.ofEpochMilli(this.now), 
ZoneOffset.UTC);
   private String outputDirectory;
   private String rsyncCatString;
   private DescriptorParser descriptorParser;
   private int storedConsensusesCounter = 0;
   private int storedMicrodescConsensusesCounter = 0;
   private int storedVotesCounter = 0;
+  private int storedBandwidthsCounter = 0;
   private int storedCertsCounter = 0;
   private int storedServerDescriptorsCounter = 0;
   private int storedExtraInfoDescriptorsCounter = 0;
@@ -74,6 +83,8 @@ public class ArchiveWriter extends CollecTorMain {
   private SortedMap> storedExtraInfoDescriptors =
   new TreeMap<>();
   private SortedMap> storedMicrodescriptors = new 
TreeMap<>();
+  private SortedMap> storedBandwidths
+  = new TreeMap<>();
 
   private File storedServerDescriptorsFile;
   private File storedExtraInfoDescriptorsFile;
@@ -103,6 +114,8 @@ public class ArchiveWriter extends CollecTorMain {
 RelayServerDescriptor.class);
 this.mapPathDescriptors.put("recent/relay-descriptors/extra-infos",
 RelayExtraInfoDescriptor.class);
+this.mapPathDescriptors.put("recent/relay-descriptors/bandwidths",
+BandwidthFile.class);
   }
 
   @Override
@@ -203,6 +216,7 @@ public class ArchiveWriter extends CollecTorMain {
 this.storedConsensuses.clear();
 this.storedMicrodescConsensuses.clear();
 this.storedVotes.clear();
+this.storedBandwidths.clear();
 this.storedServerDescriptors.clear();
 this.storedExtraInfoDescriptors.clear();
 

[tor-commits] [tor/master] Merge branch 'tor-github/pr/976'

2019-05-13 Thread dgoulet
commit 2f44786e304ae275501c1e3f74709435ae931def
Merge: 501d1ae0b f35bd3681
Author: David Goulet 
Date:   Mon May 13 07:34:00 2019 -0400

Merge branch 'tor-github/pr/976'

 changes/ticket27251 | 4 
 src/test/include.am | 4 +---
 2 files changed, 5 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] test-network-all: Test IPv6-only v3 single onion services

2019-05-13 Thread dgoulet
commit f35bd3681466e58e525d95714ba630caa98f67ae
Author: teor 
Date:   Wed Apr 24 17:41:09 2019 +1000

test-network-all: Test IPv6-only v3 single onion services

In "make test-network-all", test IPv6-only v3 single onion services,
using the chutney network single-onion-v23-ipv6-md. This test will
not pass until 23588 has been merged.

Closes ticket 27251.
---
 changes/ticket27251 | 4 
 src/test/include.am | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changes/ticket27251 b/changes/ticket27251
new file mode 100644
index 0..7ce296e8d
--- /dev/null
+++ b/changes/ticket27251
@@ -0,0 +1,4 @@
+  o Testing (chutney):
+- In "make test-network-all", test IPv6-only v3 single onion services,
+  using the chutney network single-onion-v23-ipv6-md. This test will
+  not pass until 23588 has been merged. Closes ticket 27251.
diff --git a/src/test/include.am b/src/test/include.am
index 497aa320a..fb4e9f4bc 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -46,10 +46,8 @@ TESTS += src/test/test src/test/test-slow 
src/test/test-memwipe \
 TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \
single-onion-v23
 # only run if we can ping6 ::1 (localhost)
-# IPv6-only v3 single onion services don't work yet, so we don't test the
-# single-onion-v23-ipv6-md flavor
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
-   single-onion-ipv6-md
+   single-onion-v23-ipv6-md
 # only run if we can find a stable (or simply another) version of tor
 TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 



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


[tor-commits] [metrics-web/master] Fix unknown issue with spread() function.

2019-05-13 Thread karsten
commit b3e80fce17f04cf7c83ef3843d2de0cc3bfef389
Author: Karsten Loesing 
Date:   Fri May 3 09:28:06 2019 +0200

Fix unknown issue with spread() function.

This is a hotfix to work around the issue described in #30351.
Hopefully, we'll come up with a better fix that doesn't go backwards
from tidyr to reshape2.
---
 src/main/R/rserver/rserve-init.R | 21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/R/rserver/rserve-init.R b/src/main/R/rserver/rserve-init.R
index 5a47550..3d6dad7 100644
--- a/src/main/R/rserver/rserve-init.R
+++ b/src/main/R/rserver/rserve-init.R
@@ -1,3 +1,4 @@
+require(reshape2)
 require(ggplot2)
 require(RColorBrewer)
 require(scales)
@@ -436,7 +437,7 @@ prepare_platforms <- function(start_p = NULL, end_p = NULL) 
{
 filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>%
 filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>%
 mutate(platform = tolower(platform)) %>%
-spread(platform, relays)
+dcast(date ~ platform, value.var = "relays")
 }
 
 plot_platforms <- function(start_p, end_p, path_p) {
@@ -700,7 +701,7 @@ prepare_connbidirect <- function(start_p = NULL, end_p = 
NULL) {
 filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>%
 mutate(quantile = paste("X", quantile, sep = ""),
   fraction = fraction / 100) %>%
-spread(quantile, fraction) %>%
+dcast(date + direction ~ quantile, value.var = "fraction") %>%
 rename(q1 = X0.25, md = X0.5, q3 = X0.75)
 }
 
@@ -752,7 +753,8 @@ prepare_bandwidth_flags <- function(start_p = NULL, end_p = 
NULL) {
 filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>%
 filter(!is.na(have_exit_flag)) %>%
 filter(!is.na(have_guard_flag)) %>%
-spread(variable, value)
+dcast(date + have_guard_flag + have_exit_flag ~ variable,
+  value.var = "value")
 }
 
 plot_bandwidth_flags <- function(start_p, end_p, path_p) {
@@ -1058,7 +1060,7 @@ prepare_advbwdist_perc <- function(start_p = NULL, end_p 
= NULL, p_p = NULL) {
 transmute(date, percentile = as.factor(percentile),
   variable = ifelse(is.na(isexit), "all", "exits"),
   advbw = advbw * 8 / 1e9) %>%
-spread(variable, advbw) %>%
+dcast(date + percentile ~ variable, value.var = "advbw") %>%
 rename(p = percentile)
 }
 
@@ -1096,7 +1098,7 @@ prepare_advbwdist_relay <- function(start_p = NULL, end_p 
= NULL, n_p = NULL) {
 transmute(date, relay = as.factor(relay),
   variable = ifelse(is.na(isexit), "all", "exits"),
   advbw = advbw * 8 / 1e9) %>%
-spread(variable, advbw) %>%
+dcast(date + relay ~ variable, value.var = "advbw") %>%
 rename(n = relay)
 }
 
@@ -1194,7 +1196,7 @@ prepare_webstats_tb <- function(start_p = NULL, end_p = 
NULL) {
 filter(request_type %in% c("tbid", "tbsd", "tbup", "tbur")) %>%
 group_by(log_date, request_type) %>%
 summarize(count = sum(count)) %>%
-spread(request_type, count) %>%
+dcast(log_date ~ request_type, value.var = "count") %>%
 rename(date = log_date, initial_downloads = tbid,
   signature_downloads = tbsd, update_pings = tbup,
   update_requests = tbur)
@@ -1239,7 +1241,7 @@ prepare_webstats_tb_platform <- function(start_p = NULL, 
end_p = NULL) {
 filter(request_type %in% c("tbid", "tbup")) %>%
 group_by(log_date, platform, request_type) %>%
 summarize(count = sum(count)) %>%
-spread(request_type, count, fill = 0) %>%
+dcast(log_date + platform ~ request_type, value.var = "count") %>%
 rename(date = log_date, initial_downloads = tbid, update_pings = tbup)
 }
 
@@ -1287,7 +1289,7 @@ prepare_webstats_tb_locale <- function(start_p = NULL, 
end_p = NULL) {
 group_by(date, locale, request_type) %>%
 summarize(count = sum(count)) %>%
 mutate(request_type = factor(request_type, levels = c("tbid", "tbup"))) %>%
-spread(request_type, count, fill = 0) %>%
+dcast(date + locale ~ request_type, value.var = "count") %>%
 rename(initial_downloads = tbid, update_pings = tbup)
 }
 
@@ -1342,7 +1344,8 @@ prepare_webstats_tm <- function(start_p = NULL, end_p = 
NULL) {
 group_by(log_date, request_type) %>%
 summarize(count = sum(count)) %>%
 mutate(request_type = factor(request_type, levels = c("tmid", "tmup"))) %>%
-spread(request_type, count, drop = FALSE, fill = 0) %>%
+dcast(log_date ~ request_type, value.var = "count", drop = FALSE,
+  fill = 0) %>%
 rename(date = log_date, initial_downloads = tmid, update_pings = tmup)
 }
 

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


[tor-commits] [tor-browser-build/master] Bumping tor browser branch for 9.0

2019-05-13 Thread gk
commit 68d7be6c41aa408c20cb87511efe59e7afa60357
Author: Georg Koppen 
Date:   Mon May 13 09:49:32 2019 +

Bumping tor browser branch for 9.0
---
 projects/firefox/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index c60ee8e..427033e 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -10,7 +10,7 @@ gpg_keyring: torbutton.gpg
 var:
   firefox_platform_version: 60.6.1
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
-  torbrowser_branch: 8.5
+  torbrowser_branch: 9.0
   torbrowser_update_channel: alpha
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE 
%]browser[% END %]/branding/alpha'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'

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


[tor-commits] [tor-browser-build/master] Bug 28044: Integrate Tor Launcher into tor-browser

2019-05-13 Thread gk
commit 6d94f73dc055c1739a67ffd422f7f5bf29218723
Author: Kathy Brade 
Date:   Tue Feb 26 10:16:15 2019 -0500

Bug 28044: Integrate Tor Launcher into tor-browser

Place the Tor Launcher sources within browser/extension before
starting the Firefox build (instead of creating an .xpi which
was included during the tor-browser packaging step).
---
 projects/firefox/build   |  5 +
 projects/firefox/config  |  3 +++
 projects/firefox/mozconfig-android-armv7 |  3 +++
 projects/firefox/mozconfig-android-x86   |  3 +++
 projects/tor-browser/build   |  1 -
 projects/tor-browser/config  |  3 ---
 projects/tor-launcher/build  | 12 
 projects/tor-launcher/config |  2 +-
 8 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 5cf86a4..3aa4a4d 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -151,6 +151,11 @@ fi
   patch -p1 < $rootdir/1527534.patch
 [% END -%]
 
+[% IF ! c("var/android") %]
+  # Place a copy of the Tor Launcher sources under browser/extensions
+  tar -C browser/extensions -xf $rootdir/[% 
c('input_files_by_name/tor-launcher') %]
+[% END -%]
+
 rm -f configure
 rm -f js/src/configure
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 566cbc0..c60ee8e 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -149,6 +149,9 @@ input_files:
 enable: '[% c("var/linux") %]'
   - filename: start-firefox
 enable: '[% c("var/linux") %]'
+  - project: tor-launcher
+name: tor-launcher
+enable: '[% ! c("var/android") %]'
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
 name: gradle-dependencies
 exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
diff --git a/projects/firefox/mozconfig-android-armv7 
b/projects/firefox/mozconfig-android-armv7
index dfa3aaf..6dde8b1 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -19,6 +19,9 @@ ac_add_options 
--with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm
 ac_add_options 
--with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 ac_add_options --with-l10n-base=/var/tmp/dist/locales
 
+# We do not use Tor Launcher on Android:
+ac_add_options --disable-tor-launcher
+
 if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
 # Because Google Play will likely be the primary distribution medium,
 # we disable updating and rely on Google Play by default. The
diff --git a/projects/firefox/mozconfig-android-x86 
b/projects/firefox/mozconfig-android-x86
index defe5c3..b332f52 100644
--- a/projects/firefox/mozconfig-android-x86
+++ b/projects/firefox/mozconfig-android-x86
@@ -19,6 +19,9 @@ ac_add_options 
--with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/x86
 ac_add_options 
--with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 ac_add_options --with-l10n-base=/var/tmp/dist/locales
 
+# We do not use Tor Launcher on Android:
+ac_add_options --disable-tor-launcher
+
 if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then
 # Because Google Play will likely be the primary distribution medium,
 # we disable updating and rely on Google Play by default. The
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 1d73ff5..45dbb53 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -49,7 +49,6 @@ mkdir -p "$TBDIR/$MEEKPROFILEPATH/extensions"
 unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') 
%]/mar-tools-*.zip
 MARTOOLS=$rootdir/mar-tools
 
-mv [% c('input_files_by_name/tor-launcher') %] 
"$TBDIR/$EXTSPATH/tor-launc...@torproject.org.xpi"
 mv [% c('input_files_by_name/torbutton') %] 
"$TBDIR/$EXTSPATH/torbut...@torproject.org.xpi"
 mv [% c('input_files_by_name/https-everywhere') %] 
"$TBDIR/$EXTSPATH/https-everywhere-...@eff.org.xpi"
 mv [% c('input_files_by_name/noscript') %] 
"$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 39093d4..ad382e2 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -60,9 +60,6 @@ input_files:
   - project: firefox-langpacks
 name: firefox-langpacks
 enable: '[% ! c("var/testbuild") && ! c("var/android") %]'
-  - project: tor-launcher
-name: tor-launcher
-enable: '[% ! c("var/android") %]'
   - project: torbutton
 name: torbutton
 enable: '[% ! c("var/android") %]'
diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index 90c5268..710416a 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -1,12 +1,8 @@
 #!/bin/bash
 [% c("var/set_default_env") -%]
 tar xvf [% project %]-[% c('version') %].tar.gz
-cd [% project %]-[% c('version') %]
-make package
-mkdir pkg/tmp
-cd pkg/tmp
-unzip ../*.xpi
-[% c('zip', {
-zip_src => [ '.' ],
-zip_args => 

[tor-commits] [tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser

2019-05-13 Thread gk
commit 864170b5c1e0626dbfe3707d48037010596c42e5
Author: Kathy Brade 
Date:   Fri May 10 14:12:17 2019 -0400

Bug 28044: Integrate Tor Launcher into tor-browser

Update translations using our revised import-translations.sh script.
---
 chrome.manifest| 170 +
 jar.mn | 331 +
 src/chrome/locale/ach/network-settings.dtd |  62 -
 src/chrome/locale/ach/torlauncher.properties   |  94 ---
 src/chrome/locale/ast/network-settings.dtd |  62 -
 src/chrome/locale/ast/torlauncher.properties   |  94 ---
 src/chrome/locale/ca-ES/torlauncher.properties |  49 
 src/chrome/locale/en-GB/network-settings.dtd   |  62 -
 src/chrome/locale/en-GB/torlauncher.properties |  94 ---
 src/chrome/locale/ko/torlauncher.properties|  98 
 src/chrome/locale/oc/network-settings.dtd  |  62 -
 src/chrome/locale/oc/torlauncher.properties|  94 ---
 src/chrome/locale/or/network-settings.dtd  |  62 -
 src/chrome/locale/or/torlauncher.properties|  94 ---
 src/chrome/locale/pt-PT/network-settings.dtd   |  62 +
 src/chrome/locale/pt-PT/torlauncher.properties |  94 +++
 src/chrome/locale/son/network-settings.dtd |  62 -
 src/chrome/locale/son/torlauncher.properties   |  94 ---
 src/chrome/locale/ur/network-settings.dtd  |  28 +--
 19 files changed, 720 insertions(+), 1048 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
new file mode 100644
index 000..2f55271
--- /dev/null
+++ b/chrome.manifest
@@ -0,0 +1,170 @@
+### Copyright (c) 2019, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+content torlauncher chrome/content/
+
+skin torlauncher classic/1.0 chrome/skin/
+
+resource torlauncher ./
+
+# Firefox 4-style component registration
+component {4F476361-23FB-43EF-A427-B36A14D3208E} components/tl-protocol.js
+contract @torproject.org/torlauncher-protocol-service;1 
{4F476361-23FB-43EF-A427-B36A14D3208E}
+
+component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} components/tl-process.js
+contract @torproject.org/torlauncher-process-service;1 
{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}
+category profile-after-change TorProcessService 
@torproject.org/torlauncher-process-service;1
+
+locale torlauncher en-US chrome/locale/en-US/
+locale torlauncher ady chrome/locale/ady/
+locale torlauncher af chrome/locale/af/
+locale torlauncher af-ZA chrome/locale/af-ZA/
+locale torlauncher ak chrome/locale/ak/
+locale torlauncher am chrome/locale/am/
+locale torlauncher am-ET chrome/locale/am-ET/
+locale torlauncher ar chrome/locale/ar/
+locale torlauncher arn chrome/locale/arn/
+locale torlauncher az chrome/locale/az/
+locale torlauncher be chrome/locale/be/
+locale torlauncher bg chrome/locale/bg/
+locale torlauncher bg-BG chrome/locale/bg-BG/
+locale torlauncher bn chrome/locale/bn/
+locale torlauncher bn-BD chrome/locale/bn-BD/
+locale torlauncher bn-IN chrome/locale/bn-IN/
+locale torlauncher bo chrome/locale/bo/
+locale torlauncher br chrome/locale/br/
+locale torlauncher bs chrome/locale/bs/
+locale torlauncher ca chrome/locale/ca/
+locale torlauncher ca@valencia chrome/locale/ca@valencia/
+locale torlauncher cs chrome/locale/cs/
+locale torlauncher cs-CZ chrome/locale/cs-CZ/
+locale torlauncher csb chrome/locale/csb/
+locale torlauncher cv chrome/locale/cv/
+locale torlauncher cy chrome/locale/cy/
+locale torlauncher da chrome/locale/da/
+locale torlauncher de chrome/locale/de/
+locale torlauncher dz chrome/locale/dz/
+locale torlauncher el chrome/locale/el/
+locale torlauncher el-GR chrome/locale/el-GR/
+locale torlauncher eo chrome/locale/eo/
+locale torlauncher es chrome/locale/es/
+locale torlauncher es-AR chrome/locale/es-AR/
+locale torlauncher es-CL chrome/locale/es-CL/
+locale torlauncher es-CO chrome/locale/es-CO/
+locale torlauncher es-MX chrome/locale/es-MX/
+locale torlauncher es-NI chrome/locale/es-NI/
+locale torlauncher et chrome/locale/et/
+locale torlauncher eu chrome/locale/eu/
+locale torlauncher fa chrome/locale/fa/
+locale torlauncher fi chrome/locale/fi/
+locale torlauncher fil chrome/locale/fil/
+locale torlauncher fo chrome/locale/fo/
+locale torlauncher fr chrome/locale/fr/
+locale torlauncher fr-CA chrome/locale/fr-CA/
+locale torlauncher fur chrome/locale/fur/
+locale torlauncher fy chrome/locale/fy/
+locale torlauncher ga chrome/locale/ga/
+locale torlauncher gl chrome/locale/gl/
+locale torlauncher gu chrome/locale/gu/
+locale torlauncher gu-IN chrome/locale/gu-IN/
+locale torlauncher gun chrome/locale/gun/
+locale torlauncher ha chrome/locale/ha/
+locale torlauncher he chrome/locale/he/
+locale torlauncher hi chrome/locale/hi/
+locale torlauncher hr chrome/locale/hr/
+locale torlauncher hr-HR chrome/locale/hr-HR/
+locale torlauncher ht chrome/locale/ht/
+locale torlauncher hu chrome/locale/hu/
+locale torlauncher hy chrome/locale/hy/
+locale torlauncher hy-AM chrome/locale/hy-AM/

[tor-commits] [tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser

2019-05-13 Thread gk
commit ab7e47f4ab54626e8b7e6348aac25fc3436d166f
Author: Kathy Brade 
Date:   Fri Feb 8 14:42:05 2019 -0500

Bug 28044: Integrate Tor Launcher into tor-browser

To avoid potential conflicts with other preference files, rename
our default preferences file from pref.js to torlauncher-prefs.js.

Do not load default preferences if the browser has already done so.
---
 .../preferences/{prefs.js => torlauncher-prefs.js} |  0
 src/modules/tl-util.jsm| 26 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/defaults/preferences/prefs.js 
b/src/defaults/preferences/torlauncher-prefs.js
similarity index 100%
rename from src/defaults/preferences/prefs.js
rename to src/defaults/preferences/torlauncher-prefs.js
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 8b59afb..bac5eae 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -1,4 +1,4 @@
-// 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=javascript:
@@ -876,10 +876,30 @@ let TLUtilInternal =  // Private
   return this.mDefaultPreferencesLoaded;
 }
 
+// Check whether default preferences have already been loaded, e.g.,
+// because Tor Launcher is integrated into the browser rather than
+// running as an extension. This code assumes that a default value is
+// defined for extensions.torlauncher.loglevel.
+let prefName = "extensions.torlauncher.loglevel";
+let val;
+try
+{
+  let defaultBranch = this._getPrefDefaultBranch(prefName);
+  val = defaultBranch.getIntPref("");
+} catch (e) {}
+if (val !== undefined)
+{
+  this.mDefaultPreferencesLoaded = true;
+  return true;
+}
+
+// Use the JS subscript loaded in conjunction with our pref() function
+// to load the default preferences.
+const kPrefsURL =
+  "resource://torlauncher/defaults/preferences/torlauncher-prefs.js";
 var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Ci.mozIJSSubScriptLoader);
-loader.loadSubScript(
-"resource://torlauncher/defaults/preferences/prefs.js", this);
+loader.loadSubScript(kPrefsURL, this);
 
 this.mDefaultPreferencesLoaded =
   (this.mNumDefaultPrefsDefined == this.mNumDefaultPrefsLoaded);



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


[tor-commits] [tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser

2019-05-13 Thread gk
commit b46c6039d1a5bf95aa9cbd777a51220d1df80aa0
Author: Kathy Brade 
Date:   Tue Feb 12 12:02:27 2019 -0500

Bug 28044: Integrate Tor Launcher into tor-browser

Fix locale-related issues.
  Renamed en locale to en-US (previously done during packaging).
  Added moz.build for integration with the Firefox build process.
  Enhanced the import-translations.sh script to omit incomplete locales
and to generate jar.mn and chrome.manifest.
  Removed checking for incomplete locales from the pkg-prepare make target.
  Improved the output generated by import-translations.sh and pkg-prepare.
---
 Makefile   | 32 ++--
 README | 20 +++
 chrome.manifest.in |  4 +-
 jar.mn.in  | 27 ++
 localization/import-translations.sh| 61 +++---
 moz.build  |  8 +++
 .../locale/{en => en-US}/network-settings.dtd  |  0
 .../locale/{en => en-US}/torlauncher.properties|  0
 8 files changed, 114 insertions(+), 38 deletions(-)

diff --git a/Makefile b/Makefile
index f629d52..44f9a2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2019, The Tor Project, Inc.
 ### See src/LICENSE for licensing information.
 
+# Makefile for packaging Tor Launcher outside of the browser build. The only
+# target in this file that is used by the Tor Browser build process is
+# import-translations.
+
 EXT_NAME=tor-launcher
 VERSION:=`grep em:version src/install.rdf | sed -e 's/[<>]//g' | cut -f3`
 XPI_NAME:=$(shell echo "$(EXT_NAME)-$(VERSION).xpi")
 STANDALONE_NAME=$(EXT_NAME)-standalone
 STANDALONE_TARBALL=$(shell echo "$(STANDALONE_NAME)-$(VERSION).tar.gz")
-REQUIRED_TRANSLATION_FILES=$(shell ls -1 src/chrome/locale/en/)
 
 AVAIL_TARGETS=help package standalone import-translations clean
 
@@ -36,23 +39,18 @@ pkg-prepare:clean
fi \
fi
@cp -a chrome.manifest.in "$(TMP)/$(EXT_NAME)"/chrome.manifest
-   @mv "$(TMP)/$(EXT_NAME)"/chrome/locale/en \
-   "$(TMP)/$(EXT_NAME)"/chrome/locale/en-US
@for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \
-  if [ "`basename "$${d}"`" = "en-US" ]; then \
+  locale="`basename $${d}`"; \
+  if [ "$${locale}" = "en-US" ]; then \
 continue; \
   fi; \
-  for f in $(REQUIRED_TRANSLATION_FILES); do \
-if [ ! -e "$${d}/$${f}" ] || \
-   ( \
- [ -n "$(BUNDLE_LOCALES)" ] && \
- ! echo $(BUNDLE_LOCALES) | grep -qw `basename "$${d}"` \
-   ); then \
-  echo "Removing locale $${d} (missing resource $${f})"; \
+  if [ -n "$(BUNDLE_LOCALES)" ]; then \
+if ! echo $(BUNDLE_LOCALES) | grep -qw "$${locale}"; then \
   rm -rf "$${d}"; \
-  break; \
+else \
+  echo "Including locale $${locale}"; \
 fi \
-  done \
+  fi \
 done
@for l in $(BUNDLE_LOCALES); do \
   if [ ! -d "$(TMP)/$(EXT_NAME)"/chrome/locale/"$${l}" ]; then \
@@ -62,8 +60,10 @@ pkg-prepare: clean
 done
@for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \
   locale="`basename $${d}`"; \
-  echo "locale torlauncher $${locale} chrome/locale/$${locale}/" >> \
-   "$(TMP)/$(EXT_NAME)"/chrome.manifest; \
+  if [ "$${locale}" != "en-US" ]; then \
+echo "locale torlauncher $${locale} chrome/locale/$${locale}/" >> \
+ "$(TMP)/$(EXT_NAME)"/chrome.manifest; \
+  fi; \
 done
 
 package:   pkg-prepare
diff --git a/README b/README
index 568acc1..ac536a1 100644
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
 PLEASE NOTE:
-  Tor Launcher is packaged with Tor Browser, Tor Messenger, and
-  other Tor-enabled applications and is designed for those
-  applications. You should not install and try to use it in
-  Mozilla Firefox or another Firefox-based browser.
+  Tor Launcher is built into Tor Browser, and it may be built as a
+  XUL/XPCOM extension for use with TorBirdy.  You should not install
+  and try to use it in Mozilla Firefox or another Firefox-based browser.
 
 OVERVIEW
 Tor Launcher is a browser extension that starts the tor process
@@ -32,18 +31,11 @@ for other product releases; e.g., maint-0.2.10 is a branch 
that is
 used for releases in the Tor Browser 6.5 series.
 
 BUILDING TOR LAUNCHER
-Official builds of Tor Launcher are done as part of a larger
-application build process. For example, look here for information
-about the Tor Browser build process:
+Official builds that use the Tor Launcher code are done as part of
+a larger application build process. For example, look here for
+information about the Tor Browser 

[tor-commits] [metrics-lib/master] Bump version to 2.6.1-dev.

2019-05-13 Thread karsten
commit 3693e107a3aff7473200ece3ba3889dc9462c7b3
Author: Karsten Loesing 
Date:   Mon May 13 11:45:17 2019 +0200

Bump version to 2.6.1-dev.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 9b76d46..9ae5215 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
 
 
 
-  
+  
   
   
   

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


[tor-commits] [metrics-lib/master] Prepare for 2.6.1 release.

2019-05-13 Thread karsten
commit d1d8ec5dca75147aa5ef1cd859765bb242b5dc21
Author: Karsten Loesing 
Date:   Fri May 3 08:44:52 2019 +0200

Prepare for 2.6.1 release.
---
 CHANGELOG.md | 2 +-
 build.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aee65ea..1e70572 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 2.6.1 - 2019-05-??
+# Changes in version 2.6.1 - 2019-05-03
 
  * Medium changes
- Fix a bug in recognizing descriptors as bandwidth files.
diff --git a/build.xml b/build.xml
index bdbb146..9b76d46 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
 
 
 
-  
+  
   
   
   

___
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-05-13 Thread translation
commit c2b1d4d754ccffaf851fd0b5a60d2cbfec1220fb
Author: Translation commit bot 
Date:   Mon May 13 07:20:52 2019 +

Update translations for support-portal
---
 contents+zh-CN.po | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 0eb0a247c..3a8b1ac4f 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -3586,7 +3586,7 @@ msgstr "### 权威网桥"
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "A special-purpose relay that maintains the list of [bridges](#bridge)."
-msgstr ""
+msgstr "一种专用中继,用于维护[网桥](#bridge)列表。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -3953,6 +3953,9 @@ msgid ""
 "services that use Flash also offer an HTML5 alternative, which should work "
 "in the Tor Browser."
 msgstr ""
+"Flash Player 是一个[浏览器插件](#add-on-extension-or-"
+"plugin),用于为互联网[应用程序](#app)观看音频和视频内
容。因为它并不安全,您不应该在 [Tor Browser](#tor-"
+"browser) 中启用 Flash。很多使用 Flash 的服务也提供 HTML5 
替代方案,应该可以在 Tor Browser 中使用。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4105,7 +4108,7 @@ msgstr "## I"
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### Internet Service Provider (ISP)"
-msgstr ""
+msgstr "### 网络服务提供商 (ISP)"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4281,7 +4284,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### network censorship"
-msgstr ""
+msgstr "### 网络审查"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4622,7 +4625,7 @@ msgstr "### 公开密钥加密算法"
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "A public-key cryptography system uses pairs of mathematical keys."
-msgstr ""
+msgstr "公钥加密系统使用成对的数学密钥。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4650,7 +4653,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "This signature can be verified by the public key."
-msgstr ""
+msgstr "可以通过公钥验证此签名。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4810,7 +4813,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### Sybil attack"
-msgstr ""
+msgstr "### 女巫攻击"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4864,7 +4867,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### third-party tracking"
-msgstr ""
+msgstr "### 第三方跟踪"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4885,7 +4888,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### Tor / Tor network/ Core Tor"
-msgstr ""
+msgstr "### Tor / Tor 网络/ Tor 核心"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4962,7 +4965,7 @@ msgstr ""
 msgid ""
 "By default, Tor Browser does not keep any [browsing history](#browsing-"
 "history)."
-msgstr ""
+msgstr "Tor Browser 默认不保留任何[浏览记录](#browsing-history)。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4974,7 +4977,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### Tor Launcher"
-msgstr ""
+msgstr "### Tor 启动器"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/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-05-13 Thread translation
commit 55e37dfddacfe074b28728fd6669f3478c30f128
Author: Translation commit bot 
Date:   Mon May 13 06:20:55 2019 +

Update translations for support-portal
---
 contents+zh-CN.po | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 4b781c48e..0eb0a247c 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -4306,6 +4306,9 @@ msgid ""
 "the window, which allows you to control the [JavaScript](#javascript)that "
 "runs on individual web pages, or to block it entirely."
 msgstr ""
+"[Tor Browser](#tor-browser) 包含一个叫 NoScript 
的[扩展](#add-on-extension-or-"
+"plugin),可通过窗口左上角的 “S” 图标访问。允许你
控制运行于单个网页中的 [JavaScript](#javascript),或者完å…
¨é˜»æ­¢è¿è¡Œ"
+" JavaScript。"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/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/tpo-web] Update translations for tpo-web

2019-05-13 Thread translation
commit 07dc59675dbe729b43db057f58109e2648c00a21
Author: Translation commit bot 
Date:   Mon May 13 06:20:31 2019 +

Update translations for tpo-web
---
 contents+zh-CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index f7917769f..e6c193953 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -712,7 +712,7 @@ msgstr ""
 msgid ""
 "We're a nonprofit organization and rely on supporters like you to help us "
 "keep Tor robust and secure for millions of people worldwide."
-msgstr ""
+msgstr "我们是一个非盈利组织,依靠像您一样的支持者
来帮助我们为全球数百万人保持 Tor 的强大和安全。"
 
 #: templates/footer.html:9 templates/footer.html:13
 #: templates/hero-home.html:13 templates/navbar.html:59

___
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-05-13 Thread translation
commit 946bb3838d7d8650e2f978158b0ccdef9d0d1834
Author: Translation commit bot 
Date:   Mon May 13 06:20:37 2019 +

Update translations for tpo-web_completed
---
 contents+zh-CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index f7917769f..e6c193953 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -712,7 +712,7 @@ msgstr ""
 msgid ""
 "We're a nonprofit organization and rely on supporters like you to help us "
 "keep Tor robust and secure for millions of people worldwide."
-msgstr ""
+msgstr "我们是一个非盈利组织,依靠像您一样的支持者
来帮助我们为全球数百万人保持 Tor 的强大和安全。"
 
 #: templates/footer.html:9 templates/footer.html:13
 #: templates/hero-home.html:13 templates/navbar.html:59

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